ibiz4j 发布系统代码 [ibz-dst，应用]

app_web/package.json

@@ -57,10 +57,8 @@
     "@types/mockjs": "^1.0.2",
     "@types/qs": "^6.9.0",
     "@vue/cli-plugin-babel": "^4.1.0",
-    "@vue/cli-plugin-e2e-cypress": "^4.1.0",
     "@vue/cli-plugin-router": "^4.1.0",
     "@vue/cli-plugin-typescript": "^4.1.0",
-    "@vue/cli-plugin-unit-jest": "^4.1.0",
     "@vue/cli-plugin-vuex": "^4.1.0",
     "@vue/cli-service": "^4.1.0",
     "@vue/test-utils": "1.0.0-beta.29",

app_web/src/components/app-form-item/app-form-item.vue

@@ -21,7 +21,7 @@
                 class="editor"
                 :style="slotstyle"
             >
-                <form-item :prop="name" :error="error" :required="required" :rules="rules">
+                <form-item :prop="name" :error="error"  :rules="rules">
                     <slot></slot>
                 </form-item>
             </div>
@@ -48,7 +48,7 @@
                 class="editor"
                 :style="slotstyle"
             >
-                <form-item :prop="name" :error="error" :required="required" :rules="rules">
+                <form-item :prop="name" :error="error"  :rules="rules">
                     <slot></slot>
                 </form-item>
             </div>

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

