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

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

@@ -4275,6 +4275,24 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
 	resourcetag: '',
 },
 	],
+},
+            {
+	id: 'BE1AE004-BC3C-42C5-9817-6F67035F4A7C',
+	name: 'menuitem256',
+	text: '日历视图布局面板',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '日历视图布局面板',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: '',
+	icon: '',
+	textcls: '',
+	appfunctag: 'AppFunc135',
+	resourcetag: '',
 },
         ],
     }];

app_Web/src/pages/sample/app-index-view2/router.ts

@@ -1295,6 +1295,19 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizorder-usr2-grid-view/ibizorder-usr2-grid-view.vue'),
     },
+    {
+        path: '/ibizbooks/:ibizbook?/usr6calendarview/:usr6calendarview?',
+        meta: {
+            caption: 'entities.ibizbook.views.usr6calendarview.caption',
+            info:'',
+            parameters: [
+                { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                { pathName: 'usr6calendarview', parameterName: 'usr6calendarview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizbookusr6-calendar-view/ibizbookusr6-calendar-view.vue'),
+    },
     {
         path: '/ibizbooks/:ibizbook?/wizardiwithstateview/:wizardiwithstateview?',
         meta: {

app_Web/src/pages/sample/ibizbookusr6-calendar-view/ibizbookusr6-calendar-view.scss

+// 基于 @VIEW/实体日历视图/VIEW.scss.ftl 生成
+.ibizbookusr6-calendar-view{
+    position: relative;
+}
+
+
+

app_Web/src/pages/sample/ibizbookusr6-calendar-view/ibizbookusr6-calendar-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import IBIZBOOKUsr6CalendarViewBase from './ibizbookusr6-calendar-view-base.vue';
+
+import view_calendar from '@widgets/ibizbook/ibizbookmonth-calendar/ibizbookmonth-calendar.vue';
+// 基于 @VIEW/实体日历视图/VIEW.vue.ftl 生成
+
+@Component({
+    components: {
+        view_calendar, 
+    },
+    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 IBIZBOOKUsr6CalendarView extends IBIZBOOKUsr6CalendarViewBase {
+
+}
+</script>
\ No newline at end of file

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

@@ -162,6 +162,7 @@ export const PageComponents = {
         Vue.component('ibizbookusr-grid-view-ctrl-plugin', () => import('@pages/sample/ibizbookusr-grid-view-ctrl-plugin/ibizbookusr-grid-view-ctrl-plugin.vue'));
         Vue.component('ibizbookusr-grid-view-col-plugin', () => import('@pages/sample/ibizbookusr-grid-view-col-plugin/ibizbookusr-grid-view-col-plugin.vue'));
         Vue.component('ibizbookusr-edit-view-action-plugin', () => import('@pages/sample/ibizbookusr-edit-view-action-plugin/ibizbookusr-edit-view-action-plugin.vue'));
+        Vue.component('ibizbookusr6-calendar-view', () => import('@pages/sample/ibizbookusr6-calendar-view/ibizbookusr6-calendar-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

@@ -2433,6 +2433,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/sample/ibizbookusr-edit-view-action-plugin/ibizbookusr-edit-view-action-plugin.vue'),
                 },
+                {
+                    path: 'ibizbooks/:ibizbook?/usr6calendarview/:usr6calendarview?',
+                    meta: {
+                        caption: 'entities.ibizbook.views.usr6calendarview.caption',
+                        info:'',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                            { pathName: 'usr6calendarview', parameterName: 'usr6calendarview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sample/ibizbookusr6-calendar-view/ibizbookusr6-calendar-view.vue'),
+                },
                 {
                     path: 'ibizappviews/:ibizappview?/gridview/:gridview?',
                     meta: {
@@ -4947,6 +4961,19 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizorder-usr2-grid-view/ibizorder-usr2-grid-view.vue'),
     },
+    {
+        path: '/ibizbooks/:ibizbook?/usr6calendarview/:usr6calendarview?',
+        meta: {
+            caption: 'entities.ibizbook.views.usr6calendarview.caption',
+            info:'',
+            parameters: [
+                { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                { pathName: 'usr6calendarview', parameterName: 'usr6calendarview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizbookusr6-calendar-view/ibizbookusr6-calendar-view.vue'),
+    },
     {
         path: '/ibizbooks/:ibizbook?/wizardiwithstateview/:wizardiwithstateview?',
         meta: {

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

@@ -1113,6 +1113,19 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizorder-usr2-grid-view/ibizorder-usr2-grid-view.vue'),
     },
+    {
+        path: '/ibizbooks/:ibizbook?/usr6calendarview/:usr6calendarview?',
+        meta: {
+            caption: 'entities.ibizbook.views.usr6calendarview.caption',
+            info:'',
+            parameters: [
+                { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                { pathName: 'usr6calendarview', parameterName: 'usr6calendarview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizbookusr6-calendar-view/ibizbookusr6-calendar-view.vue'),
+    },
     {
         path: '/ibizbooks/:ibizbook?/wizardiwithstateview/:wizardiwithstateview?',
         meta: {

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

@@ -809,6 +809,16 @@ export const viewstate: any = {
                 'e6b9fc2b5a23e89827909ccc050eb381',
             ],
         },
+        {
+            viewtag: '508e2461c49ad9175533bf925ea0267e',
+            viewmodule: 'Sample',
+            viewname: 'IBIZBOOKUsr6CalendarView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '58e37ccddda10feedac7c809d5cee02a',
+            ],
+        },
         {
             viewtag: '517580eb2dc02c481b306635c52fb1a3',
             viewmodule: 'Sample',
@@ -1093,6 +1103,7 @@ export const viewstate: any = {
                 'CBB075E1-BDC9-4F6A-BCF4-09EC4D7370EE',
                 '611B670D-30A4-44D8-A0F7-DD1266265CD6',
                 'F7892096-9D26-49A7-A1E6-9D49CE5D60EA',
+                '508e2461c49ad9175533bf925ea0267e',
             ],
         },
         {

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

@@ -595,7 +595,7 @@ export default class IBIZOrderUIServiceBase extends UIService {
             window.open(url, '_blank');
             return { ok: true, result: _args };
         }
-        const url = `https://www.baidu.com/s?wd=${_context.nameparam}${_viewParam.param2}`;
+        const url = `https://www.baidu.com/s?wd=${context.nameparam}${viewParams.param2}`;
         return openPopupApp(url);
     }
 

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

@@ -1041,6 +1041,9 @@ export default class MainMenuBase extends Vue implements ControlInterface {
                     case 'UsrAppFunc1206570767': 
                         this.clickUsrAppFunc1206570767(item);
                         return;
+                    case 'AppFunc135': 
+                        this.clickAppFunc135(item);
+                        return;
                     default:
                         console.warn('未指定应用功能');
                 }
@@ -4821,6 +4824,29 @@ export default class MainMenuBase extends Vue implements ControlInterface {
         })
     }
     
+    /**
+     * 日历视图布局面板
+     *
+     * @param {*} [item={}]
+     * @memberof MainMenu
+     */
+    public clickAppFunc135(item: any = {}) {
+        const viewparam: any = {};
+        Object.assign(viewparam, {});
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+            { pathName: 'usr6calendarview', parameterName: 'usr6calendarview' },
+        ];
+        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

@@ -4744,6 +4744,26 @@ export default class MainMenuModel {
     cappslanguageres: '',    
 },
 	],
+},
+        {
+	id: 'BE1AE004-BC3C-42C5-9817-6F67035F4A7C',
+	name: 'menuitem256',
+	text: '日历视图布局面板',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '日历视图布局面板',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: '',
+	icon: '',
+	textcls: '',
+	appfunctag: 'AppFunc135',
+	resourcetag: '',
+	authtag:'Web-MainMenu-menuitem256',
+    cappslanguageres: '',    
 },
     ];
 
@@ -6715,6 +6735,18 @@ export default class MainMenuModel {
                 { pathName: 'usreditview_actionplugin', parameterName: 'usreditview_actionplugin' },
             ],
         },
+        {
+            appfunctag: 'AppFunc135',
+            appfuncyype: 'APPVIEW',
+            openmode: '',
+            codename: 'ibizbookusr6calendarview',
+            deResParameters: [],
+            routepath: '/index/:index?/ibizbooks/:ibizbook?/usr6calendarview/:usr6calendarview?',
+            parameters: [
+                { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                { pathName: 'usr6calendarview', parameterName: 'usr6calendarview' },
+            ],
+        },
 	];
 
     /**

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

@@ -712,7 +712,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: 'IBIZBOOKCalendarView' + (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 };
@@ -748,7 +748,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: 'IBIZBOOKCalendarView' + (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/ibizbook/guide-borrow-form-form/guide-borrow-form-form-base.vue

@@ -1378,7 +1378,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1429,7 +1429,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1499,7 +1499,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1607,7 +1607,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1799,7 +1799,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/guide-return-form-form/guide-return-form-form-base.vue

@@ -1344,7 +1344,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1395,7 +1395,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1465,7 +1465,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1573,7 +1573,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1765,7 +1765,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/guide-view-form-form/guide-view-form-form-base.vue

@@ -1447,7 +1447,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1499,7 +1499,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1569,7 +1569,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1677,7 +1677,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1869,7 +1869,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

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

@@ -288,7 +288,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) {
@@ -431,6 +431,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;
     
     /**
     * 是否嵌入关系界面
@@ -965,7 +979,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;
         }
@@ -1105,7 +1119,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;
         }
@@ -1219,7 +1233,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){
@@ -2152,7 +2166,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);
@@ -2161,7 +2175,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);
@@ -2237,7 +2251,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',

app_Web/src/widgets/ibizsample0021/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: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout' + (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: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

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

@@ -363,6 +363,13 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
+    /**
+     * 打开新建数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public newdata: any;
     /**
      * 打开编辑数据视图
      *
@@ -895,7 +902,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZSample0021WFDynaExpGridView_layout" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZSample0021GridView_layout" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1035,7 +1042,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZSample0021GridView_layout' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1149,7 +1156,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: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2057,7 +2064,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: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2066,7 +2073,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: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2142,7 +2149,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZSample0021GridView_layout' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

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

@@ -4808,7 +4808,7 @@
     "dialogResult" : "OK",
     "frontProcessType" : "OPENHTMLPAGE",
     "fullCodeName" : "IBIZOrder_OpenBDAnSearch",
-    "htmlPageUrl" : "https://www.baidu.com/s?wd=${_context.nameparam}${_viewParam.param2}",
+    "htmlPageUrl" : "https://www.baidu.com/s?wd=${context.nameparam}${viewParams.param2}",
     "mOSFilePath" : "pssysapps/Web/psappdataentities/IBIZOrder/psappdeuiactions/OpenBDAnSearch",
     "name" : "打开百度并搜索",
     "getPSAppDataEntity" : {

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

@@ -846,7 +846,6 @@
     "useDefaultLayout" : true
   },
   "rTMOSFilePath" : "pssysapps/Web/psappdeviews/IBIZBOOKUsr6CalendarView",
-  "refFlag" : false,
   "title" : "图书日历视图",
   "viewStyle" : "DEFAULT",
   "viewType" : "DECALENDARVIEW",

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

@@ -1192,7 +1192,7 @@
         "dialogResult" : "OK",
         "frontProcessType" : "OPENHTMLPAGE",
         "fullCodeName" : "IBIZOrder_OpenBDAnSearch",
-        "htmlPageUrl" : "https://www.baidu.com/s?wd=${_context.nameparam}${_viewParam.param2}",
+        "htmlPageUrl" : "https://www.baidu.com/s?wd=${context.nameparam}${viewParams.param2}",
         "mOSFilePath" : "pssysapps/Web/psappdataentities/IBIZOrder/psappdeuiactions/OpenBDAnSearch",
         "name" : "打开百度并搜索",
         "getPSAppDataEntity" : {

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

@@ -5809,6 +5809,28 @@
         "layout" : "TABLE_24COL"
       },
       "tooltip" : "vue3插件测试"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "日历视图布局面板",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem256",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "AppFunc135"
+      },
+      "getPSLayout" : {
+        "childColLG" : -1,
+        "childColMD" : 24,
+        "childColSM" : -1,
+        "childColXS" : -1,
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "tooltip" : "日历视图布局面板"
     } ],
     "getPSControlHandler" : {
       "enableDEFieldPrivilege" : false,

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

@@ -3000,6 +3000,16 @@
       "tooltip" : "其他插件"
     } ],
     "tooltip" : "vue3插件测试"
+  }, {
+    "accUserMode" : 2,
+    "caption" : "日历视图布局面板",
+    "itemType" : "MENUITEM",
+    "name" : "menuitem256",
+    "getPSAppFunc" : {
+      "modelref" : true,
+      "id" : "AppFunc135"
+    },
+    "tooltip" : "日历视图布局面板"
   } ],
   "rTMOSFilePath" : "pssysapps/Web/psappmenus/MainMenu",
   "enableCustomize" : false,

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

@@ -172,7 +172,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-1307-7">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-1310-7">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -344,7 +344,7 @@
 
 
     <!--输出实体[IBIZORDER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-777-14">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-779-14">
         <createTable tableName="T_IBIZORDER">
                 <column name="TP" remarks="" type="TEXT(1048576)">
                 </column>
@@ -528,7 +528,7 @@
 
 
     <!--输出实体[IBIZSAMPLE0001]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0001-55-19">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0001-58-19">
         <createTable tableName="T_IBIZSAMPLE0001">
                 <column name="FIELD01" remarks="" type="VARCHAR(100)">
                 </column>
@@ -1477,7 +1477,7 @@
         <!--输出实体[IBIZQJ]外键关系 -->
         <!--输出实体[IBIZSAMPLE]外键关系 -->
         <!--输出实体[IBIZSAMPLE0001]外键关系 -->
-    <changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0001-55-48">
+    <changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0001-58-48">
        <addForeignKeyConstraint baseColumnNames="IBIZSAMPLE0002ID" baseTableName="T_IBIZSAMPLE0001" constraintName="DER1N_IBIZSAMPLE0001_IBIZSAMPL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="IBIZSAMPLE0002ID" referencedTableName="T_IBIZSAMPLE0002" validate="true"/>
     </changeSet>
         <!--输出实体[IBIZSAMPLE0002]外键关系 -->

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-777-8" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-779-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>
@@ -67,7 +67,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZSAMPLE0001]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0001-55-13" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0001-58-13" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZSAMPLE0001">
                <![CDATA[ SELECT t1.[CREATEDATE], t1.[CREATEMAN], t1.[FIELD01], t1.[FIELD02], t1.[FIELD05], t1.[FIELD06], t1.[FIELD07], t1.[FIELD08], t1.[FIELD09], t1.[FIELD10], t1.[FIELD11], t1.[FIELD12], t1.[FIELD13], t1.[FIELD14], t1.[FIELD15], t1.[FIELD16], t1.[FIELD17], t1.[FIELD18], t1.[FIELD19], t1.[FIELD20], t1.[FIELD21], t1.[FIELD22], t1.[FIELD23], t1.[FIELD24], t1.[FIELD25], t1.[FIELD26], t1.[FIELD27], t1.[IBIZSAMPLE0001ID], t1.[IBIZSAMPLE0001NAME], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZSAMPLE0001] t1  ]]>
          </createView>