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

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

@@ -2143,6 +2143,14 @@
         "viewname": "IBIZBOOKUiActionGridView",
         "viewtag": "ed78366e2eee279c793da8d909b2a85a"
     },
+    "ibizsample0021gridview_layout": {
+        "title": "订单表格视图",
+        "caption": "订单",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Sample",
+        "viewname": "IBIZSample0021GridView_layout",
+        "viewtag": "ef0aa2f297f599cdbc14fc8393b78a1d"
+    },
     "ibizorderpickupview": {
         "title": "订单数据选择视图",
         "caption": "订单",
@@ -2239,6 +2247,14 @@
         "viewname": "IBIZBOOKUsr8GridView",
         "viewtag": "f775b5fa118588587f6f02af5f79ec1f"
     },
+    "ibizbookcustomview_layout": {
+        "title": "实体自定义视图",
+        "caption": "实体自定义视图",
+        "viewtype": "DECUSTOMVIEW",
+        "viewmodule": "Sample",
+        "viewname": "IBIZBOOKCustomView_layout",
+        "viewtag": "fa2731c1873f3c86aa065e73cff4667b"
+    },
     "ibizbookusr9gridview": {
         "title": "图书表格视图（主状态）",
         "caption": "图书",

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

@@ -322,6 +322,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("表格列重置",null),
 				title: commonLogic.appcommonhandle("表格列重置",null),
 			},
+			customview_layout: {
+				caption: commonLogic.appcommonhandle("实体自定义视图",null),
+				title: commonLogic.appcommonhandle("实体自定义视图",null),
+			},
 			usr9gridview: {
 				caption: commonLogic.appcommonhandle("图书",null),
 				title: commonLogic.appcommonhandle("图书表格视图（主状态）",null),

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

@@ -322,6 +322,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Grid Column Reset",null),
 				title: commonLogic.appcommonhandle("表格列重置",null),
 			},
+			customview_layout: {
+				caption: commonLogic.appcommonhandle("Custom View",null),
+				title: commonLogic.appcommonhandle("实体自定义视图",null),
+			},
 			usr9gridview: {
 				caption: commonLogic.appcommonhandle("Grid Main State",null),
 				title: commonLogic.appcommonhandle("图书表格视图（主状态）",null),

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

@@ -322,6 +322,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("表格列重置",null),
 				title: commonLogic.appcommonhandle("表格列重置",null),
 			},
+			customview_layout: {
+				caption: commonLogic.appcommonhandle("实体自定义视图",null),
+				title: commonLogic.appcommonhandle("实体自定义视图",null),
+			},
 			usr9gridview: {
 				caption: commonLogic.appcommonhandle("图书",null),
 				title: commonLogic.appcommonhandle("图书表格视图（主状态）",null),

app_Web/src/locale/lanres/entities/ibizsample0021/ibizsample0021_BO_CN_base.ts

@@ -45,6 +45,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle(" 实体工作流动态导航表格视图",null),
 				title: commonLogic.appcommonhandle(" 实体工作流动态导航表格视图",null),
 			},
+			gridview_layout: {
+				caption: commonLogic.appcommonhandle("订单",null),
+				title: commonLogic.appcommonhandle("订单表格视图",null),
+			},
 		},
 		operationform_form: {
 			details: {
@@ -211,7 +215,7 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("导出",null),
 			},
 		},
-		gridviewtoolbar_toolbar: {
+		gridview_layouttoolbar_toolbar: {
 			tbitem3: {
 				caption: commonLogic.appcommonhandle("新建",null),
 				tip: commonLogic.appcommonhandle("新建",null),
@@ -283,6 +287,56 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("开始",null),
 			},
 		},
+		gridviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("新建",null),
+				tip: commonLogic.appcommonhandle("新建",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("编辑",null),
+				tip: commonLogic.appcommonhandle("编辑",null),
+			},
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("刷新",null),
+				tip: commonLogic.appcommonhandle("刷新",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("拷贝",null),
+				tip: commonLogic.appcommonhandle("拷贝",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("删除",null),
+				tip: commonLogic.appcommonhandle("删除",null),
+			},
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("导出",null),
+				tip: commonLogic.appcommonhandle("导出",null),
+			},
+			tbitem10: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem16: {
+				caption: commonLogic.appcommonhandle("其它",null),
+				tip: commonLogic.appcommonhandle("其它",null),
+			},
+			tbitem21: {
+				caption: commonLogic.appcommonhandle("导出数据模型",null),
+				tip: commonLogic.appcommonhandle("导出数据模型",null),
+			},
+			tbitem23: {
+				caption: commonLogic.appcommonhandle("数据导入",null),
+				tip: commonLogic.appcommonhandle("数据导入",null),
+			},
+		},
 	};
 	return data;
 }

app_Web/src/locale/lanres/entities/ibizsample0021/ibizsample0021_en_US_base.ts

@@ -45,6 +45,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Workflow Dynamic Navigation View",null),
 				title: commonLogic.appcommonhandle(" 实体工作流动态导航表格视图",null),
 			},
+			gridview_layout: {
+				caption: commonLogic.appcommonhandle("Workflow Start",null),
+				title: commonLogic.appcommonhandle("订单表格视图",null),
+			},
 		},
 		operationform_form: {
 			details: {
@@ -211,7 +215,7 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("Export {0} Data To Excel",null),
 			},
 		},
-		gridviewtoolbar_toolbar: {
+		gridview_layouttoolbar_toolbar: {
 			tbitem3: {
 				caption: commonLogic.appcommonhandle("New",null),
 				tip: commonLogic.appcommonhandle("New",null),
@@ -283,6 +287,56 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("开始",null),
 			},
 		},
+		gridviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("New",null),
+				tip: commonLogic.appcommonhandle("New",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("Edit",null),
+				tip: commonLogic.appcommonhandle("Edit {0}",null),
+			},
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("刷新",null),
+				tip: commonLogic.appcommonhandle("刷新",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("Copy",null),
+				tip: commonLogic.appcommonhandle("Copy {0}",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("Remove",null),
+				tip: commonLogic.appcommonhandle("Remove {0}",null),
+			},
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("Export",null),
+				tip: commonLogic.appcommonhandle("Export {0} Data To Excel",null),
+			},
+			tbitem10: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem16: {
+				caption: commonLogic.appcommonhandle("其它",null),
+				tip: commonLogic.appcommonhandle("其它",null),
+			},
+			tbitem21: {
+				caption: commonLogic.appcommonhandle("Export Data Model",null),
+				tip: commonLogic.appcommonhandle("导出数据模型",null),
+			},
+			tbitem23: {
+				caption: commonLogic.appcommonhandle("数据导入",null),
+				tip: commonLogic.appcommonhandle("数据导入",null),
+			},
+		},
 	};
 	return data;
 }

app_Web/src/locale/lanres/entities/ibizsample0021/ibizsample0021_zh_CN_base.ts

@@ -45,6 +45,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle(" 实体工作流动态导航表格视图",null),
 				title: commonLogic.appcommonhandle(" 实体工作流动态导航表格视图",null),
 			},
+			gridview_layout: {
+				caption: commonLogic.appcommonhandle("订单",null),
+				title: commonLogic.appcommonhandle("订单表格视图",null),
+			},
 		},
 		operationform_form: {
 			details: {
@@ -211,7 +215,7 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("导出",null),
 			},
 		},
-		gridviewtoolbar_toolbar: {
+		gridview_layouttoolbar_toolbar: {
 			tbitem3: {
 				caption: commonLogic.appcommonhandle("新建",null),
 				tip: commonLogic.appcommonhandle("新建",null),
@@ -283,6 +287,56 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("开始",null),
 			},
 		},
+		gridviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("新建",null),
+				tip: commonLogic.appcommonhandle("新建",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("编辑",null),
+				tip: commonLogic.appcommonhandle("编辑",null),
+			},
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("刷新",null),
+				tip: commonLogic.appcommonhandle("刷新",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("拷贝",null),
+				tip: commonLogic.appcommonhandle("拷贝",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("删除",null),
+				tip: commonLogic.appcommonhandle("删除",null),
+			},
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("导出",null),
+				tip: commonLogic.appcommonhandle("导出",null),
+			},
+			tbitem10: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem16: {
+				caption: commonLogic.appcommonhandle("其它",null),
+				tip: commonLogic.appcommonhandle("其它",null),
+			},
+			tbitem21: {
+				caption: commonLogic.appcommonhandle("导出数据模型",null),
+				tip: commonLogic.appcommonhandle("导出数据模型",null),
+			},
+			tbitem23: {
+				caption: commonLogic.appcommonhandle("数据导入",null),
+				tip: commonLogic.appcommonhandle("数据导入",null),
+			},
+		},
 	};
 	return data;
 }

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

