ShineKOT 发布系统代码 [后台服务，演示应用]

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

@@ -71,6 +71,14 @@
         "viewname": "IBIZOrderWFActionView",
         "viewtag": "0c15b18a869b229948278abd039a68d0"
     },
+    "ibizbookusr3editview": {
+        "title": "图书编辑视图",
+        "caption": "图书",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "Sample",
+        "viewname": "IBIZBOOKUsr3EditView",
+        "viewtag": "0d9d3edf2d060a859fa7f2e206556730"
+    },
     "ibizorderodsp_d_wfgridview": {
         "title": "订单工作流表格视图(订单审批)",
         "caption": "订单",
@@ -159,6 +167,14 @@
         "viewname": "IBIZOrderTreeGridExView",
         "viewtag": "17c2991a0bd88cfd2bd6f8651537450b"
     },
+    "ibizbookusr3listview": {
+        "title": "图书列表视图",
+        "caption": "图书",
+        "viewtype": "DELISTVIEW",
+        "viewmodule": "Sample",
+        "viewname": "IBIZBOOKUsr3ListView",
+        "viewtag": "19c3e99f599211667d8e93f98edf70f8"
+    },
     "ibizsample0003sf4editview": {
         "title": "示例实体03编辑视图",
         "caption": "示例实体03",
@@ -1343,6 +1359,14 @@
         "viewname": "IBIZSample0013PickupView",
         "viewtag": "ca4d303820103b229490282d1d850702"
     },
