ibiz4j 部署微服务应用

app_Web/public/assets/json/view-config.json

@@ -55,6 +55,14 @@
         "viewname": "SysUserMPickupView",
         "viewtag": "1f8cf7e78d6d88588d1d568d1866cc77"
     },
+    "dictoptiongridview": {
+        "title": "字典项表格视图",
+        "caption": "字典项",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "dict",
+        "viewname": "DictOptionGridView",
+        "viewtag": "22e202992971f634c00e022b2cae335e"
+    },
     "sysauthloggridview": {
         "title": "认证日志表格视图",
         "caption": "认证日志",

app_Web/src/locale/lang/en-US.ts

@@ -99,6 +99,8 @@ export default {
                 menuitem16: "任务",
                 menuitem17: "日志",
                 menuitem18: "字典管理",
+                menuitem19: "目录",
+                menuitem20: "字典项",
             },
         },
     },

app_Web/src/locale/lang/zh-CN.ts

@@ -99,6 +99,8 @@ export default {
                 menuitem16: "任务",
                 menuitem17: "日志",
                 menuitem18: "字典管理",
+                menuitem19: "目录",
+                menuitem20: "字典项",
             },
         },
     },

app_Web/src/locale/lanres/entities/dict-option/dict-option_en_US.ts

@@ -21,6 +21,10 @@ export default {
 			caption: "字典项",
       		title: "字典项编辑视图",
 		},
