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

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

@@ -1407,6 +1407,14 @@
         "viewname": "IBIZOrderCalendarExpView_layout",
         "viewtag": "8a29ee094e2f26c928d26ef24d29401f"
     },
+    "ibizorderproivateplugingridview": {
+        "title": "透视表插件示例",
+        "caption": "透视表插件示例",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Sample",
+        "viewname": "IBIZOrderProivatePluginGridView",
+        "viewtag": "8A41D051-1CDD-4050-9B28-822A20EA0D40"
+    },
     "ibizordertypeeditview": {
         "title": "订单类型编辑视图",
         "caption": "订单类型",

app_Web/src/locale/lang/BO-CN-base.ts

@@ -442,6 +442,7 @@ function getAppLocale(){
                     menuitem234: commonLogic.appcommonhandle("表格列插件示例",null),
                     menuitem235: commonLogic.appcommonhandle("视图样式插件",null),
                     menuitem236: commonLogic.appcommonhandle("部件插件示例",null),
+                    menuitem237: commonLogic.appcommonhandle("表格模板插件（透视表）",null),
                 },
             },
             formpage:{

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

@@ -442,6 +442,7 @@ function getAppLocale(){
                     menuitem234: commonLogic.appcommonhandle("表格列插件示例",null),
                     menuitem235: commonLogic.appcommonhandle("视图样式插件",null),
                     menuitem236: commonLogic.appcommonhandle("部件插件示例",null),
+                    menuitem237: commonLogic.appcommonhandle("表格模板插件（透视表）",null),
                 },
             },
             formpage:{

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

@@ -442,6 +442,7 @@ function getAppLocale(){
                     menuitem234: commonLogic.appcommonhandle("表格列插件示例",null),
                     menuitem235: commonLogic.appcommonhandle("视图样式插件",null),
                     menuitem236: commonLogic.appcommonhandle("部件插件示例",null),
+                    menuitem237: commonLogic.appcommonhandle("表格模板插件（透视表）",null),
                 },
             },
             formpage:{

app_Web/src/locale/lanres/entities/ibizorder/ibizorder_BO_CN_base.ts

@@ -207,6 +207,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("实体日历导航视图",null),
 				title: commonLogic.appcommonhandle("实体日历导航视图",null),
 			},
+			proivateplugingridview: {
+				caption: commonLogic.appcommonhandle("透视表插件示例",null),
+				title: commonLogic.appcommonhandle("透视表插件示例",null),
+			},
 			usr2editview: {
 				caption: commonLogic.appcommonhandle("编辑表单更新默认值",null),
 				title: commonLogic.appcommonhandle("编辑表单更新默认值",null),
@@ -2255,6 +2259,64 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("数据导入",null),
 			},
 		},
+		proivateplugingridviewtoolbar_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),
+			},
+			tbitem11: {
+				caption: commonLogic.appcommonhandle("打印",null),
+				tip: commonLogic.appcommonhandle("打印",null),
+			},
+			tbitem12: {
+				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),
+			},
+		},
 		calendarexpviewcalendarexpbar_toolbar_toolbar: {
 			deuiaction3: {
 				caption: commonLogic.appcommonhandle("编辑",null),

app_Web/src/locale/lanres/entities/ibizorder/ibizorder_en_US_base.ts

@@ -207,6 +207,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Entity Calendar Navigation View",null),
 				title: commonLogic.appcommonhandle("实体日历导航视图",null),
 			},
+			proivateplugingridview: {
+				caption: commonLogic.appcommonhandle("透视表插件示例",null),
+				title: commonLogic.appcommonhandle("透视表插件示例",null),
+			},
 			usr2editview: {
 				caption: commonLogic.appcommonhandle("Update Default",null),
 				title: commonLogic.appcommonhandle("编辑表单更新默认值",null),
@@ -2255,6 +2259,64 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("数据导入",null),
 			},
 		},
+		proivateplugingridviewtoolbar_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),
+			},
+			tbitem11: {
+				caption: commonLogic.appcommonhandle("Print",null),
+				tip: commonLogic.appcommonhandle("Print",null),
+			},
+			tbitem12: {
+				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),
+			},
+		},
 		calendarexpviewcalendarexpbar_toolbar_toolbar: {
 			deuiaction3: {
 				caption: commonLogic.appcommonhandle("Edit",null),

app_Web/src/locale/lanres/entities/ibizorder/ibizorder_zh_CN_base.ts

@@ -207,6 +207,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("实体日历导航视图",null),
 				title: commonLogic.appcommonhandle("实体日历导航视图",null),
 			},
+			proivateplugingridview: {
+				caption: commonLogic.appcommonhandle("透视表插件示例",null),
+				title: commonLogic.appcommonhandle("透视表插件示例",null),
+			},
 			usr2editview: {
 				caption: commonLogic.appcommonhandle("编辑表单更新默认值",null),
 				title: commonLogic.appcommonhandle("编辑表单更新默认值",null),
@@ -2255,6 +2259,64 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("数据导入",null),
 			},
 		},
