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

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

@@ -367,6 +367,7 @@ function getAppLocale(){
                     menuitem25: commonLogic.appcommonhandle("关系界面刷新主表单",null),
                     menuitem208: commonLogic.appcommonhandle("界面逻辑测试",null),
                     menuitem209: commonLogic.appcommonhandle("表格加载",null),
+                    menuitem210: commonLogic.appcommonhandle("表单界面逻辑加载",null),
                     menuitem66: commonLogic.appcommonhandle("视图布局面板测试",null),
                     menuitem125: commonLogic.appcommonhandle("测试表单自定义布局多媒体",null),
                     menuitem126: commonLogic.appcommonhandle("自定义导航",null),

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

@@ -367,6 +367,7 @@ function getAppLocale(){
                     menuitem25: commonLogic.appcommonhandle("关系界面刷新主表单",null),
                     menuitem208: commonLogic.appcommonhandle("界面逻辑测试",null),
                     menuitem209: commonLogic.appcommonhandle("表格加载",null),
+                    menuitem210: commonLogic.appcommonhandle("表单界面逻辑加载",null),
                     menuitem66: commonLogic.appcommonhandle("视图布局面板测试",null),
                     menuitem125: commonLogic.appcommonhandle("测试表单自定义布局多媒体",null),
                     menuitem126: commonLogic.appcommonhandle("自定义导航",null),

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

@@ -367,6 +367,7 @@ function getAppLocale(){
                     menuitem25: commonLogic.appcommonhandle("关系界面刷新主表单",null),
                     menuitem208: commonLogic.appcommonhandle("界面逻辑测试",null),
                     menuitem209: commonLogic.appcommonhandle("表格加载",null),
+                    menuitem210: commonLogic.appcommonhandle("表单界面逻辑加载",null),
                     menuitem66: commonLogic.appcommonhandle("视图布局面板测试",null),
                     menuitem125: commonLogic.appcommonhandle("测试表单自定义布局多媒体",null),
                     menuitem126: commonLogic.appcommonhandle("自定义导航",null),

app_Web/src/pages/sample/ibizbookform-load-custom-view/ibizbookform-load-custom-view.less

+.ibizbookform-load-custom-view {
+    display: block;
+}

app_Web/src/pages/sample/ibizbookform-load-custom-view/ibizbookform-load-custom-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import IBIZBOOKFormLoadCustomViewBase from './ibizbookform-load-custom-view-base.vue';
+
+import view_form from '@widgets/ibizbook/main-form/main-form.vue';
+@Component({
+    components: {
+        view_form, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class IBIZBOOKFormLoadCustomView extends IBIZBOOKFormLoadCustomViewBase {
+
+}
+</script>
\ No newline at end of file

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

@@ -105,6 +105,7 @@ export const PageComponents = {
         Vue.component('ibizbookusr4-edit-view', () => import('@pages/sample/ibizbookusr4-edit-view/ibizbookusr4-edit-view.vue'));
         Vue.component('ibizorder-detail-usr3-edit-view', () => import('@pages/sample/ibizorder-detail-usr3-edit-view/ibizorder-detail-usr3-edit-view.vue'));
         Vue.component('ibizbookgrid-load-custom-view', () => import('@pages/sample/ibizbookgrid-load-custom-view/ibizbookgrid-load-custom-view.vue'));
+        Vue.component('ibizbookform-load-custom-view', () => import('@pages/sample/ibizbookform-load-custom-view/ibizbookform-load-custom-view.vue'));
         Vue.component('ibizcustomer-media-test-edit-view', () => import('@pages/sample/ibizcustomer-media-test-edit-view/ibizcustomer-media-test-edit-view.vue'));
         Vue.component('ibizorder-test-custom-layout-panel-grid-exp-view', () => import('@pages/sample/ibizorder-test-custom-layout-panel-grid-exp-view/ibizorder-test-custom-layout-panel-grid-exp-view.vue'));
         Vue.component('ibizbookusr5-list-view', () => import('@pages/sample/ibizbookusr5-list-view/ibizbookusr5-list-view.vue'));

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

@@ -1623,6 +1623,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/sample/ibizbookgrid-load-custom-view/ibizbookgrid-load-custom-view.vue'),
                 },
+                {
+                    path: 'ibizbooks/:ibizbook?/formloadcustomview/:formloadcustomview?',
+                    meta: {
+                        caption: 'entities.ibizbook.views.formloadcustomview.caption',
+                        info:'',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                            { pathName: 'formloadcustomview', parameterName: 'formloadcustomview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sample/ibizbookform-load-custom-view/ibizbookform-load-custom-view.vue'),
+                },
                 {
                     path: 'ibizcustomers/:ibizcustomer?/mediatesteditview/:mediatesteditview?',
                     meta: {
@@ -3744,6 +3758,19 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizorder-sf2-edit-view/ibizorder-sf2-edit-view.vue'),
     },
+    {
+        path: '/ibizbooks/:ibizbook?/formloadcustomview/:formloadcustomview?',
+        meta: {
+            caption: 'entities.ibizbook.views.formloadcustomview.caption',
+            info:'',
+            parameters: [
+                { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                { pathName: 'formloadcustomview', parameterName: 'formloadcustomview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizbookform-load-custom-view/ibizbookform-load-custom-view.vue'),
+    },
     {
         path: '/ibizuniproducts/:ibizuniproduct?/sgridview_layout/:sgridview_layout?',
         meta: {

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

@@ -496,6 +496,19 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizorder-sf2-edit-view/ibizorder-sf2-edit-view.vue'),
     },
+    {
+        path: '/ibizbooks/:ibizbook?/formloadcustomview/:formloadcustomview?',
+        meta: {
+            caption: 'entities.ibizbook.views.formloadcustomview.caption',
+            info:'',
+            parameters: [
+                { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                { pathName: 'formloadcustomview', parameterName: 'formloadcustomview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizbookform-load-custom-view/ibizbookform-load-custom-view.vue'),
+    },
     {
         path: '/ibizuniproducts/:ibizuniproduct?/sgridview_layout/:sgridview_layout?',
         meta: {

app_Web/src/pages/ungroup/app-login-view/app-login-view.less

 .app-login-view {
     display: block;
 }
+.greenToolBar {color:white !important;background-color:rgba(0, 166, 90, 0.7) !important;}
+
+.deepskyblueToolBar {color:white !important;background-color:#108cee !important;}
+.redToolBar {color:white;background-color:red;}

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

@@ -337,6 +337,15 @@ export const viewstate: any = {
                 '6bc6e690dc5abfc6d89703e4459c785c',
             ],
         },
+        {
+            viewtag: '1C3D71C7-D5B8-4937-89F7-F822EA1629F4',
+            viewmodule: 'Sample',
+            viewname: 'IBIZBOOKFormLoadCustomView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: '1e5f6384a69035a45e28c2552fd485bc',
             viewmodule: 'Sample',
@@ -895,6 +904,7 @@ export const viewstate: any = {
                 'f0e584392d060bfef6ad4cec29f73d0d',
                 'd1e103c50de1fa941638bec77683936c',
                 '05879876-B0D0-4102-991F-61A0C4608489',
+                '1C3D71C7-D5B8-4937-89F7-F822EA1629F4',
                 '7ce3aaf69c0b882631428087b7db6464',
                 '38b0b453d423e0772822db6be4f02505',
                 '2D42F3B7-3267-4276-9120-10F2D81E35AF',

app_Web/src/uiservice/ibizbook/custom-edit-ui-logic-base.ts

@@ -34,11 +34,6 @@ export default class CustomEditUILogicBase {
             default: true,
             entityParam: true,
         },
-        {
-            name: '表格数据',
-            codeName: 'gridData',
-            entityListParam: true,
-        },
         {
             name: '当前表格部件',
             codeName: 'grid',
@@ -49,6 +44,11 @@ export default class CustomEditUILogicBase {
             codeName: 'view',
             activeViewParam: true,
         },
+        {
+            name: '表格数据',
+            codeName: 'gridData',
+            entityListParam: true,
+        },
         {
             name: '当前容器',
             codeName: 'currentContainer',
@@ -156,33 +156,6 @@ export default class CustomEditUILogicBase {
         await this.execute_deuiaction1_node(actionContext);
     }
     
-    /**
-     * 结束
-     *
-     * @param {UIActionContext} actionContext 界面逻辑上下文
-     * @memberof CustomEditUILogicBase
-     */
-    protected async execute_end1_node(actionContext: UIActionContext) {
-        const strReturnType: string = 'NULLVALUE';
-        if (Object.is(strReturnType, LogicReturnType.NONEVALUE) || Object.is(strReturnType, LogicReturnType.NULLVALUE)) {
-            actionContext.setResult(null);
-        } else if (Object.is(strReturnType, LogicReturnType.SRCVALUE)) {
-            actionContext.setResult('');
-        } else if (Object.is(strReturnType, LogicReturnType.BREAK)) {
-            actionContext.setResult(LogicReturnType.BREAK);
-        } else if (Object.is(strReturnType, LogicReturnType.LOGICPARAM) || Object.is(strReturnType, LogicReturnType.LOGICPARAMFIELD)) {
-            const returnParam = actionContext.getParam('');
-            if (Object.is(strReturnType, LogicReturnType.LOGICPARAM)) {
-                actionContext.setResult(returnParam.getReal());
-            } else {
-                actionContext.setResult(returnParam.get(''));
-            }
-        } else {
-            throw new Error(`无法识别的返回值类型${strReturnType}`);
-        }
-        console.log('已完成执行 结束 节点');
-    }
-    
     /**
      * 绑定表格
      *
@@ -217,14 +190,14 @@ export default class CustomEditUILogicBase {
      * @memberof CustomEditUILogicBase
      */
     protected async execute_deuiaction1_node(actionContext: UIActionContext) {
-        const data = actionContext.getParam('SA.SRFDA.PS.Core.DataEntity.Logic.PSDEUILogicParamImpl@10fcfbc4.codeName');
+        const data = actionContext.getParam('gridData').getReal();
         const { context, viewparams } = actionContext;
         const additionalParam = actionContext.additionalParam;
         const uiService = await window.uiServiceRegister.getService('ibizbook');
-        if (uiService && uiService['IBIZBOOK_Edit'] && uiService['IBIZBOOK_Edit'] instanceof Function) {
+        if (uiService && uiService['IBIZBOOK_openCustomEditView'] && uiService['IBIZBOOK_openCustomEditView'] instanceof Function) {
             const xData = actionContext.activeCtrlParamName ? actionContext.getParam(actionContext.activeCtrlParamName).getReal() : additionalParam && additionalParam.xData ? additionalParam.xData : {};
             const container = actionContext.activeContainerParamName ? actionContext.getParam(actionContext.activeContainerParamName).getReal() : additionalParam && additionalParam.actioncontext ? additionalParam.actioncontext : {};
-            const result = await uiService['IBIZBOOK_Edit'](
+            const result = await uiService['IBIZBOOK_openCustomEditView'](
                 Object.prototype.toString.call(data) === '[object Array]' ? data : [data],
                 context,
                 viewparams,
@@ -242,5 +215,32 @@ export default class CustomEditUILogicBase {
         await this.execute_end1_node(actionContext);
     }
     
+    /**
+     * 结束
+     *
+     * @param {UIActionContext} actionContext 界面逻辑上下文
+     * @memberof CustomEditUILogicBase
+     */
+    protected async execute_end1_node(actionContext: UIActionContext) {
+        const strReturnType: string = 'NULLVALUE';
+        if (Object.is(strReturnType, LogicReturnType.NONEVALUE) || Object.is(strReturnType, LogicReturnType.NULLVALUE)) {
+            actionContext.setResult(null);
+        } else if (Object.is(strReturnType, LogicReturnType.SRCVALUE)) {
+            actionContext.setResult('');
+        } else if (Object.is(strReturnType, LogicReturnType.BREAK)) {
+            actionContext.setResult(LogicReturnType.BREAK);
+        } else if (Object.is(strReturnType, LogicReturnType.LOGICPARAM) || Object.is(strReturnType, LogicReturnType.LOGICPARAMFIELD)) {
+            const returnParam = actionContext.getParam('');
+            if (Object.is(strReturnType, LogicReturnType.LOGICPARAM)) {
+                actionContext.setResult(returnParam.getReal());
+            } else {
+                actionContext.setResult(returnParam.get(''));
+            }
+        } else {
+            throw new Error(`无法识别的返回值类型${strReturnType}`);
+        }
+        console.log('已完成执行 结束 节点');
+    }
+    
 
 }
\ No newline at end of file

app_Web/src/uiservice/ibizbook/custom-view-form-load-ui-logic-base.ts

@@ -28,16 +28,16 @@ export default class CustomViewFormLoadUILogicBase {
      * @memberof CustomViewFormLoadUILogicBase
      */
     protected logicParams: any[] = [
-        {
-            name: '当前视图参数',
-            codeName: 'viewParam',
-            viewNavDataParam: true,
-        },
         {
             name: '表单部件',
             codeName: 'form',
             ctrlParam: true,
         },
+        {
+            name: '上下文',
+            codeName: 'context',
+            navContextParam: true,
+        },
         {
             name: '传入变量',
             codeName: 'Default',
@@ -49,6 +49,11 @@ export default class CustomViewFormLoadUILogicBase {
             codeName: 'view',
             activeViewParam: true,
         },
+        {
+            name: '当前视图参数',
+            codeName: 'viewParam',
+            viewNavDataParam: true,
+        },
     ];
 
     /**
@@ -124,6 +129,23 @@ export default class CustomViewFormLoadUILogicBase {
         await this.execute_bindparam1_node(actionContext);
     }
     
+    /**
+     * 绑定表单
+     *
+     * @param {UIActionContext} actionContext 界面逻辑上下文
+     * @memberof CustomViewFormLoadUILogicBase
+     */
+    protected async execute_bindparam1_node(actionContext: UIActionContext) {
+        throw new Error('操作参数或者源参数缺失!');
+        console.log('已完成执行 绑定表单 节点');
+        if(Verify.testCond(this.getCondParam(actionContext, 'context', 'ibizbook'), 'ISNOTNULL', '')) {
+            await this.execute_viewctrlinvoke1_node(actionContext);
+        }
+        if(Verify.testCond(this.getCondParam(actionContext, 'context', 'ibizbook'), 'EQ', '')) {
+            await this.execute_viewctrlinvoke2_node(actionContext);
+        }
+    }
+    
     /**
      * 调用load
      *
@@ -213,18 +235,5 @@ export default class CustomViewFormLoadUILogicBase {
         await this.execute_end1_node(actionContext);
     }
     
-    /**
-     * 绑定表单
-     *
-     * @param {UIActionContext} actionContext 界面逻辑上下文
-     * @memberof CustomViewFormLoadUILogicBase
-     */
-    protected async execute_bindparam1_node(actionContext: UIActionContext) {
-        throw new Error('操作参数或者源参数缺失!');
-        console.log('已完成执行 绑定表单 节点');
-        await this.execute_viewctrlinvoke1_node(actionContext);
-        await this.execute_viewctrlinvoke2_node(actionContext);
-    }
-    
 
 }
\ No newline at end of file

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

@@ -337,6 +337,55 @@ export default class IBIZBOOKUIServiceBase extends UIService {
         openIndexViewTab(data);
     }
 
+        /**
+     * 打开自定义编辑视图
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     * @memberof IBIZBOOKUIService
+     */
+    public async IBIZBOOK_openCustomEditView(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+    
+        let data: any = {};
+        let parentContext:any = {};
+        let parentViewParam:any = {};
+        const _this: any = actionContext;
+        const _args: any[] = Util.deepCopy(args);
+        const actionTarget: string | null = 'SINGLEKEY';
+        Object.assign(context, { ibizbook: '%ibizbook%' });
+        Object.assign(params, { ibizbookid: '%ibizbook%' });
+        Object.assign(params, { ibizbookname: '%ibizbookname%' });
+        if(_this.context){
+            parentContext = _this.context;
+        }
+        if(_this.viewparams){
+            parentViewParam = _this.viewparams;
+        }
+        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
+        context = Object.assign({},actionContext.context,context);
+        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
+        Object.assign(data,parentObj);
+        Object.assign(context,parentObj);
+        let deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+            { pathName: 'formloadcustomview', parameterName: 'formloadcustomview' },
+        ];
+        const openIndexViewTab = (data: any) => {
+            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
+            actionContext.$router.push(routePath);
+            return null;
+        }
+        openIndexViewTab(data);
+    }
+
         /**
      * 打开文档
      *

app_Web/src/uiservice/ibizorder/open-yu-que-ui-logic-base.ts

@@ -143,7 +143,7 @@ export default class OpenYuQueUILogicBase {
      * @memberof OpenYuQueUILogicBase
      */
     protected async execute_deuiaction1_node(actionContext: UIActionContext) {
-        const data = actionContext.getParam('SA.SRFDA.PS.Core.DataEntity.Logic.PSDEUILogicParamImpl@113fdae3.codeName');
+        const data = actionContext.getParam('Default').getReal();
         const { context, viewparams } = actionContext;
         const additionalParam = actionContext.additionalParam;
         const uiService = await window.uiServiceRegister.getService('ibizorder');

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

@@ -924,6 +924,9 @@ export default class MainMenuBase extends Vue implements ControlInterface {
                 case 'UsrAppFunc1109902486': 
                     this.clickUsrAppFunc1109902486(item);
                     return;
+                case 'UsrAppFunc1109992105': 
+                    this.clickUsrAppFunc1109992105(item);
+                    return;
                 case 'AppFunc100': 
                     this.clickAppFunc100(item);
                     return;
@@ -3474,6 +3477,29 @@ export default class MainMenuBase extends Vue implements ControlInterface {
         })
     }
     
+    /**
+     * 表单界面逻辑加载
+     *
+     * @param {*} [item={}]
+     * @memberof MainMenu
+     */
+    public clickUsrAppFunc1109992105(item: any = {}) {
+        const viewparam: any = {};
+        Object.assign(viewparam, {});
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+            { pathName: 'formloadcustomview', parameterName: 'formloadcustomview' },
+        ];
+        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

@@ -598,7 +598,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 };
@@ -634,7 +634,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

@@ -671,7 +671,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: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -707,7 +707,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: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

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

@@ -1274,7 +1274,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
      */
     public load(opt: any = {}): void {
         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 };
@@ -1309,7 +1309,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
      */
     public loadDraft(opt: any = {}): void {
         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 } ;
@@ -1370,7 +1370,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});
@@ -1478,7 +1478,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});
@@ -1552,7 +1552,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

@@ -1377,7 +1377,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         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 };
@@ -1412,7 +1412,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {}): void {
         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 } ;
@@ -1473,7 +1473,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});
@@ -1581,7 +1581,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});
@@ -1655,7 +1655,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];
@@ -2072,4 +2072,5 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
 
 <style lang='less'>
 @import './guide-view-form-form.less';
+</style>uide-view-form-form.less';
 </style>
\ No newline at end of file

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

@@ -657,7 +657,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, isReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -736,7 +736,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: 'IBIZBOOKUsr4DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -845,7 +845,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: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (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);
@@ -853,7 +853,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: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (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

@@ -69,11 +69,6 @@ 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

@@ -299,7 +299,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) {
@@ -421,6 +421,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;
     
     /**
     * 是否嵌入关系界面
@@ -953,7 +967,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: '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(pageReset){
@@ -1048,7 +1062,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: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1154,7 +1168,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){
@@ -2071,7 +2085,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});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -2079,7 +2093,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});
                         if(item.ibizorder){
@@ -2146,7 +2160,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: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

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

@@ -104,6 +104,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/PSSYSAPPS/Web/PSAPPINDEXVIEWS/index.json

@@ -3544,6 +3544,24 @@
               "layout" : "TABLE_24COL"
             },
             "tooltip" : "表格加载"
+          }, {
+            "accUserMode" : 2,
+            "caption" : "表单界面逻辑加载",
+            "itemType" : "MENUITEM",
+            "name" : "menuitem210",
+            "getPSAppFunc" : {
+              "modelref" : true,
+              "id" : "UsrAppFunc1109992105"
+            },
+            "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

@@ -1984,6 +1984,16 @@
           "id" : "UsrAppFunc1109902486"
         },
         "tooltip" : "表格加载"
+      }, {
+        "accUserMode" : 2,
+        "caption" : "表单界面逻辑加载",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem210",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "UsrAppFunc1109992105"
+        },
+        "tooltip" : "表单界面逻辑加载"
       } ],
       "tooltip" : "界面逻辑测试"
     } ],

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

@@ -3532,6 +3532,16 @@
       "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKUsr6GridView.json",
       "viewType" : "DEGRIDVIEW"
     }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "UsrAppFunc1109992105",
+    "name" : "表单界面逻辑加载",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKFormLoadCustomView.json",
+      "viewType" : "DECUSTOMVIEW"
+    }
   }, {
     "appFuncType" : "APPVIEW",
     "codeName" : "AppFunc9",
@@ -18536,6 +18546,24 @@
                   "layout" : "TABLE_24COL"
                 },
                 "tooltip" : "表格加载"
+              }, {
+                "accUserMode" : 2,
+                "caption" : "表单界面逻辑加载",
+                "itemType" : "MENUITEM",
+                "name" : "menuitem210",
+                "getPSAppFunc" : {
+                  "modelref" : true,
+                  "id" : "UsrAppFunc1109992105"
+                },
+                "getPSLayout" : {
+                  "columnCount" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "tooltip" : "表单界面逻辑加载"
               } ],
               "getPSLayout" : {
                 "columnCount" : 24,

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

@@ -172,7 +172,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-563-7">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-573-7">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>