+		gridview: {
+			caption: "字典项",
+      		title: "字典项表格视图",
+		},
 		grideditview: {
 			caption: "字典项",
       		title: "字典项表格视图",
@@ -55,6 +59,25 @@ export default {
 		uiactions: {
 		},
 	},
+	main_grid: {
+		columns: {
+			cid: "目录代码",
+			val: "代码值",
+			label: "名称",
+			pval: "父代码值",
+			showorder: "排序",
+			cname: "目录",
+			cls: "栏目样式",
+			iconcls: "图标",
+			vfilter: "过滤项",
+			disabled: "是否禁用",
+			expired: "过期/失效",
+			extension: "扩展",
+			updatedate: "最后修改时间",
+		},
+		uiactions: {
+		},
+	},
 	options_grid: {
 		columns: {
 			cid: "目录代码",
@@ -93,6 +116,60 @@ export default {
 			tip: "关闭",
 		},
 	},
+	gridviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem6: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem24: {
+			caption: "行编辑",
+			tip: "行编辑",
+		},
+		tbitem25: {
+			caption: "新建行",
+			tip: "新建行",
+		},
+		deuiaction1: {
+			caption: "保存行",
+			tip: "保存行",
+		},
+		tbitem26: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		deuiaction2: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
 	grideditviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "New",

app_Web/src/locale/lanres/entities/dict-option/dict-option_zh_CN.ts

@@ -20,6 +20,10 @@ export default {
 			caption: "字典项",
       		title: "字典项编辑视图",
 		},
+		gridview: {
+			caption: "字典项",
+      		title: "字典项表格视图",
+		},
 		grideditview: {
 			caption: "字典项",
       		title: "字典项表格视图",
@@ -54,6 +58,25 @@ export default {
 		uiactions: {
 		},
 	},
+	main_grid: {
+		columns: {
+			cid: "目录代码",
+			val: "代码值",
+			label: "名称",
+			pval: "父代码值",
+			showorder: "排序",
+			cname: "目录",
+			cls: "栏目样式",
+			iconcls: "图标",
+			vfilter: "过滤项",
+			disabled: "是否禁用",
+			expired: "过期/失效",
+			extension: "扩展",
+			updatedate: "最后修改时间",
+		},
+		uiactions: {
+		},
+	},
 	options_grid: {
 		columns: {
 			cid: "目录代码",
@@ -92,6 +115,60 @@ export default {
 			tip: "关闭",
 		},
 	},
+	gridviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem6: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem24: {
+			caption: "行编辑",
+			tip: "行编辑",
+		},
+		tbitem25: {
+			caption: "新建行",
+			tip: "新建行",
+		},
+		deuiaction1: {
+			caption: "保存行",
+			tip: "保存行",
+		},
+		tbitem26: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		deuiaction2: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
 	grideditviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "新建",

app_Web/src/mock/app/index-appmenu/index-appmenu.ts

@@ -339,8 +339,46 @@ mock.onGet('v7/indexappmenu').reply((config: any) => {
 	iconcls: 'fa fa-reorder',
 	icon: '',
 	textcls: '',
+	appfunctag: '',
+	resourcetag: '',
+	items: [
+		{
+	id: '93B39387-4DF9-4B87-B8E6-99B2F0759268',
+	name: 'menuitem19',
+	text: '目录',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '目录',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: 'fa fa-folder-open-o',
+	icon: '',
+	textcls: '',
 	appfunctag: 'Auto10',
 	resourcetag: '',
+},
+		{
+	id: 'B24E45E8-5D6D-45A3-92D7-19E8EBDF476D',
+	name: 'menuitem20',
+	text: '字典项',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '字典项',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: 'fa fa-stack-exchange',
+	icon: '',
+	textcls: '',
+	appfunctag: '_2',
+	resourcetag: '',
+},
+	],
 },
         ],
     }];

app_Web/src/mock/viewconfig/viewconfig.ts

@@ -63,6 +63,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "SysUserMPickupView",
             "viewtag": "1f8cf7e78d6d88588d1d568d1866cc77"
         },
+        "dictoptiongridview": {
+            "title": "字典项表格视图",
+            "caption": "字典项",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "dict",
+            "viewname": "DictOptionGridView",
+            "viewtag": "22e202992971f634c00e022b2cae335e"
+        },
         "sysauthloggridview": {
             "title": "认证日志表格视图",
             "caption": "认证日志",

app_Web/src/pages/dict/dict-option-grid-view/dict-option-grid-view.less

+.dict-option-grid-view{
+    position: relative;
+}
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
+
+

app_Web/src/pages/dict/dict-option-grid-view/dict-option-grid-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import DictOptionGridViewBase from './dict-option-grid-view-base.vue';
+
+import view_grid from '@widgets/dict-option/main-grid/main-grid.vue';
+import view_searchform from '@widgets/dict-option/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 DictOptionGridView extends DictOptionGridViewBase {
+
+}
+</script>
\ No newline at end of file

app_Web/src/pages/rt/index/page-register.ts

@@ -11,9 +11,9 @@ export const PageComponents = {
         Vue.component('ibzemployee-grid-view', () => import('@pages/ou/ibzemployee-grid-view/ibzemployee-grid-view.vue'));
         Vue.component('sys-user-role-grid-view', () => import('@pages/uaa/sys-user-role-grid-view/sys-user-role-grid-view.vue'));
         Vue.component('ibzdepartment-pickup-view', () => import('@pages/ou/ibzdepartment-pickup-view/ibzdepartment-pickup-view.vue'));
+        Vue.component('wfmember-edit-view', () => import('@pages/workflow/wfmember-edit-view/wfmember-edit-view.vue'));
         Vue.component('jobs-log-grid-view', () => import('@pages/task/jobs-log-grid-view/jobs-log-grid-view.vue'));
         Vue.component('ibzpost-grid-view', () => import('@pages/ou/ibzpost-grid-view/ibzpost-grid-view.vue'));
-        Vue.component('wfmember-edit-view', () => import('@pages/workflow/wfmember-edit-view/wfmember-edit-view.vue'));
         Vue.component('sys-role-pickup-grid-view', () => import('@pages/uaa/sys-role-pickup-grid-view/sys-role-pickup-grid-view.vue'));
         Vue.component('wfmember-grid-view', () => import('@pages/workflow/wfmember-grid-view/wfmember-grid-view.vue'));
         Vue.component('dict-catalog-edit-view', () => import('@pages/dict/dict-catalog-edit-view/dict-catalog-edit-view.vue'));
@@ -25,9 +25,9 @@ export const PageComponents = {
         Vue.component('ibzdepartment-tree-exp-view', () => import('@pages/ou/ibzdepartment-tree-exp-view/ibzdepartment-tree-exp-view.vue'));
         Vue.component('ibzteam-edit-view', () => import('@pages/ou/ibzteam-edit-view/ibzteam-edit-view.vue'));
         Vue.component('sys-role-grid-view', () => import('@pages/uaa/sys-role-grid-view/sys-role-grid-view.vue'));
+        Vue.component('wfgroup-mpickup-view', () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'));
         Vue.component('ibzorganization-pickup-view', () => import('@pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view.vue'));
         Vue.component('wfgroup-grid-view', () => import('@pages/workflow/wfgroup-grid-view/wfgroup-grid-view.vue'));
-        Vue.component('wfgroup-mpickup-view', () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'));
         Vue.component('dict-catalog-grid-view', () => import('@pages/dict/dict-catalog-grid-view/dict-catalog-grid-view.vue'));
         Vue.component('wfuser-pickup-view', () => import('@pages/workflow/wfuser-pickup-view/wfuser-pickup-view.vue'));
         Vue.component('ibzteam-member-grid-view', () => import('@pages/ou/ibzteam-member-grid-view/ibzteam-member-grid-view.vue'));
@@ -40,8 +40,8 @@ export const PageComponents = {
         Vue.component('sys-user-pickup-view', () => import('@pages/uaa/sys-user-pickup-view/sys-user-pickup-view.vue'));
         Vue.component('jobs-info-grid-view', () => import('@pages/task/jobs-info-grid-view/jobs-info-grid-view.vue'));
         Vue.component('wfprocess-definition-grid-view', () => import('@pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-view.vue'));
-        Vue.component('ibzdept-member-grid-view', () => import('@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'));
         Vue.component('sys-user-mpickup-view', () => import('@pages/uaa/sys-user-mpickup-view/sys-user-mpickup-view.vue'));
+        Vue.component('ibzdept-member-grid-view', () => import('@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'));
         Vue.component('jobs-info-edit-view', () => import('@pages/task/jobs-info-edit-view/jobs-info-edit-view.vue'));
         Vue.component('ibzdepartment-pickup-grid-view', () => import('@pages/ou/ibzdepartment-pickup-grid-view/ibzdepartment-pickup-grid-view.vue'));
         Vue.component('ibzorganization-option-view', () => import('@pages/ou/ibzorganization-option-view/ibzorganization-option-view.vue'));
@@ -63,6 +63,7 @@ export const PageComponents = {
         Vue.component('ibzdept-member-edit-view', () => import('@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'));
         Vue.component('sys-role-pickup-view', () => import('@pages/uaa/sys-role-pickup-view/sys-role-pickup-view.vue'));
         Vue.component('ibzorganization-pickup-grid-view', () => import('@pages/ou/ibzorganization-pickup-grid-view/ibzorganization-pickup-grid-view.vue'));
+        Vue.component('dict-option-grid-view', () => import('@pages/dict/dict-option-grid-view/dict-option-grid-view.vue'));
         Vue.component('sys-user-pickup-grid-view', () => import('@pages/uaa/sys-user-pickup-grid-view/sys-user-pickup-grid-view.vue'));
         Vue.component('dict-catalog-pickup-view', () => import('@pages/dict/dict-catalog-pickup-view/dict-catalog-pickup-view.vue'));
         Vue.component('sys-permission-mpickup-view', () => import('@pages/uaa/sys-permission-mpickup-view/sys-permission-mpickup-view.vue'));

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

@@ -76,6 +76,17 @@ export const viewstate: any = {
                 '6869875c7409bd1dddd3d0fc62c502db',
             ],
         },
+        {
+            viewtag: '22e202992971f634c00e022b2cae335e',
+            viewmodule: 'dict',
+            viewname: 'DictOptionGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '0986ae2314847b586b20edfbb40fc82b',
+                'a9c82814d9bcd23dbf78c4c073759d7c',
+            ],
+        },
         {
             viewtag: '255944d6d1a575d0eda2b68bc19314f3',
             viewmodule: 'uaa',
@@ -547,6 +558,7 @@ export const viewstate: any = {
                 'd907ddd1845887ecabac4d8d199bf792',
                 '13c174556f45e9b10b66dc51834a6ab5',
                 'f498dfb24e88df7c70a5c09ecb587647',
+                '22e202992971f634c00e022b2cae335e',
                 '74a6ce3ddf610ce7fb201662c6d4b8da',
             ],
         },

app_Web/src/uiservice/dict-option/dict-option-ui-service-base.ts

@@ -80,6 +80,7 @@ export default class DictOptionUIServiceBase extends UIService {
      */  
     public initViewMap(){
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'dictoptions'});
+        this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'dictoptions'});
         this.allViewMap.set(':',{viewname:'grideditview',srfappde:'dictoptions'});
     }
 

app_Web/src/widgets/app/index-appmenu/index-appmenu-base.vue

@@ -529,6 +529,9 @@ export default class IndexBase extends Vue implements ControlInterface {
                 case 'Auto8': 
                     this.clickAuto8(item);
                     return;
+                case '_2': 
+                    this.click_2(item);
+                    return;
                 case 'Auto13': 
                     this.clickAuto13(item);
                     return;
@@ -758,6 +761,29 @@ export default class IndexBase extends Vue implements ControlInterface {
         })
     }
     
+    /**
+     * 字典项
+     *
+     * @param {*} [item={}]
+     * @memberof Index
+     */
+    public click_2(item: any = {}) {
+        const viewparam: any = {};
+        Object.assign(viewparam, {});
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'dictoptions', parameterName: 'dictoption' },
+            { pathName: 'gridview', parameterName: 'gridview' },
+        ];
+        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
+        if(Object.is(this.$route.fullPath,path)){
+            return;
+        }
+        this.$nextTick(function(){
+            this.$router.push(path);
+        })
+    }
+    
     /**
      * 岗位管理
      *

app_Web/src/widgets/app/index-appmenu/index-appmenu-model.ts

@@ -360,9 +360,49 @@ export default class IndexModel {
 	iconcls: 'fa fa-reorder',
 	icon: '',
 	textcls: '',
-	appfunctag: 'Auto10',
+	appfunctag: '',
 	resourcetag: '',
 	authtag:'Web-Index-menuitem18',
+	items: [
+		{
+	id: '93B39387-4DF9-4B87-B8E6-99B2F0759268',
+	name: 'menuitem19',
+	text: '目录',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '目录',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: 'fa fa-folder-open-o',
+	icon: '',
+	textcls: '',
+	appfunctag: 'Auto10',
+	resourcetag: '',
+	authtag:'Web-Index-menuitem19',
+},
+		{
+	id: 'B24E45E8-5D6D-45A3-92D7-19E8EBDF476D',
+	name: 'menuitem20',
+	text: '字典项',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '字典项',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: 'fa fa-stack-exchange',
+	icon: '',
+	textcls: '',
+	appfunctag: '_2',
+	resourcetag: '',
+	authtag:'Web-Index-menuitem20',
+},
+	],
 },
     ];
 

app_Web/src/widgets/dict-option/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: 'val',
+          prop: 'value',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'pval',
+          prop: 'parent',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'cls',
+          prop: 'cls',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'expired',
+          prop: 'expired',
+          dataType: 'YESNO',
+        },
+        {
+          name: 'label',
+          prop: 'label',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'cid',
+          prop: 'catalog_id',
+          dataType: 'PICKUP',
+        },
+        {
+          name: 'srfmajortext',
+          prop: 'label',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'srfdataaccaction',
+          prop: 'value_key',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'srfkey',
+          prop: 'value_key',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'iconcls',
+          prop: 'icon_class',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'extension',
+          prop: 'extension',
+          dataType: 'LONGTEXT_1000',
+        },
+        {
+          name: 'vfilter',
+          prop: 'filter',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'showorder',
+          prop: 'showorder',
+          dataType: 'INT',
+        },
+        {
+          name: 'updatedate',
+          prop: 'updatedate',
+          dataType: 'DATETIME',
+        },
+        {
+          name: 'cname',
+          prop: 'catalog_name',
+          dataType: 'PICKUPTEXT',
+        },
+        {
+          name: 'disabled',
+          prop: 'disabled',
+          dataType: 'YESNO',
+        },
+        {
+          name: 'dictoption',
+          prop: 'value_key',
+        },
+      {
+        name: 'n_cname_like',
+        prop: 'n_cname_like',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'n_val_like',
+        prop: 'n_val_like',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'n_label_like',
+        prop: 'n_label_like',
+        dataType: 'TEXT',
+      },
+
+        {
+          name:'size',
+          prop:'size'
+        },
+        {
+          name:'query',
+          prop:'query'
+        },
+        {
+          name:'page',
+          prop:'page'
+        },
+        {
+          name:'sort',
+          prop:'sort'
+        },
+        {
+          name:'srfparentdata',
+          prop:'srfparentdata'
+        },
+        // 前端新增修改标识，新增为"0",修改为"1"或未设值
+        {
+          name: 'srffrontuf',
+          prop: 'srffrontuf',
+          dataType: 'TEXT',
+        },
+      ]
+    }
+  }
+
+}
\ No newline at end of file

app_Web/src/widgets/dict-option/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 {
+      .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;
+        }
+      }
+    }
+    .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;
+              }
+          }
+        }
+    }
+    .el-table__body-wrapper{
+      height: calc(100% - 45px) !important;
+    }
+}
+.ivu-modal-content{
+    .footer{
+        .ivu-row{
+            text-align: right;
+        }
+    }
+}
+
+
+
+// this is less

app_Web/src/widgets/dict-option/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

config.xml

@@ -37,6 +37,11 @@
 	  git clone -b master $para2 ibzrt/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzrt/
+      mvn clean package -Pweb
+      cd ibzrt-app/ibzrt-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzrt-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzrt-app/ibzrt-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzrt-app-web.jar
 
-EXPOSE 8080
+EXPOSE 30000
 
 ADD ibzrt-app-web.jar /ibzrt-app-web.jar

ibzrt-app/ibzrt-app-web/src/main/docker/ibzrt-app-web.yaml

@@ -3,9 +3,22 @@ services:
   ibzrt-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
     ports:
-      - "8080:8080"
+      - "30000:30000"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=30000
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits: