lab_qyk 发布系统代码

app_Web/src/app-register.ts

@@ -76,6 +76,7 @@ import AppDepartmentSelect from './components/app-department-select/app-departme
 import IBizGroupSelect from './components/ibiz-group-select/ibiz-group-select.vue'
 import IBizGroupPicker from './components/ibiz-group-picker/ibiz-group-picker.vue'
 import AppWFApproval from './components/app-wf-approval/app-wf-approval.vue'
+import Breadcrumb from './components/app-breadcrumb/app-breadcrumb.vue';
 
 // 全局挂载UI实体服务注册中心
 window['uiServiceRegister'] = uiServiceRegister;
@@ -161,5 +162,6 @@ export const AppComponents = {
         v.component('ibiz-group-select',IBizGroupSelect);
         v.component('ibiz-group-picker',IBizGroupPicker);
         v.component('app-wf-approval',AppWFApproval);
+        v.component('app-breadcrumb',Breadcrumb);
     },
 };
\ No newline at end of file

app_Web/src/components/app-autocomplete/app-autocomplete.vue

@@ -173,29 +173,22 @@ export default class AppAutocomplete extends Vue {
      * @param callback 
      */
     public onSearch(query: any, callback: any): void {
+        // 公共参数处理
+        let data: any = {};
+        const bcancel: boolean = this.handlePublicParams(data);
+        if (!bcancel) {
+            return;
+        }
+        // 参数处理
+        let _context = data.context;
+        let _param = data.param;
         // 处理搜索参数
         query = !query ? '' : query;
         if (!this.inputState && Object.is(query, this.value)) {
             query = '';
         }
         this.inputState = false;
-        // 合并视图上下文参数和视图参数
-        let param: any = JSON.parse(JSON.stringify(this.viewparams));
-        let context: any = JSON.parse(JSON.stringify(this.context));
-        Object.assign(param, { query: query });
-        // 附加参数处理
-        if (this.itemParam.context) {
-            let _context = this.$util.formatData(this.data,this.itemParam.context);
-            Object.assign(context,_context);
-        }
-        if (this.itemParam.param) {
-            let _param = this.$util.formatData(this.data,this.itemParam.param);
-            Object.assign(param,_param);
-        }
-        if (this.itemParam.parentdata) {
-            let _parentdata = this.$util.formatData(this.data,this.itemParam.parentdata);
-            Object.assign(param,_parentdata);
-        }
+        Object.assign(_param, { query: query });
         // 错误信息国际化
         let error: string = (this.$t('components.appAutocomplete.error') as any);
         let miss: string = (this.$t('components.appAutocomplete.miss') as any);
@@ -208,7 +201,7 @@ export default class AppAutocomplete extends Vue {
         } else if(!this.acParams.interfaceName) {
             this.$Notice.error({ title: error, desc: miss+'interfaceName' });
         } else {
-          this.service.getItems(this.acParams.serviceName,this.acParams.interfaceName, context, param).then((response: any) => {
+          this.service.getItems(this.acParams.serviceName,this.acParams.interfaceName, _context, _param).then((response: any) => {
               if (!response) {
                   this.$Notice.error({ title: error, desc: requestException });
               } else {
@@ -274,6 +267,34 @@ export default class AppAutocomplete extends Vue {
         this.$forceUpdate();
     }
 
+    
+    /**
+     * 公共参数处理
+     *
+     * @param {*} arg
+     * @returns
+     * @memberof AppAutocomplete
+     */
+    public handlePublicParams(arg: any): boolean {
+        if (!this.data) {
+            this.$Notice.error({ title: (this.$t('components.appPicker.error') as any), desc: (this.$t('components.appPicker.formdataException') as any) });
+            return false;
+        }
+        // 合并表单参数
+        arg.param = JSON.parse(JSON.stringify(this.viewparams));
+        arg.context = JSON.parse(JSON.stringify(this.context));
+        // 附加参数处理
+        if (this.itemParam.context) {
+          let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context);
+            Object.assign(arg.context,_context);
+        }
+        if (this.itemParam.param) {
+          let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param);
+            Object.assign(arg.param,_param);
+        }
+        return true;
+    }
+
 }
 </script>
 

app_Web/src/components/app-breadcrumb/app-breadcrumb.less

+
+.el-breadcrumb__inner,
+.el-breadcrumb__inner a {
+  font-weight: 400 !important;
+}
+
+.app-breadcrumb.el-breadcrumb {
+  display: inline-block;
+  font-size: 14px;
+  line-height: 50px;
+  margin-left: 8px;
+
+  .no-redirect {
+    color: #97a8be;
+    cursor: text;
+  }
+}
\ No newline at end of file

app_Web/src/components/app-breadcrumb/app-breadcrumb.vue

+<template>
+  <el-breadcrumb
+    class="app-breadcrumb"
+    separator="/"
+  >
+    <transition-group name="breadcrumb">
+      <el-breadcrumb-item
+        v-for="(item, index) in breadcrumbs"
+        :key="item.path"
+      >
+        <span
+          v-if="item.redirect === 'noredirect' || index === breadcrumbs.length-1"
+          class="no-redirect"
+        >{{  $t(item.meta.caption) }}</span>
+        <a
+          v-else
+          @click.prevent="handleLink(item)"
+        >{{  $t(item.meta.caption) }}</a>
+      </el-breadcrumb-item>
+    </transition-group>
+  </el-breadcrumb>
+</template>
+
+<script lang="ts">
+import { compile } from 'path-to-regexp'
+import { Component, Vue, Watch } from 'vue-property-decorator'
+import { RouteRecord, Route } from 'vue-router'
+
+@Component({
+  name: 'Breadcrumb'
+})
+export default class extends Vue {
+  private breadcrumbs: RouteRecord[] = []
+
+  @Watch('$route')
+  private onRouteChange(route: Route) {
+    // if you go to the redirect page, do not update the breadcrumbs
+    if (route.path.startsWith('/redirect/')) {
+      return
+    }
+    this.getBreadcrumb()
+  }
+
+  created() {
+    this.getBreadcrumb()
+  }
+
+  private getBreadcrumb() {
+    let matched = this.$route.matched.filter((item) => item.meta && item.meta.caption)
+    const first = matched[0]
+    if (!this.isDashboard(first)) {
+      matched = [{ path: "/index/:index?", meta: { 
+                caption: 'app.views.index.caption',
+                viewType: 'APPINDEX',
+                parameters: [
+                    { pathName: 'index', parameterName: 'index' },
+                ],
+                requireAuth: true, } } as RouteRecord].concat(matched)
+    }
+    this.breadcrumbs = matched.filter((item) => {
+      return item.meta && item.meta.caption && item.meta.breadcrumb !== false
+    })
+  }
+
+  private isDashboard(route: RouteRecord) {
+    const name = route && route.meta.parameters[0].pathName;
+    if (!name) {
+      return false
+    }
+    return name.trim().toLocaleLowerCase() === 'index'.toLocaleLowerCase()
+  }
+
+  private pathCompile(path: string) {
+    const { params } = this.$route
+    const toPath = compile(path)
+    return toPath(params)
+  }
+
+  private handleLink(item: any) {
+    const { redirect, path } = item
+    if (redirect) {
+      this.$router.push(redirect).catch(err => {
+        console.warn(err)
+      })
+      return
+    }
+    this.$router.push(this.pathCompile(path)).catch(err => {
+      console.warn(err)
+    })
+  }
+}
+</script>
+
+<style lang='less'>
+@import "./app-breadcrumb.less";
+</style>
\ No newline at end of file

app_Web/src/components/app-checkbox-list/app-checkbox-list.vue

@@ -53,6 +53,38 @@ export default class AppCheckBox extends Vue {
      */
     @Prop() disabled?: boolean;
 
+    /**
+     * 传入表单数据
+     *
+     * @type {*}
+     * @memberof DropDownList
+     */
+    @Prop() public data?: any;
+
+    /**
+     * 传入额外参数
+     *
+     * @type {*}
+     * @memberof DropDownList
+     */
+    @Prop() public itemParam?: any;
+
+    /**
+     * 视图上下文
+     *
+     * @type {*}
+     * @memberof AppAutocomplete
+     */
+    @Prop() public context!: any;
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof AppFormDRUIPart
+     */
+    @Prop() public viewparams!: any;
+
     /**
      * 获取启用禁用状态
      *
@@ -166,6 +198,28 @@ export default class AppCheckBox extends Vue {
      */
     public items: any[] = [];
 
+    /**
+     * 公共参数处理
+     *
+     * @param {*} arg
+     * @returns
+     * @memberof DropDownList
+     */
+    public handlePublicParams(arg: any) {
+        // 合并表单参数
+        arg.param = JSON.parse(JSON.stringify(this.viewparams));
+        arg.context = JSON.parse(JSON.stringify(this.context));
+        // 附加参数处理
+        if (this.itemParam.context) {
+          let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context);
+            Object.assign(arg.context,_context);
+        }
+        if (this.itemParam.param) {
+          let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param);
+            Object.assign(arg.param,_param);
+        }
+    }
+
     /**
      * vue  生命周期
      *
@@ -181,7 +235,13 @@ export default class AppCheckBox extends Vue {
                     console.log(`----${this.tag}----$t('components.appCheckBox.notExist')`);
                 }
             } else if (Object.is(this.codelistType,"DYNAMIC")) {
-                this.codeListService.getItems(this.tag).then((res:any) => {
+                // 公共参数处理
+                let data: any = {};
+                this.handlePublicParams(data);
+                // 参数处理
+                let _context = data.context;
+                let _param = data.param;
+                this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
                     this.items = res;
                 }).catch((error:any) => {
                     console.log(`----${this.tag}----$t('components.appCheckBox.notExist')`);

app_Web/src/components/app-embed-picker/app-embed-picker.vue

@@ -170,15 +170,15 @@ export default class AppEmbedPicker extends Vue {
         let context: any = JSON.parse(JSON.stringify(this.context));
         // 附加参数处理
         if (this.itemParam.context) {
-            let _context = this.$util.formatData(activeData,this.itemParam.context);
+            let _context = this.$util.formatData(activeData,context,this.itemParam.context);
             Object.assign(context,_context);
         }
         if (this.itemParam.param) {
-            let _param = this.$util.formatData(activeData,this.itemParam.param);
+            let _param = this.$util.formatData(activeData,param,this.itemParam.param);
             Object.assign(param,_param);
         }
         if (this.itemParam.parentdata) {
-            let _parentdata = this.$util.formatData(activeData,this.itemParam.parentdata);
+            let _parentdata = this.$util.formatData(activeData,param,this.itemParam.parentdata);
             Object.assign(param,_parentdata);
         }
         this.viewdata = JSON.stringify(context);

app_Web/src/components/app-mpicker/app-mpicker.vue

@@ -44,6 +44,14 @@ export default class AppMpicker extends Vue {
      */
     @Prop() curvalue?: any;
 
+    /**
+     * 表单项参数
+     * 
+     * @type {any}
+     * @memberof AppPicker
+     */
+    @Prop() public itemParam: any;
+
     /**
      * 表单项名称
      */
@@ -147,9 +155,18 @@ export default class AppMpicker extends Vue {
      * @memberof AppMpicker
      */
     public onSearch(query: any) {
-        let param: any = { query: query };
+        // 公共参数处理
+        let data: any = {};
+        const bcancel: boolean = this.handlePublicParams(data);
+        if (!bcancel) {
+            return;
+        }
+        // 参数处理
+        let _context = data.context;
+        let _param = data.param;
+        Object.assign(_param ,{ query: query });
         if (this.activeData) {
-            Object.assign(param, { srfreferdata: this.activeData });
+            Object.assign(_param, { srfreferdata: this.activeData });
         }
         // 错误信息国际化
         let error: string = (this.$t('components.appMpicker.error') as any);
@@ -162,7 +179,7 @@ export default class AppMpicker extends Vue {
         } else if(!this.acParams.interfaceName) {
             this.$Notice.error({ title: error, desc: miss+'interfaceName' });
         } else {
-          this.service.getItems(this.acParams.serviceName,this.acParams.interfaceName, param).then((response: any) => {
+          this.service.getItems(this.acParams.serviceName,this.acParams.interfaceName, _context, _param).then((response: any) => {
               if (!response) {
                   this.$Notice.error({ title: error, desc: requestException });
               } else {
@@ -216,6 +233,33 @@ export default class AppMpicker extends Vue {
         }
     }
 
+    /**
+     * 公共参数处理
+     *
+     * @param {*} arg
+     * @returns
+     * @memberof AppMpicker
+     */
+    public handlePublicParams(arg: any): boolean {
+        if (!this.activeData) {
+            this.$Notice.error({ title: (this.$t('components.appPicker.error') as any), desc: (this.$t('components.appPicker.formdataException') as any) });
+            return false;
+        }
+        // 合并表单参数
+        arg.param = JSON.parse(JSON.stringify(this.viewparams));
+        arg.context = JSON.parse(JSON.stringify(this.context));
+        // 附加参数处理
+        if (this.itemParam.context) {
+          let _context = this.$util.formatData(this.activeData,arg.context,this.itemParam.context);
+            Object.assign(arg.context,_context);
+        }
+        if (this.itemParam.param) {
+          let _param = this.$util.formatData(this.activeData,arg.param,this.itemParam.param);
+            Object.assign(arg.param,_param);
+        }
+        return true;
+    }
+
     /**
      * 打开视图
      *
@@ -229,8 +273,15 @@ export default class AppMpicker extends Vue {
         if (this.pickupView && Object.keys(this.pickupView).length > 0) {
             // 参数处理
             const view = { ...this.pickupView };
-            let _viewparams = JSON.parse(JSON.stringify(this.viewparams));
-            let _context = JSON.parse(JSON.stringify(this.context));
+            // 公共参数处理
+            let data: any = {};
+            const bcancel: boolean = this.handlePublicParams(data);
+            if (!bcancel) {
+                return;
+            }
+            // 参数处理
+            let _context = data.context;
+            let _viewparams = data.param;
             let _selectItems = JSON.parse(JSON.stringify(this.selectItems));
             if(!Object.is(this.deKeyField,"srfkey")){
                 _selectItems.forEach((item:any, index:number)=>{

app_Web/src/components/app-picker-select-view/app-picker-select-view.vue

@@ -259,17 +259,13 @@ export default class AppPickerSelectView extends Vue {
         arg.context = JSON.parse(JSON.stringify(this.context));
         // 附加参数处理
         if (this.itemParam.context) {
-          let _context = this.$util.formatData(this.data,this.itemParam.context);
+          let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context);
             Object.assign(arg.context,_context);
         }
         if (this.itemParam.param) {
-          let _param = this.$util.formatData(this.data,this.itemParam.param);
+          let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param);
             Object.assign(arg.param,_param);
         }
-        if (this.itemParam.parentdata) {
-          let _parentdata = this.$util.formatData(this.data,this.itemParam.parentdata);
-            Object.assign(arg.param,_parentdata);
-        }
         return true;
     }
 

app_Web/src/components/app-picker/app-picker.vue

@@ -651,17 +651,13 @@ export default class AppPicker extends Vue {
         arg.context = JSON.parse(JSON.stringify(this.context));
         // 附加参数处理
         if (this.itemParam.context) {
-          let _context = this.$util.formatData(this.data,this.itemParam.context);
+          let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context);
             Object.assign(arg.context,_context);
         }
         if (this.itemParam.param) {
-          let _param = this.$util.formatData(this.data,this.itemParam.param);
+          let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param);
             Object.assign(arg.param,_param);
         }
-        if (this.itemParam.parentdata) {
-          let _parentdata = this.$util.formatData(this.data,this.itemParam.parentdata);
-            Object.assign(arg.param,_parentdata);
-        }
         return true;
     }
 

app_Web/src/components/app-radio-group/app-radio-group.vue

@@ -61,6 +61,14 @@ export default class AppRadioGroup extends Vue {
      */
     @Prop() public codelistType?: string;
 
+    /**
+     * 传入表单数据
+     *
+     * @type {*}
+     * @memberof DropDownList
+     */
+    @Prop() public data?: any;
+
     /**
      * 是否禁用
      *
@@ -69,6 +77,30 @@ export default class AppRadioGroup extends Vue {
      */
     @Prop() public disabled?: boolean;
 
+    /**
+     * 传入额外参数
+     *
+     * @type {*}
+     * @memberof DropDownList
+     */
+    @Prop() public itemParam?: any;
+
+    /**
+     * 视图上下文
+     *
+     * @type {*}
+     * @memberof AppAutocomplete
+     */
+    @Prop() public context!: any;
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof AppFormDRUIPart
+     */
+    @Prop() public viewparams!: any;
+
     /**
      * 属性名称
      *
@@ -99,6 +131,28 @@ export default class AppRadioGroup extends Vue {
      */
     public items: any[] = [];
 
+    /**
+     * 公共参数处理
+     *
+     * @param {*} arg
+     * @returns
+     * @memberof DropDownList
+     */
+    public handlePublicParams(arg: any) {
+        // 合并表单参数
+        arg.param = JSON.parse(JSON.stringify(this.viewparams));
+        arg.context = JSON.parse(JSON.stringify(this.context));
+        // 附加参数处理
+        if (this.itemParam.context) {
+          let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context);
+            Object.assign(arg.context,_context);
+        }
+        if (this.itemParam.param) {
+          let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param);
+            Object.assign(arg.param,_param);
+        }
+    }
+
     /**
      * vue  生命周期
      *
@@ -108,7 +162,13 @@ export default class AppRadioGroup extends Vue {
         if(this.tag && this.codelistType == 'STATIC'){
             this.items  = this.$store.getters.getCodeListItems(this.tag);
         }else if(this.tag && this.codelistType == 'DYNAMIC'){
-            this.codeListService.getItems(this.tag).then((data:any)=>{
+            // 公共参数处理
+            let data: any = {};
+            this.handlePublicParams(data);
+            // 参数处理
+            let _context = data.context;
+            let _param = data.param;
+            this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
                 this.items = data;
             }).catch((data:any)=>{
                 console.log(`----${this.tag}----代码表不存在！`);

app_Web/src/components/app-tree-picker/app-tree-picker.vue

@@ -220,15 +220,15 @@ export default class AppTreePicker extends Vue {
         let context: any = JSON.parse(JSON.stringify(this.context));
         // 附加参数处理
         if (this.itemParam.context) {
-            let _context = this.$util.formatData(activeData,this.itemParam.context);
+            let _context = this.$util.formatData(activeData,context,this.itemParam.context);
             Object.assign(context,_context);
         }
         if (this.itemParam.param) {
-            let _param = this.$util.formatData(activeData,this.itemParam.param);
+            let _param = this.$util.formatData(activeData,param,this.itemParam.param);
             Object.assign(param,_param);
         }
         if (this.itemParam.parentdata) {
-            let _parentdata = this.$util.formatData(activeData,this.itemParam.parentdata);
+            let _parentdata = this.$util.formatData(activeData,param,this.itemParam.parentdata);
             Object.assign(param,_parentdata);
         }
         this.viewdata = JSON.stringify(context);

app_Web/src/components/dropdown-list-dynamic/dropdown-list-dynamic.vue

@@ -81,7 +81,7 @@ export default class DropDownListDynamic extends Vue {
     @Watch('data',{ deep: true })
     onDataChange(newVal: any, val: any){
         if(newVal){
-            this.handleOtherParam();
+            
         }
     }
 
@@ -145,26 +145,40 @@ export default class DropDownListDynamic extends Vue {
     public items: any[] = [];
 
     /**
-     * 处理额外参数
+     * 视图上下文
+     *
+     * @type {*}
+     * @memberof AppAutocomplete
      */
-    public handleOtherParam(){
-        if(this.itemParam){
-            this.queryParam = {};
-            this.otherParam = this.itemParam.parentdata;
-            if(this.otherParam && Object.keys(this.otherParam).length >0){
-                Object.keys(this.otherParam).forEach((item:any) =>{
-                    let value: string | null = this.otherParam[item];
-                    if (value && value.startsWith('%') && value.endsWith('%')) {
-                        const key = value.substring(1, value.length - 1);
-                        if (this.data && this.data.hasOwnProperty(key)) {
-                            value = (this.data[key] !== null && this.data[key] !== undefined) ? this.data[key] : null;
-                        } else {
-                            value = null;
-                        }
-                    }
-                    Object.assign(this.queryParam,{[item]:value});
-                })
+    @Prop() public context!: any;
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof AppFormDRUIPart
+     */
+    @Prop() public viewparams!: any;
+
+    /**
+     * 公共参数处理
+     *
+     * @param {*} arg
+     * @returns
+     * @memberof DropDownListDynamic
+     */
+    public handlePublicParams(arg: any) {
+        // 合并表单参数
+        arg.param = JSON.parse(JSON.stringify(this.viewparams));
+        arg.context = JSON.parse(JSON.stringify(this.context));
+        // 附加参数处理
+        if (this.itemParam.context) {
+          let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context);
+            Object.assign(arg.context,_context);
         }
+        if (this.itemParam.param) {
+          let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param);
+            Object.assign(arg.param,_param);
         }
     }
 
@@ -182,7 +196,13 @@ export default class DropDownListDynamic extends Vue {
               console.log(`----${this.tag}----代码表不存在`);
           }
       }else if(this.tag && Object.is(this.codelistType,"DYNAMIC")){
-          this.codeListService.getItems(this.tag,{},this.queryParam).then((res:any) => {
+          // 公共参数处理
+          let data: any = {};
+          this.handlePublicParams(data);
+          // 参数处理
+          let _context = data.context;
+          let _param = data.param;
+          this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
               this.items = res;
           }).catch((error:any) => {
               console.log(`----${this.tag}----代码表不存在`);
@@ -199,7 +219,13 @@ export default class DropDownListDynamic extends Vue {
     public onClick($event:any){
         if($event){
             if(this.tag && Object.is(this.codelistType,"DYNAMIC")){
-                this.codeListService.getItems(this.tag,{},this.queryParam).then((res:any) => {
+                // 公共参数处理
+                let data: any = {};
+                this.handlePublicParams(data);
+                // 参数处理
+                let _context = data.context;
+                let _param = data.param;
+                this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
                     this.items = res;
                 }).catch((error:any) => {
                     console.log(`----${this.tag}----代码表不存在`);

app_Web/src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue

@@ -84,6 +84,38 @@ export default class DropDownListMpicker extends Vue {
      */
     @Prop() public placeholder?: string;
 
+    /**
+     * 传入额外参数
+     *
+     * @type {*}
+     * @memberof DropDownListMpicker
+     */
+    @Prop() public itemParam?: any;
+
+    /**
+     * 视图上下文
+     *
+     * @type {*}
+     * @memberof DropDownListMpicker
+     */
+    @Prop() public context!: any;
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof DropDownListMpicker
+     */
+    @Prop() public viewparams!: any;
+
+    /**
+     * 传入表单数据
+     *
+     * @type {*}
+     * @memberof DropDownListMpicker
+     */
+    @Prop() public data?: any;
+
     /**
      * 计算属性(当前值)
      * @type {any}
@@ -113,6 +145,28 @@ export default class DropDownListMpicker extends Vue {
      */
     public items: any[] = [];
 
+    /**
+     * 公共参数处理
+     *
+     * @param {*} arg
+     * @returns
+     * @memberof DropDownList
+     */
+    public handlePublicParams(arg: any) {
+        // 合并表单参数
+        arg.param = JSON.parse(JSON.stringify(this.viewparams));
+        arg.context = JSON.parse(JSON.stringify(this.context));
+        // 附加参数处理
+        if (this.itemParam.context) {
+          let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context);
+            Object.assign(arg.context,_context);
+        }
+        if (this.itemParam.param) {
+          let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param);
+            Object.assign(arg.param,_param);
+        }
+    }
+
     /**
      * vue  生命周期
      *
@@ -127,7 +181,13 @@ export default class DropDownListMpicker extends Vue {
               console.log(`----${this.tag}----代码表不存在`);
           }
       }else if(this.tag && Object.is(this.codelistType,"DYNAMIC")){
-          this.codeListService.getItems(this.tag).then((res:any) => {
+          // 公共参数处理
+          let data: any = {};
+          this.handlePublicParams(data);
+          // 参数处理
+          let _context = data.context;
+          let _param = data.param;
+          this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
               this.items = res;
           }).catch((error:any) => {
               console.log(`----${this.tag}----代码表不存在`);
@@ -143,7 +203,13 @@ export default class DropDownListMpicker extends Vue {
      */
     public onClick($event:any){
         if(this.tag && Object.is(this.codelistType,"DYNAMIC")){
-            this.codeListService.getItems(this.tag).then((res:any) => {
+            // 公共参数处理
+            let data: any = {};
+            this.handlePublicParams(data);
+            // 参数处理
+            let _context = data.context;
+            let _param = data.param;
+            this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
                 this.items = res;
             }).catch((error:any) => {
                 console.log(`----${this.tag}----代码表不存在`);

app_Web/src/components/dropdown-list/dropdown-list.vue

@@ -81,7 +81,7 @@ export default class DropDownList extends Vue {
     @Watch('data',{ deep: true })
     onDataChange(newVal: any, val: any){
         if(newVal){
-            this.handleOtherParam();
+            
         }
     }
 
@@ -93,6 +93,22 @@ export default class DropDownList extends Vue {
      */
     @Prop() public itemParam?: any;
 
+    /**
+     * 视图上下文
+     *
+     * @type {*}
+     * @memberof AppAutocomplete
+     */
+    @Prop() public context!: any;
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof AppFormDRUIPart
+     */
+    @Prop() public viewparams!: any;
+
     /**
      * 是否禁用
      * @type {any}
@@ -145,26 +161,24 @@ export default class DropDownList extends Vue {
     public items: any[] = [];
 
     /**
-     * 处理额外参数
-     */
-    public handleOtherParam(){
-        if(this.itemParam){
-            this.queryParam = {};
-            this.otherParam = this.itemParam.parentdata;
-            if(this.otherParam && Object.keys(this.otherParam).length >0){
-                Object.keys(this.otherParam).forEach((item:any) =>{
-                    let value: string | null = this.otherParam[item];
-                    if (value && value.startsWith('%') && value.endsWith('%')) {
-                        const key = value.substring(1, value.length - 1);
-                        if (this.data && this.data.hasOwnProperty(key)) {
-                            value = (this.data[key] !== null && this.data[key] !== undefined) ? this.data[key] : null;
-                        } else {
-                            value = null;
-                        }
-                    }
-                    Object.assign(this.queryParam,{[item]:value});
-                })
+     * 公共参数处理
+     *
+     * @param {*} arg
+     * @returns
+     * @memberof DropDownList
+     */
+    public handlePublicParams(arg: any) {
+        // 合并表单参数
+        arg.param = JSON.parse(JSON.stringify(this.viewparams));
+        arg.context = JSON.parse(JSON.stringify(this.context));
+        // 附加参数处理
+        if (this.itemParam.context) {
+          let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context);
+            Object.assign(arg.context,_context);
         }
+        if (this.itemParam.param) {
+          let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param);
+            Object.assign(arg.param,_param);
         }
     }
 
@@ -182,7 +196,13 @@ export default class DropDownList extends Vue {
               console.log(`----${this.tag}----代码表不存在`);
           }
       }else if(this.tag && Object.is(this.codelistType,"DYNAMIC")){
-          this.codeListService.getItems(this.tag,{},this.queryParam).then((res:any) => {
+          // 公共参数处理
+          let data: any = {};
+          this.handlePublicParams(data);
+          // 参数处理
+          let _context = data.context;
+          let _param = data.param;
+          this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
               this.items = res;
           }).catch((error:any) => {
               console.log(`----${this.tag}----代码表不存在`);
@@ -199,7 +219,13 @@ export default class DropDownList extends Vue {
     public onClick($event:any){
         if($event){
             if(this.tag && Object.is(this.codelistType,"DYNAMIC")){
-                this.codeListService.getItems(this.tag,{},this.queryParam).then((res:any) => {
+                // 公共参数处理
+                let data: any = {};
+                this.handlePublicParams(data);
+                // 参数处理
+                let _context = data.context;
+                let _param = data.param;
+                this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
                     this.items = res;
                 }).catch((error:any) => {
                     console.log(`----${this.tag}----代码表不存在`);

app_Web/src/components/tab-page-exp/tab-page-exp.less

+// .ibiz-page-tag {
+//     position: relative;
+//     box-sizing: border-box;
+//     // width: calc(100% + 30px);
+//     height: 38px;
+//     padding: 0 60px 0 30px;
+//     background: #f6f6f6;
+//     .tags-body {
+//         position: relative;
+//         width: 100%;
+//         height: 100%;
+//         overflow: hidden;
+//         .tags-container {
+//             position: absolute;
+//             overflow: visible;
+//             white-space: nowrap;
+//             transition: left .3s ease;
+//             .ivu-tag {
+//                 margin: 0;
+//                 height: 38px;
+//                 line-height: 38px;
+//                 border: 0;
+//                 border-radius: 0;
+//                 border-right: 1px solid #ddd;
+//                 font-size: 14px;
+//                 .text-icon {
+//                     height: 16px;
+//                     margin-bottom: -3px;
+//                 }
+//                 .ivu-icon-ios-close {
+//                     visibility: hidden;
+//                 }
+//                 .tag-text {
+//                     display: table-cell;
+//                     .ivu-tooltip {
+//                         display: block;
+//                         .ivu-tooltip-rel {
+//                             display: block;
+//                             max-width: 200px;
+//                             overflow: hidden;
+//                             text-overflow: ellipsis;
+//                         }
+//                     }
+//                 }
+//             }
+//             .ivu-tag.tag-is-active {
+//                 background: #fff;
+//             }
+//             .ivu-tag:hover,.ivu-tag.tag-is-active {
+//                 .ivu-icon-ios-close {
+//                     visibility: initial;
+//                 }
+//             }
+//         }
+//     }
+//     .move-btn {
+//         font-size: 18px;
+//         width: 30px;
+//         height: 38px;
+//         line-height: 38px;
+//         border-left: 1px solid #ddd;
+//         border-right: 1px solid #ddd;
+//         text-align: center;
+//         cursor: pointer;
+//     }
+//     .move-btn:hover {
+//         background: #efefef;
+//     }
+//     .move-left, .move-right, .ivu-dropdown{
+//         position: absolute;
+//         top: 0;
+//     }
+//     .move-left {
+//         left: 0;
+//     }
+//     .move-right {
+//         right: 30px;
+//     }
+//     .ivu-dropdown {
+//         right: 0;
+//     }
+// }
+// .tags-transition-move {
+//     transition: transform .3s;
+// }
+// .tags-transition-enter,.tags-transition-leave-to{
+//     opacity: 0;
+// }
 .ibiz-page-tag {
-    position: relative;
-    box-sizing: border-box;
-    // width: calc(100% + 30px);
-    height: 38px;
-    padding: 0 60px 0 30px;
-    background: #f6f6f6;
-    .tags-body {
-        position: relative;
-        width: 100%;
-        height: 100%;
-        overflow: hidden;
-        .tags-container {
-            position: absolute;
-            overflow: visible;
-            white-space: nowrap;
-            transition: left .3s ease;
-            .ivu-tag {
-                margin: 0;
-                height: 38px;
-                line-height: 38px;
-                border: 0;
-                border-radius: 0;
-                border-right: 1px solid #ddd;
-                font-size: 14px;
-                .text-icon {
-                    height: 16px;
-                    margin-bottom: -3px;
+    .el-tabs{
+        .el-tabs__nav{
+            border:none;
         }
-                .ivu-icon-ios-close {
-                    visibility: hidden;
+        .el-tabs__item{
+            color:#ccc;
+            border:none;
         }
-                .tag-text {
-                    display: table-cell;
-                    .ivu-tooltip {
-                        display: block;
-                        .ivu-tooltip-rel {
-                            display: block;
-                            max-width: 200px;
-                            overflow: hidden;
-                            text-overflow: ellipsis;
+        .el-tabs__item:hover{
+            color:#409eff;
         }
+        .is-active{
+            color:#409eff;
+            border-bottom:2px solid #409eff !important;    
         }
+        .el-tabs__nav-scroll{
+            background-color: white;
         }
     }
-            .ivu-tag.tag-is-active {
-                background: #fff;
-            }
-            .ivu-tag:hover,.ivu-tag.tag-is-active {
-                .ivu-icon-ios-close {
-                    visibility: initial;
-                }
-            }
-        }
-    }
-    .move-btn {
-        font-size: 18px;
-        width: 30px;
-        height: 38px;
-        line-height: 38px;
-        border-left: 1px solid #ddd;
-        border-right: 1px solid #ddd;
-        text-align: center;
-        cursor: pointer;
-    }
-    .move-btn:hover {
-        background: #efefef;
-    }
-    .move-left, .move-right, .ivu-dropdown{
-        position: absolute;
-        top: 0;
-    }
-    .move-left {
-        left: 0;
-    }
-    .move-right {
-        right: 30px;
-    }
-    .ivu-dropdown {
-        right: 0;
-    }
-}
-.tags-transition-move {
-    transition: transform .3s;
-}
-.tags-transition-enter,.tags-transition-leave-to{
-    opacity: 0;
 }
\ No newline at end of file

app_Web/src/components/tab-page-exp/tab-page-exp.vue

 <template>
-    <div class="ibiz-page-tag" v-if="$store.state.pageMetas.length > 0">
-        <div class="move-btn move-left" @click="leftMove">
-            <icon type="ios-arrow-back" />
+  <div class="ibiz-page-tag">
+    <el-tabs
+      type="card"
+      @tab-click="changePage"
+      v-model="editableTabsValue"
+      closable
+      @tab-remove="onClose"
+    >
+      <el-tab-pane
+        v-for="(meta, index) of $store.state.pageMetas"
+        :label="getCaption(meta.caption, meta.info)"
+        :name="index+''"
+        :key="index+''"
+      ></el-tab-pane>
+    </el-tabs>
   </div>
-        <div ref="scrollBody" class="tags-body">
-            <div ref="scrollChild" class="tags-container" :style="{left: styleLeft + 'px'}">
-                <transition-group name="tags-transition">
-                    <template v-for="(meta, index) of $store.state.pageMetas">
-                        <Tag ref="tagElement" :key="index" :class="isActive(index) ? 'tag-is-active' : ''" :name="index" closable @click.native="changePage(index)" @on-close="onClose(index)">
-                            <div class="tag-text">
-                                <tooltip  :content="getCaption(meta.caption, meta.info)" transfer :max-width="300">
-                                    <i v-if="meta.iconCls && !Object.is(meta.iconCls, '')" :class="meta.iconCls"></i>
-                                    <img v-else :src="meta.imgPath" class="text-icon" />
-                                    &nbsp;{{getCaption(meta.caption, meta.info)}}
-                                </tooltip>
-                            </div>
-                        </Tag>
-                    </template>
-                </transition-group>
-            </div>
-        </div>
-        <div class="move-btn move-right" @click="rightMove">
-            <icon type="ios-arrow-forward" />
-        </div>
-        <Dropdown @on-click="doTagAction" placement="bottom-end">
-            <div class="move-btn">
-                <icon type="ios-close-circle-outline" />
-            </div>
-            <DropdownMenu slot="list">
-                <template v-for="(action, index) of actions">
-                    <DropdownItem :key="index" :name="action.value">{{$t(action.text)}}</DropdownItem>
-                </template>
-            </DropdownMenu>
-        </Dropdown >
-    </div >
 </template>
 
 <script lang="ts">
-import { Vue, Component, Provide, Prop, Watch } from 'vue-property-decorator';
-import { Environment } from '../../environments/environment';
+import { Vue, Component, Provide, Prop, Watch } from "vue-property-decorator";
+import { Environment } from "../../environments/environment";
 
 @Component({})
 export default class TabPageExp extends Vue {
@@ -46,20 +27,27 @@ export default class TabPageExp extends Vue {
   public styleLeft: number = 0;
 
   @Provide()
-    public actions: any[] = [{ text: 'app.tabpage.closeall', value: 'closeAll' }, { text: 'app.tabpage.closeother', value: 'closeOther' }];
+  public actions: any[] = [
+    { text: "app.tabpage.closeall", value: "closeAll" },
+    { text: "app.tabpage.closeother", value: "closeOther" }
+  ];
+
+  public editableTabsValue: any = "";
 
   @Watch("$route")
   public onRouteChange(newVal: any) {
     this.moveToView(newVal);
-        this.$emit('change', newVal);
+    this.$emit("change", newVal);
   }
 
   public created() {
     Vue.prototype.$tabPageExp = this;
   }
 
-    public getCaption(caption: any, info: any):any {
-        return  info && !Object.is(info, '') ? `${this.$t(caption)} - ${info}` : this.$t(caption);
+  public getCaption(caption: any, info: any): any {
+    return info && !Object.is(info, "")
+      ? `${this.$t(caption)} - ${info}`
+      : this.$t(caption);
   }
 
   /**
@@ -70,8 +58,15 @@ export default class TabPageExp extends Vue {
   public leftMove() {
     const scrollBody: any = this.$refs.scrollBody;
     const scrollChild: any = this.$refs.scrollChild;
-        if (scrollBody && scrollChild && scrollChild.offsetWidth > scrollBody.offsetWidth) {
-            if ((scrollChild.offsetWidth - scrollBody.offsetWidth + this.styleLeft) > 100) {
+    if (
+      scrollBody &&
+      scrollChild &&
+      scrollChild.offsetWidth > scrollBody.offsetWidth
+    ) {
+      if (
+        scrollChild.offsetWidth - scrollBody.offsetWidth + this.styleLeft >
+        100
+      ) {
         this.styleLeft -= 100;
       } else {
         this.styleLeft = scrollBody.offsetWidth - scrollChild.offsetWidth;
@@ -122,10 +117,10 @@ export default class TabPageExp extends Vue {
       this.$store.commit("deletePage", name);
       this.gotoPage();
     }
-        const appview = this.$store.getters['viewaction/getAppView'](page.viewtag);
+    const appview = this.$store.getters["viewaction/getAppView"](page.viewtag);
     if (appview && appview.viewdatachange) {
-            const title: any = this.$t('app.tabpage.sureclosetip.title');
-            const content: any = this.$t('app.tabpage.sureclosetip.content');
+      const title: any = this.$t("app.tabpage.sureclosetip.title");
+      const content: any = this.$t("app.tabpage.sureclosetip.content");
       this.$Modal.confirm({
         title: title,
         content: content,
@@ -133,8 +128,7 @@ export default class TabPageExp extends Vue {
           this.$store.commit("deletePage", name);
           this.gotoPage();
         },
-                onCancel: () => {
-                }
+        onCancel: () => {}
       });
     } else {
       this.$store.commit("deletePage", name);
@@ -162,8 +156,9 @@ export default class TabPageExp extends Vue {
    * @param {*} index
    * @memberof TabPageExp
    */
-    public changePage(index: any) {
-        this.$store.commit("setCurPage", index);
+  public changePage(tab: any, event: any) {
+    this.editableTabsValue = tab.index;
+    this.$store.commit("setCurPage", tab.index);
     this.gotoPage();
   }
 
@@ -180,17 +175,25 @@ export default class TabPageExp extends Vue {
       if (Object.is(path, this.$route.fullPath)) {
         return;
       }
-            const index = this.$store.state.pageTagList.findIndex((page: any) => Object.is(page.fullPath, path));
+      const index = this.$store.state.pageTagList.findIndex((page: any) =>
+        Object.is(page.fullPath, path)
+      );
       if (index >= 0) {
         const page = this.$store.state.pageTagList[index];
-                this.$router.push({ path: page.path, params: page.params, query: page.query });
+        this.$router.push({
+          path: page.path,
+          params: page.params,
+          query: page.query
+        });
       }
     } else {
-            let path: string | null = window.sessionStorage.getItem(Environment.AppName);
-            if(path) {
-                this.$router.push({path: path});
+      let path: string | null = window.sessionStorage.getItem(
+        Environment.AppName
+      );
+      if (path) {
+        this.$router.push({ path: path });
       } else {
-                this.$router.push('/');
+        this.$router.push("/");
       }
     }
   }
@@ -202,15 +205,25 @@ export default class TabPageExp extends Vue {
    * @memberof TabPageExp
    */
   public setCurPageCaption(caption: string, title: any, info: string) {
-        if(this.$route.meta && (!Object.is(this.$route.meta.caption, caption))) {
+    if (this.$route.meta && !Object.is(this.$route.meta.caption, caption)) {
       return;
     }
-        this.$store.commit("setCurPageCaption", { route: this.$route, caption: title, info: info });
+    this.$store.commit("setCurPageCaption", {
+      route: this.$route,
+      caption: title,
+      info: info
+    });
     setTimeout(() => {
       this.moveToView(this.$route);
     }, 1);
   }
 
+  /**
+   * 移动至指定页面标签
+   *
+   * @param {*} to
+   * @memberof TabPageExp
+   */
   /**
    * 移动至指定页面标签
    *
@@ -218,21 +231,19 @@ export default class TabPageExp extends Vue {
    * @memberof TabPageExp
    */
   public moveToView(to: any) {
+    let that: any = this;
     const pages: any[] = this.$store.state.pageTagList;
     let leftWidth: number = 0;
     this.$nextTick(() => {
+      let _index: any = "";
       pages.forEach((page, index) => {
-                const tag: any = this.$refs.tagElement;
-                if (!tag) {
-                    return ;
-                }
-                const el = tag[index].$el;
-                if (Object.is(page.fullPath, to.fullPath)) {
-                    this.setLeft(el, leftWidth);
-                } else {
-                    leftWidth += el.offsetWidth;
+        if (Object.is(page.path, to.path)) {
+          _index = index + "";
         }
       });
+      if (_index !== "") {
+        that.editableTabsValue = _index + "";
+      }
     });
   }
 
@@ -243,13 +254,19 @@ export default class TabPageExp extends Vue {
    * @param {number} leftWidth
    * @memberof TabPageExp
    */
-    public setLeft(tag: { offsetWidth: number; }, leftWidth: number) {
+  public setLeft(tag: { offsetWidth: number }, leftWidth: number) {
     if (tag) {
       const scrollBody: any = this.$refs.scrollBody;
       if (leftWidth < -this.styleLeft) {
         this.styleLeft = -leftWidth;
-            } else if ((leftWidth + tag.offsetWidth) > (scrollBody.offsetWidth - this.styleLeft)) {
-                this.styleLeft -= (leftWidth + tag.offsetWidth) - (scrollBody.offsetWidth - this.styleLeft);
+      } else if (
+        leftWidth + tag.offsetWidth >
+        scrollBody.offsetWidth - this.styleLeft
+      ) {
+        this.styleLeft -=
+          leftWidth +
+          tag.offsetWidth -
+          (scrollBody.offsetWidth - this.styleLeft);
       }
     }
   }
@@ -261,10 +278,10 @@ export default class TabPageExp extends Vue {
    * @memberof TabPageExp
    */
   public doTagAction(name: string) {
-        if (Object.is(name, 'closeAll')) {
+    if (Object.is(name, "closeAll")) {
       this.$store.commit("removeAllPage");
       this.gotoPage();
-        } else if (Object.is(name, 'closeOther')) {
+    } else if (Object.is(name, "closeOther")) {
       this.$store.commit("removeOtherPage");
       this.moveToView(this.$route);
     }
@@ -273,5 +290,5 @@ export default class TabPageExp extends Vue {
 </script>
 
 <style lang="less">
-@import './tab-page-exp.less';
+@import "./tab-page-exp.less";
 </style>

app_Web/src/pages/rt/index/index-base.vue

@@ -2,25 +2,13 @@
 <div class="index_view index">
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="index"></app-studioaction>
     <layout :class="themeClasses" :style="themeStyle">
-        <header class="index_header">
-            <div class="header-left" >
-                <div class="page-logo">
-                        <img src="../../../assets/img/logo.png" height="32" />
-                    <span style="display: inline-block;margin-left: 10px;font-size: 22px;">{{$t(model.srfCaption)}}</span>
-                </div>
-            </div>
-            <div class="header-right" style="display: flex;align-items: center;justify-content: space-between;">
-                <app-header-menus />
-                <app-lang style='font-size: 15px;padding: 0 10px;'></app-lang>
-                <app-orgsector></app-orgsector>
-                <app-user></app-user>
-                <app-theme style="width:45px;display: flex;justify-content: center;"></app-theme>
-            </div>
-        </header>
         <layout>
             <sider :width="collapseChange ? 64 : 200" hide-trigger v-model="collapseChange">
                 <div class="sider-top">
-                    <i class="ivu-icon ivu-icon-md-menu" @click="handleClick"></i>
+                    <div class="page-logo">
+                        <img v-show="collapseChange" src="../../../assets/img/logo.png" height="16" />
+                        <span v-show="!collapseChange" style="display: inline-block;margin-left: 10px;font-size: 22px;">{{$t(model.srfCaption)}}</span>
+                    </div>
                 </div>
                 <view_appmenu 
     :viewState="viewState"  
@@ -37,14 +25,30 @@
     @closeview="closeView($event)">
 </view_appmenu>
             </sider>
-            <content class="index_content" :style="{'width':this.collapseChange ? 'calc(100vw - 64px)' : 'calc(100vw - 200px)' }">
+        </layout>
+        <header class="index_header">
+            <div class="header-left" >
+                <div class="page-logo">
+                    <i v-show="!collapseChange" class="ivu-icon el-icon-s-fold" @click="handleClick"></i>
+                    <i v-show="collapseChange" class="ivu-icon el-icon-s-unfold" @click="handleClick"></i>
+                    <app-breadcrumb></app-breadcrumb>
+                </div>
+            </div>
+            <div class="header-right" style="display: flex;align-items: center;justify-content: space-between;">
+                <app-header-menus />
+                <app-lang style='font-size: 15px;padding: 0 10px;'></app-lang>
+                <app-orgsector></app-orgsector>
+                <app-user></app-user>
+                <app-theme style="width:45px;display: flex;justify-content: center;"></app-theme>
+            </div>
+        </header>
+        <content class="index_content" :style="{'width':this.collapseChange ? 'calc(100vw - 64px)' : 'calc(100vw - 240px)' }">
             <tab-page-exp></tab-page-exp>
             <app-keep-alive :routerList="getRouterList">
                 <router-view :key="getRouterViewKey"></router-view>
             </app-keep-alive>
         </content>
     </layout>
-    </layout>
 </div>
 
 </template>

app_Web/src/pages/rt/index/index.less

@@ -10,7 +10,7 @@
     padding: 0;
     margin: 0;
     .index_header{
-        height:50px;
+        height:65px;
         padding:0 20px;
         display: flex;
         align-items: center;
@@ -20,6 +20,12 @@
           align-items: center;
         }
         .header-left{
+            .ivu-icon{
+                 font-size: 20px;
+                padding: 4px;
+                margin-top: -2px;
+                cursor: pointer;
+            }
             display: flex;
             align-items: center;
             justify-content: space-between;
@@ -35,7 +41,7 @@
         }
     }
     .index_content{
-        background-color:#fff;
+        background-color:#F0F2F5;
         height:calc(100vh - 50px);
         overflow-x: hidden;
         overflow-y: hidden;
@@ -47,15 +53,18 @@
     }
     .ivu-layout .ivu-layout-sider .ivu-layout-sider-children .sider-top{
         line-height: 58px;
-        text-align: right;
+        text-align: center;
         padding-right: 18px;
     }
-    .ivu-layout .ivu-layout-sider .ivu-layout-sider-children .sider-top .ivu-icon{
+    .ivu-layout .ivu-layout-sider .ivu-layout-sider-children .sider-top{
         font-size: 20px;
         padding: 4px;
         margin-top: -2px;
         cursor: pointer;
     }
+    .sider-top{
+        height:65px;
+    }
 }
 
 /***    BRGIN:滚动条样式    ***/

app_Web/src/styles/default.less

@@ -63,10 +63,11 @@
 }
 
 .view-container {
-    height: calc(100% - 38px);
-    // height: 100%;
-    // display: flex;
-    padding: 0 15px;
+    height: calc(100% - 65px);
+    padding: 0 12px;
+    margin: 0px 12px;
+    background: white;
+    box-shadow: 0 2px 4px 0 rgba(0,0,0,.12), 0 0 6px 0 rgba(0,0,0,.04);
     // flex-direction: column;
     > .view-card {
         height: 100%;
@@ -110,11 +111,16 @@
 .viewcontainer2 {
     height: 100%;
     width: 100%;
+    padding: 0px 12px !important;
+    margin: 0px !important;
+    -webkit-box-shadow: none !important;
 }
 .viewcontainer3 {
     height: 100%;
     width: 100%;
-    padding: 0px;
+    padding: 0px 12px !important;
+    margin: 0px !important;
+    -webkit-box-shadow: none !important;
 }
 
 
@@ -207,7 +213,7 @@
     }
 }
 
-.view-container.degridview, .view-container.degridview9, .view-container.dewfgridview, .view-container.delistview, .view-container.delistview9, .view-container.dedataview, .view-container.dedataview9, .view-container.decalendarview, .view-container.decalendarview9{
+.view-container.degridview, .view-container.degridview9, .view-container.dewfgridview, .view-container.delistview, .view-container.delistview9, .view-container.dedataview, .view-container.dedataview9{
   >.view-card.view-no-caption{
     >.ivu-card-body{
       height: 100%;

app_Web/src/theme/blue.theme.less

 /***    BRGIN:默认蓝色主题    ***/
 .app_theme_blue {
-  > header {
+    > .ivu-layout-has-sider > .ivu-layout > header{
       background-color: #2d5f8b;
       color: #6ba1d1;
       .app-theme-icon {
           color: #6ba1d1;
       }
-      .page-logo {
-          color: #fff;
-      }
       .header-right {
           > div:hover {
               background: #3774aa;
           }
+      }
+      .header-left {
+        i{
+            color:#b4bcc8;
+        }
+        i:hover{
+            color:#fff;
+        }
+        > .app-breadcrumb{
+            > span .el-breadcrumb__item .el-breadcrumb__inner{
+                a{
+                    color:#b4bcc8 !important;
+                    cursor: pointer !important;
+                }
+                a:last-child:hover{
+                    color:#fff !important;
+                }
+            }
+        }
     }
       .el-menu.el-menu--horizontal {
           > .el-menu-item, > .el-submenu > .el-submenu__title {
@@ -47,30 +63,32 @@
                   color: #6ba1d1;
               }
           }
-          .app-menu {
-              > .el-menu-item.is-active, > .el-submenu.is-active > .el-submenu__title {
-                  border-left: 4px solid #d64635;
-              }
-          }
       }
   }
   > .el-menu , > .ivu-layout > .ivu-layout-sider .app-app-menu > .app-menu {
       background: #4276a4;
-      .el-menu-item:hover, .el-menu-item.is-active {
+      .el-menu-item:hover, .el-menu-item:hover {
           background: #3c6c95 !important;
           color: #f1f1f1 !important;
           i {
               color: #f1f1f1;
           }
       }
-      .el-submenu.is-opened, .el-submenu:hover, .el-submenu.is-active {
-          > .el-submenu__title {
-              background: #3c6c95 !important;
+      .el-submenu_title:hover{
         color: #f1f1f1 !important;
         i {
             color: #f1f1f1;
         }
       }
+      
+      .el-menu-item.is-active{
+        border-left: 4px solid #d64635;
+        background: #3c6c95 !important;
+      }
+      .el-submenu.is-opened, .el-submenu:hover, .el-submenu.is-active {
+          > .el-submenu__title {
+              background: #4276a4;
+          }
       }
       .el-submenu__title, .el-menu-item {
           color: #c9dff5;
@@ -78,9 +96,16 @@
               color: #c9dff5;
           }
       }
+      .el-submenu__title:hover{
+        color: #f1f1f1 !important;
+        i {
+            color: #f1f1f1;
+        }
+      }
       .el-menu-item {
           border-top: 1px solid #4276a4;
           background: #4276a4;
+          border-left: 4px solid transparent;
       }
       .el-submenu {
           border-top: 1px solid #4276a4;
@@ -97,5 +122,8 @@
   .ivu-menu-submenu-title{
       color: #f5f5f5;
   }
+  .sider-top{
+    color:#fff;
+  }
 }
 /***    END:默认蓝色主题   ***/
\ No newline at end of file

app_Web/src/theme/dark-blue.theme.less

 /***    BRGIN:默认Dark Blue主题    ***/
 .app_theme_darkblue {
-  > header {
+    > .ivu-layout-has-sider > .ivu-layout > header{
         background-color: #2b3643;
         color: #606d80;
         .app-theme-icon {
             color: #606d80;
         }
-      .page-logo {
-          color: #fff;
-      }
         .header-right {
             > div:hover {
                 background: #3b4a5c;
             }
         }
+        .header-left {
+            i{
+                color:#b4bcc8;
+            }
+            i:hover{
+                color:#fff;
+            }
+            > .app-breadcrumb{
+                > span .el-breadcrumb__item .el-breadcrumb__inner{
+                    a{
+                        color:#b4bcc8 !important;
+                        cursor: pointer !important;
+                    }
+                    a:last-child:hover{
+                        color:#fff !important;
+                    }
+                }
+            }
+        }
         .el-menu.el-menu--horizontal {
             > .el-menu-item, > .el-submenu > .el-submenu__title {
                 background: #2b3643;
@@ -47,30 +63,33 @@
                     color: #606d80;
                 }
             }
-          .app-menu {
-              > .el-menu-item.is-active, > .el-submenu.is-active > .el-submenu__title {
-                  border-left: 4px solid #1caf9a;
-              }
-          }
         }
     }
     > .el-menu , > .ivu-layout > .ivu-layout-sider .app-app-menu > .app-menu {
         background: #364150;
-      .el-menu-item:hover, .el-menu-item.is-active {
+        .el-menu-item:hover, .el-menu-item:hover {
             background: #3e4b5c !important;
             color: #f1f1f1 !important;
             i {
                 color: #f1f1f1;
             }
         }
-      .el-submenu.is-opened, .el-submenu:hover, .el-submenu.is-active {
-          > .el-submenu__title {
-              background: #3e4b5c !important;
+        
+        .el-submenu__title:hover{
             color: #f1f1f1 !important;
             i {
                 color: #f1f1f1;
             }
         }
+        .el-menu-item.is-active{
+          border-left: 4px solid #1caf9a;
+          background: #3e4b5c !important;
+          color:white;
+        }
+        .el-submenu.is-opened, .el-submenu:hover, .el-submenu.is-active {
+            > .el-submenu__title {
+                background: #364150;
+            }
         }
         .el-submenu__title, .el-menu-item {
             color: #b4bcc8;
@@ -81,6 +100,7 @@
         .el-menu-item {
             border-top: 1px solid #364150;
             background: #364150;
+            border-left: 4px solid transparent;
         }
         .el-submenu {
             border-top: 1px solid #364150;
@@ -97,5 +117,8 @@
     .ivu-menu-submenu-title{
         color: #fff;
     }
-}
-/***    END:默认Dark Blue主题   ***/
+    .sider-top{
+        color:#fff;
\ No newline at end of file
+    }
+  }
+  /***    END:默认Dark Blue主题   ***/
\ No newline at end of file

app_Web/src/theme/default.theme.less

@@ -6,9 +6,6 @@
         .app-theme-icon {
             color: #aaaaaa;
         }
-      .page-logo {
-          color: #535c70;
-      }
         .header-right {
             > div:hover {
                 background: #d4d4d4;
@@ -47,30 +44,31 @@
                     color: #aaaaaa;
                 }
             }
-          .app-menu {
-              > .el-menu-item.is-active, > .el-submenu.is-active > .el-submenu__title {
-                  border-left: 4px solid #1890ff;
-              }
-          }
         }
     }
     > .el-menu , > .ivu-layout > .ivu-layout-sider .app-app-menu > .app-menu {
         background: #f6f6f6;
-      .el-menu-item:hover, .el-menu-item.is-active {
+        .el-menu-item:hover, .el-menu-item:hover,.el-menu-item.is-active {
             background: #fff !important;
             color: #1890ff !important;
             i {
                 color: #1890ff;
             }
         }
-      .el-submenu.is-opened, .el-submenu:hover, .el-submenu.is-active {
-          > .el-submenu__title {
-              background: #fff !important;
+        .el-submenu__title:hover{
             color: #1890ff !important;
             i {
                 color: #1890ff;
             }
         }
+        .el-menu-item.is-active{
+          border-left: 4px solid #1890ff;
+          background: #fff !important;
+        }
+        .el-submenu.is-opened, .el-submenu:hover{
+            > .el-submenu__title {
+                background: #f6f6f6;
+            }
         }
         .el-submenu__title, .el-menu-item {
             color: #666666;
@@ -81,6 +79,7 @@
         .el-menu-item {
             border-top: 1px solid #f6f6f6;
             background: #f6f6f6;
+            border-left: 4px solid transparent;
         }
         .el-submenu {
             border-top: 1px solid #f6f6f6;
@@ -97,5 +96,8 @@
     .ivu-menu-submenu-title{
         color: #000;
     }
-}
-/***    END:默认亮色主题   ***/
+    .sider-top{
+        color:#000;
\ No newline at end of file
+    }
+  }
+  /***    END:默认亮色主题   ***/
\ No newline at end of file

app_Web/src/utils/app-modal/app-modal.less

@@ -11,7 +11,7 @@
                 padding: 0;
                 height: calc(100% - 52px);
                 .view-container{
-                  padding: 15px;
+                  padding: 12px;
                 }
             }
         }

app_Web/src/utils/types/util.d.ts

@@ -117,16 +117,18 @@ export declare interface Util {
      * @memberof Util
      */
     srfFilePath2(name: string): string;
+    
     /**
      * 附加参数格式化
      *
      * @static
      * @param {any} arg 表单数据
+     * @param {any} parent 外层context或viewparams
      * @param {any} params 附加参数
      * @returns {any}
      * @memberof Util
      */
-    formatData(arg: any, params: any): any
+    formatData(arg: any,parent:any, params: any): any ;
 
     /**
      * 日期格式化

app_Web/src/utils/util/util.ts

@@ -293,11 +293,12 @@ export class Util {
      *
      * @static
      * @param {any} arg 表单数据
+     * @param {any} parent 外层context或viewparams
      * @param {any} params 附加参数
      * @returns {any}
      * @memberof Util
      */
-    public static formatData(arg: any, params: any): any {
+    public static formatData(arg: any,parent:any, params: any): any {
         let _data: any = {};
         Object.keys(params).forEach((name: string) => {
             if (!name) {
@@ -307,7 +308,13 @@ export class Util {
             if (value && value.startsWith('%') && value.endsWith('%')) {
                 const key = value.substring(1, value.length - 1);
                 if (arg && arg.hasOwnProperty(key)) {
-                    value = (arg[key] !== null && arg[key] !== undefined) ? arg[key] : null;
+                    if(arg[key] !== null && arg[key] !== undefined){
+                        value = arg[key];
+                    }else if(parent[key] !== null && parent[key] !== undefined){
+                        value = parent[key];
+                    }else{
+                        value = null;
+                    }
                 } else {
                     value = null;
                 }

app_Web/src/widgets/app/index-appmenu/index-appmenu.less

@@ -21,28 +21,32 @@
             }
         }
         .el-submenu__title i, .el-menu-item i {
-            font-size: 16px;
-            width: 16px;
+            font-size: 12px;
+            width: 18px;
+        }
+        .el-submenu__title .app-menu-icon,.el-submenu__title .app-menu-icon{
+            width:20px;
+            font-size: 14px;
         }
         .el-submenu__title .text {
             font-size: 16px;
         }
         .el-menu-item, .el-submenu__title {
-            height: 36px;
-            font-size: 16px;
-            line-height: 32px;
+            height: 50px;
+            font-size: 14px;
+            line-height: 50px;
         }
         .el-menu-item, .el-submenu, .el-menu {
             border-top: 1px solid #fff;
         }
         > .el-menu-item, > .el-submenu > .el-submenu__title {
-            height: 40px;
-            line-height: 36px;
-            border-left: 4px solid transparent;
+            height: 56px;
+            line-height: 56px;
             padding-left: 16px !important;
         }
         .app-menu-icon {
-            margin-right: 4px;
+            margin: 4px;
+            text-align: center;
         }
         > .el-submenu {
             > .el-menu {

app_Web/src/widgets/ibzdepartment/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar.less

@@ -7,7 +7,8 @@
         > .ivu-split-pane {
             > div {
                 height: 100%;
-                overflow: auto;
+                overflow-y: auto;
+                overflow-x: hidden;
                 display: flex;
                 flex-direction: column;
                 .tree-exp-bar-header {

app_Web/src/widgets/ibzemployee/main-form/main-form-base.vue

@@ -58,7 +58,17 @@
 </i-col>
 <i-col v-show="detailsModel.sex.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='sex' :itemRules="this.rules.sex" class='' :caption="$t('entities.ibzemployee.main_form.details.sex')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sex.error" :isEmptyCaption="false" labelPos="LEFT">
-     <dropdown-list v-model="data.sex" :data="data" :itemParam="{}" :disabled="detailsModel.sex.disabled"  tag='CLIBZSex' codelistType='STATIC' placeholder='请选择...' style=""></dropdown-list>
+     <dropdown-list 
+    v-model="data.sex" 
+    :data="data" 
+    :context="context"
+    :viewparams="viewparams"
+    :itemParam="{}" 
+    :disabled="detailsModel.sex.disabled"  
+    tag='CLIBZSex' 
+    codelistType='STATIC'
+    placeholder='请选择...' style="">
+ </dropdown-list>
 </app-form-item>
 
 </i-col>

app_Web/src/widgets/ibzorganization/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar.less

@@ -7,7 +7,8 @@
         > .ivu-split-pane {
             > div {
                 height: 100%;
-                overflow: auto;
+                overflow-y: auto;
+                overflow-x: hidden;
                 display: flex;
                 flex-direction: column;
                 .tree-exp-bar-header {

app_Web/src/widgets/sys-auth-log/default-searchform/default-searchform-base.vue

@@ -18,7 +18,17 @@
           </i-col>
           <i-col v-show="detailsModel.n_authcode_eq.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
               <app-form-item name='n_authcode_eq' :itemRules="this.rules.n_authcode_eq" class='' :caption="$t('entities.sysauthlog.default_searchform.details.n_authcode_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_authcode_eq.error" :isEmptyCaption="false" labelPos="LEFT"> 
-               <dropdown-list v-model="data.n_authcode_eq" :data="data" :itemParam="{}" :disabled="detailsModel.n_authcode_eq.disabled"  tag='CLAuthCode' codelistType='STATIC' placeholder='请选择...' style=""></dropdown-list>
+               <dropdown-list 
+              v-model="data.n_authcode_eq" 
+              :data="data" 
+              :context="context"
+              :viewparams="viewparams"
+              :itemParam="{}" 
+              :disabled="detailsModel.n_authcode_eq.disabled"  
+              tag='CLAuthCode' 
+              codelistType='STATIC'
+              placeholder='请选择...' style="">
+           </dropdown-list>
           </app-form-item>
           
           </i-col>

app_Web/src/widgets/wfprocess-definition/main-form/main-form-base.vue

@@ -32,7 +32,18 @@
 </i-col>
 <i-col v-show="detailsModel.modelenable.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='modelenable' :itemRules="this.rules.modelenable" class='' :caption="$t('entities.wfprocessdefinition.main_form.details.modelenable')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.modelenable.error" :isEmptyCaption="false" labelPos="LEFT">
-     <dropdown-list v-model="data.modelenable" :data="data" :itemParam="{}" :disabled="detailsModel.modelenable.disabled" style="width:100px;width: 100px;" tag='YesNo' codelistType='STATIC'  placeholder='请选择...'></dropdown-list>
+     <dropdown-list 
+  v-model="data.modelenable" 
+  :data="data" 
+  :context="context"
+  :viewparams="viewparams"
+  :itemParam="{}" 
+  :disabled="detailsModel.modelenable.disabled" 
+  style="width:100px;width: 100px;" 
+  tag='YesNo' 
+  codelistType='STATIC'
+  placeholder='请选择...'>
+ </dropdown-list>
 </app-form-item>
 
 </i-col>