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

app_Web/src/pages/sample/ibizcustomer-usr3-edit-view/ibizcustomer-usr3-edit-view-base.vue

@@ -170,25 +170,16 @@
         </template>
         <template #container_grid4>
     <app-simpleflex-container name="container_grid4" :layoutModelDetails="layoutModelDetails">
+        <template #container14>
+    <app-simpleflex-container name="container14" :layoutModelDetails="layoutModelDetails">
+    </app-simpleflex-container>
+        </template>
         <template #container15>
     <app-simpleflex-container name="container15" :layoutModelDetails="layoutModelDetails">
-        <template #view_pagecaption2>
-        <app-preset-caption name="view_pagecaption2" :layoutModelDetails="layoutModelDetails"> 按钮测试编辑视图 </app-preset-caption>
-        </template>
     </app-simpleflex-container>
         </template>
         <template #container13>
     <app-simpleflex-container name="container13" :layoutModelDetails="layoutModelDetails">
-        <template #view_pagecaption>
-        <app-preset-caption name="view_pagecaption" :layoutModelDetails="layoutModelDetails"> 按钮测试编辑视图 </app-preset-caption>
-        </template>
-    </app-simpleflex-container>
-        </template>
-        <template #container14>
-    <app-simpleflex-container name="container14" :layoutModelDetails="layoutModelDetails">
-        <template #view_pagecaption1>
-        <app-preset-caption name="view_pagecaption1" :layoutModelDetails="layoutModelDetails"> 按钮测试编辑视图 </app-preset-caption>
-        </template>
     </app-simpleflex-container>
         </template>
     </app-simpleflex-container>