+    "ibizbookusr9gridview": {
+        "title": "图书表格视图（主状态）",
+        "caption": "图书",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Sample",
+        "viewname": "IBIZBOOKUsr9GridView",
+        "viewtag": "ce961e4db11b6cb36fcb604e4a4948a3"
+    },
     "ibizorderdetailf6gridview": {
         "title": "订单明细表格视图",
         "caption": "订单明细",

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

@@ -334,7 +334,7 @@ export default {
                 menuitem45: "数据打印",
                 menuitem67: "索引实体",
                 menuitem68: "继承实体",
-                menuitem70: "主状态",
+                menuitem70: "表格主状态",
                 menuitem71: "多表单",
                 menuitem92: "其他",
                 menuitem93: "示例实体02示例数据补充",

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

@@ -334,7 +334,7 @@ export default {
                 menuitem45: "数据打印",
                 menuitem67: "索引实体",
                 menuitem68: "继承实体",
-                menuitem70: "主状态",
+                menuitem70: "表格主状态",
                 menuitem71: "多表单",
                 menuitem92: "其他",
                 menuitem93: "示例实体02示例数据补充",

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US.ts

@@ -36,6 +36,14 @@ export default {
 			caption: "状态属性",
       		title: "状态属性",
 		},
+		usr3editview: {
+			caption: "图书",
+      		title: "图书编辑视图",
+		},
+		usr3listview: {
+			caption: "图书",
+      		title: "图书列表视图",
+		},
 		editview3: {
 			caption: "图书",
       		title: "图书编辑视图",
@@ -168,6 +176,10 @@ export default {
 			caption: "图书",
       		title: "图书表格视图",
 		},
+		usr9gridview: {
+			caption: "图书",
+      		title: "图书表格视图（主状态）",
+		},
 		usr4dataview: {
 			caption: "图书",
       		title: "图书数据视图（项布局面板）",
@@ -293,6 +305,31 @@ export default {
 		uiactions: {
 		},
 	},
+	majorstateform_form: {
+		details: {
+			group1: "图书基本信息", 
+			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "图书标识", 
+			srfmajortext: "图书名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			ibizbookname: "图书名称", 
+			type: "图书类型", 
+			createman: "建立人", 
+			createdate: "建立时间", 
+			updateman: "更新人", 
+			updatedate: "更新时间", 
+			ibizbookid: "图书标识", 
+		},
+		uiactions: {
+		},
+	},
 	main_form: {
 		details: {
 			group1: "图书基本信息", 
@@ -526,6 +563,21 @@ export default {
 		uiactions: {
 		},
 	},
+	main7_grid: {
+		columns: {
+			author: "图书作者",
+			ibizbookname: "图书名称",
+			type: "图书类型",
+			press: "图书出版社",
+			price: "图书价格",
+			uagridcolumn1: "操作",
+		},
+		nodata:"",
+		uiactions: {
+        ibizbook_edit: "编辑",
+        ibizbook_delete: "删除",
+		},
+	},
 	main5_grid: {
 		columns: {
 			type: "图书类型",
@@ -562,6 +614,11 @@ export default {
 		uiactions: {
 		},
 	},
+	majorstatelist_list: {
+		nodata:"",
+		uiactions: {
+		},
+	},
 	groupbycodelistlist_list: {
 		nodata:"",
 		uiactions: {
@@ -639,9 +696,7 @@ export default {
 	interfunckanban_kanban: {
 		nodata:"",
 		uiactions: {
-        new: "New",
-        edit: "Edit",
-        remove: "Remove",
+        ibizbook_openkanbandocument: "打开实体看板文档",
 		},
 	},
 	usr_gantt: {
@@ -671,6 +726,20 @@ export default {
 		uiactions: {
 		},
 	},
+	usr3editviewtoolbar_toolbar: {
+	},
+	usr3listviewtoolbar_toolbar: {
+	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem5: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+	},
 	groupbycodelistkanbanviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "New",
@@ -721,16 +790,6 @@ export default {
 			tip: "导出数据模型",
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
-	},
 	treegridexviewtoolbar_toolbar: {
 	},
 	usr5dataviewtoolbar_toolbar: {
@@ -1427,6 +1486,8 @@ export default {
 	},
 	editview4toolbar_toolbar: {
 	},
+	usr9gridviewtoolbar_toolbar: {
+	},
 	listviewtoolbar_toolbar: {
 		deuiaction1: {
 			caption: "New",
@@ -1583,22 +1644,6 @@ export default {
 			tip: "导出数据模型",
 		},
 	},
-	interfunckanbanviewkanban_quicktoolbar_toolbar: {
-		deuiaction1: {
-			caption: "New",
-			tip: "New",
-		},
-	},
-	interfunckanbanviewkanban_batchtoolbar_toolbar: {
-		deuiaction1: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		deuiaction2: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-	},
 	usr3gridviewtoolbar_toolbar: {
 	},
 	meditview9toolbar_toolbar: {

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN.ts

@@ -35,6 +35,14 @@ export default {
 			caption: "状态属性",
       		title: "状态属性",
 		},
+		usr3editview: {
+			caption: "图书",
+      		title: "图书编辑视图",
+		},
+		usr3listview: {
+			caption: "图书",
+      		title: "图书列表视图",
+		},
 		editview3: {
 			caption: "图书",
       		title: "图书编辑视图",
@@ -167,6 +175,10 @@ export default {
 			caption: "图书",
       		title: "图书表格视图",
 		},
+		usr9gridview: {
+			caption: "图书",
+      		title: "图书表格视图（主状态）",
+		},
 		usr4dataview: {
 			caption: "图书",
       		title: "图书数据视图（项布局面板）",
@@ -292,6 +304,31 @@ export default {
 		uiactions: {
 		},
 	},
+	majorstateform_form: {
+		details: {
+			group1: "图书基本信息", 
+			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "图书标识", 
+			srfmajortext: "图书名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			ibizbookname: "图书名称", 
+			type: "图书类型", 
+			createman: "建立人", 
+			createdate: "建立时间", 
+			updateman: "更新人", 
+			updatedate: "更新时间", 
+			ibizbookid: "图书标识", 
+		},
+		uiactions: {
+		},
+	},
 	main_form: {
 		details: {
 			group1: "图书基本信息", 
@@ -525,6 +562,21 @@ export default {
 		uiactions: {
 		},
 	},
+	main7_grid: {
+		columns: {
+			author: "图书作者",
+			ibizbookname: "图书名称",
+			type: "图书类型",
+			press: "图书出版社",
+			price: "图书价格",
+			uagridcolumn1: "操作",
+		},
+		nodata:"",
+		uiactions: {
+			ibizbook_edit: "编辑",
+			ibizbook_delete: "删除",
+		},
+	},
 	main5_grid: {
 		columns: {
 			type: "图书类型",
@@ -561,6 +613,11 @@ export default {
 		uiactions: {
 		},
 	},
+	majorstatelist_list: {
+		nodata:"",
+		uiactions: {
+		},
+	},
 	groupbycodelistlist_list: {
 		nodata:"",
 		uiactions: {
@@ -638,9 +695,7 @@ export default {
 	interfunckanban_kanban: {
 		nodata:"",
 		uiactions: {
-			new: "新建",
-			edit: "编辑",
-			remove: "删除",
+			ibizbook_openkanbandocument: "打开实体看板文档",
 		},
 	},
 	usr_gantt: {
@@ -670,6 +725,20 @@ export default {
 		uiactions: {
 		},
 	},
+	usr3editviewtoolbar_toolbar: {
+	},
+	usr3listviewtoolbar_toolbar: {
+	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem5: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+	},
 	groupbycodelistkanbanviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "新建",
@@ -720,16 +789,6 @@ export default {
 			tip: "导出数据模型",
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "保存",
-			tip: "保存",
-		},
-		tbitem5: {
-			caption: "保存并关闭",
-			tip: "保存并关闭",
-		},
-	},
 	treegridexviewtoolbar_toolbar: {
 	},
 	usr5dataviewtoolbar_toolbar: {
@@ -1426,6 +1485,8 @@ export default {
 	},
 	editview4toolbar_toolbar: {
 	},
+	usr9gridviewtoolbar_toolbar: {
+	},
 	listviewtoolbar_toolbar: {
 		deuiaction1: {
 			caption: "新建",
@@ -1582,22 +1643,6 @@ export default {
 			tip: "导出数据模型",
 		},
 	},
-	interfunckanbanviewkanban_quicktoolbar_toolbar: {
-		deuiaction1: {
-			caption: "新建",
-			tip: "新建",
-		},
-	},
-	interfunckanbanviewkanban_batchtoolbar_toolbar: {
-		deuiaction1: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		deuiaction2: {
-			caption: "删除",
-			tip: "删除",
-		},
-	},
 	usr3gridviewtoolbar_toolbar: {
 	},
 	meditview9toolbar_toolbar: {

app_Web/src/mock/app/main-menu-appmenu/main-menu-appmenu.ts

@@ -3031,10 +3031,10 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
 		{
 	id: 'c931e0ff705c4be3c4199457a0ac5b75',
 	name: 'menuitem70',
-	text: '主状态',
+	text: '表格主状态',
 	type: 'MENUITEM',
 	counterid: '',
-	tooltip: '主状态',
+	tooltip: '表格主状态',
 	expanded: false,
 	separator: false,
 	hidden: false,
@@ -3043,7 +3043,7 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
 	iconcls: '',
 	icon: '',
 	textcls: '',
-	appfunctag: 'Auto243',
+	appfunctag: 'AppFunc79',
 	resourcetag: '',
 },
 		{

app_Web/src/mock/viewconfig/viewconfig.ts

@@ -79,6 +79,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "IBIZOrderWFActionView",
             "viewtag": "0c15b18a869b229948278abd039a68d0"
         },
+        "ibizbookusr3editview": {
+            "title": "图书编辑视图",
+            "caption": "图书",
+            "viewtype": "DEEDITVIEW",
+            "viewmodule": "Sample",
+            "viewname": "IBIZBOOKUsr3EditView",
+            "viewtag": "0d9d3edf2d060a859fa7f2e206556730"
+        },
         "ibizorderodsp_d_wfgridview": {
             "title": "订单工作流表格视图(订单审批)",
             "caption": "订单",
@@ -167,6 +175,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "IBIZOrderTreeGridExView",
             "viewtag": "17c2991a0bd88cfd2bd6f8651537450b"
         },
+        "ibizbookusr3listview": {
+            "title": "图书列表视图",
+            "caption": "图书",
+            "viewtype": "DELISTVIEW",
+            "viewmodule": "Sample",
+            "viewname": "IBIZBOOKUsr3ListView",
+            "viewtag": "19c3e99f599211667d8e93f98edf70f8"
+        },
         "ibizsample0003sf4editview": {
             "title": "示例实体03编辑视图",
             "caption": "示例实体03",
@@ -1351,6 +1367,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "IBIZSample0013PickupView",
             "viewtag": "ca4d303820103b229490282d1d850702"
         },
+        "ibizbookusr9gridview": {
+            "title": "图书表格视图（主状态）",
+            "caption": "图书",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Sample",
+            "viewname": "IBIZBOOKUsr9GridView",
+            "viewtag": "ce961e4db11b6cb36fcb604e4a4948a3"
+        },
         "ibizorderdetailf6gridview": {
             "title": "订单明细表格视图",
             "caption": "订单明细",

app_Web/src/pages/sample/ibizbookusr3-edit-view/ibizbookusr3-edit-view.less

+.view-card {
+    >.ivu-card-extra {
+        top: 5px;
+        right: 0px;
+    }
+}
+
+.ibizbookusr3-edit-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/sample/ibizbookusr3-edit-view/ibizbookusr3-edit-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import IBIZBOOKUsr3EditViewBase from './ibizbookusr3-edit-view-base.vue';
+
+import view_form from '@widgets/ibizbook/major-state-form-form/major-state-form-form.vue';
+@Component({
+    components: {
+        view_form, 
+    },
+    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 IBIZBOOKUsr3EditView extends IBIZBOOKUsr3EditViewBase {
+
+}
+</script>
\ No newline at end of file

app_Web/src/pages/sample/ibizbookusr9-grid-view/ibizbookusr9-grid-view.less

+.ibizbookusr9-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/sample/ibizbookusr9-grid-view/ibizbookusr9-grid-view.vue

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

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

@@ -74,6 +74,15 @@ export const viewstate: any = {
             refviews: [
             ],
         },
+        {
+            viewtag: '0d9d3edf2d060a859fa7f2e206556730',
+            viewmodule: 'Sample',
+            viewname: 'IBIZBOOKUsr3EditView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: '104b6cee4acd54ede4e4fe5fd0e28a13',
             viewmodule: 'Sample',
@@ -270,6 +279,7 @@ export const viewstate: any = {
                 '7f65e6161c444d29e1f53f1cb76e92de',
                 '756fecec409c3a955f0cd737259d27c7',
                 '490f607f17e7cc8ceccc77f2d0b9a70d',
+                'ce961e4db11b6cb36fcb604e4a4948a3',
                 '13ed6c02918e612bac45715a6f300f2f',
                 '17c2991a0bd88cfd2bd6f8651537450b',
                 '9c8e1b12e5e55164c2ec0e5617e1574b',
@@ -1588,6 +1598,17 @@ export const viewstate: any = {
                 '54c2461e07dd79fdbecc2c1e3aec8096',
             ],
         },
+        {
+            viewtag: 'ce961e4db11b6cb36fcb604e4a4948a3',
+            viewmodule: 'Sample',
+            viewname: 'IBIZBOOKUsr9GridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                'b3429ecc4d89a02bc5f5279f1bd7f620',
+                '0d9d3edf2d060a859fa7f2e206556730',
+            ],
+        },
         {
             viewtag: 'd1ee943cf3137dc4d57ad59aa8c4b8cb',
             viewmodule: 'Sample',

app_Web/src/uiservice/ibizbook/ibizbook-ui-service-base.ts

@@ -25,7 +25,7 @@ export default class IBIZBOOKUIServiceBase extends UIService {
      * 
      * @memberof  IBIZBOOKUIServiceBase
      */
-    public isEnableDEMainState:boolean = false;
+    public isEnableDEMainState:boolean = true;
 
     /**
      * 当前UI服务对应的数据服务对象
@@ -60,7 +60,7 @@ export default class IBIZBOOKUIServiceBase extends UIService {
      * 
      * @memberof  IBIZBOOKUIServiceBase
      */  
-    public mainStateFields:Array<any> = [];
+    public mainStateFields:Array<any> = ['type'];
 
     /**
      * 主状态集合Map
@@ -97,6 +97,8 @@ export default class IBIZBOOKUIServiceBase extends UIService {
      */  
     public initViewMap(){
         this.allViewMap.set(':',{viewname:'wizardiwithstateview',srfappde:'ibizbooks',component:'ibizbookwizard-iwith-state-view'});
+        this.allViewMap.set(':',{viewname:'usr3editview',srfappde:'ibizbooks',component:'ibizbookusr3-edit-view'});
+        this.allViewMap.set(':',{viewname:'usr3listview',srfappde:'ibizbooks',component:'ibizbookusr3-list-view'});
         this.allViewMap.set(':',{viewname:'editview3',srfappde:'ibizbooks',component:'ibizbookedit-view3'});
         this.allViewMap.set(':',{viewname:'autogrouplistview',srfappde:'ibizbooks',component:'ibizbookauto-group-list-view'});
         this.allViewMap.set(':',{viewname:'ruleseditview',srfappde:'ibizbooks',component:'ibizbookrules-edit-view'});
@@ -130,6 +132,7 @@ export default class IBIZBOOKUIServiceBase extends UIService {
         this.allViewMap.set(':',{viewname:'pickuptreeview',srfappde:'ibizbooks',component:'ibizbookpickup-tree-view'});
         this.allViewMap.set(':',{viewname:'roweditgridview',srfappde:'ibizbooks',component:'ibizbookrow-edit-grid-view'});
         this.allViewMap.set(':',{viewname:'usr6gridview',srfappde:'ibizbooks',component:'ibizbookusr6-grid-view'});
+        this.allViewMap.set(':',{viewname:'usr9gridview',srfappde:'ibizbooks',component:'ibizbookusr9-grid-view'});
         this.allViewMap.set(':',{viewname:'usr4dataview',srfappde:'ibizbooks',component:'ibizbookusr4-data-view'});
         this.allViewMap.set(':',{viewname:'usr3gridview',srfappde:'ibizbooks',component:'ibizbookusr3-grid-view'});
         this.allViewMap.set(':',{viewname:'dataview',srfappde:'ibizbooks',component:'ibizbookdata-view'});
@@ -153,6 +156,7 @@ export default class IBIZBOOKUIServiceBase extends UIService {
      * @memberof  IBIZBOOKUIServiceBase
      */  
     public initDeMainStateMap(){
+        this.allDeMainStateMap.set('都市','都市');
     }
 
     /**
@@ -161,6 +165,159 @@ export default class IBIZBOOKUIServiceBase extends UIService {
      * @memberof  IBIZBOOKUIServiceBase
      */  
     public initDeMainStateOPPrivsMap(){
+        this.allDeMainStateOPPrivsMap.set('都市',Object.assign({'CREATE':1,'DELETE':1,'EDIT':1,'READ':1,'UPDATE':1},{'EDIT':0,}));
+    }
+
+    /**
+     * 打开实体看板文档
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     */
+    public async IBIZBOOK_openKanbanDocument(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+    
+        let data: any = {};
+        let parentContext:any = {};
+        let parentViewParam:any = {};
+        const _this: any = actionContext;
+        const _args: any[] = Util.deepCopy(args);
+        const actionTarget: string | null = 'NONE';
+        if(_this.context){
+            parentContext = _this.context;
+        }
+        if(_this.viewparams){
+            parentViewParam = _this.viewparams;
+        }
+        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
+        context = Object.assign({},actionContext.context,context);
+        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
+        Object.assign(data,parentObj);
+        Object.assign(context,parentObj);
+        const openPopupApp = (url: string) => {
+            window.open(url, '_blank');
+            return null;
+        }
+        const url = `https://www.yuque.com/ibiz/wuf19n/tqi7p6`;
+        openPopupApp(url);
+    }
+
+    /**
+     * 删除
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     */
+    public async IBIZBOOK_Delete(args: any[],context:any = {}, params:any = {}, $event?: any, xData?: any,actionContext?: any,srfParentDeName?:string){
+        let data: any = {};
+        let parentContext:any = {};
+        let parentViewParam:any = {};
+        const _this: any = actionContext;
+        const _args: any[] = Util.deepCopy(args);
+        const actionTarget: string | null = 'SINGLEKEY';
+        Object.assign(context, { ibizbook: '%ibizbook%' });
+        Object.assign(params, { ibizbookid: '%ibizbook%' });
+        Object.assign(params, { ibizbookname: '%ibizbookname%' });
+        if(_this.context){
+            parentContext = _this.context;
+        }
+        if(_this.viewparams){
+            parentViewParam = _this.viewparams;
+        }
+        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
+        context = Object.assign({},actionContext.context,context);
+        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
+        Object.assign(data,parentObj);
+        Object.assign(context,parentObj);
+        // 直接调实体服务需要转换的数据
+        if(context && context.srfsessionid){
+          context.srfsessionkey = context.srfsessionid;
+            delete context.srfsessionid;
+        }
+        const backend = () => {
+            const curService:IBIZBOOKService =  new IBIZBOOKService();
+            curService.Remove(context,data, true).then((response: any) => {
+                if (!response || response.status !== 200) {
+                    actionContext.$Notice.error({ title: '错误', desc: response.message });
+                    return;
+                }
+                actionContext.$Notice.success({ title: '成功', desc: '删除成功！' });
+                const _this: any = actionContext;
+                return response;
+            }).catch((response: any) => {
+                if (response && response.status && response.data) {
+                    actionContext.$Notice.error({ title: (actionContext.$t('app.commonWords.wrong') as string), desc: response.data.message });
+                    return;
+                }
+                if (!response || !response.status || !response.data) {
+                    actionContext.$Notice.error({ title: (actionContext.$t('app.commonWords.wrong') as string), desc: (actionContext.$t('app.commonWords.sysException') as string) });
+                    return;
+                }
+                return response;
+            });
+        };
+        backend();
+    }
+
+    /**
+     * 编辑
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     */
+    public async IBIZBOOK_Edit(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+    
+        let data: any = {};
+        let parentContext:any = {};
+        let parentViewParam:any = {};
+        const _this: any = actionContext;
+        const _args: any[] = Util.deepCopy(args);
+        const actionTarget: string | null = 'SINGLEKEY';
+        Object.assign(context, { ibizbook: '%ibizbook%' });
+        Object.assign(params, { ibizbookid: '%ibizbook%' });
+        Object.assign(params, { ibizbookname: '%ibizbookname%' });
+        if(_this.context){
+            parentContext = _this.context;
+        }
+        if(_this.viewparams){
+            parentViewParam = _this.viewparams;
+        }
+        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
+        context = Object.assign({},actionContext.context,context);
+        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
+        Object.assign(data,parentObj);
+        Object.assign(context,parentObj);
+        let deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+            { pathName: 'usr3editview', parameterName: 'usr3editview' },
+        ];
+        const openIndexViewTab = (data: any) => {
+            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
+            actionContext.$router.push(routePath);
+            return null;
+        }
+        openIndexViewTab(data);
     }
 
 

app_Web/src/widgets/app/main-menu-appmenu/main-menu-appmenu-base.vue

@@ -728,6 +728,9 @@ export default class MainMenuBase extends Vue implements ControlInterface {
                 case 'AppFunc18': 
                     this.clickAppFunc18(item);
                     return;
+                case 'AppFunc79': 
+                    this.clickAppFunc79(item);
+                    return;
                 case 'AppFunc77': 
                     this.clickAppFunc77(item);
                     return;
@@ -776,9 +779,6 @@ export default class MainMenuBase extends Vue implements ControlInterface {
                 case 'Auto185': 
                     this.clickAuto185(item);
                     return;
-                case 'Auto243': 
-                    this.clickAuto243(item);
-                    return;
                 case 'AppFunc30': 
                     this.clickAppFunc30(item);
                     return;
@@ -2521,6 +2521,29 @@ export default class MainMenuBase extends Vue implements ControlInterface {
         })
     }
     
+    /**
+     * 表格主状态
+     *
+     * @param {*} [item={}]
+     * @memberof MainMenu
+     */
+    public clickAppFunc79(item: any = {}) {
+        const viewparam: any = {};
+        Object.assign(viewparam, {});
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+            { pathName: 'usr9gridview', parameterName: 'usr9gridview' },
+        ];
+        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);
+        })
+    }
+    
     /**
      * 实体表格导航视图
      *
@@ -2889,29 +2912,6 @@ export default class MainMenuBase extends Vue implements ControlInterface {
         })
     }
     
-    /**
-     * 主状态
-     *
-     * @param {*} [item={}]
-     * @memberof MainMenu
-     */
-    public clickAuto243(item: any = {}) {
-        const viewparam: any = {};
-        Object.assign(viewparam, {});
-        const deResParameters: any[] = [];
-        const parameters: any[] = [
-            { pathName: 'ibizorders', parameterName: 'ibizorder' },
-            { pathName: 'sgridview', parameterName: 'sgridview' },
-        ];
-        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/main-menu-appmenu/main-menu-appmenu-model.ts

@@ -3199,10 +3199,10 @@ export default class MainMenuModel {
 		{
 	id: 'c931e0ff705c4be3c4199457a0ac5b75',
 	name: 'menuitem70',
-	text: '主状态',
+	text: '表格主状态',
 	type: 'MENUITEM',
 	counterid: '',
-	tooltip: '主状态',
+	tooltip: '表格主状态',
 	expanded: false,
 	separator: false,
 	hidden: false,
@@ -3211,7 +3211,7 @@ export default class MainMenuModel {
 	iconcls: '',
 	icon: '',
 	textcls: '',
-	appfunctag: 'Auto243',
+	appfunctag: 'AppFunc79',
 	resourcetag: '',
 	authtag:'Web-MainMenu-menuitem70',
 },

app_Web/src/widgets/ibizbook/auto-group-list-list/auto-group-list-list-model.ts

@@ -49,6 +49,7 @@ export default class AutoGroupListModel {
 			},
 			{
 				name: 'type',
+        codelist:{tag:'BookType',codelistType:'STATIC'},
 			},
 			{
 				name: 'srfkey',
@@ -60,6 +61,9 @@ export default class AutoGroupListModel {
 				prop: 'ibizbookname',
 				dataType: 'TEXT',
 			},
+			{
+				name: 'srfmstag',
+			},
 			{
 				name: 'ibizbook',
 				prop: 'ibizbookid',

app_Web/src/widgets/ibizbook/gridexpbar-grid-grid/gridexpbar-grid-grid-base.vue

@@ -930,17 +930,17 @@ export default class Gridexpbar_gridBase extends Vue implements ControlInterface
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/gridexpbar-grid-grid/gridexpbar-grid-grid-model.ts

@@ -31,6 +31,9 @@ export default class Gridexpbar_gridModel {
           prop: 'ibizbookid',
           dataType: 'GUID',
         },
+        {
+          name: 'srfmstag',
+        },
         {
           name: 'srfmajortext',
           prop: 'ibizbookname',

app_Web/src/widgets/ibizbook/group-by-codelist-kan-ban-kanban/group-by-codelist-kan-ban-kanban-model.ts

@@ -49,6 +49,9 @@ export default class GroupByCodelistKanBanModel {
 				prop: 'type',
 				dataType: 'TEXT',
 			},
+			{
+				name: 'srfmstag',
+			},
 			{
 				name: 'srfkey',
 				prop: 'ibizbookid',

app_Web/src/widgets/ibizbook/group-by-codelist-list-list/group-by-codelist-list-list-base.vue

@@ -290,7 +290,7 @@ export default class GroupByCodelistListBase extends Vue implements ControlInter
      * @type {string}
      * @memberof GroupByCodelistListBase
      */
-    public groupFieldCodelist: boolean = false;
+    public groupFieldCodelist: boolean = true;
 
     /**
      * 分组数据

app_Web/src/widgets/ibizbook/group-by-codelist-list-list/group-by-codelist-list-list-model.ts

@@ -16,6 +16,7 @@ export default class GroupByCodelistListModel {
 		return [
 			{
 				name: 'type',
+        codelist:{tag:'BookType',codelistType:'STATIC'},
 			},
 			{
 				name: 'booknumber',
@@ -45,6 +46,9 @@ export default class GroupByCodelistListModel {
 				prop: 'ibizbookname',
 				dataType: 'TEXT',
 			},
+			{
+				name: 'srfmstag',
+			},
 			{
 				name: 'ibizbook',
 				prop: 'ibizbookid',

app_Web/src/widgets/ibizbook/has-panel-kan-ban-kanban/has-panel-kan-ban-kanban-model.ts

@@ -39,6 +39,9 @@ export default class HasPanelKanBanModel {
 				prop: 'ibizbookid',
 				dataType: 'GUID',
 			},
+			{
+				name: 'srfmstag',
+			},
 			{
 				name: 'srfkey',
 				prop: 'ibizbookid',

app_Web/src/widgets/ibizbook/has-panel-list-list/has-panel-list-list-model.ts

@@ -19,6 +19,7 @@ export default class HasPanelListModel {
 			},
 			{
 				name: 'type',
+        codelist:{tag:'BookType',codelistType:'STATIC'},
 			},
 			{
 				name: 'booknumber',
@@ -45,6 +46,9 @@ export default class HasPanelListModel {
 				prop: 'ibizbookname',
 				dataType: 'TEXT',
 			},
+			{
+				name: 'srfmstag',
+			},
 			{
 				name: 'ibizbook',
 				prop: 'ibizbookid',

app_Web/src/widgets/ibizbook/inter-func-kanban-kanban/inter-func-kanban-kanban-base.vue

@@ -13,6 +13,16 @@
                 <div :key="group + index" class="dataview-group-content dataview-group-kanban" style="flex-grow: 1;">
                     <div class="dataview-group-header">
                         {{ getGroupText(group.value) }}
+                        <Poptip trigger="hover" content="content" placement="bottom-end" style="float: right;">
+                            <Icon type="md-more" />
+                            <div slot="content" class="group-action">
+                                <div class="group-action-item">
+                                    <i-button long @click="uiAction('openKanbanDocument', $event)">
+                                    打开实体看板文档
+                                    </i-button>
+                                </div>
+                            </div>
+                        </Poptip>
                     </div>
                     <draggable :list="group.items" group="kanban" class="dataview-group-items" @change="onDragChange($event, group.value)">
                         <div v-for="(item, i) in group.items" :key="i" :class="{'dataview-group-item': true, 'is-select': item.isselected}" @click="handleClick(item)" @dblclick="handleDblClick(item)">
@@ -128,91 +138,6 @@ export default class InterFuncKanbanBase extends Vue implements ControlInterface
      */
     public appEntityService: IBIZBOOKService = new IBIZBOOKService({ $store: this.$store });
     
-    /**
-     * kanban_quicktoolbar 部件 click 事件
-     *
-     * @param {*} [args={}]
-     * @param {*} $event
-     * @memberof InterFuncKanbanBase
-     */
-    public kanban_quicktoolbar_click($event: any, $event2?: any) {
-        if (Object.is($event.tag, 'deuiaction1')) {
-            this.kanban_quicktoolbar_deuiaction1_click(null, 'kanban_quicktoolbar', $event2);
-        }
-    }
-
-    /**
-     * kanban_batchtoolbar 部件 click 事件
-     *
-     * @param {*} [args={}]
-     * @param {*} $event
-     * @memberof InterFuncKanbanBase
-     */
-    public kanban_batchtoolbar_click($event: any, $event2?: any) {
-        if (Object.is($event.tag, 'deuiaction1')) {
-            this.kanban_batchtoolbar_deuiaction1_click(null, 'kanban_batchtoolbar', $event2);
-        }
-        if (Object.is($event.tag, 'deuiaction2')) {
-            this.kanban_batchtoolbar_deuiaction2_click(null, 'kanban_batchtoolbar', $event2);
-        }
-    }
-    
-
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public kanban_quicktoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this;
-        if (_this.getDatas && _this.getDatas instanceof Function) {
-            datas = [..._this.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.New(datas, contextJO,paramJO,  $event, xData,this,"IBIZBOOK");
-    }
-
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public kanban_batchtoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this;
-        if (_this.getDatas && _this.getDatas instanceof Function) {
-            datas = [..._this.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.Edit(datas, contextJO,paramJO,  $event, xData,this,"IBIZBOOK");
-    }
 
     /**
      * 逻辑事件
@@ -222,8 +147,7 @@ export default class InterFuncKanbanBase extends Vue implements ControlInterface
      * @param {*} [$event]
      * @memberof 
      */
-    public kanban_batchtoolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
+    public kanban_group_ud509c70_click(params: any = {}, tag?: any, $event?: any) {
         // 取数
         let datas: any[] = [];
         let xData: any = null;
@@ -239,72 +163,8 @@ export default class InterFuncKanbanBase extends Vue implements ControlInterface
           datas = [params];
         }
         // 界面行为
-        this.Remove(datas, contextJO,paramJO,  $event, xData,this,"IBIZBOOK");
-    }
-
-    /**
-     * 新建
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKInterFuncKanBanViewBase
-     */
-    public New(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-         const _this: any = this;
-        if (_this.newdata && _this.newdata instanceof Function) {
-            const data: any = {};
-            _this.newdata([{ ...data }],[{ ...data }], params, $event, xData);
-        } else {
-            _this.$Notice.error({ title: '错误', desc: 'newdata 视图处理逻辑不存在，请添加!' });
-        }
-    }
-    /**
-     * 编辑
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKInterFuncKanBanViewBase
-     */
-    public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        if (args.length === 0) {
-            return;
-        }
-        const _this: any = this;
-        if (_this.opendata && _this.opendata instanceof Function) {
-            const data: any = { };
-            if (args.length > 0) {
-                Object.assign(data, { ibizbook: args[0].ibizbook })
-            }
-            _this.opendata([{ ...data }], params, $event, xData);
-        } else {
-            _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
-        }
-    }
-    /**
-     * 删除
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKInterFuncKanBanViewBase
-     */
-    public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (!xData || !(xData.remove instanceof Function)) {
-            return ;
-        }
-        xData.remove(args);
+        const curUIService:IBIZBOOKUIService  = new IBIZBOOKUIService();
+        curUIService.IBIZBOOK_openKanbanDocument(datas,contextJO, paramJO,  $event, xData,this,"IBIZBOOK");
     }
 
 
@@ -1016,14 +876,8 @@ export default class InterFuncKanbanBase extends Vue implements ControlInterface
      */
 	public uiAction(tag: any, $event: any) {
         let row = this.selections.length > 0 ? this.selections[0] : {};
-        if(Object.is('New', tag)) {
-            this.kanban_quicktoolbar_deuiaction1_click(row, tag, $event);
-        }
-        if(Object.is('Edit', tag)) {
-            this.kanban_batchtoolbar_deuiaction1_click(row, tag, $event);
-        }
-        if(Object.is('Remove', tag)) {
-            this.kanban_batchtoolbar_deuiaction2_click(row, tag, $event);
+        if(Object.is('openKanbanDocument', tag)) {
+            this.kanban_group_ud509c70_click(row, tag, $event);
         }
     }
 

app_Web/src/widgets/ibizbook/inter-func-kanban-kanban/inter-func-kanban-kanban-model.ts

@@ -34,6 +34,9 @@ export default class InterFuncKanbanModel {
 				prop: 'type',
 				dataType: 'TEXT',
 			},
+			{
+				name: 'srfmstag',
+			},
 			{
 				name: 'srfkey',
 				prop: 'ibizbookid',

app_Web/src/widgets/ibizbook/internal-func-grid/internal-func-grid-base.vue

@@ -53,7 +53,9 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.type}}</span>
+                        <template >
+            <codelist :value="row.type" tag='BookType' codelistType='STATIC' ></codelist>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
@@ -1199,17 +1201,17 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){
@@ -1310,6 +1312,14 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
      */
     public async formatExcelData(filterVal:any, jsonData:any) {
         let codelistColumns:Array<any> = [
+            {
+                name: 'type',
+                srfkey: 'BookType',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
         ];
         let _this = this;
         for (const codelist of codelistColumns) {

app_Web/src/widgets/ibizbook/internal-func-grid/internal-func-grid-model.ts

@@ -56,6 +56,9 @@ export default class InternalFuncModel {
           prop: 'type',
           dataType: 'TEXT',
         },
+        {
+          name: 'srfmstag',
+        },
         {
           name: 'srfmajortext',
           prop: 'ibizbookname',

app_Web/src/widgets/ibizbook/lnternal-func-list-list/lnternal-func-list-list-model.ts

@@ -22,6 +22,7 @@ export default class LnternalFuncListModel {
 			},
 			{
 				name: 'type',
+        codelist:{tag:'BookType',codelistType:'STATIC'},
 			},
 			{
 				name: 'srficon',
@@ -57,6 +58,9 @@ export default class LnternalFuncListModel {
 				prop: 'ibizbookid',
 				dataType: 'GUID',
 			},
+			{
+				name: 'srfmstag',
+			},
 			{
 				name: 'ibizbook',
 				prop: 'ibizbookid',

app_Web/src/widgets/ibizbook/main2-grid/main2-grid-base.vue

@@ -39,7 +39,9 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.type}}</span>
+                        <template >
+            <codelist :value="row.type" tag='BookType' codelistType='STATIC' ></codelist>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
@@ -1079,17 +1081,17 @@ export default class Main2Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){
@@ -1190,6 +1192,14 @@ export default class Main2Base extends Vue implements ControlInterface {
      */
     public async formatExcelData(filterVal:any, jsonData:any) {
         let codelistColumns:Array<any> = [
+            {
+                name: 'type',
+                srfkey: 'BookType',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
         ];
         let _this = this;
         for (const codelist of codelistColumns) {

app_Web/src/widgets/ibizbook/main2-grid/main2-grid-model.ts

@@ -56,6 +56,9 @@ export default class Main2Model {
           prop: 'type',
           dataType: 'TEXT',
         },
+        {
+          name: 'srfmstag',
+        },
         {
           name: 'srfmajortext',
           prop: 'ibizbookname',

app_Web/src/widgets/ibizbook/main3-grid/main3-grid-base.vue

@@ -39,7 +39,9 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.type}}</span>
+                        <template >
+            <codelist :value="row.type" tag='BookType' codelistType='STATIC' ></codelist>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
@@ -725,7 +727,7 @@ export default class Main3Base extends Vue implements ControlInterface {
      * @type {string}
      * @memberof Main3Base
      */
-    public groupAppFieldCodelistTag:string ="";
+    public groupAppFieldCodelistTag:string ="BookType";
 
     /**
      * 分组属性代码表类型
@@ -733,7 +735,7 @@ export default class Main3Base extends Vue implements ControlInterface {
      * @type {string}
      * @memberof Main3Base
      */
-    public groupAppFieldCodelistType: string = "";
+    public groupAppFieldCodelistType: string = "STATIC";
 
     /**
      * 分组模式
@@ -1079,17 +1081,17 @@ export default class Main3Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){
@@ -1190,6 +1192,14 @@ export default class Main3Base extends Vue implements ControlInterface {
      */
     public async formatExcelData(filterVal:any, jsonData:any) {
         let codelistColumns:Array<any> = [
+            {
+                name: 'type',
+                srfkey: 'BookType',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
         ];
         let _this = this;
         for (const codelist of codelistColumns) {

app_Web/src/widgets/ibizbook/main3-grid/main3-grid-model.ts

@@ -56,6 +56,9 @@ export default class Main3Model {
           prop: 'type',
           dataType: 'TEXT',
         },
+        {
+          name: 'srfmstag',
+        },
         {
           name: 'srfmajortext',
           prop: 'ibizbookname',

app_Web/src/widgets/ibizbook/main4-grid/main4-grid-base.vue

@@ -31,7 +31,9 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.type}}</span>
+                        <template >
+            <codelist :value="row.type" tag='BookType' codelistType='STATIC' ></codelist>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
@@ -1070,17 +1072,17 @@ export default class Main4Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){
@@ -1181,6 +1183,14 @@ export default class Main4Base extends Vue implements ControlInterface {
      */
     public async formatExcelData(filterVal:any, jsonData:any) {
         let codelistColumns:Array<any> = [
+            {
+                name: 'type',
+                srfkey: 'BookType',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
         ];
         let _this = this;
         for (const codelist of codelistColumns) {

app_Web/src/widgets/ibizbook/main4-grid/main4-grid-model.ts

@@ -56,6 +56,9 @@ export default class Main4Model {
           prop: 'type',
           dataType: 'TEXT',
         },
+        {
+          name: 'srfmstag',
+        },
         {
           name: 'srfmajortext',
           prop: 'ibizbookname',

app_Web/src/widgets/ibizbook/main5-grid/main5-grid-base.vue

@@ -31,7 +31,9 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.type}}</span>
+                        <template >
+            <codelist :value="row.type" tag='BookType' codelistType='STATIC' ></codelist>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
@@ -1086,17 +1088,17 @@ export default class Main5Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){
@@ -1197,6 +1199,14 @@ export default class Main5Base extends Vue implements ControlInterface {
      */
     public async formatExcelData(filterVal:any, jsonData:any) {
         let codelistColumns:Array<any> = [
+            {
+                name: 'type',
+                srfkey: 'BookType',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
         ];
         let _this = this;
         for (const codelist of codelistColumns) {

app_Web/src/widgets/ibizbook/main5-grid/main5-grid-model.ts

@@ -56,6 +56,9 @@ export default class Main5Model {
           prop: 'type',
           dataType: 'TEXT',
         },
+        {
+          name: 'srfmstag',
+        },
         {
           name: 'srfmajortext',
           prop: 'ibizbookname',

app_Web/src/widgets/ibizbook/main6-grid/main6-grid-base.vue

@@ -1287,17 +1287,17 @@ export default class Main6Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main6-grid/main6-grid-model.ts

@@ -79,6 +79,9 @@ export default class Main6Model {
           dataType: 'TEXT',
           isEditable:true
         },
+        {
+          name: 'srfmstag',
+        },
         {
           name: 'srfmajortext',
           prop: 'ibizbookname',

app_Web/src/widgets/ibizbook/main7-grid/main7-grid-model.ts

+/**
+ * Main7 部件模型
+ *
+ * @export
+ * @class Main7Model
+ */
+export default class Main7Model {
+
+	/**
+	 * 是否是实体数据导出
+	 *
+	 * @returns {any[]}
+	 * @memberof Main7GridMode
+	 */
+	public isDEExport: boolean = false;
+
+	/**
+	 * 获取数据项集合
+	 *
+	 * @returns {any[]}
+	 * @memberof Main7GridMode
+	 */
+	public getDataItems(): any[] {
+    if(this.isDEExport){
+		  return [
+      ]
+    }else{
+		  return [
+        {
+          name: 'author',
+          prop: 'author',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'press',
+          prop: 'press',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'ibizbookname',
+          prop: 'ibizbookname',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'price',
+          prop: 'price',
+          dataType: 'FLOAT',
+        },
+        {
+          name: 'ibizbookid',
+          prop: 'ibizbookid',
+          dataType: 'GUID',
+        },
+        {
+          name: 'type',
+          prop: 'type',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'srfmstag',
+        },
+        {
+          name: 'srfmajortext',
+          prop: 'ibizbookname',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'srfdataaccaction',
+          prop: 'ibizbookid',
+          dataType: 'GUID',
+        },
+        {
+          name: 'srfkey',
+          prop: 'ibizbookid',
+          dataType: 'GUID',
+          isEditable:true
+        },
+        {
+          name: 'ibizbook',
+          prop: 'ibizbookid',
+        },
+      {
+        name: 'n_ibizbookname_like',
+        prop: 'n_ibizbookname_like',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_price_gtandeq',
+        prop: 'n_price_gtandeq',
+        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/ibizbook/main7-grid/main7-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/ibizbook/main7-grid/main7-grid.vue

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

app_Web/src/widgets/ibizbook/major-state-form-form/major-state-form-form-model.ts

+/**
+ * MajorStateForm 部件模型
+ *
+ * @export
+ * @class MajorStateFormModel
+ */
+export default class MajorStateFormModel {
+
+  /**
+  * 获取数据项集合
+  *
+  * @returns {any[]}
+  * @memberof MajorStateFormModel
+  */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'srfwfmemo',
+        prop: 'srfwfmemo',
+        dataType: 'TEXT',
+      },
+      // 前端新增修改标识，新增为"0",修改为"1"或未设值
+      {
+        name: 'srffrontuf',
+        prop: 'srffrontuf',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srfupdatedate',
+        prop: 'updatedate',
+        dataType: 'DATETIME',
+      },
+      {
+        name: 'srforikey',
+      },
+      {
+        name: 'srfkey',
+        prop: 'ibizbookid',
+        dataType: 'GUID',
+      },
+      {
+        name: 'srfmajortext',
+        prop: 'ibizbookname',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srftempmode',
+      },
+      {
+        name: 'srfuf',
+      },
+      {
+        name: 'srfdeid',
+      },
+      {
+        name: 'srfsourcekey',
+      },
+      {
+        name: 'ibizbookname',
+        prop: 'ibizbookname',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'type',
+        prop: 'type',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'createman',
+        prop: 'createman',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'createdate',
+        prop: 'createdate',
+        dataType: 'DATETIME',
+      },
+      {
+        name: 'updateman',
+        prop: 'updateman',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'updatedate',
+        prop: 'updatedate',
+        dataType: 'DATETIME',
+      },
+      {
+        name: 'ibizbookid',
+        prop: 'ibizbookid',
+        dataType: 'GUID',
+      },
+      {
+        name: 'ibizbook',
+        prop: 'ibizbookid',
+        dataType: 'FONTKEY',
+      },
+    ]
+  }
+
+}
\ No newline at end of file

app_Web/src/widgets/ibizbook/major-state-form-form/major-state-form-form.less

+.ivu-tabs-no-animation>.ivu-tabs-content{
+    padding: 0 16px;
+}
+.ivu-card-head{
+    padding: 14px 0;
+}
+.app-form {
+    overflow: auto;
+    padding: 6px;
+    > .ivu-row {
+        > .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%;
+        }
+    }
+}
+
+.app-form {
+    >.ivu-row:nth-child(2) {
+        >.ivu-col:nth-child(1) {
+            >.ivu-row.app-form-group.app-group-hiddden-caption:nth-child(1) {
+                margin-top: 12px;
+            }
+        }
+    }
+}
+.app-form{
+  // 表单行间距
+  .app-form-item{
+    margin-bottom: 20px;
+  }
+  // 表单按钮margin
+  .app-form-button{
+      margin:0 6px;
+  }
+}
+// this is less

app_Web/src/widgets/ibizbook/major-state-form-form/major-state-form-form.vue

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

app_Web/src/widgets/ibizbook/new-default-grid/new-default-grid-base.vue

@@ -100,7 +100,7 @@
                             </app-form-item>
                         </template>
                         <template v-if="!actualIsOpenEdit">
-            <app-span name='type' editorType="TEXTBOX" :value="row.type" dataType="TEXT" precision="0" ></app-span>
+            <codelist :value="row.type" tag='BookType' codelistType='STATIC' ></codelist>
                         </template>
                     </template>
                 </el-table-column>
@@ -1206,17 +1206,17 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){
@@ -1317,6 +1317,14 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
      */
     public async formatExcelData(filterVal:any, jsonData:any) {
         let codelistColumns:Array<any> = [
+            {
+                name: 'type',
+                srfkey: 'BookType',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
         ];
         let _this = this;
         for (const codelist of codelistColumns) {