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

app_Web/src/pages/sample/ibizsample0003-stab-exp-view-layout/ibizsample0003-stab-exp-view-layout-base.vue

@@ -13,6 +13,11 @@
         </template>
         <template #container2>
     <app-simpleflex-container name="container2" :layoutModelDetails="layoutModelDetails">
+        <template #>
+        <app-ctrl-pos name="" :layoutModelDetails="layoutModelDetails">
+                <span>部件占位</span>
+        </app-ctrl-pos>
+        </template>
     </app-simpleflex-container>
         </template>
     </app-simpleflex-container>
@@ -21,10 +26,8 @@
     <app-scroll-container name="container_scroll1" :layoutModelDetails="layoutModelDetails">
         <template #container_scroll_main1>
     <app-scroll-container name="container_scroll_main1" :layoutModelDetails="layoutModelDetails">
-        <template #tabviewpanel>
-        <app-ctrl-pos name="tabviewpanel" :layoutModelDetails="layoutModelDetails">
-                <span>部件占位tabviewpanel</span>
-        </app-ctrl-pos>
+        <template #nav_pos1>
+        <app-nav-pos name="nav_pos1" :layoutModelDetails="layoutModelDetails" :navData="layoutModelDetails['nav_pos1'].navData"/>
         </template>
     </app-scroll-container>
         </template>