@@ -170,10 +170,20 @@ export default class DropDownList extends Vue {
 
     /**
      * 属性类型
-     * @type {string}
+     *
+     * @type {'string' | 'number'}
+     * @memberof DropDownList
+     */
+    @Prop({ default: 'string' })
+    public valueType!: 'string' | 'number';
+
+     /**
+     * 选择实际值
+     *
+     * @type {*}
      * @memberof DropDownList
      */
-    @Prop() public valueType?: string;
+    public value: any = null;
 
     /**
      * 计算属性(当前值)
@@ -204,7 +214,7 @@ export default class DropDownList extends Vue {
             })
             return JSON.stringify([result]);
         }
-        return this.itemValue;
+        return this.value;
     }
 
     /**
@@ -263,10 +273,12 @@ export default class DropDownList extends Vue {
             this.formStateEvent = this.formState.subscribe(({ type, data }) => {
                 if (Object.is('load', type)) {
                     this.loadData();
+                    this.readyValue();
                 }
             });
         }
         this.loadData();
+        this.readyValue();
     }
 
     /**
@@ -298,6 +310,29 @@ export default class DropDownList extends Vue {
           });
       }
     }
+
+    /**
+     * 准备值
+     *
+     * @memberof DropDownList
+     */
+    public readyValue() {
+        if (this.itemValue == null) {
+            this.value = null;
+            return;
+        }
+        if (this.$util.typeOf(this.itemValue) === this.valueType) {
+            this.value = this.itemValue;
+        } else if (this.valueType === 'number') {
+            if (this.itemValue.indexOf('.') === -1) {
+                this.value = parseInt(this.itemValue);
+            } else {
+                this.value = parseFloat(this.itemValue);
+            }
+        } else {
+            this.value = this.itemValue.toString();
+        }
+    }
     
     /**
      * 下拉点击事件
@@ -331,32 +366,29 @@ export default class DropDownList extends Vue {
      * @memberof DropDownList
      */
     public formatCodeList(items: Array<any>){
-        let matching: boolean = true;
+        let matching: boolean = false;
         this.items = [];
         try{
-            if(this.valueType){
-                items.forEach((item: any)=>{
-                    const type = this.$util.typeOf(item.value);
-                    if(type != this.valueType){
-                        matching = false;
-                        if(type == 'number'){
-                            item.value = item.value.toString();
+            items.forEach((item: any)=>{
+                const type = this.$util.typeOf(item.value);
+                if(type != this.valueType){
+                    matching = true;
+                    if(type === 'number'){
+                        item.value = item.value.toString();
+                    }else{
+                        if(item.value.indexOf('.') == -1){
+                            item.value = parseInt(item.value);
                         }else{
-                            if(item.value.indexOf('.') == -1){
-                                item.value = parseInt(item.value);
-                            }else{
-                                item.value = parseFloat(item.value);
-                            }
+                            item.value = parseFloat(item.value);
                         }
                     }
-                    this.items.push(item);
-                });
-                if(!matching){
-                    console.warn(`代码表 ${ this.tag } 值类型和属性类型不匹配，已自动强制转换，请修正代码表值类型和属性类型匹配`);
                 }
-            }else{
-                this.items = items;
+                this.items.push(item);
+            });
+            if(matching){
+                console.warn(`代码表 ${ this.tag } 值类型和属性类型不匹配，已自动强制转换，请修正代码表值类型和属性类型匹配`);
             }
+            
         }catch(error){
             console.warn('代码表值类型和属性类型不匹配，自动强制转换异常，请修正代码表值类型和属性类型匹配');
         }

app_web/src/engine/view/tab-exp-view-engine.ts

@@ -41,6 +41,9 @@ export default class TabExpViewEngine extends ViewEngine {
             if (!Object.is(_item.type, 'TABEXPPANEL')) {
                 return;
             }
+            if(this.view.context && this.view.context[(this.keyPSDEField as string)]){
+                return;
+            }
             this.setViewState2({ tag: _item.name, action: 'load', viewdata: this.view.context });
         });
     }

app_web/src/locale/lanres/entities/dabuild/dabuild_en_US.ts

@@ -8,6 +8,7 @@ export default {
     model_name: "模型名称",
     state: "状态",
     dadimension: "维度",
+    system_id: "系统标识",
   },
 	views: {
 		gridview: {

app_web/src/locale/lanres/entities/dabuild/dabuild_zh_CN.ts

@@ -7,6 +7,7 @@ export default {
     model_name: "模型名称",
     state: "状态",
     dadimension: "维度",
+    system_id: "系统标识",
   },
 	views: {
 		gridview: {

app_web/src/locale/lanres/entities/dachart/dachart_en_US.ts

@@ -6,6 +6,7 @@ export default {
     dict: "过滤项字典",
     group: "分组",
     config: "展现配置",
+    system_id: "系统标识",
   },
 	views: {
 		editview: {

app_web/src/locale/lanres/entities/dachart/dachart_zh_CN.ts

@@ -5,6 +5,7 @@ export default {
     dict: "过滤项字典",
     group: "分组",
     config: "展现配置",
+    system_id: "系统标识",
   },
 	views: {
 		editview: {

app_web/src/locale/lanres/entities/dareport/dareport_en_US.ts

@@ -6,6 +6,7 @@ export default {
     dict: "过滤项字典",
     group: "分组",
     config: "展现配置",
+    system_id: "系统标识",
   },
 	views: {
 		editview: {

app_web/src/locale/lanres/entities/dareport/dareport_zh_CN.ts

@@ -5,6 +5,7 @@ export default {
     dict: "过滤项字典",
     group: "分组",
     config: "展现配置",
+    system_id: "系统标识",
   },
 	views: {
 		editview: {

app_web/src/locale/lanres/entities/exec-log/exec-log_en_US.ts

@@ -11,6 +11,7 @@ export default {
     key_value_field: "标识属性",
     run_body: "运行内容",
     run_result: "运行结果",
+    system_id: "系统标识",
   },
 	views: {
 		gridview: {

app_web/src/locale/lanres/entities/exec-log/exec-log_zh_CN.ts

@@ -10,6 +10,7 @@ export default {
     key_value_field: "标识属性",
     run_body: "运行内容",
     run_result: "运行结果",
+    system_id: "系统标识",
   },
 	views: {
 		gridview: {

app_web/src/locale/lanres/entities/exec-result/exec-result_en_US.ts

@@ -16,6 +16,7 @@ export default {
     metric_field: "指标属性",
     ext1_field: "扩展属性1",
     ext2_field: "扩展属性2",
+    system_id: "系统标识",
   },
 	views: {
 		gridview: {

app_web/src/locale/lanres/entities/exec-result/exec-result_zh_CN.ts

@@ -15,6 +15,7 @@ export default {
     metric_field: "指标属性",
     ext1_field: "扩展属性1",
     ext2_field: "扩展属性2",
+    system_id: "系统标识",
   },
 	views: {
 		gridview: {

app_web/src/locale/lanres/entities/meta-entity/meta-entity_en_US.ts

@@ -14,6 +14,8 @@ export default {
     module_name: "模块",
     ext_params: "扩展参数",
     show_order: "排序",
+    createdate: "创建时间",
+    updatedate: "最后修改时间",
   },
 	views: {
 		pickupview: {
@@ -41,9 +43,11 @@ export default {
 			tabpage2: "关系", 
 			druipart3: "", 
 			tabpage3: "数据集", 
+			tabpage4: "扩展参数", 
 			tabpanel1: "", 
 			group1: "实体基本信息", 
 			formpage1: "基本信息", 
+			srfupdatedate: "最后修改时间", 
 			srforikey: "", 
 			srfkey: "标识", 
 			srfmajortext: "实体名", 
@@ -55,9 +59,12 @@ export default {
 			logicname: "逻辑名称", 
 			codename: "代码名称", 
 			tablename: "表名称", 
+			modulename: "模块", 
+			showorder: "排序", 
 			dsname: "数据源", 
 			systemid: "系统标识", 
 			dsid: "数据源标识", 
+			moduleid: "模块标识", 
 			entityid: "标识", 
 		},
 		uiactions: {

app_web/src/locale/lanres/entities/meta-entity/meta-entity_zh_CN.ts

@@ -13,6 +13,8 @@ export default {
     module_name: "模块",
     ext_params: "扩展参数",
     show_order: "排序",
+    createdate: "创建时间",
+    updatedate: "最后修改时间",
   },
 	views: {
 		pickupview: {
@@ -40,9 +42,11 @@ export default {
 			tabpage2: "关系", 
 			druipart3: "", 
 			tabpage3: "数据集", 
+			tabpage4: "扩展参数", 
 			tabpanel1: "", 
 			group1: "实体基本信息", 
 			formpage1: "基本信息", 
+			srfupdatedate: "最后修改时间", 
 			srforikey: "", 
 			srfkey: "标识", 
 			srfmajortext: "实体名", 
@@ -54,9 +58,12 @@ export default {
 			logicname: "逻辑名称", 
 			codename: "代码名称", 
 			tablename: "表名称", 
+			modulename: "模块", 
+			showorder: "排序", 
 			dsname: "数据源", 
 			systemid: "系统标识", 
 			dsid: "数据源标识", 
+			moduleid: "模块标识", 
 			entityid: "标识", 
 		},
 		uiactions: {

app_web/src/locale/lanres/entities/meta-field/meta-field_en_US.ts

@@ -32,6 +32,8 @@ export default {
     extension_field: "扩展属性",
     is_enable_audit: "审计",
     show_order: "排序",
+    createdate: "创建时间",
+    updatedate: "最后修改时间",
   },
 	views: {
 		editgridview: {
@@ -62,6 +64,7 @@ export default {
 			grouppanel3: "分组面板", 
 			group1: "属性基本信息", 
 			formpage1: "基本信息", 
+			srfupdatedate: "最后修改时间", 
 			srforikey: "", 
 			srfkey: "属性标识", 
 			srfmajortext: "属性名称", 

app_web/src/locale/lanres/entities/meta-field/meta-field_zh_CN.ts

@@ -31,6 +31,8 @@ export default {
     extension_field: "扩展属性",
     is_enable_audit: "审计",
     show_order: "排序",
+    createdate: "创建时间",
+    updatedate: "最后修改时间",
   },
 	views: {
 		editgridview: {
@@ -61,6 +63,7 @@ export default {
 			grouppanel3: "分组面板", 
 			group1: "属性基本信息", 
 			formpage1: "基本信息", 
+			srfupdatedate: "最后修改时间", 
 			srforikey: "", 
 			srfkey: "属性标识", 
 			srfmajortext: "属性名称", 

app_web/src/locale/lanres/entities/meta-model/meta-model_en_US.ts

@@ -5,6 +5,11 @@ export default {
     name: "名称",
     code_name: "代码名称",
     config: "配置",
+    system_id: "系统标识",
+    materialized_view: "物化视图",
+    refresh_time: "刷新时间",
+    createdate: "创建时间",
+    updatedate: "最后修改时间",
   },
 	views: {
 		pickupgridview: {
@@ -32,6 +37,7 @@ export default {
 		details: {
 			group1: "模型基本信息", 
 			formpage1: "基本信息", 
+			srfupdatedate: "最后修改时间", 
 			srforikey: "", 
 			srfkey: "标识", 
 			srfmajortext: "名称", 
@@ -41,7 +47,10 @@ export default {
 			srfsourcekey: "", 
 			modelname: "名称", 
 			codename: "代码名称", 
+			materializedview: "物化视图", 
+			refreshtime: "刷新时间", 
 			modelcfg: "配置", 
+			systemid: "系统标识", 
 			modelid: "标识", 
 		},
 		uiactions: {
@@ -60,6 +69,8 @@ export default {
 		details: {
 			formpage1: "常规条件", 
 			n_modelname_like: "名称(%)", 
+			n_codename_like: "代码名称(文本包含(%))", 
+			n_systemid_eq: "系统标识(等于(=))", 
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/entities/meta-model/meta-model_zh_CN.ts

@@ -4,6 +4,11 @@ export default {
     name: "名称",
     code_name: "代码名称",
     config: "配置",
+    system_id: "系统标识",
+    materialized_view: "物化视图",
+    refresh_time: "刷新时间",
+    createdate: "创建时间",
+    updatedate: "最后修改时间",
   },
 	views: {
 		pickupgridview: {
@@ -31,6 +36,7 @@ export default {
 		details: {
 			group1: "模型基本信息", 
 			formpage1: "基本信息", 
+			srfupdatedate: "最后修改时间", 
 			srforikey: "", 
 			srfkey: "标识", 
 			srfmajortext: "名称", 
@@ -40,7 +46,10 @@ export default {
 			srfsourcekey: "", 
 			modelname: "名称", 
 			codename: "代码名称", 
+			materializedview: "物化视图", 
+			refreshtime: "刷新时间", 
 			modelcfg: "配置", 
+			systemid: "系统标识", 
 			modelid: "标识", 
 		},
 		uiactions: {
@@ -59,6 +68,8 @@ export default {
 		details: {
 			formpage1: "常规条件", 
 			n_modelname_like: "名称(%)", 
+			n_codename_like: "代码名称(文本包含(%))", 
+			n_systemid_eq: "系统标识(等于(=))", 
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/entities/meta-module/meta-module_en_US.ts

@@ -29,8 +29,6 @@ export default {
 		details: {
 			group1: "模块基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srforikey: "", 
 			srfkey: "模块标识", 
 			srfmajortext: "模块名称", 
@@ -38,6 +36,10 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			modulename: "模块名称", 
+			codename: "代码名称", 
+			showorder: "排序", 
+			systemid: "系统标识", 
 			moduleid: "模块标识", 
 		},
 		uiactions: {
@@ -45,6 +47,10 @@ export default {
 	},
 	main_grid: {
 		columns: {
+			modulename: "模块名称",
+			codename: "代码名称",
+			showorder: "排序",
+			systemid: "系统标识",
 		},
 		nodata:"",
 		uiactions: {
@@ -53,6 +59,9 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
+			n_modulename_like: "模块名称(文本包含(%))", 
+			n_codename_eq: "代码名称(等于(=))", 
+			n_systemid_eq: "系统标识(等于(=))", 
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/entities/meta-module/meta-module_zh_CN.ts

@@ -28,8 +28,6 @@ export default {
 		details: {
 			group1: "模块基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srforikey: "", 
 			srfkey: "模块标识", 
 			srfmajortext: "模块名称", 
@@ -37,6 +35,10 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			modulename: "模块名称", 
+			codename: "代码名称", 
+			showorder: "排序", 
+			systemid: "系统标识", 
 			moduleid: "模块标识", 
 		},
 		uiactions: {
@@ -44,6 +46,10 @@ export default {
 	},
 	main_grid: {
 		columns: {
+			modulename: "模块名称",
+			codename: "代码名称",
+			showorder: "排序",
+			systemid: "系统标识",
 		},
 		nodata:"",
 		uiactions: {
@@ -52,6 +58,9 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
+			n_modulename_like: "模块名称(文本包含(%))", 
+			n_codename_eq: "代码名称(等于(=))", 
+			n_systemid_eq: "系统标识(等于(=))", 
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_en_US.ts

@@ -12,6 +12,8 @@ export default {
     nested_name: "嵌套代码名称",
     system_id: "系统",
     lookup: "Lookup",
+    createdate: "创建时间",
+    updatedate: "最后修改时间",
   },
 	views: {
 		pickupgridview: {
@@ -40,6 +42,7 @@ export default {
 			lookup: "", 
 			group1: "实体关系基本信息", 
 			formpage1: "基本信息", 
+			srfupdatedate: "最后修改时间", 
 			srforikey: "", 
 			srfkey: "关系标识", 
 			srfmajortext: "关系名称", 

app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_zh_CN.ts

@@ -11,6 +11,8 @@ export default {
     nested_name: "嵌套代码名称",
     system_id: "系统",
     lookup: "Lookup",
+    createdate: "创建时间",
+    updatedate: "最后修改时间",
   },
 	views: {
 		pickupgridview: {
@@ -39,6 +41,7 @@ export default {
 			lookup: "", 
 			group1: "实体关系基本信息", 
 			formpage1: "基本信息", 
+			srfupdatedate: "最后修改时间", 
 			srforikey: "", 
 			srfkey: "关系标识", 
 			srfmajortext: "关系名称", 

app_web/src/locale/lanres/entities/rule-engine/rule-engine_en_US.ts

@@ -8,6 +8,7 @@ export default {
     model_name: "模型",
     state: "状态",
     last_runtime: "上次执行时间",
+    system_id: "系统",
   },
 	views: {
 		editview: {

app_web/src/locale/lanres/entities/rule-engine/rule-engine_zh_CN.ts

@@ -7,6 +7,7 @@ export default {
     model_name: "模型",
     state: "状态",
     last_runtime: "上次执行时间",
+    system_id: "系统",
   },
 	views: {
 		editview: {

app_web/src/locale/lanres/entities/rule-item/rule-item_en_US.ts

@@ -14,6 +14,7 @@ export default {
     cond: "条件",
     createdate: "建立时间",
     updatedate: "更新时间",
+    system_id: "系统标识",
   },
 	views: {
 		gridview: {

app_web/src/locale/lanres/entities/rule-item/rule-item_zh_CN.ts

@@ -13,6 +13,7 @@ export default {
     cond: "条件",
     createdate: "建立时间",
     updatedate: "更新时间",
+    system_id: "系统标识",
   },
 	views: {
 		gridview: {

app_web/src/pages/lite/dst-index/page-register.ts

@@ -6,12 +6,14 @@ export const PageComponents = {
         Vue.component('meta-model-pickup-view', () => import('@pages/lite/meta-model-pickup-view/meta-model-pickup-view.vue'));
         Vue.component('meta-data-set-grid-view', () => import('@pages/lite/meta-data-set-grid-view/meta-data-set-grid-view.vue'));
         Vue.component('meta-field-pickup-view', () => import('@pages/lite/meta-field-pickup-view/meta-field-pickup-view.vue'));
+        Vue.component('meta-module-pickup-view', () => import('@pages/lite/meta-module-pickup-view/meta-module-pickup-view.vue'));
         Vue.component('meta-field-pickup-grid-view', () => import('@pages/lite/meta-field-pickup-grid-view/meta-field-pickup-grid-view.vue'));
         Vue.component('rule-item-grid-view', () => import('@pages/rule/rule-item-grid-view/rule-item-grid-view.vue'));
         Vue.component('dst-data-source-pickup-view', () => import('@pages/lite/dst-data-source-pickup-view/dst-data-source-pickup-view.vue'));
         Vue.component('meta-model-pickup-grid-view', () => import('@pages/lite/meta-model-pickup-grid-view/meta-model-pickup-grid-view.vue'));
         Vue.component('meta-relationship-edit-view', () => import('@pages/lite/meta-relationship-edit-view/meta-relationship-edit-view.vue'));
         Vue.component('dabuild-grid-view', () => import('@pages/analysis/dabuild-grid-view/dabuild-grid-view.vue'));
+        Vue.component('meta-module-pickup-grid-view', () => import('@pages/lite/meta-module-pickup-grid-view/meta-module-pickup-grid-view.vue'));
         Vue.component('meta-field-edit-view', () => import('@pages/lite/meta-field-edit-view/meta-field-edit-view.vue'));
         Vue.component('dametric-grid-view', () => import('@pages/analysis/dametric-grid-view/dametric-grid-view.vue'));
         Vue.component('dareport-grid-view', () => import('@pages/analysis/dareport-grid-view/dareport-grid-view.vue'));

app_web/src/pages/lite/dst-index/router.ts

@@ -212,6 +212,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/lite/meta-field-pickup-view/meta-field-pickup-view.vue'),
                 },
+                {
+                    path: 'metamodules/:metamodule?/pickupview/:pickupview?',
+                    meta: {
+                        caption: 'entities.metamodule.views.pickupview.caption',
+                        info:'',
+                        parameters: [
+                            { pathName: 'dstindex', parameterName: 'dstindex' },
+                            { pathName: 'metamodules', parameterName: 'metamodule' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/lite/meta-module-pickup-view/meta-module-pickup-view.vue'),
+                },
                 {
                     path: 'dstsystems/:dstsystem?/metaentities/:metaentity?/metafields/:metafield?/pickupgridview/:pickupgridview?',
                     meta: {
@@ -358,6 +372,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/analysis/dabuild-grid-view/dabuild-grid-view.vue'),
                 },
+                {
+                    path: 'metamodules/:metamodule?/pickupgridview/:pickupgridview?',
+                    meta: {
+                        caption: 'entities.metamodule.views.pickupgridview.caption',
+                        info:'',
+                        parameters: [
+                            { pathName: 'dstindex', parameterName: 'dstindex' },
+                            { pathName: 'metamodules', parameterName: 'metamodule' },
+                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/lite/meta-module-pickup-grid-view/meta-module-pickup-grid-view.vue'),
+                },
                 {
                     path: 'dstsystems/:dstsystem?/metaentities/:metaentity?/metafields/:metafield?/editview/:editview?',
                     meta: {
@@ -1118,6 +1146,19 @@ const router = new Router({
         },
         component: () => import('@pages/lite/meta-relationship-pickup-grid-view/meta-relationship-pickup-grid-view.vue'),
     },
+    {
+        path: '/metamodules/:metamodule?/pickupgridview/:pickupgridview?',
+        meta: {
+            caption: 'entities.metamodule.views.pickupgridview.caption',
+            info:'',
+            parameters: [
+                { pathName: 'metamodules', parameterName: 'metamodule' },
+                { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/lite/meta-module-pickup-grid-view/meta-module-pickup-grid-view.vue'),
+    },
     {
         path: '/execresults/:execresult?/gridview/:gridview?',
         meta: {
@@ -1468,6 +1509,19 @@ const router = new Router({
         },
         component: () => import('@pages/lite/meta-model-edit-view/meta-model-edit-view.vue'),
     },
+    {
+        path: '/metamodules/:metamodule?/pickupview/:pickupview?',
+        meta: {
+            caption: 'entities.metamodule.views.pickupview.caption',
+            info:'',
+            parameters: [
+                { pathName: 'metamodules', parameterName: 'metamodule' },
+                { pathName: 'pickupview', parameterName: 'pickupview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/lite/meta-module-pickup-view/meta-module-pickup-view.vue'),
+    },
     {
         path: '/ruleengines/:ruleengine?/gridview/:gridview?',
         meta: {

app_web/src/pages/lite/meta-module-pickup-grid-view/meta-module-pickup-grid-view.less

+.meta-module-pickup-grid-view{
+    position: relative;
+}
+
+
+.meta-module-pickup-grid-view{
+    display: block;
+}
\ No newline at end of file

app_web/src/pages/lite/meta-module-pickup-grid-view/meta-module-pickup-grid-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import MetaModulePickupGridViewBase from './meta-module-pickup-grid-view-base.vue';
+
+import view_grid from '@widgets/meta-module/main-grid/main-grid.vue';
+import view_searchform from '@widgets/meta-module/default-searchform/default-searchform.vue';
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class MetaModulePickupGridView extends MetaModulePickupGridViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/pages/lite/meta-module-pickup-view/meta-module-pickup-view.less

+.meta-module-pickup-view{
+    position: relative;
+}
+
+
+
+.pickup-view {
+    >.pickupviewpanel {
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-end;
+        height: calc(100% - 64px);
+    }
+    >.footer {
+        height: 64px;
+    }
+}
\ No newline at end of file

app_web/src/pages/lite/meta-module-pickup-view/meta-module-pickup-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import MetaModulePickupViewBase from './meta-module-pickup-view-base.vue';
+
+import view_pickupviewpanel from '@widgets/meta-module/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.vue';
+@Component({
+    components: {
+        view_pickupviewpanel, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class MetaModulePickupView extends MetaModulePickupViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/store/modules/view-action/state.ts

@@ -89,6 +89,15 @@ export const viewstate: any = {
             refviews: [
             ],
         },
+        {
+            viewtag: '17ce052423b847f488d74d3b2ba6bfdf',
+            viewmodule: 'lite',
+            viewname: 'MetaModulePickupGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: '1b472dc31d7586037311b19f13ecd5b8',
             viewmodule: 'rule',
@@ -250,6 +259,7 @@ export const viewstate: any = {
                 'e6680f2a41992382be6a1ffde17df734',
                 '3cbe2fc7acab1a6f0e7e81f1bd86cd41',
                 'b88526b042da335fe07234b43a635ddf',
+                '6c1c3923e62702394622b642a9952bd7',
             ],
         },
         {
@@ -261,6 +271,16 @@ export const viewstate: any = {
             refviews: [
             ],
         },
+        {
+            viewtag: '6c1c3923e62702394622b642a9952bd7',
+            viewmodule: 'lite',
+            viewname: 'MetaModulePickupView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '17ce052423b847f488d74d3b2ba6bfdf',
+            ],
+        },
         {
             viewtag: '6e86bf4ff68dc883c7cedd90289cf139',
             viewmodule: 'rule',

app_web/src/widgets/meta-entity/main-form/main-form-model.ts

@@ -25,6 +25,11 @@ export default class MainModel {
         prop: 'srffrontuf',
         dataType: 'TEXT',
       },
+      {
+        name: 'srfupdatedate',
+        prop: 'updatedate',
+        dataType: 'DATETIME',
+      },
       {
         name: 'srforikey',
       },
@@ -70,6 +75,16 @@ export default class MainModel {
         prop: 'table_name',
         dataType: 'TEXT',
       },
+      {
+        name: 'modulename',
+        prop: 'module_name',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'showorder',
+        prop: 'show_order',
+        dataType: 'INT',
+      },
       {
         name: 'dsname',
         prop: 'ds_name',
@@ -85,6 +100,11 @@ export default class MainModel {
         prop: 'ds_id',
         dataType: 'PICKUP',
       },
+      {
+        name: 'moduleid',
+        prop: 'module_id',
+        dataType: 'PICKUP',
+      },
       {
         name: 'entityid',
         prop: 'entity_id',

app_web/src/widgets/meta-entity/main-form/main-form-service.ts

@@ -2,6 +2,7 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import MetaEntityService from '@/service/meta-entity/meta-entity-service';
 import MainModel from './main-form-model';
+import MetaModuleService from '@/service/meta-module/meta-module-service';
 import DstDataSourceService from '@/service/dst-data-source/dst-data-source-service';
 
 
@@ -42,6 +43,14 @@ export default class MainService extends ControlService {
         this.model = new MainModel();
     }
 
+    /**
+     * 模块服务对象
+     *
+     * @type {MetaModuleService}
+     * @memberof MainService
+     */
+    public metamoduleService: MetaModuleService = new MetaModuleService();
+
     /**
      * 数据源服务对象
      *
@@ -99,6 +108,9 @@ export default class MainService extends ControlService {
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
         data.page = data.page ? data.page : 0;
         data.size = data.size ? data.size : 1000;
+        if (Object.is(serviceName, 'MetaModuleService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.metamoduleService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'id', 'metamodule');
+        }
         if (Object.is(serviceName, 'DstDataSourceService') && Object.is(interfaceName, 'FetchDefault')) {
             return this.doItems(this.dstdatasourceService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'ds_id', 'dstdatasource');
         }

app_web/src/widgets/meta-entity/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -54,6 +54,12 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'show_order',
       },
+      {
+        name: 'createdate',
+      },
+      {
+        name: 'updatedate',
+      },
     ]
   }
 

app_web/src/widgets/meta-field/main-form/main-form-base.vue

@@ -707,6 +707,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public data: any = {
+        srfupdatedate: null,
         srforikey: null,
         srfkey: null,
         srfmajortext: null,
@@ -994,6 +995,8 @@ export default class MainBase extends Vue implements ControlInterface {
         group1: new FormGroupPanelModel({ caption: '属性基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.metafield.main_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
 , 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
+, 
+        srfupdatedate: new FormItemModel({ caption: '最后修改时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -1065,6 +1068,18 @@ export default class MainBase extends Vue implements ControlInterface {
 , 
     };
 
+    /**
+     * 监控表单属性 srfupdatedate 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.srfupdatedate')
+    onSrfupdatedateChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'srfupdatedate', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 srforikey 值
      *
@@ -1557,6 +1572,7 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
 
 
         if (Object.is(name, '') || Object.is(name, 'fieldtype') || Object.is(name, 'physicalfield')) {

app_web/src/widgets/meta-field/main-form/main-form-model.ts

@@ -25,6 +25,11 @@ export default class MainModel {
         prop: 'srffrontuf',
         dataType: 'TEXT',
       },
+      {
+        name: 'srfupdatedate',
+        prop: 'updatedate',
+        dataType: 'DATETIME',
+      },
       {
         name: 'srforikey',
       },

app_web/src/widgets/meta-field/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -108,6 +108,12 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'show_order',
       },
+      {
+        name: 'createdate',
+      },
+      {
+        name: 'updatedate',
+      },
     ]
   }
 

app_web/src/widgets/meta-model/default-searchform/default-searchform-base.vue

@@ -17,6 +17,20 @@
           
           </app-form-item>
           
+          </i-col>
+          <i-col v-show="detailsModel.n_codename_like.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
+              <app-form-item name='n_codename_like' :itemRules="this.rules.n_codename_like" class='' :caption="$t('entities.metamodel.default_searchform.details.n_codename_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_codename_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
+              <input-box 
+              v-model="data.n_codename_like"  
+              @enter="onEnter($event)"  
+                
+              :disabled="detailsModel.n_codename_like.disabled" 
+              type='text' 
+              style="">
+          </input-box>
+          
+          </app-form-item>
+          
           </i-col>
       </row>
     </i-col>
@@ -276,6 +290,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public data: any = {
         n_modelname_like: null,
+        n_codename_like: null,
+        n_systemid_eq: null,
     };
 
     /**
@@ -288,6 +304,10 @@ export default class DefaultBase extends Vue implements ControlInterface {
         formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
 , 
         n_modelname_like: new FormItemModel({ caption: '名称(%)', detailType: 'FORMITEM', name: 'n_modelname_like', visible: true, isShowCaption: true, form: this,required:false, disabled: false, enableCond: 3 })
+, 
+        n_codename_like: new FormItemModel({ caption: '代码名称(文本包含(%))', detailType: 'FORMITEM', name: 'n_codename_like', visible: true, isShowCaption: true, form: this,required:false, disabled: false, enableCond: 3 })
+, 
+        n_systemid_eq: new FormItemModel({ caption: '系统标识(等于(=))', detailType: 'FORMITEM', name: 'n_systemid_eq', visible: true, isShowCaption: true, form: this,required:false, disabled: false, enableCond: 3 })
 , 
     };
     
@@ -304,6 +324,18 @@ export default class DefaultBase extends Vue implements ControlInterface {
             { required: this.detailsModel.n_modelname_like.required, type: 'string', message: '名称(%) 值不能为空', trigger: 'change' },
             { required: this.detailsModel.n_modelname_like.required, type: 'string', message: '名称(%) 值不能为空', trigger: 'blur' },
         ],
+        n_codename_like: [
+            { type: 'string', message: '代码名称(文本包含(%)) 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '代码名称(文本包含(%)) 值必须为字符串类型', trigger: 'blur' },
+            { required: this.detailsModel.n_codename_like.required, type: 'string', message: '代码名称(文本包含(%)) 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.n_codename_like.required, type: 'string', message: '代码名称(文本包含(%)) 值不能为空', trigger: 'blur' },
+        ],
+        n_systemid_eq: [
+            { type: 'string', message: '系统标识(等于(=)) 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '系统标识(等于(=)) 值必须为字符串类型', trigger: 'blur' },
+            { required: this.detailsModel.n_systemid_eq.required, type: 'string', message: '系统标识(等于(=)) 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.n_systemid_eq.required, type: 'string', message: '系统标识(等于(=)) 值不能为空', trigger: 'blur' },
+        ],
     }
 
     /**
@@ -318,6 +350,30 @@ export default class DefaultBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'n_modelname_like', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 n_codename_like 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof DefaultBase
+     */
+    @Watch('data.n_codename_like')
+    onN_codename_likeChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'n_codename_like', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 n_systemid_eq 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof DefaultBase
+     */
+    @Watch('data.n_systemid_eq')
+    onN_systemid_eqChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'n_systemid_eq', newVal: newVal, oldVal: oldVal });
+    }
+
 
     /**
      * 重置表单项值
@@ -340,6 +396,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
                 
 
 
+
+
     }
 
     /**
@@ -417,6 +475,9 @@ export default class DefaultBase extends Vue implements ControlInterface {
      * @memberof DefaultBase
      */
     public createDefault(){                    
+        if (this.data.hasOwnProperty('n_systemid_eq')) {
+            this.data['n_systemid_eq'] = this.context['dstsystemid'];
+        }
     }
 
     /**

app_web/src/widgets/meta-model/default-searchform/default-searchform-model.ts

@@ -30,6 +30,16 @@ export default class DefaultModel {
         prop: 'name',
         dataType: 'TEXT',
       },
+      {
+        name: 'n_codename_like',
+        prop: 'code_name',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'n_systemid_eq',
+        prop: 'system_id',
+        dataType: 'PICKUP',
+      },
     ]
   }
 

app_web/src/widgets/meta-model/main-form/main-form-model.ts

@@ -25,6 +25,11 @@ export default class MainModel {
         prop: 'srffrontuf',
         dataType: 'TEXT',
       },
+      {
+        name: 'srfupdatedate',
+        prop: 'updatedate',
+        dataType: 'DATETIME',
+      },
       {
         name: 'srforikey',
       },
@@ -60,11 +65,26 @@ export default class MainModel {
         prop: 'code_name',
         dataType: 'TEXT',
       },
+      {
+        name: 'materializedview',
+        prop: 'materialized_view',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'refreshtime',
+        prop: 'refresh_time',
+        dataType: 'DATETIME',
+      },
       {
         name: 'modelcfg',
         prop: 'config',
         dataType: 'LONGTEXT',
       },
+      {
+        name: 'systemid',
+        prop: 'system_id',
+        dataType: 'PICKUP',
+      },
       {
         name: 'modelid',
         prop: 'id',

app_web/src/widgets/meta-model/main-grid/main-grid-model.ts

@@ -26,6 +26,11 @@ export default class MainModel {
       ]
     }else{
 		  return [
+        {
+          name: 'systemid',
+          prop: 'system_id',
+          dataType: 'PICKUP',
+        },
         {
           name: 'modelname',
           prop: 'name',
@@ -61,6 +66,16 @@ export default class MainModel {
         prop: 'n_modelname_like',
         dataType: 'QUERYPARAM'
       },
+      {
+        name: 'n_codename_like',
+        prop: 'n_codename_like',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_systemid_eq',
+        prop: 'n_systemid_eq',
+        dataType: 'QUERYPARAM'
+      },
 
         {
           name:'size',

app_web/src/widgets/meta-model/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -27,6 +27,21 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'config',
       },
+      {
+        name: 'system_id',
+      },
+      {
+        name: 'materialized_view',
+      },
+      {
+        name: 'refresh_time',
+      },
+      {
+        name: 'createdate',
+      },
+      {
+        name: 'updatedate',
+      },
     ]
   }
 

app_web/src/widgets/meta-module/default-searchform/default-searchform-model.ts

+/**
+ * Default 部件模型
+ *
+ * @export
+ * @class DefaultModel
+ */
+export default class DefaultModel {
+
+  /**
+  * 获取数据项集合
+  *
+  * @returns {any[]}
+  * @memberof DefaultModel
+  */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'srfwfmemo',
+        prop: 'srfwfmemo',
+        dataType: 'TEXT',
+      },
+      // 前端新增修改标识，新增为"0",修改为"1"或未设值
+      {
+        name: 'srffrontuf',
+        prop: 'srffrontuf',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'n_modulename_like',
+        prop: 'name',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'n_codename_eq',
+        prop: 'code_name',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'n_systemid_eq',
+        prop: 'system_id',
+        dataType: 'PICKUP',
+      },
+    ]
+  }
+
+}
\ No newline at end of file

app_web/src/widgets/meta-module/default-searchform/default-searchform.less

+.ivu-tabs-no-animation>.ivu-tabs-content{
+    padding: 0 16px;
+}
+.ivu-card-head{
+    padding: 14px 0;
+}
+.app-search-form {
+  padding: 8px 14px 0;
+  .ivu-form-item{
+    margin-bottom: 8px;
+  }
+  .search_reset {
+      margin-right: 12px;
+      margin-bottom: 8px;
+  }
+  .search-button{
+      text-align: right;
+  }
+}
+.app-search-form-flex {
+    height: 100%;
+    > .ivu-row {
+        height: 100%;
+        > .ivu-tabs {
+            height: 100%;
+            display: flex;
+            flex-direction: column;
+            > .ivu-tabs-content {
+                flex-grow: 1;
+                overflow: auto;
+                > .ivu-tabs-tabpane {
+                    height: 100%;
+                }
+            }
+        }
+    }
+}
+.app-tabpanel-flex {
+    height: 100%;
+    > .ivu-tabs-content {
+        height: calc(100% - 52px);
+        > .ivu-tabs-tabpane {
+            height: 100%;
+        }
+    }
+}
+// this is less

app_web/src/widgets/meta-module/default-searchform/default-searchform.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import DefaultBase from './default-searchform-base.vue';
+
+ 
+@Component({
+    components: {
+         
+    }
+})
+export default class Default extends DefaultBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/widgets/meta-module/main-grid/main-grid-model.ts

+/**
+ * Main 部件模型
+ *
+ * @export
+ * @class MainModel
+ */
+export default class MainModel {
+
+	/**
+	 * 是否是实体数据导出
+	 *
+	 * @returns {any[]}
+	 * @memberof MainGridMode
+	 */
+	public isDEExport: boolean = false;
+
+	/**
+	 * 获取数据项集合
+	 *
+	 * @returns {any[]}
+	 * @memberof MainGridMode
+	 */
+	public getDataItems(): any[] {
+    if(this.isDEExport){
+		  return [
+      ]
+    }else{
+		  return [
+        {
+          name: 'systemid',
+          prop: 'system_id',
+          dataType: 'PICKUP',
+          isEditable:true
+        },
+        {
+          name: 'modulename',
+          prop: 'name',
+          dataType: 'TEXT',
+          isEditable:true
+        },
+        {
+          name: 'codename',
+          prop: 'code_name',
+          dataType: 'TEXT',
+          isEditable:true
+        },
+        {
+          name: 'showorder',
+          prop: 'show_order',
+          dataType: 'INT',
+          isEditable:true
+        },
+        {
+          name: 'srfmajortext',
+          prop: 'name',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'srfdataaccaction',
+          prop: 'id',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'srfkey',
+          prop: 'id',
+          dataType: 'TEXT',
+          isEditable:true
+        },
+        {
+          name: 'metamodule',
+          prop: 'id',
+        },
+      {
+        name: 'n_modulename_like',
+        prop: 'n_modulename_like',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_codename_eq',
+        prop: 'n_codename_eq',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_systemid_eq',
+        prop: 'n_systemid_eq',
+        dataType: 'QUERYPARAM'
+      },
+
+        {
+          name:'size',
+          prop:'size',
+          dataType: 'QUERYPARAM'
+        },
+        {
+          name:'query',
+          prop:'query',
+          dataType: 'QUERYPARAM'
+        },
+        {
+          name:'filter',
+          prop:'filter',
+          dataType: 'QUERYPARAM'
+        },
+        {
+          name:'page',
+          prop:'page',
+          dataType: 'QUERYPARAM'
+        },
+        {
+          name:'sort',
+          prop:'sort',
+          dataType: 'QUERYPARAM'
+        },
+        {
+          name:'srfparentdata',
+          prop:'srfparentdata',
+          dataType: 'QUERYPARAM'
+        },
+        // 前端新增修改标识，新增为"0",修改为"1"或未设值
+        {
+          name: 'srffrontuf',
+          prop: 'srffrontuf',
+          dataType: 'TEXT',
+        },
+      ]
+    }
+  }
+
+}
\ No newline at end of file

app_web/src/widgets/meta-module/main-grid/main-grid.less

+.grid {
+    flex-grow: 1;
+    height: 100%;
+    overflow: auto;
+    .el-table__body-wrapper::-webkit-scrollbar {
+      /*滚动条整体样式*/
+      width : 10px !important;  /*高宽分别对应横竖滚动条的尺寸*/
+      height: 10px !important;
+    }
+    .el-table__body-wrapper::-webkit-scrollbar-thumb {
+      /*滚动条颜色*/
+      border-radius   : 10px !important;
+      background-color: #cecece !important;
+    }
+    .el-table__body-wrapper::-webkit-scrollbar-track {
+      /*滚动条里面轨道*/
+      box-shadow   : inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
+      background   : #ededed !important;
+      border-radius: 10px !important;
+    }
+    /*表格文字过长省略*/
+    .el-table th>.cell, .el-table td>.cell{
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      word-break: break-all;
+    }
+    .el-table-column--selection .cell {
+        padding-left: 0px;
+        padding-right: 0px;
+    }
+    .app-column-link, .app-format-data{
+      display: inline;
+    }
+    .el-table {
+      height: 100%;
+      display:flex;
+      flex-direction: column;
+      justify-content: flex-start;
+      .el-table__row{
+        .grid-uiaction-divider {
+          padding:0 10px 0 10px;
+          border-left: 1px #b3b3b3 solid;
+        }
+        .grid-first-uiaction {
+          padding:0 10px 0 10px;
+        }
+      }
+      .quick-toolbar{
+          display: inline-block;
+          button{
+            background: #ebf3fb;
+            color: #2575ca;
+            border: 0;
+        }
+      }
+      .el-tooltip{
+        .ivu-form-item{
+          margin-bottom: unset !important;
+        }
+      }
+      .el-table__body .edit-cell{
+        padding:0;
+        .app-form-item{
+          margin-top: 20px;
+          margin-bottom: 20px;
+        }
+      }
+      .el-table__header-wrapper{
+        min-height: 45px;
+        max-height: 100px;
+        height: auto;
+      }
+      .el-table__footer-wrapper{
+        min-height: 45px;
+        max-height: 100px;
+        height: auto;
+      }
+    }
+    .grid-pagination {
+        height: 50px;
+        padding: 6px 0px;
+        .page-button {
+            button  {
+                padding: 0;
+                font-size: 16px;
+                min-width: 32px;
+                height: 32px;
+                margin-right: 4px;
+            }
+        }
+        .page-column {
+            position: absolute;
+            left: 0;
+        }
+        .batch-toolbar{
+            position: absolute;
+            left: 105px;
+          >.toolbar-container{
+              button  {
+                  font-size: 16px;
+                  min-width: 32px;
+                  height: 32px;
+                  margin-right: 4px;
+                  margin-top: 0;
+                  margin-bottom: 0;
+              }
+          }
+        }
+    }
+}
+.ivu-modal-content{
+    .footer{
+        .ivu-row{
+            text-align: right;
+        }
+    }
+}
+.cell-indeterminate {
+  >div>label {
+    >span {
+      .el-checkbox__inner {
+        background-color: #409eff;
+        border-color: #409eff;
+      }
+      .el-checkbox__inner:before {
+        content: "";
+        position: absolute;
+        display: block;
+        background-color: #fff;
+        height: 2px;
+        transform: scale(.5);
+        left: 0;
+        right: 0;
+        top: 5px;
+      }
+    }
+    >span.is-checked {
+      .el-checkbox__inner {
+        background-color: #409eff;
+        border-color: #409eff;
+      }
+      .el-checkbox__inner:after {
+        border: 0px;
+      }
+    }
+  }
+}
+
+.cell-select-all {
+  >div>label {
+    >span {
+      .el-checkbox__inner {
+        background-color: #409eff;
+        border-color: #409eff;
+      }
+      .el-checkbox__inner:after {
+        box-sizing: content-box;
+        content: "";
+        border: 1px solid #fff;
+        border-left: 0;
+        border-top: 0;
+        height: 7px;
+        left: 4px;
+        position: absolute;
+        top: 1px;
+        transform: rotate(45deg) scaleY(1);
+        width: 3px;
+        transition: transform .15s ease-in .05s;
+        transform-origin: center;
+      }
+    }
+  }
+}
+
+// this is less

app_web/src/widgets/meta-module/main-grid/main-grid.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import MainBase from './main-grid-base.vue';
+
+ 
+@Component({
+    components: {
+         
+    }
+})
+export default class Main extends MainBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/widgets/meta-module/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

+/**
+ * PickupViewpickupviewpanel 部件模型
+ *
+ * @export
+ * @class PickupViewpickupviewpanelModel
+ */
+export default class PickupViewpickupviewpanelModel {
+
+  /**
+    * 获取数据项集合
+    *
+    * @returns {any[]}
+    * @memberof PickupViewpickupviewpanelModel
+    */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'metamodule',
+        prop: 'id',
+      },
+      {
+        name: 'name',
+      },
+      {
+        name: 'code_name',
+      },
+      {
+        name: 'system_id',
+      },
+      {
+        name: 'show_order',
+      },
+    ]
+  }
+
+
+}
\ No newline at end of file

app_web/src/widgets/meta-module/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-service.ts

+import { Http } from '@/utils';
+import ControlService from '@/widgets/control-service';
+
+/**
+ * PickupViewpickupviewpanel 部件服务对象
+ *
+ * @export
+ * @class PickupViewpickupviewpanelService
+ */
+export default class PickupViewpickupviewpanelService extends ControlService {
+}
\ No newline at end of file

app_web/src/widgets/meta-module/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.less

+// this is less
+.pickupviewpanel{
+  width: 100%;
+}
\ No newline at end of file

app_web/src/widgets/meta-module/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import PickupViewpickupviewpanelBase from './pickup-viewpickupviewpanel-pickupviewpanel-base.vue';
+
+ 
+@Component({
+    components: {
+         
+    }
+})
+export default class PickupViewpickupviewpanel extends PickupViewpickupviewpanelBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/widgets/meta-relationship/main-form/main-form-base.vue

@@ -514,6 +514,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public data: any = {
         lookup: null,
+        srfupdatedate: null,
         srforikey: null,
         srfkey: null,
         srfmajortext: null,
@@ -715,6 +716,8 @@ export default class MainBase extends Vue implements ControlInterface {
         group1: new FormGroupPanelModel({ caption: '实体关系基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.metarelationship.main_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
 , 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
+, 
+        srfupdatedate: new FormItemModel({ caption: '最后修改时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -750,6 +753,18 @@ export default class MainBase extends Vue implements ControlInterface {
 , 
     };
 
+    /**
+     * 监控表单属性 srfupdatedate 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.srfupdatedate')
+    onSrfupdatedateChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'srfupdatedate', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 srforikey 值
      *
@@ -1014,6 +1029,7 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
 
     }
 

app_web/src/widgets/meta-relationship/main-form/main-form-model.ts

@@ -29,6 +29,11 @@ export default class MainModel {
         name: 'lookup',
         dataType:'FORMPART'
       },
+      {
+        name: 'srfupdatedate',
+        prop: 'updatedate',
+        dataType: 'DATETIME',
+      },
       {
         name: 'srforikey',
       },

app_web/src/widgets/meta-relationship/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -48,6 +48,12 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'lookup',
       },
+      {
+        name: 'createdate',
+      },
+      {
+        name: 'updatedate',
+      },
     ]
   }
 

app_web/src/widgets/rule-item/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -54,6 +54,9 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'updatedate',
       },
+      {
+        name: 'system_id',
+      },
     ]
   }
 

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/domain/DABuild.java

@@ -88,6 +88,13 @@ public class DABuild extends EntityMP implements Serializable {
     @JSONField(name = "state")
     @JsonProperty("state")
     private String state;
+    /**
+     * 系统标识
+     */
+    @TableField(exist = false)
+    @JSONField(name = "system_id")
+    @JsonProperty("system_id")
+    private String systemId;
 
     /**
      * 模型

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/domain/DAChart.java

@@ -81,6 +81,13 @@ public class DAChart extends EntityMP implements Serializable {
     @JSONField(name = "config")
     @JsonProperty("config")
     private String config;
+    /**
+     * 系统标识
+     */
+    @TableField(value = "systemid")
+    @JSONField(name = "system_id")
+    @JsonProperty("system_id")
+    private String systemId;
 
 
 
@@ -116,6 +123,14 @@ public class DAChart extends EntityMP implements Serializable {
         this.modify("vmcfg", config);
     }
 
+    /**
+     * 设置 [系统标识]
+     */
+    public void setSystemId(String systemId) {
+        this.systemId = systemId;
+        this.modify("systemid", systemId);
+    }
+
 
     /**
      * 复制当前对象数据到目标对象(粘贴重置)

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/domain/DAReport.java

@@ -81,6 +81,13 @@ public class DAReport extends EntityMP implements Serializable {
     @JSONField(name = "config")
     @JsonProperty("config")
     private String config;
+    /**
+     * 系统标识
+     */
+    @TableField(value = "systemid")
+    @JSONField(name = "system_id")
+    @JsonProperty("system_id")
+    private String systemId;
 
 
 
@@ -116,6 +123,14 @@ public class DAReport extends EntityMP implements Serializable {
         this.modify("vmcfg", config);
     }
 
+    /**
+     * 设置 [系统标识]
+     */
+    public void setSystemId(String systemId) {
+        this.systemId = systemId;
+        this.modify("systemid", systemId);
+    }
+
 
     /**
      * 复制当前对象数据到目标对象(粘贴重置)

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/impl/DABuildServiceImpl.java

@@ -199,6 +199,7 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
                 model=majorEntity;
             }
             et.setModelName(model.getName());
+            et.setSystemId(model.getSystemId());
         }
     }
 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/domain/MetaEntity.java

@@ -135,6 +135,24 @@ public class MetaEntity extends EntityMP implements Serializable {
     @JSONField(name = "show_order")
     @JsonProperty("show_order")
     private Integer showOrder;
+    /**
+     * 创建时间
+     */
+    @DEField(preType = DEPredefinedFieldType.CREATEDATE)
+    @TableField(value = "createdate", fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
+    @JSONField(name = "createdate", format = "yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("createdate")
+    private Timestamp createdate;
+    /**
+     * 最后修改时间
+     */
+    @DEField(preType = DEPredefinedFieldType.UPDATEDATE)
+    @TableField(value = "updatedate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
+    @JSONField(name = "updatedate", format = "yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("updatedate")
+    private Timestamp updatedate;
 
     /**
      * 

ibzdst-core/src/main/java/cn/ibizlab/core/lite/filter/MetaModelSearchContext.java

@@ -55,6 +55,13 @@ public class MetaModelSearchContext extends QueryWrapperContext<MetaModel> {
             this.getSearchCond().like("codename", n_codename_like);
         }
     }
+	private String n_systemid_eq;//[系统标识]
+	public void setN_systemid_eq(String n_systemid_eq) {
+        this.n_systemid_eq = n_systemid_eq;
+        if(!ObjectUtils.isEmpty(this.n_systemid_eq)){
+            this.getSearchCond().eq("systemid", n_systemid_eq);
+        }
+    }
 
     /**
 	 * 启用快速搜索

ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/impl/ExecResultServiceImpl.java

@@ -196,6 +196,7 @@ public class ExecResultServiceImpl extends ServiceImpl<ExecResultMapper, ExecRes
                 rule=majorEntity;
             }
             et.setRuleName(rule.getRuleName());
+            et.setSystemId(rule.getSystemId());
         }
     }