@@ -505,13 +496,10 @@ export default class IBIZCustomerUsr3EditViewBase extends Vue {
         container11:{ name: 'container11', type: 'VIEWLAYOUT', 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_grid3', panel: this , details:[] , dataRegionType: 'INHERIT' },
         container12:{ name: 'container12', type: 'VIEWLAYOUT', 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_grid3', panel: this , details:[] , dataRegionType: 'INHERIT' },
         container_grid3:{ name: 'container_grid3', type: 'VIEWLAYOUT', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', 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 , details:['container9','container10','container11','container12'] , dataRegionType: 'INHERIT' },
-        view_pagecaption2:{ name: 'view_pagecaption2', type: 'VIEWLAYOUT', 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: 'container15', panel: this , required: false, fieldState: '0', predefinedType: 'VIEW_PAGECAPTION', renderMode: 'HEADING1', dataItemName:'', wrapMode:'', vAlign:'', hAlign:'', },
-        container15:{ name: 'container15', type: 'VIEWLAYOUT', 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: 'container_grid4', panel: this , details:['view_pagecaption2'] , dataRegionType: 'INHERIT' },
-        view_pagecaption:{ name: 'view_pagecaption', type: 'VIEWLAYOUT', 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: 'container13', panel: this , required: false, fieldState: '0', predefinedType: 'VIEW_PAGECAPTION', renderMode: 'HEADING1', dataItemName:'', wrapMode:'', vAlign:'', hAlign:'', },
-        container13:{ name: 'container13', type: 'VIEWLAYOUT', 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_grid4', panel: this , details:['view_pagecaption'] , dataRegionType: 'INHERIT' },
-        view_pagecaption1:{ name: 'view_pagecaption1', type: 'VIEWLAYOUT', 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: 'container14', panel: this , required: false, fieldState: '0', predefinedType: 'VIEW_PAGECAPTION', renderMode: 'HEADING1', dataItemName:'', wrapMode:'', vAlign:'', hAlign:'', },
-        container14:{ name: 'container14', type: 'VIEWLAYOUT', 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:6, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid4', panel: this , details:['view_pagecaption1'] , dataRegionType: 'INHERIT' },
-        container_grid4:{ name: 'container_grid4', type: 'VIEWLAYOUT', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', 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 , details:['container15','container13','container14'] , dataRegionType: 'INHERIT' },
+        container14:{ name: 'container14', type: 'VIEWLAYOUT', 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:6, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid4', panel: this , details:[] , dataRegionType: 'INHERIT' },
+        container15:{ name: 'container15', type: 'VIEWLAYOUT', 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: 'container_grid4', panel: this , details:[] , dataRegionType: 'INHERIT' },
+        container13:{ name: 'container13', type: 'VIEWLAYOUT', 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_grid4', panel: this , details:[] , dataRegionType: 'INHERIT' },
+        container_grid4:{ name: 'container_grid4', type: 'VIEWLAYOUT', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', 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 , details:['container14','container15','container13'] , dataRegionType: 'INHERIT' },
         container_scroll_main1:{ name: 'container_scroll_main1', type: 'VIEWLAYOUT', 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:['container_grid1','container_grid2','container_grid5','container_grid3','container_grid4'] , dataRegionType: 'INHERIT' },
         container_scroll1:{ name: 'container_scroll1', type: 'VIEWLAYOUT', 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:0, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['container_scroll_main1'] , dataRegionType: 'INHERIT' }
     };

app_Web/src/widgets/app/app-panel-view-panel/app-panel-view-panel-base.vue

@@ -472,7 +472,7 @@ export default class AppPanelViewBase extends Vue implements ControlInterface {
         this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
-        this.panelLogic(name);
+        this.panelLogic(name, index);
         this.panelEditItemChange(this.data, name, value);
     }
 
@@ -507,7 +507,9 @@ export default class AppPanelViewBase extends Vue implements ControlInterface {
      * @memberof AppPanelViewBase
      */
     public panelLogic(name: string, index?: number): void {
-                
+        if (name && (index || index === 0)) {
+            name = name.replace(`_${index}`,"");
+        }
     }
 
     /**

app_Web/src/widgets/ibizbook/auto1-panel/auto1-panel-base.vue

@@ -510,7 +510,7 @@ export default class Auto1Base extends Vue implements ControlInterface {
         this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
-        this.panelLogic(name);
+        this.panelLogic(name, index);
         this.panelEditItemChange(this.data, name, value);
     }
 
@@ -545,11 +545,9 @@ export default class Auto1Base extends Vue implements ControlInterface {
      * @memberof Auto1Base
      */
     public panelLogic(name: string, index?: number): void {
-                
-
-
-
-
+        if (name && (index || index === 0)) {
+            name = name.replace(`_${index}`,"");
+        }
     }
 
     /**

app_Web/src/widgets/ibizbook/has-panel-kan-ban-panel/has-panel-kan-ban-panel-base.vue

@@ -510,7 +510,7 @@ export default class HasPanelKanBanBase extends Vue implements ControlInterface
         this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
-        this.panelLogic(name);
+        this.panelLogic(name, index);
         this.panelEditItemChange(this.data, name, value);
     }
 
@@ -545,11 +545,9 @@ export default class HasPanelKanBanBase extends Vue implements ControlInterface
      * @memberof HasPanelKanBanBase
      */
     public panelLogic(name: string, index?: number): void {
-                
-
-
-
-
+        if (name && (index || index === 0)) {
+            name = name.replace(`_${index}`,"");
+        }
     }
 
     /**

app_Web/src/widgets/ibizbook/has-panel-list-panel/has-panel-list-panel-base.vue

@@ -510,7 +510,7 @@ export default class HasPanelListBase extends Vue implements ControlInterface {
         this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
-        this.panelLogic(name);
+        this.panelLogic(name, index);
         this.panelEditItemChange(this.data, name, value);
     }
 
@@ -545,11 +545,9 @@ export default class HasPanelListBase extends Vue implements ControlInterface {
      * @memberof HasPanelListBase
      */
     public panelLogic(name: string, index?: number): void {
-                
-
-
-
-
+        if (name && (index || index === 0)) {
+            name = name.replace(`_${index}`,"");
+        }
     }
 
     /**

app_Web/src/widgets/ibizbook/listpanel-panel/listpanel-panel-base.vue

@@ -522,7 +522,7 @@ export default class ListpanelBase extends Vue implements ControlInterface {
         this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
-        this.panelLogic(name);
+        this.panelLogic(name, index);
         this.panelEditItemChange(this.data, name, value);
     }
 
@@ -557,14 +557,9 @@ export default class ListpanelBase extends Vue implements ControlInterface {
      * @memberof ListpanelBase
      */
     public panelLogic(name: string, index?: number): void {
-                
-
-
-
-
-
-
-
+        if (name && (index || index === 0)) {
+            name = name.replace(`_${index}`,"");
+        }
     }
 
     /**

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="listviewlist_quicktoolbarModels.deuiaction1.visabled" :disabled="listviewlist_quicktoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="list_quicktoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="usr4listview_layoutlist_quicktoolbarModels.deuiaction1.visabled" :disabled="usr4listview_layoutlist_quicktoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="list_quicktoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-file-text-o'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_quicktoolbar_toolbar.deuiaction1.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_quicktoolbar_toolbar.deuiaction1.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_quicktoolbar_toolbar.deuiaction1.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_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="listviewlist_batchtoolbarModels.deuiaction1.visabled" :disabled="listviewlist_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="usr4listview_layoutlist_batchtoolbarModels.deuiaction1.visabled" :disabled="usr4listview_layoutlist_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-edit'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
                 </tooltip>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="listviewlist_batchtoolbarModels.deuiaction2.visabled" :disabled="listviewlist_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
+                        <i-button v-show="usr4listview_layoutlist_batchtoolbarModels.deuiaction2.visabled" :disabled="usr4listview_layoutlist_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
                             <i class='fa fa-remove'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
                 </tooltip>
             </div>
         </span>
@@ -362,7 +362,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKListViewBase
+     * @memberof IBIZBOOKUsr4ListView_layoutBase
      */
     public New(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
          const _this: any = this;
@@ -382,7 +382,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKListViewBase
+     * @memberof IBIZBOOKUsr4ListView_layoutBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -408,7 +408,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKListViewBase
+     * @memberof IBIZBOOKUsr4ListView_layoutBase
      */
     public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
@@ -613,9 +613,9 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKListView
+     * @memberof IBIZBOOKUsr4ListView_layout
      */
-    public listviewlist_quicktoolbarModels: any = {
+    public usr4listview_layoutlist_quicktoolbarModels: any = {
         deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
     };
@@ -625,9 +625,9 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKListView
+     * @memberof IBIZBOOKUsr4ListView_layout
      */
-    public listviewlist_batchtoolbarModels: any = {
+    public usr4listview_layoutlist_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' } },
@@ -850,7 +850,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: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }        
         const arg: any = {...opt};
@@ -966,7 +966,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: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.removeAction') as string) });
             return;
         }
         if (datas.length === 0) {
@@ -1061,7 +1061,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: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (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);
@@ -1069,7 +1069,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: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

app_Web/src/widgets/ibizbook/timelineitemlayoutpanel-panel/timelineitemlayoutpanel-panel-base.vue

@@ -498,7 +498,7 @@ export default class TIMELINEITEMLAYOUTPANELBase extends Vue implements ControlI
         this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
-        this.panelLogic(name);
+        this.panelLogic(name, index);
         this.panelEditItemChange(this.data, name, value);
     }
 
@@ -533,8 +533,9 @@ export default class TIMELINEITEMLAYOUTPANELBase extends Vue implements ControlI
      * @memberof TIMELINEITEMLAYOUTPANELBase
      */
     public panelLogic(name: string, index?: number): void {
-                
-
+        if (name && (index || index === 0)) {
+            name = name.replace(`_${index}`,"");
+        }
     }
 
     /**

app_Web/src/widgets/ibizbook/usr-panel/usr-panel-base.vue

@@ -498,7 +498,7 @@ export default class UsrBase extends Vue implements ControlInterface {
         this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
-        this.panelLogic(name);
+        this.panelLogic(name, index);
         this.panelEditItemChange(this.data, name, value);
     }
 
@@ -533,8 +533,9 @@ export default class UsrBase extends Vue implements ControlInterface {
      * @memberof UsrBase
      */
     public panelLogic(name: string, index?: number): void {
-                
-
+        if (name && (index || index === 0)) {
+            name = name.replace(`_${index}`,"");
+        }
     }
 
     /**

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

@@ -687,7 +687,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};
@@ -766,7 +766,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[] = [];
@@ -875,7 +875,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);
@@ -883,7 +883,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/ibizbook/usr4-panel/usr4-panel-base.vue

@@ -510,7 +510,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
         this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
-        this.panelLogic(name);
+        this.panelLogic(name, index);
         this.panelEditItemChange(this.data, name, value);
     }
 
@@ -545,11 +545,9 @@ export default class Usr4Base extends Vue implements ControlInterface {
      * @memberof Usr4Base
      */
     public panelLogic(name: string, index?: number): void {
-                
-
-
-
-
+        if (name && (index || index === 0)) {
+            name = name.replace(`_${index}`,"");
+        }
     }
 
     /**

app_Web/src/widgets/ibizbook/usr5-panel/usr5-panel-base.vue

@@ -498,7 +498,7 @@ export default class Usr5Base extends Vue implements ControlInterface {
         this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
-        this.panelLogic(name);
+        this.panelLogic(name, index);
         this.panelEditItemChange(this.data, name, value);
     }
 
@@ -533,8 +533,9 @@ export default class Usr5Base extends Vue implements ControlInterface {
      * @memberof Usr5Base
      */
     public panelLogic(name: string, index?: number): void {
-                
-
+        if (name && (index || index === 0)) {
+            name = name.replace(`_${index}`,"");
+        }
     }
 
     /**

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

@@ -703,13 +703,6 @@
   "getPSDEViewCodeName" : "Usr3EditView",
   "getPSDEViewId" : "CA5E9C34-54D6-40DA-A97C-BB80464AA4C8",
   "getPSViewLayoutPanel" : {
-    "getAllPSPanelFields" : [ {
-      "id" : "view_pagecaption2"
-    }, {
-      "id" : "view_pagecaption"
-    }, {
-      "id" : "view_pagecaption1"
-    } ],
     "codeName" : "Layoutpanel",
     "controlType" : "VIEWLAYOUTPANEL",
     "layoutMode" : "TABLE_24COL",
@@ -2491,95 +2484,38 @@
             "caption" : "面板容器",
             "itemStyle" : "DEFAULT",
             "itemType" : "CONTAINER",
-            "name" : "container15",
+            "name" : "container14",
             "getPSLayout" : {
               "layout" : "SIMPLEFLEX"
             },
             "getPSLayoutPos" : {
-              "grow" : -1,
+              "grow" : 6,
               "layout" : "SIMPLEFLEX"
-            },
-            "getPSPanelItems" : [ {
-              "caption" : "页面标题",
-              "itemStyle" : "DEFAULT",
-              "itemType" : "FIELD",
-              "name" : "view_pagecaption2",
-              "getPSEditor" : {
-                "editorType" : "SPAN",
-                "name" : "view_pagecaption2",
-                "predefinedType" : "VIEW_PAGECAPTION",
-                "renderMode" : "HEADING1",
-                "enableLinkView" : false
-              },
-              "getPSLayoutPos" : {
-                "grow" : -1,
-                "layout" : "SIMPLEFLEX"
-              },
-              "hidden" : false,
-              "showCaption" : false
-            } ]
+            }
           }, {
             "caption" : "面板容器",
             "itemStyle" : "DEFAULT",
             "itemType" : "CONTAINER",
-            "name" : "container13",
+            "name" : "container15",
             "getPSLayout" : {
               "layout" : "SIMPLEFLEX"
             },
             "getPSLayoutPos" : {
-              "grow" : 3,
+              "grow" : -1,
               "layout" : "SIMPLEFLEX"
-            },
-            "getPSPanelItems" : [ {
-              "caption" : "页面标题",
-              "itemStyle" : "DEFAULT",
-              "itemType" : "FIELD",
-              "name" : "view_pagecaption",
-              "getPSEditor" : {
-                "editorType" : "SPAN",
-                "name" : "view_pagecaption",
-                "predefinedType" : "VIEW_PAGECAPTION",
-                "renderMode" : "HEADING1",
-                "enableLinkView" : false
-              },
-              "getPSLayoutPos" : {
-                "grow" : -1,
-                "layout" : "SIMPLEFLEX"
-              },
-              "hidden" : false,
-              "showCaption" : false
-            } ]
+            }
           }, {
             "caption" : "面板容器",
             "itemStyle" : "DEFAULT",
             "itemType" : "CONTAINER",
-            "name" : "container14",
+            "name" : "container13",
             "getPSLayout" : {
               "layout" : "SIMPLEFLEX"
             },
             "getPSLayoutPos" : {
-              "grow" : 6,
+              "grow" : 3,
               "layout" : "SIMPLEFLEX"
-            },
-            "getPSPanelItems" : [ {
-              "caption" : "页面标题",
-              "itemStyle" : "DEFAULT",
-              "itemType" : "FIELD",
-              "name" : "view_pagecaption1",
-              "getPSEditor" : {
-                "editorType" : "SPAN",
-                "name" : "view_pagecaption1",
-                "predefinedType" : "VIEW_PAGECAPTION",
-                "renderMode" : "HEADING1",
-                "enableLinkView" : false
-              },
-              "getPSLayoutPos" : {
-                "grow" : -1,
-                "layout" : "SIMPLEFLEX"
-              },
-              "hidden" : false,
-              "showCaption" : false
-            } ]
+            }
           } ]
         } ],
         "showCaption" : true

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

@@ -278,7 +278,7 @@
 
 
     <!--输出实体[IBIZCUSTOMER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizcustomer-342-10">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizcustomer-344-10">
         <createTable tableName="T_IBIZCUSTOMER">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>

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

@@ -19,7 +19,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZCUSTOMER]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizcustomer-342-4" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizcustomer-344-4" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZCUSTOMER">
                <![CDATA[ SELECT t1.[ADDRESS], t1.[CREATEDATE], t1.[CREATEMAN], t1.[CUSTOMERUID], t1.[IBIZCUSTOMERID], t1.[IBIZCUSTOMERNAME], t1.[SN], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZCUSTOMER] t1  ]]>
          </createView>