@@ -290,10 +293,11 @@ export default class IBIZSample0003STabExpView_layoutBase extends Vue {
     public layoutItems:any = {
         view_pagecaption:{ name: 'view_pagecaption', caption: '页面标题', isShowCaption: false, sysCss: '', itemType: 'FIELD', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , fieldState: '0', predefinedType: 'VIEW_PAGECAPTION', dataItemName:'', },
         container1:{ name: 'container1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:3, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['view_pagecaption'] , dataRegionType: 'INHERIT' },
-        container2:{ name: 'container2', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:9, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:[] , dataRegionType: 'INHERIT' },
+        :{ name: '', caption: '工具栏', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container2', panel: this },
+        container2:{ name: 'container2', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:9, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:[''] , dataRegionType: 'INHERIT' },
         container_grid1:{ name: 'container_grid1', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['container1','container2'] , dataRegionType: 'INHERIT' },
-        tabviewpanel:{ name: 'tabviewpanel', caption: '分页视图面板', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_main1', panel: this },
-        container_scroll_main1:{ name: 'container_scroll_main1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['tabviewpanel'] , dataRegionType: 'INHERIT' },
+        nav_pos1:{ name: 'nav_pos1', caption: '导航区占位', isShowCaption: true, sysCss: '', itemType: 'RAWITEM', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_main1', panel: this , viewType: 'DETABEXPVIEW', predefinedType: 'NAV_POS', contentType: '', contentStyle: '', rawContent: '', htmlContent: '', },
+        container_scroll_main1:{ name: 'container_scroll_main1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['nav_pos1'] , dataRegionType: 'INHERIT' },
         tabexppanel:{ name: 'tabexppanel', caption: '分页导航面板', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_header1', panel: this },
         container_scroll_header1:{ name: 'container_scroll_header1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'NORTH', layoutHeight:80, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['tabexppanel'] , dataRegionType: 'INHERIT' },
         container_scroll1:{ name: 'container_scroll1', caption: '滚动条容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['container_scroll_main1','container_scroll_header1'] , dataRegionType: 'INHERIT' },

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

@@ -592,7 +592,6 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '1ec7069b18d0c9b18fb55c839b2e0822',
                 'cbf09cbd2a5b6c65479dec84af3fe874',
                 '2e7cbc7793bdd49ea744b56e6e14571c',
             ],

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

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

app_Web/src/widgets/ibizbook/lnternal-func-list-list/lnternal-func-list-list-base.vue

@@ -46,11 +46,11 @@
             <span class="quick-toolbar">
                             <div class='toolbar-container'>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="usr4listview_layoutlist_quicktoolbarModels.deuiaction1.visabled" :disabled="usr4listview_layoutlist_quicktoolbarModels.deuiaction1.disabled" class='' v-loading:i-button @click="list_quicktoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="listviewlist_quicktoolbarModels.deuiaction1.visabled" :disabled="listviewlist_quicktoolbarModels.deuiaction1.disabled" class='' v-loading:i-button @click="list_quicktoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-file-text-o'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_quicktoolbar_toolbar.deuiaction1.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_quicktoolbar_toolbar.deuiaction1.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_quicktoolbar_toolbar.deuiaction1.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_quicktoolbar_toolbar.deuiaction1.tip')}}</div>
                 </tooltip>
             </div>
             </span>
@@ -61,18 +61,18 @@
         <span class="batch-toolbar">
                     <div class='toolbar-container'>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="usr4listview_layoutlist_batchtoolbarModels.deuiaction1.visabled" :disabled="usr4listview_layoutlist_batchtoolbarModels.deuiaction1.disabled" class='' v-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="listviewlist_batchtoolbarModels.deuiaction1.visabled" :disabled="listviewlist_batchtoolbarModels.deuiaction1.disabled" class='' v-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-edit'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
                 </tooltip>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="usr4listview_layoutlist_batchtoolbarModels.deuiaction2.visabled" :disabled="usr4listview_layoutlist_batchtoolbarModels.deuiaction2.disabled" class='' v-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
+                        <i-button v-show="listviewlist_batchtoolbarModels.deuiaction2.visabled" :disabled="listviewlist_batchtoolbarModels.deuiaction2.disabled" class='' v-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
                             <i class='fa fa-remove'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
                 </tooltip>
             </div>
         </span>
@@ -354,7 +354,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKUsr4ListView_layoutBase
+     * @memberof IBIZBOOKListViewBase
      */
     public New(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
          const _this: any = this;
@@ -374,7 +374,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKUsr4ListView_layoutBase
+     * @memberof IBIZBOOKListViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -400,7 +400,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKUsr4ListView_layoutBase
+     * @memberof IBIZBOOKListViewBase
      */
     public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
@@ -575,9 +575,9 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKUsr4ListView_layout
+     * @memberof IBIZBOOKListView
      */
-    public usr4listview_layoutlist_quicktoolbarModels: any = {
+    public listviewlist_quicktoolbarModels: any = {
         deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
     };
@@ -587,9 +587,9 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKUsr4ListView_layout
+     * @memberof IBIZBOOKListView
      */
-    public usr4listview_layoutlist_batchtoolbarModels: any = {
+    public listviewlist_batchtoolbarModels: any = {
         deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
         deuiaction2: { name: 'deuiaction2', actiontarget: 'NONE', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
@@ -812,7 +812,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      */
     public load(opt: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }        
         const arg: any = {...opt};
@@ -928,7 +928,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.removeAction') as string) });
             return;
         }
         if (datas.length === 0) {
@@ -1023,7 +1023,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (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);
@@ -1031,7 +1031,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

app_Web/src/widgets/ibizbook/main-form/main-form-base.vue

@@ -1800,7 +1800,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1835,7 +1835,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {}): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1897,7 +1897,7 @@ export default class MainBase 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: 'IBIZBOOKOptionView' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -2005,7 +2005,7 @@ export default class MainBase 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: 'IBIZBOOKOptionView' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg,{viewparams:this.viewparams});
@@ -2082,7 +2082,7 @@ export default class MainBase 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: 'IBIZBOOKOptionView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView_layout' + (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

@@ -291,7 +291,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) {
@@ -413,6 +413,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;
     
     /**
     * 是否嵌入关系界面
@@ -945,7 +959,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){
@@ -1040,7 +1054,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[] = [];
@@ -1146,7 +1160,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){
@@ -2063,7 +2077,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);
@@ -2071,7 +2085,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){
@@ -2138,7 +2152,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',

app_Web/src/widgets/ibizsample0003/stab-exp-view-layouttabexppanel-tabexppanel/stab-exp-view-layouttabexppanel-tabexppanel-base.vue

@@ -2,31 +2,7 @@
 <template>
   <div class='tabviewpanel' style="height:100%;">
         <tabs :value="activiedTabViewPanel" :animated="false" class='tabexppanel' name='stabexpview_layouttabexppanel' @on-click="tabPanelClick">
-        <tab-pane :index="0" name='tabviewpanel' tab='stabexpview_layouttabexppanel' class=''  v-if="authResourceObject['tabviewpanel'].visabled"
-            :label="(h) =>{
-                return h('div', [
-                    h('span', '统一产品'),
-                    h('Badge', {
-                        props: {
-                            count: undefined,
-                            type: 'primary'
-                        }
-                    })
-                ])
-            }" >
-            <view_tabviewpanel 
-    :viewState="viewState"  
-    :viewparams="JSON.parse(JSON.stringify(viewparams))" 
-    :context="JSON.parse(JSON.stringify(context))" 
-    :activeData="JSON.stringify(activeData)"
-    v-if="isInit.tabviewpanel"
-    name="tabviewpanel"  
-    ref='tabviewpanel'
-    @viewpanelDatasChange = "tabViewPanelDatasChange"
-    @closeview="closeView($event)">
-</view_tabviewpanel>
-        </tab-pane>
-        <tab-pane :index="1" name='tabviewpanel3' tab='stabexpview_layouttabexppanel' class=''  v-if="authResourceObject['tabviewpanel3'].visabled"
+        <tab-pane :index="0" name='tabviewpanel3' tab='stabexpview_layouttabexppanel' class=''  v-if="authResourceObject['tabviewpanel3'].visabled"
             :label="(h) =>{
                 return h('div', [
                     h('span', '软件'),
@@ -50,7 +26,7 @@
     @closeview="closeView($event)">
 </view_tabviewpanel3>
         </tab-pane>
-        <tab-pane :index="2" name='tabviewpanel2' tab='stabexpview_layouttabexppanel' class=''  v-if="authResourceObject['tabviewpanel2'].visabled"
+        <tab-pane :index="1" name='tabviewpanel2' tab='stabexpview_layouttabexppanel' class=''  v-if="authResourceObject['tabviewpanel2'].visabled"
             :label="(h) =>{
                 return h('div', [
                     h('span', '硬件'),
@@ -242,8 +218,7 @@ export default class STabExpView_layouttabexppanelBase extends Vue implements Co
      * @memberof STabExpView_layouttabexppanelBase
      */
     public isInit: any = {
-        tabviewpanel:  true ,
-        tabviewpanel3:  false ,
+        tabviewpanel3:  true ,
         tabviewpanel2:  false ,
     }
 
@@ -312,7 +287,7 @@ export default class STabExpView_layouttabexppanelBase extends Vue implements Co
      * @type {*}
      * @memberof STabExpView_layouttabexppanelBase
      */
-    public authResourceObject:any = {'tabviewpanel':{resourcetag:null,visabled: true,disabled: false},'tabviewpanel3':{resourcetag:null,visabled: true,disabled: false},'tabviewpanel2':{resourcetag:null,visabled: true,disabled: false}};
+    public authResourceObject:any = {'tabviewpanel3':{resourcetag:null,visabled: true,disabled: false},'tabviewpanel2':{resourcetag:null,visabled: true,disabled: false}};
 
     /**
      * 被激活的分页面板
@@ -320,7 +295,7 @@ export default class STabExpView_layouttabexppanelBase extends Vue implements Co
      * @type {string}
      * @memberof STabExpView_layouttabexppanelBase
      */
-    public activiedTabViewPanel: string = 'tabviewpanel';
+    public activiedTabViewPanel: string = 'tabviewpanel3';
 
     /**
      * 计算分页面板权限

app_Web/src/widgets/ibizsample0003/stab-exp-view-layouttabexppanel-tabexppanel/stab-exp-view-layouttabexppanel-tabexppanel.vue

 <script lang='tsx'>
 import { Component } from 'vue-property-decorator';
 import STabExpView_layouttabexppanelBase from './stab-exp-view-layouttabexppanel-tabexppanel-base.vue';
-import view_tabviewpanel from '@widgets/ibizsample0003/stab-exp-view-layouttabviewpanel-tabviewpanel/stab-exp-view-layouttabviewpanel-tabviewpanel.vue';
 import view_tabviewpanel3 from '@widgets/ibizsample0003/stab-exp-view-layouttabviewpanel3-tabviewpanel/stab-exp-view-layouttabviewpanel3-tabviewpanel.vue';
 import view_tabviewpanel2 from '@widgets/ibizsample0003/stab-exp-view-layouttabviewpanel2-tabviewpanel/stab-exp-view-layouttabviewpanel2-tabviewpanel.vue';
 
  
 @Component({
     components: {
-        view_tabviewpanel, 
         view_tabviewpanel3, 
         view_tabviewpanel2, 
          

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

@@ -32,40 +32,40 @@
     "getPSAppViewLogics" : [ {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "layoutpanel_button_openview2_click",
+      "name" : "layoutpanel_button_openview1_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "layoutpanel_button_openview2"
+        "id" : "layoutpanel_button_openview1"
       }
     }, {
       "logicTrigger" : "CUSTOM",
       "logicType" : "APPVIEWUIACTION",
-      "name" : "layoutpanel_button_openview1_click",
+      "name" : "layoutpanel_button_openview2_click",
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "layoutpanel_button_openview1"
+        "id" : "layoutpanel_button_openview2"
       }
     } ],
     "getPSAppViewUIActions" : [ {
-      "name" : "layoutpanel_button_openview2",
+      "name" : "layoutpanel_button_openview1",
       "getPSUIAction" : {
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
         },
         "modelref" : true,
-        "id" : "panel_Usr1104773172_button_openview2_click"
+        "id" : "panel_Usr1104773172_button_openview1_click"
       },
       "xDataControlName" : "layoutpanel"
     }, {
-      "name" : "layoutpanel_button_openview1",
+      "name" : "layoutpanel_button_openview2",
       "getPSUIAction" : {
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
         },
         "modelref" : true,
-        "id" : "panel_Usr1104773172_button_openview1_click"
+        "id" : "panel_Usr1104773172_button_openview2_click"
       },
       "xDataControlName" : "layoutpanel"
     } ],
@@ -87,99 +87,142 @@
         "layout" : "FLEX"
       },
       "getPSPanelItems" : [ {
-        "caption" : "FORM",
-        "itemStyle" : "DEFAULT",
-        "itemType" : "CTRLPOS",
-        "name" : "form",
-        "getPSLayoutPos" : {
-          "grow" : -1,
-          "heightMode" : "FULL",
-          "layout" : "FLEX"
-        },
-        "showCaption" : true
-      }, {
-        "caption" : "容器",
-        "contentHeight" : 60.0,
-        "height" : 60.0,
+        "caption" : "滚动条容器",
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container1",
+        "name" : "container_scroll1",
         "getPSLayout" : {
-          "align" : "flex-end",
-          "dir" : "row",
-          "layout" : "FLEX"
+          "layout" : "BORDER"
         },
         "getPSLayoutPos" : {
           "grow" : -1,
-          "height" : 60,
-          "heightMode" : "PX",
           "layout" : "FLEX"
         },
         "getPSPanelItems" : [ {
-          "actionType" : "UIACTION",
-          "buttonStyle" : "DEFAULT",
-          "caption" : "确认",
+          "caption" : "面板容器",
           "itemStyle" : "DEFAULT",
-          "itemType" : "BUTTON",
-          "name" : "button_openview2",
-          "getPSAppViewUIAction" : {
-            "modelref" : true,
-            "id" : "layoutpanel_button_openview2"
+          "itemType" : "CONTAINER",
+          "name" : "container_scroll_main1",
+          "getPSLayout" : {
+            "layout" : "BORDER"
           },
           "getPSLayoutPos" : {
-            "grow" : -1,
-            "heightMode" : "FULL",
-            "layout" : "FLEX"
+            "layout" : "BORDER",
+            "layoutPos" : "CENTER"
           },
-          "getPSUIAction" : {
-            "caption" : "确认",
-            "codeName" : "panel_Usr1104773172_button_openview2_click",
-            "fullCodeName" : "panel_Usr1104773172_button_openview2_click",
-            "name" : "确认",
-            "getPSAppDataEntity" : {
-              "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
-            },
-            "predefinedType" : "DATA_SAVECHANGES",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "panel_Usr1104773172_button_openview2_click",
-            "uIActionType" : "DEUIACTION"
-          },
-          "tooltip" : "确认",
+          "getPSPanelItems" : [ {
+            "caption" : "FORM",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CTRLPOS",
+            "name" : "form",
+            "getPSLayoutPos" : {
+              "heightMode" : "FULL",
+              "layout" : "BORDER",
+              "layoutPos" : "CENTER"
+            },
+            "showCaption" : true
+          } ],
           "showCaption" : true
         }, {
-          "actionType" : "UIACTION",
-          "buttonStyle" : "DEFAULT",
-          "caption" : "取消",
+          "caption" : "面板容器",
+          "contentHeight" : 60.0,
+          "height" : 60.0,
           "itemStyle" : "DEFAULT",
-          "itemType" : "BUTTON",
-          "name" : "button_openview1",
-          "getPSAppViewUIAction" : {
-            "modelref" : true,
-            "id" : "layoutpanel_button_openview1"
+          "itemType" : "CONTAINER",
+          "name" : "container_scroll_bottom1",
+          "getPSLayout" : {
+            "layout" : "BORDER"
           },
           "getPSLayoutPos" : {
-            "grow" : -1,
-            "heightMode" : "FULL",
-            "layout" : "FLEX"
-          },
-          "getPSUIAction" : {
-            "caption" : "取消",
-            "codeName" : "panel_Usr1104773172_button_openview1_click",
-            "fullCodeName" : "panel_Usr1104773172_button_openview1_click",
-            "name" : "取消",
-            "getPSAppDataEntity" : {
-              "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
-            },
-            "predefinedType" : "DATA_CANCELCHANGES",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "panel_Usr1104773172_button_openview1_click",
-            "uIActionType" : "DEUIACTION"
+            "height" : 60,
+            "heightMode" : "PX",
+            "layout" : "BORDER",
+            "layoutPos" : "SOUTH"
           },
-          "tooltip" : "取消",
+          "getPSPanelItems" : [ {
+            "caption" : "容器",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CONTAINER",
+            "name" : "container1",
+            "getPSLayout" : {
+              "align" : "flex-end",
+              "dir" : "row",
+              "layout" : "FLEX"
+            },
+            "getPSLayoutPos" : {
+              "hAlignSelf" : "RIGHT",
+              "layout" : "BORDER",
+              "layoutPos" : "CENTER",
+              "vAlignSelf" : "MIDDLE"
+            },
+            "getPSPanelItems" : [ {
+              "actionType" : "UIACTION",
+              "buttonStyle" : "DEFAULT",
+              "caption" : "取消",
+              "itemStyle" : "DEFAULT",
+              "itemType" : "BUTTON",
+              "name" : "button_openview1",
+              "getPSAppViewUIAction" : {
+                "modelref" : true,
+                "id" : "layoutpanel_button_openview1"
+              },
+              "getPSLayoutPos" : {
+                "grow" : -1,
+                "heightMode" : "FULL",
+                "layout" : "FLEX"
+              },
+              "getPSUIAction" : {
+                "caption" : "取消",
+                "codeName" : "panel_Usr1104773172_button_openview1_click",
+                "fullCodeName" : "panel_Usr1104773172_button_openview1_click",
+                "name" : "取消",
+                "getPSAppDataEntity" : {
+                  "modelref" : true,
+                  "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
+                },
+                "predefinedType" : "DATA_CANCELCHANGES",
+                "timeout" : 60000,
+                "uIActionMode" : "SYS",
+                "uIActionTag" : "panel_Usr1104773172_button_openview1_click",
+                "uIActionType" : "DEUIACTION"
+              },
+              "tooltip" : "取消",
+              "showCaption" : true
+            }, {
+              "actionType" : "UIACTION",
+              "buttonStyle" : "DEFAULT",
+              "caption" : "确认",
+              "itemStyle" : "DEFAULT",
+              "itemType" : "BUTTON",
+              "name" : "button_openview2",
+              "getPSAppViewUIAction" : {
+                "modelref" : true,
+                "id" : "layoutpanel_button_openview2"
+              },
+              "getPSLayoutPos" : {
+                "grow" : -1,
+                "heightMode" : "FULL",
+                "layout" : "FLEX"
+              },
+              "getPSUIAction" : {
+                "caption" : "确认",
+                "codeName" : "panel_Usr1104773172_button_openview2_click",
+                "fullCodeName" : "panel_Usr1104773172_button_openview2_click",
+                "name" : "确认",
+                "getPSAppDataEntity" : {
+                  "modelref" : true,
+                  "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
+                },
+                "predefinedType" : "DATA_SAVECHANGES",
+                "timeout" : 60000,
+                "uIActionMode" : "SYS",
+                "uIActionTag" : "panel_Usr1104773172_button_openview2_click",
+                "uIActionType" : "DEUIACTION"
+              },
+              "tooltip" : "确认",
+              "showCaption" : true
+            } ]
+          } ],
           "showCaption" : true
         } ]
       } ]

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

@@ -172,7 +172,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-210-7">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-214-7">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -640,7 +640,7 @@
 
 
     <!--输出实体[IBIZSAMPLE0003]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0003-55-21">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0003-59-21">
         <createTable tableName="T_IBIZSAMPLE0003">
                 <column name="IBIZSAMPLE0003NAME" remarks="" type="VARCHAR(200)">
                 </column>

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

@@ -79,7 +79,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZSAMPLE0003]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0003-55-15" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0003-59-15" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZSAMPLE0003">
                <![CDATA[ SELECT t1.[CREATEDATE], t1.[CREATEMAN], t1.[FIELD01], t1.[IBIZSAMPLE0003ID], t1.[IBIZSAMPLE0003NAME], t1.[MEMO], t1.[PIBIZSAMPLE0003ID], t11.[IBIZSAMPLE0003NAME] AS [PIBIZSAMPLE0003NAME], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZSAMPLE0003] t1  LEFT JOIN T_IBIZSAMPLE0003 t11 ON t1.PIBIZSAMPLE0003ID = t11.IBIZSAMPLE0003ID  ]]>
          </createView>