+		proivateplugingridviewtoolbar_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),
+			},
+			tbitem11: {
+				caption: commonLogic.appcommonhandle("打印",null),
+				tip: commonLogic.appcommonhandle("打印",null),
+			},
+			tbitem12: {
+				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),
+			},
+		},
 		calendarexpviewcalendarexpbar_toolbar_toolbar: {
 			deuiaction3: {
 				caption: commonLogic.appcommonhandle("编辑",null),

app_Web/src/mock/viewconfig/viewconfig.ts

@@ -1415,6 +1415,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "IBIZOrderCalendarExpView_layout",
             "viewtag": "8a29ee094e2f26c928d26ef24d29401f"
         },
+        "ibizorderproivateplugingridview": {
+            "title": "透视表插件示例",
+            "caption": "透视表插件示例",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Sample",
+            "viewname": "IBIZOrderProivatePluginGridView",
+            "viewtag": "8A41D051-1CDD-4050-9B28-822A20EA0D40"
+        },
         "ibizordertypeeditview": {
             "title": "订单类型编辑视图",
             "caption": "订单类型",

app_Web/src/pages/sample/ibizorder-proivate-plugin-grid-view/ibizorder-proivate-plugin-grid-view.less

+// 基于 @VIEW/实体表格视图/VIEW.less.ftl 生成
+.ibizorder-proivate-plugin-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
+
+.deepskyblueToolBar {color:white !important;background-color:#108cee !important;}
+
+

app_Web/src/pages/sample/ibizorder-proivate-plugin-grid-view/ibizorder-proivate-plugin-grid-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import IBIZOrderProivatePluginGridViewBase from './ibizorder-proivate-plugin-grid-view-base.vue';
+
+import view_grid from '@widgets/ibizorder/main-grid/main-grid.vue';
+import view_searchform from '@widgets/ibizorder/default-searchform/default-searchform.vue';
+// 基于 @VIEW/实体表格视图/VIEW.vue.ftl 生成
+
+@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 IBIZOrderProivatePluginGridView extends IBIZOrderProivatePluginGridViewBase {
+
+}
+</script>
\ No newline at end of file

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

@@ -149,6 +149,7 @@ export const PageComponents = {
         Vue.component('ibizorder-plugin-ex-grid-view', () => import('@pages/sample/ibizorder-plugin-ex-grid-view/ibizorder-plugin-ex-grid-view.vue'));
         Vue.component('ibizorder-view-plugin-ex-grid-view', () => import('@pages/sample/ibizorder-view-plugin-ex-grid-view/ibizorder-view-plugin-ex-grid-view.vue'));
         Vue.component('ibizorder-ctrl-plugin-ex-grid-view', () => import('@pages/sample/ibizorder-ctrl-plugin-ex-grid-view/ibizorder-ctrl-plugin-ex-grid-view.vue'));
+        Vue.component('ibizorder-proivate-plugin-grid-view', () => import('@pages/sample/ibizorder-proivate-plugin-grid-view/ibizorder-proivate-plugin-grid-view.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

@@ -2251,6 +2251,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/sample/ibizorder-ctrl-plugin-ex-grid-view/ibizorder-ctrl-plugin-ex-grid-view.vue'),
                 },
+                {
+                    path: 'ibizorders/:ibizorder?/proivateplugingridview/:proivateplugingridview?',
+                    meta: {
+                        caption: 'entities.ibizorder.views.proivateplugingridview.caption',
+                        info:'',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'ibizorders', parameterName: 'ibizorder' },
+                            { pathName: 'proivateplugingridview', parameterName: 'proivateplugingridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sample/ibizorder-proivate-plugin-grid-view/ibizorder-proivate-plugin-grid-view.vue'),
+                },
                 {
                     path: 'ibizappviews/:ibizappview?/gridview/:gridview?',
                     meta: {
@@ -5412,6 +5426,19 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizorder-calendar-exp-view-layout/ibizorder-calendar-exp-view-layout.vue'),
     },
+    {
+        path: '/ibizorders/:ibizorder?/proivateplugingridview/:proivateplugingridview?',
+        meta: {
+            caption: 'entities.ibizorder.views.proivateplugingridview.caption',
+            info:'',
+            parameters: [
+                { pathName: 'ibizorders', parameterName: 'ibizorder' },
+                { pathName: 'proivateplugingridview', parameterName: 'proivateplugingridview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizorder-proivate-plugin-grid-view/ibizorder-proivate-plugin-grid-view.vue'),
+    },
     {
         path: '/ibizcustomers/:ibizcustomer?/pickupview_layout/:pickupview_layout?',
         meta: {

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

@@ -1872,6 +1872,19 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizorder-calendar-exp-view-layout/ibizorder-calendar-exp-view-layout.vue'),
     },
+    {
+        path: '/ibizorders/:ibizorder?/proivateplugingridview/:proivateplugingridview?',
+        meta: {
+            caption: 'entities.ibizorder.views.proivateplugingridview.caption',
+            info:'',
+            parameters: [
+                { pathName: 'ibizorders', parameterName: 'ibizorder' },
+                { pathName: 'proivateplugingridview', parameterName: 'proivateplugingridview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizorder-proivate-plugin-grid-view/ibizorder-proivate-plugin-grid-view.vue'),
+    },
     {
         path: '/ibizcustomers/:ibizcustomer?/pickupview_layout/:pickupview_layout?',
         meta: {

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

@@ -1030,6 +1030,7 @@ export const viewstate: any = {
                 '2E76797A-3404-4235-AAC0-1ADBB1930CC7',
                 '730EF6B2-038F-4AF2-86DF-E8455B0CBE75',
                 '6A0A394B-1B07-4CCE-8DBE-4A571FF09D8F',
+                '8A41D051-1CDD-4050-9B28-822A20EA0D40',
             ],
         },
         {
@@ -1531,6 +1532,19 @@ export const viewstate: any = {
                 '7f46cd67bcfbeac794fcc5c91d8bcceb',
             ],
         },
+        {
+            viewtag: '8A41D051-1CDD-4050-9B28-822A20EA0D40',
+            viewmodule: 'Sample',
+            viewname: 'IBIZOrderProivatePluginGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                'bbfdcd8f2a068286f0431e509a6fbc97',
+                'd827fd85e8d9be1bb9348765c09cd465',
+                '56738595155756fd86c36e20af24f056',
+                'e6b9fc2b5a23e89827909ccc050eb381',
+            ],
+        },
         {
             viewtag: '8bb68e0800e34b41e92a18ffcf1f7e9f',
             viewmodule: 'Sample',

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

@@ -138,6 +138,7 @@ export default class IBIZOrderUIServiceBase extends UIService {
         this.allViewMap.set(':',{viewname:'linechartview',viewType:'DECHARTVIEW',srfappde:'ibizorders',component:'ibizorder-line-chart-view'});
         this.allViewMap.set(':',{viewname:'seditview4_layout',viewType:'DEEDITVIEW4',srfappde:'ibizorders',component:'ibizorder-sedit-view4-layout'});
         this.allViewMap.set(':',{viewname:'calendarexpview_layout',viewType:'DECALENDAREXPVIEW',srfappde:'ibizorders',component:'ibizorder-calendar-exp-view-layout'});
+        this.allViewMap.set(':',{viewname:'proivateplugingridview',viewType:'DEGRIDVIEW',srfappde:'ibizorders',component:'ibizorder-proivate-plugin-grid-view'});
         this.allViewMap.set(':',{viewname:'usr2editview',viewType:'DEEDITVIEW',srfappde:'ibizorders',component:'ibizorder-usr2-edit-view'});
         this.allViewMap.set(':',{viewname:'gridview9',viewType:'DEGRIDVIEW9',srfappde:'ibizorders',component:'ibizorder-grid-view9'});
         this.allViewMap.set(':',{viewname:'sf6gridview',viewType:'DEGRIDVIEW',srfappde:'ibizorders',component:'ibizorder-sf6-grid-view'});

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

@@ -1103,6 +1103,9 @@ export default class MainMenuBase extends Vue implements ControlInterface {
                     case 'UsrAppFunc1123700954': 
                         this.clickUsrAppFunc1123700954(item);
                         return;
+                    case 'UsrAppFunc1124626681': 
+                        this.clickUsrAppFunc1124626681(item);
+                        return;
                     default:
                         console.warn('未指定应用功能');
                 }
@@ -4580,6 +4583,29 @@ export default class MainMenuBase extends Vue implements ControlInterface {
             this.$router.push(path);
         })
     }
+    
+    /**
+     * 透视表插件示例
+     *
+     * @param {*} [item={}]
+     * @memberof MainMenu
+     */
+    public clickUsrAppFunc1124626681(item: any = {}) {
+        const viewparam: any = {};
+        Object.assign(viewparam, {});
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'ibizorders', parameterName: 'ibizorder' },
+            { pathName: 'proivateplugingridview', parameterName: 'proivateplugingridview' },
+        ];
+        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/ibizappeditor/default-searchform/default-searchform-base.vue

@@ -639,7 +639,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: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -675,7 +675,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public async loadDraft(opt: any = {},mode?:string): Promise<any> {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/usr2-dataview/usr2-dataview-model.ts

@@ -11,7 +11,7 @@ export default class Usr2Model {
 	 * 获取数据项集合
 	 *
 	 * @returns {any[]}
-	 * @memberof Usr2DataViewMode
+	 * @memberof Usr2Dataviewexpbar_dataviewMode
 	 */
 	public getDataItems(): any[] {
 		return [
@@ -40,17 +40,6 @@ export default class Usr2Model {
 				dataType: 'FONTKEY',
 			},
 
-      {
-        name: 'n_ibizbookname_like',
-        prop: 'n_ibizbookname_like',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_price_gtandeq',
-        prop: 'n_price_gtandeq',
-        dataType: 'QUERYPARAM'
-      },
-
 
       {
         name:'size',

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-base.vue

@@ -698,7 +698,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -792,7 +792,7 @@ export default class Usr4Base 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: 'IBIZBOOKTestCLDataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -908,7 +908,7 @@ export default class Usr4Base 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: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.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);
@@ -916,7 +916,7 @@ export default class Usr4Base 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: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-model.ts

@@ -70,6 +70,11 @@ export default class Usr4Model {
         prop: 'n_ibizbookname_like',
         dataType: 'QUERYPARAM'
       },
+      {
+        name: 'n_price_gtandeq',
+        prop: 'n_price_gtandeq',
+        dataType: 'QUERYPARAM'
+      },
 
 
       {

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

@@ -319,7 +319,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZOrderPickupGridViewBase
+     * @memberof IBIZOrderSF1GridViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -462,6 +462,20 @@ 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;
     
     /**
     * 是否嵌入关系界面
@@ -996,7 +1010,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZOrderPickupGridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZOrderSF1GridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1125,7 +1139,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1239,7 +1253,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: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2170,7 +2184,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: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2179,7 +2193,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: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2255,7 +2269,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

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

@@ -105,6 +105,21 @@ 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/IBIZOrder.json

@@ -4448,6 +4448,12 @@
     "name" : "订单实体表格视图（属性映射求和）",
     "realModelSubType" : "DEGRIDVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "ProivatePluginGridView",
+    "logicName" : "透视表插件示例",
+    "name" : "透视表插件示例",
+    "realModelSubType" : "DEGRIDVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "SF3GridView",
     "logicName" : "订单实体表格视图（禁用排序表格）",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSTREEGRIDICES/TreeTable.json

@@ -29,21 +29,21 @@
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "图书名称",
-    "codeName" : "ibizbookname",
+    "caption" : "作者",
+    "codeName" : "author",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "ibizbookname",
-    "name" : "ibizbookname",
+    "dataItemName" : "author",
+    "name" : "author",
     "width" : 50,
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "作者",
-    "codeName" : "author",
+    "caption" : "图书名称",
+    "codeName" : "ibizbookname",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "author",
-    "name" : "author",
+    "dataItemName" : "ibizbookname",
+    "name" : "ibizbookname",
     "width" : 50,
     "widthUnit" : "px",
     "enableExpand" : false,

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

@@ -85,21 +85,21 @@
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
+      "caption" : "作者",
+      "codeName" : "author",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "name" : "ibizbookname",
+      "dataItemName" : "author",
+      "name" : "author",
       "width" : 50,
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "作者",
-      "codeName" : "author",
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "author",
-      "name" : "author",
+      "dataItemName" : "ibizbookname",
+      "name" : "ibizbookname",
       "width" : 50,
       "widthUnit" : "px",
       "enableExpand" : false,

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPINDEXVIEWS/index.json

@@ -4226,6 +4226,24 @@
           "layout" : "TABLE_24COL"
         },
         "tooltip" : "部件插件示例"
+      }, {
+        "accUserMode" : 2,
+        "caption" : "表格模板插件（透视表）",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem237",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "UsrAppFunc1124626681"
+        },
+        "getPSLayout" : {
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "表格模板插件（透视表）"
       } ],
       "getPSLayout" : {
         "columnCount" : 24,

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPMENUS/MainMenu.json

@@ -2513,6 +2513,16 @@
         "id" : "UsrAppFunc1123700954"
       },
       "tooltip" : "部件插件示例"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "表格模板插件（透视表）",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem237",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc1124626681"
+      },
+      "tooltip" : "表格模板插件（透视表）"
     } ],
     "tooltip" : "插件"
   } ],

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

@@ -2589,6 +2589,16 @@
       "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZSample0021WFDynaActionView.json",
       "viewType" : "DEWFDYNAACTIONVIEW"
     }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "UsrAppFunc1124626681",
+    "name" : "透视表插件示例",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderProivatePluginGridView.json",
+      "viewType" : "DEGRIDVIEW"
+    }
   }, {
     "appFuncType" : "APPVIEW",
     "codeName" : "AppFunc77",
@@ -4129,6 +4139,12 @@
     "pluginType" : "EDITFORM_RENDER",
     "refMode" : "CONTROL",
     "refTag" : "FORM"
+  }, {
+    "name" : "表格（透视表）",
+    "pluginCode" : "PivotTable",
+    "pluginType" : "GRID_RENDER",
+    "refMode" : "CONTROL",
+    "refTag" : "GRID"
   }, {
     "name" : "视图数量",
     "pluginCode" : "PFPlugin8",
@@ -14412,6 +14428,12 @@
     "viewType" : "DECALENDAREXPVIEW",
     "resource" : "IBIZOrder",
     "view" : "CalendarExpView_layout"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderProivatePluginGridView.json",
+    "viewType" : "DEGRIDVIEW",
+    "resource" : "IBIZOrder",
+    "view" : "ProivatePluginGridView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderTypeEditView.json",
@@ -19581,6 +19603,24 @@
               "layout" : "TABLE_24COL"
             },
             "tooltip" : "部件插件示例"
+          }, {
+            "accUserMode" : 2,
+            "caption" : "表格模板插件（透视表）",
+            "itemType" : "MENUITEM",
+            "name" : "menuitem237",
+            "getPSAppFunc" : {
+              "modelref" : true,
+              "id" : "UsrAppFunc1124626681"
+            },
+            "getPSLayout" : {
+              "columnCount" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "tooltip" : "表格模板插件（透视表）"
           } ],
           "getPSLayout" : {
             "columnCount" : 24,

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSSYSAPP.simple.json

@@ -103,6 +103,12 @@
     "pluginType" : "EDITFORM_RENDER",
     "refMode" : "CONTROL",
     "refTag" : "FORM"
+  }, {
+    "name" : "表格（透视表）",
+    "pluginCode" : "PivotTable",
+    "pluginType" : "GRID_RENDER",
+    "refMode" : "CONTROL",
+    "refTag" : "GRID"
   }, {
     "name" : "视图数量",
     "pluginCode" : "PFPlugin8",

demo-core/src/main/resources/liquibase/h2_table.xml

@@ -340,7 +340,7 @@
 
 
     <!--输出实体[IBIZORDER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-655-14">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-662-14">
         <createTable tableName="T_IBIZORDER">
                 <column name="TP" remarks="" type="TEXT(1048576)">
                 </column>

demo-core/src/main/resources/liquibase/view.xml

@@ -37,7 +37,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZORDER]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-655-8" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-662-8" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZORDER">
                <![CDATA[ SELECT t1.[AMOUNT], t1.[CREATEDATE], t1.[CREATEMAN], t1.[DETAILNUM], t1.[IBIZCUSTOMERID], t11.[IBIZCUSTOMERNAME], t1.[IBIZORDERID], t1.[IBIZORDERNAME], t1.[MEMO], t1.[ORDERSTATE], t1.[ORDERTIME], t1.[ORDERTYPE], t1.[ORDERUID], t1.[UPDATEDATE], t1.[UPDATEMAN], t1.[WFINSTANCEID], t1.[WFSTATE], t1.[WFSTEP] FROM [T_IBIZORDER] t1  LEFT JOIN T_IBIZCUSTOMER t11 ON t1.IBIZCUSTOMERID = t11.IBIZCUSTOMERID  ]]>
          </createView>