@@ -3605,7 +3605,7 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
 	iconcls: '',
 	icon: '',
 	textcls: '',
-	appfunctag: 'AppFunc86',
+	appfunctag: 'AppFunc123',
 	resourcetag: '',
 },
 		{
@@ -3661,7 +3661,7 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
 	iconcls: '',
 	icon: '',
 	textcls: '',
-	appfunctag: 'AppFunc22',
+	appfunctag: 'AppFunc124',
 	resourcetag: '',
 },
 	],

app_Web/src/mock/viewconfig/viewconfig.ts

@@ -2151,6 +2151,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "IBIZBOOKUiActionGridView",
             "viewtag": "ed78366e2eee279c793da8d909b2a85a"
         },
+        "ibizsample0021gridview_layout": {
+            "title": "订单表格视图",
+            "caption": "订单",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Sample",
+            "viewname": "IBIZSample0021GridView_layout",
+            "viewtag": "ef0aa2f297f599cdbc14fc8393b78a1d"
+        },
         "ibizorderpickupview": {
             "title": "订单数据选择视图",
             "caption": "订单",
@@ -2247,6 +2255,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "IBIZBOOKUsr8GridView",
             "viewtag": "f775b5fa118588587f6f02af5f79ec1f"
         },
+        "ibizbookcustomview_layout": {
+            "title": "实体自定义视图",
+            "caption": "实体自定义视图",
+            "viewtype": "DECUSTOMVIEW",
+            "viewmodule": "Sample",
+            "viewname": "IBIZBOOKCustomView_layout",
+            "viewtag": "fa2731c1873f3c86aa065e73cff4667b"
+        },
         "ibizbookusr9gridview": {
             "title": "图书表格视图（主状态）",
             "caption": "图书",

app_Web/src/pages/sample/ibizbookcustom-view-layout/ibizbookcustom-view-layout.less

+.ibizbookcustom-view-layout {
+    display: block;
+}

app_Web/src/pages/sample/ibizbookcustom-view-layout/ibizbookcustom-view-layout.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import IBIZBOOKCustomView_layoutBase from './ibizbookcustom-view-layout-base.vue';
+
+@Component({
+    components: {
+    },
+    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 IBIZBOOKCustomView_layout extends IBIZBOOKCustomView_layoutBase {
+
+}
+</script>
\ No newline at end of file

app_Web/src/pages/sample/ibizsample0021-grid-view-layout/ibizsample0021-grid-view-layout.less

+.ibizsample0021-grid-view-layout {
+    display: block;
+}

app_Web/src/pages/sample/ibizsample0021-grid-view-layout/ibizsample0021-grid-view-layout.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import IBIZSample0021GridView_layoutBase from './ibizsample0021-grid-view-layout-base.vue';
+
+import view_searchform from '@widgets/ibizsample0021/default-searchform/default-searchform.vue';
+import view_grid from '@widgets/ibizsample0021/main-grid/main-grid.vue';
+@Component({
+    components: {
+        view_searchform, 
+        view_grid, 
+    },
+    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 IBIZSample0021GridView_layout extends IBIZSample0021GridView_layoutBase {
+
+}
+</script>
\ No newline at end of file

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

@@ -134,7 +134,9 @@ export const PageComponents = {
         Vue.component('ibizbookusr2-edit-view-layout', () => import('@pages/sample/ibizbookusr2-edit-view-layout/ibizbookusr2-edit-view-layout.vue'));
         Vue.component('ibizuniproduct-sgrid-view-layout', () => import('@pages/sample/ibizuniproduct-sgrid-view-layout/ibizuniproduct-sgrid-view-layout.vue'));
         Vue.component('ibizsample0021-wfdyna-exp-grid-view-layout', () => import('@pages/sample/ibizsample0021-wfdyna-exp-grid-view-layout/ibizsample0021-wfdyna-exp-grid-view-layout.vue'));
+        Vue.component('ibizsample0021-grid-view-layout', () => import('@pages/sample/ibizsample0021-grid-view-layout/ibizsample0021-grid-view-layout.vue'));
         Vue.component('ibizsample0021-wfdyna-action-view-layout', () => import('@pages/sample/ibizsample0021-wfdyna-action-view-layout/ibizsample0021-wfdyna-action-view-layout.vue'));
+        Vue.component('ibizbookcustom-view-layout', () => import('@pages/sample/ibizbookcustom-view-layout/ibizbookcustom-view-layout.vue'));
         Vue.component('ibizappviewgrid-view', () => import('@pages/sample/ibizappviewgrid-view/ibizappviewgrid-view.vue'));
         Vue.component('ibizappviewlist-view', () => import('@pages/sample/ibizappviewlist-view/ibizappviewlist-view.vue'));
         Vue.component('ibizappctrlgrid-view', () => import('@pages/sample/ibizappctrlgrid-view/ibizappctrlgrid-view.vue'));

app_Web/src/pages/sample/index/router.ts

@@ -2042,6 +2042,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/sample/ibizsample0021-wfdyna-exp-grid-view-layout/ibizsample0021-wfdyna-exp-grid-view-layout.vue'),
                 },
+                {
+                    path: 'ibizsample0021s/:ibizsample0021?/gridview_layout/:gridview_layout?',
+                    meta: {
+                        caption: 'entities.ibizsample0021.views.gridview_layout.caption',
+                        info:'',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'ibizsample0021s', parameterName: 'ibizsample0021' },
+                            { pathName: 'gridview_layout', parameterName: 'gridview_layout' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sample/ibizsample0021-grid-view-layout/ibizsample0021-grid-view-layout.vue'),
+                },
                 {
                     path: 'ibizsample0021s/:ibizsample0021?/wfdynaactionview_layout/:wfdynaactionview_layout?',
                     meta: {
@@ -2056,6 +2070,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/sample/ibizsample0021-wfdyna-action-view-layout/ibizsample0021-wfdyna-action-view-layout.vue'),
                 },
+                {
+                    path: 'ibizbooks/:ibizbook?/customview_layout/:customview_layout?',
+                    meta: {
+                        caption: 'entities.ibizbook.views.customview_layout.caption',
+                        info:'',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                            { pathName: 'customview_layout', parameterName: 'customview_layout' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sample/ibizbookcustom-view-layout/ibizbookcustom-view-layout.vue'),
+                },
                 {
                     path: 'ibizappviews/:ibizappview?/gridview/:gridview?',
                     meta: {
@@ -6004,6 +6032,19 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizsample0014-edit-view/ibizsample0014-edit-view.vue'),
     },
+    {
+        path: '/ibizsample0021s/:ibizsample0021?/gridview_layout/:gridview_layout?',
+        meta: {
+            caption: 'entities.ibizsample0021.views.gridview_layout.caption',
+            info:'',
+            parameters: [
+                { pathName: 'ibizsample0021s', parameterName: 'ibizsample0021' },
+                { pathName: 'gridview_layout', parameterName: 'gridview_layout' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizsample0021-grid-view-layout/ibizsample0021-grid-view-layout.vue'),
+    },
     {
         path: '/ibizorders/:ibizorder?/pickupview/:pickupview?',
         meta: {
@@ -6134,6 +6175,19 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizbookusr8-grid-view/ibizbookusr8-grid-view.vue'),
     },
+    {
+        path: '/ibizbooks/:ibizbook?/customview_layout/:customview_layout?',
+        meta: {
+            caption: 'entities.ibizbook.views.customview_layout.caption',
+            info:'',
+            parameters: [
+                { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                { pathName: 'customview_layout', parameterName: 'customview_layout' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizbookcustom-view-layout/ibizbookcustom-view-layout.vue'),
+    },
     {
         path: '/ibizbooks/:ibizbook?/usr9gridview/:usr9gridview?',
         meta: {

app_Web/src/pages/ungroup/app-index-view/router.ts

@@ -2840,6 +2840,19 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizsample0014-edit-view/ibizsample0014-edit-view.vue'),
     },
+    {
+        path: '/ibizsample0021s/:ibizsample0021?/gridview_layout/:gridview_layout?',
+        meta: {
+            caption: 'entities.ibizsample0021.views.gridview_layout.caption',
+            info:'',
+            parameters: [
+                { pathName: 'ibizsample0021s', parameterName: 'ibizsample0021' },
+                { pathName: 'gridview_layout', parameterName: 'gridview_layout' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizsample0021-grid-view-layout/ibizsample0021-grid-view-layout.vue'),
+    },
     {
         path: '/ibizorders/:ibizorder?/pickupview/:pickupview?',
         meta: {
@@ -2970,6 +2983,19 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizbookusr8-grid-view/ibizbookusr8-grid-view.vue'),
     },
+    {
+        path: '/ibizbooks/:ibizbook?/customview_layout/:customview_layout?',
+        meta: {
+            caption: 'entities.ibizbook.views.customview_layout.caption',
+            info:'',
+            parameters: [
+                { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                { pathName: 'customview_layout', parameterName: 'customview_layout' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizbookcustom-view-layout/ibizbookcustom-view-layout.vue'),
+    },
     {
         path: '/ibizbooks/:ibizbook?/usr9gridview/:usr9gridview?',
         meta: {

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

@@ -916,7 +916,9 @@ export const viewstate: any = {
                 '250e5b8897b031e2ab4124c51a7efadd',
                 '1e5f6384a69035a45e28c2552fd485bc',
                 'c898d7238b770cd5350c8a37c312159b',
+                'ef0aa2f297f599cdbc14fc8393b78a1d',
                 'a6d2ee3618dcfb23c3db981c9dbc4340',
+                'fa2731c1873f3c86aa065e73cff4667b',
             ],
         },
         {
@@ -2177,6 +2179,16 @@ export const viewstate: any = {
                 'a2936c6b9623c39072407c14da37ba3c',
             ],
         },
+        {
+            viewtag: 'ef0aa2f297f599cdbc14fc8393b78a1d',
+            viewmodule: 'Sample',
+            viewname: 'IBIZSample0021GridView_layout',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                'afffdfdd3ba8340fdf33581ad0171996',
+            ],
+        },
         {
             viewtag: 'efefe92eef97af14a35603f0324861cb',
             viewmodule: 'Sample',
@@ -2279,6 +2291,15 @@ export const viewstate: any = {
                 '58e37ccddda10feedac7c809d5cee02a',
             ],
         },
+        {
+            viewtag: 'fa2731c1873f3c86aa065e73cff4667b',
+            viewmodule: 'Sample',
+            viewname: 'IBIZBOOKCustomView_layout',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: 'fbc25877298bbacf410c4d1a85bb053b',
             viewmodule: 'Sample',

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

@@ -168,6 +168,7 @@ export default class IBIZBOOKUIServiceBase extends UIService {
         this.allViewMap.set(':',{viewname:'usr2gridview',srfappde:'ibizbooks',component:'ibizbookusr2-grid-view'});
         this.allViewMap.set(':',{viewname:'groupbycodelistlistview',srfappde:'ibizbooks',component:'ibizbookgroup-by-codelist-list-view'});
         this.allViewMap.set(':',{viewname:'usr8gridview',srfappde:'ibizbooks',component:'ibizbookusr8-grid-view'});
+        this.allViewMap.set(':',{viewname:'customview_layout',srfappde:'ibizbooks',component:'ibizbookcustom-view-layout'});
         this.allViewMap.set(':',{viewname:'usr9gridview',srfappde:'ibizbooks',component:'ibizbookusr9-grid-view'});
         this.allViewMap.set(':',{viewname:'dashboardview_layout',srfappde:'ibizbooks',component:'ibizbookdashboard-view-layout'});
     }

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

@@ -103,6 +103,7 @@ export default class IBIZSample0021UIServiceBase extends UIService {
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'ibizsample0021s',component:'ibizsample0021-grid-view'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'ibizsample0021s',component:'ibizsample0021-edit-view'});
         this.allViewMap.set(':',{viewname:'wfdynaexpgridview_layout',srfappde:'ibizsample0021s',component:'ibizsample0021-wfdyna-exp-grid-view-layout'});
+        this.allViewMap.set(':',{viewname:'gridview_layout',srfappde:'ibizsample0021s',component:'ibizsample0021-grid-view-layout'});
     }
 
     /**

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

@@ -1006,9 +1006,15 @@ export default class MainMenuBase extends Vue implements ControlInterface {
                 case 'AppFunc121': 
                     this.clickAppFunc121(item);
                     return;
+                case 'AppFunc123': 
+                    this.clickAppFunc123(item);
+                    return;
                 case 'AppFunc122': 
                     this.clickAppFunc122(item);
                     return;
+                case 'AppFunc124': 
+                    this.clickAppFunc124(item);
+                    return;
                 default:
                     console.warn('未指定应用功能');
             }
@@ -4140,6 +4146,29 @@ export default class MainMenuBase extends Vue implements ControlInterface {
         })
     }
     
+    /**
+     * 工作流启动（布局面板）
+     *
+     * @param {*} [item={}]
+     * @memberof MainMenu
+     */
+    public clickAppFunc123(item: any = {}) {
+        const viewparam: any = {};
+        Object.assign(viewparam, {});
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'ibizsample0021s', parameterName: 'ibizsample0021' },
+            { pathName: 'gridview_layout', parameterName: 'gridview_layout' },
+        ];
+        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);
+        })
+    }
+    
     /**
      * 工作流动态操作视图（布局面板）
      *
@@ -4164,6 +4193,29 @@ export default class MainMenuBase extends Vue implements ControlInterface {
             console.log(result);
         });
     }
+    
+    /**
+     * 自定义视图（布局面板）
+     *
+     * @param {*} [item={}]
+     * @memberof MainMenu
+     */
+    public clickAppFunc124(item: any = {}) {
+        const viewparam: any = {};
+        Object.assign(viewparam, {});
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+            { pathName: 'customview_layout', parameterName: 'customview_layout' },
+        ];
+        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

@@ -3804,7 +3804,7 @@ export default class MainMenuModel {
 	iconcls: '',
 	icon: '',
 	textcls: '',
-	appfunctag: 'AppFunc86',
+	appfunctag: 'AppFunc123',
 	resourcetag: '',
 	authtag:'Web-MainMenu-menuitem225',
 },
@@ -3863,7 +3863,7 @@ export default class MainMenuModel {
 	iconcls: '',
 	icon: '',
 	textcls: '',
-	appfunctag: 'AppFunc22',
+	appfunctag: 'AppFunc124',
 	resourcetag: '',
 	authtag:'Web-MainMenu-menuitem230',
 },
@@ -5508,6 +5508,18 @@ export default class MainMenuModel {
                 { pathName: 'wfdynaexpgridview_layout', parameterName: 'wfdynaexpgridview_layout' },
             ],
         },
+        {
+            appfunctag: 'AppFunc123',
+            appfuncyype: 'APPVIEW',
+            openmode: '',
+            codename: 'ibizsample0021gridview_layout',
+            deResParameters: [],
+            routepath: '/index/:index?/ibizsample0021s/:ibizsample0021?/gridview_layout/:gridview_layout?',
+            parameters: [
+                { pathName: 'ibizsample0021s', parameterName: 'ibizsample0021' },
+                { pathName: 'gridview_layout', parameterName: 'gridview_layout' },
+            ],
+        },
         {
             appfunctag: 'AppFunc122',
             appfuncyype: 'APPVIEW',
@@ -5520,6 +5532,18 @@ export default class MainMenuModel {
                 { pathName: 'wfdynaactionview_layout', parameterName: 'wfdynaactionview_layout' },
             ],
         },
+        {
+            appfunctag: 'AppFunc124',
+            appfuncyype: 'APPVIEW',
+            openmode: '',
+            codename: 'ibizbookcustomview_layout',
+            deResParameters: [],
+            routepath: '/index/:index?/ibizbooks/:ibizbook?/customview_layout/:customview_layout?',
+            parameters: [
+                { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                { pathName: 'customview_layout', parameterName: 'customview_layout' },
+            ],
+        },
 	];
 
     /**

app_Web/src/widgets/ibizappeditor/default-searchform/default-searchform-base.vue

@@ -590,7 +590,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -626,7 +626,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue

@@ -663,7 +663,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -699,7 +699,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizorder/main-grid/main-grid-base.vue

@@ -291,7 +291,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZOrderSF1GridViewBase
+     * @memberof IBIZOrderPickupGridViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -413,20 +413,6 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
-    /**
-     * 打开新建数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public newdata: any;
-    /**
-     * 打开编辑数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -959,7 +945,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -1054,7 +1040,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1160,7 +1146,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2077,7 +2063,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -2085,7 +2071,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){
@@ -2152,7 +2138,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

app_Web/src/widgets/ibizorder/main-grid/main-grid-model.ts

@@ -104,21 +104,6 @@ export default class MainModel {
         prop: 'n_ibizordername_like',
         dataType: 'QUERYPARAM'
       },
-      {
-        name: 'n_orderstate_eq',
-        prop: 'n_orderstate_eq',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_ordertime_gt',
-        prop: 'n_ordertime_gt',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_ordertime_lt',
-        prop: 'n_ordertime_lt',
-        dataType: 'QUERYPARAM'
-      },
 
         {
           name:'size',

demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZBOOK.json

@@ -4125,6 +4125,12 @@
     "name" : "图书实体表格视图（选项操作）",
     "realModelSubType" : "DEGRIDVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "CustomView_layout",
+    "logicName" : "实体自定义视图（布局面板）",
+    "name" : "实体自定义视图（布局面板）",
+    "realModelSubType" : "DECUSTOMVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "Usr4CalendarView",
     "logicName" : "图书实体日历视图（自定义插件）",

demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZSample0021.json

@@ -1509,6 +1509,12 @@
     "name" : "订单实体编辑视图",
     "realModelSubType" : "DEEDITVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "GridView_layout",
+    "logicName" : "订单实体表格视图（布局面板）",
+    "name" : "订单实体表格视图（布局面板）",
+    "realModelSubType" : "DEGRIDVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "approvedForm",
     "logicName" : "部门领导审批通过操作表单",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKCustomView_layout.json

+{
+  "accUserMode" : 2,
+  "getCapPSLanguageRes" : {
+    "lanResTag" : "MENUITEM.CAPTION.CUSTOMVIEW"
+  },
+  "caption" : "实体自定义视图",
+  "codeName" : "IBIZBOOKCustomView_layout",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKCustomView_layout.json",
+  "name" : "IBIZBOOKCustomView_layout",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
+  },
+  "getPSAppViewMsgGroup" : {
+    "modelref" : true,
+    "id" : "VMGroup85"
+  },
+  "getPSDEViewCodeName" : "CustomView_layout",
+  "getPSDEViewId" : "8E256DEB-D2D3-4FA4-891E-309B320E93D8",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Layoutpanel",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "layoutMode" : "TABLE_24COL",
+    "logicName" : "自定义视图",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
+    },
+    "getPSControlParam" : { },
+    "getPSLayout" : {
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "getRootPSPanelItems" : [ {
+      "caption" : "容器",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "page_container",
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      }
+    } ],
+    "layoutBodyOnly" : true,
+    "layoutPanel" : true,
+    "useDefaultLayout" : false,
+    "modelid" : "01998BC8-AF5A-46BD-BA0A-4E87605B3F52",
+    "modeltype" : "PSSYSVIEWLAYOUTPANEL"
+  },
+  "title" : "实体自定义视图",
+  "getTitlePSLanguageRes" : {
+    "lanResTag" : "PAGE.TITLE.IBIZBOOK.CUSTOMVIEW"
+  },
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DECUSTOMVIEW",
+  "enableDP" : true,
+  "showCaptionBar" : false,
+  "modelid" : "fa2731c1873f3c86aa065e73cff4667b",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file