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

app_Web/src/model/panel-detail/panel-container.ts

@@ -135,7 +135,11 @@ export class PanelContainerModel extends PanelDetailModel {
                 break;
             case 'INHERIT':
                 if (!this.parentName) {
+                    if (this.type == 'VIEWLAYOUT') {
                         this.data = nullData;
+                    } else {
+                        this.data = this.panel.data;
+                    }
                 } else {
                     const parentItem = this.panel.layoutModelDetails[this.parentName];
                     if (parentItem) {

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

@@ -120,7 +120,7 @@
         <template v-slot:container9="slotProps">
     <app-standard-container name="container9" :index="slotProps.data.index" :isMultiContainer="false" :layoutModelDetails="layoutModelDetails">
         <template #field_text_dynamic>
-        <app-preset-text name="field_text_dynamic" :index="slotProps.data.index" :value="layoutData[`ibizcustomername_${slotProps.data.index}`]" :layoutModelDetails="layoutModelDetails"/>
+        <app-preset-text name="field_text_dynamic" :index="slotProps.data.index" :value="layoutData[`field_text_dynamic_${slotProps.data.index}`]" :layoutModelDetails="layoutModelDetails"/>
         </template>
         <template #field_textbox>
         <app-panel-field name="field_textbox" :index="slotProps.data.index" :layoutModelDetails="layoutModelDetails" :value="layoutData[`field_textbox_${slotProps.data.index}`]"> <input-box type="text" name="field_textbox" :value="layoutData[`field_textbox_${slotProps.data.index}`]" :disabled="layoutModelDetails[`field_textbox_${slotProps.data.index}`] ? layoutModelDetails[`field_textbox_${slotProps.data.index}`].disabled : false" @change="(value) => handleValueChange({ name: `field_textbox_${slotProps.data.index}`, value}, `${slotProps.data.index}`)"> </input-box> </app-panel-field>

app_Web/src/pages/ungroup/app-index-view/app-index-view-base.vue

@@ -15,7 +15,7 @@
         <app-preset-text name="static_text1" :layoutModelDetails="layoutModelDetails"/>
         </template>
         <template #field_text_dynamic>
-        <app-preset-text name="field_text_dynamic" :value="layoutData.field_textbox" :layoutModelDetails="layoutModelDetails"/>
+        <app-preset-text name="field_text_dynamic" :value="layoutData.field_text_dynamic" :layoutModelDetails="layoutModelDetails"/>
         </template>
         <template #field_textbox4>
         <app-panel-field name="field_textbox4" :layoutModelDetails="layoutModelDetails" :value="layoutData.field_textbox4"> <input-box type="text" name="field_textbox4" :value="layoutData.field_textbox4" :disabled="layoutModelDetails.field_textbox4 ? layoutModelDetails.field_textbox4.disabled : false" @change="(value) => handleValueChange({ name: 'field_textbox4', value})"> </input-box> </app-panel-field>

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

@@ -338,13 +338,10 @@ export default class AppPanelViewBase extends Vue implements ControlInterface {
      *
      * @memberof AppPanelViewBase
      */
-    @Watch('inputData', { deep: true } )
+    @Watch('inputData', { deep: true, immediate: true } )
     public onInputDataChange(newVal: any, oldVal: any){
         if(newVal){
             this.computedUIData(newVal);
-            this.layoutData = Util.deepCopy(newVal);
-            this.computeButtonState(newVal);
-            this.panelLogic('');
         }
     }
 
@@ -365,7 +362,6 @@ export default class AppPanelViewBase extends Vue implements ControlInterface {
     public afterMounted () {
         const _this: any = this;
         _this.initLayout().then((result: any) => {
-            _this.onInputDataChange(this.inputData);
             _this.isLayoutLoadding = false;
         });
     }
@@ -379,7 +375,7 @@ export default class AppPanelViewBase extends Vue implements ControlInterface {
     public computedUIData(newVal:any){
         if((this.dataModel.getDataItems instanceof Function) && this.dataModel.getDataItems().length >0){
             this.dataModel.getDataItems().forEach((item:any) =>{
-                this.data[item.name] = newVal[item.prop];
+                this.data[item.prop] = newVal[item.prop];
             })
         }
     }
@@ -469,7 +465,6 @@ export default class AppPanelViewBase extends Vue implements ControlInterface {
             return;
         }
         const { name, value } = args;
-        this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
         this.panelLogic(name, index);

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

@@ -628,7 +628,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 };
@@ -664,7 +664,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/auto1-panel/auto1-panel-base.vue

@@ -376,13 +376,10 @@ export default class Auto1Base extends Vue implements ControlInterface {
      *
      * @memberof Auto1Base
      */
-    @Watch('inputData', { deep: true } )
+    @Watch('inputData', { deep: true, immediate: true } )
     public onInputDataChange(newVal: any, oldVal: any){
         if(newVal){
             this.computedUIData(newVal);
-            this.layoutData = Util.deepCopy(newVal);
-            this.computeButtonState(newVal);
-            this.panelLogic('');
         }
     }
 
@@ -403,7 +400,6 @@ export default class Auto1Base extends Vue implements ControlInterface {
     public afterMounted () {
         const _this: any = this;
         _this.initLayout().then((result: any) => {
-            _this.onInputDataChange(this.inputData);
             _this.isLayoutLoadding = false;
         });
     }
@@ -417,7 +413,7 @@ export default class Auto1Base extends Vue implements ControlInterface {
     public computedUIData(newVal:any){
         if((this.dataModel.getDataItems instanceof Function) && this.dataModel.getDataItems().length >0){
             this.dataModel.getDataItems().forEach((item:any) =>{
-                this.data[item.name] = newVal[item.prop];
+                this.data[item.prop] = newVal[item.prop];
             })
         }
     }
@@ -507,7 +503,6 @@ export default class Auto1Base extends Vue implements ControlInterface {
             return;
         }
         const { name, value } = args;
-        this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
         this.panelLogic(name, index);

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

@@ -701,7 +701,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: 'IBIZBOOKGroupByCodelistListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -737,7 +737,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: 'IBIZBOOKGroupByCodelistListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

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

@@ -1352,7 +1352,7 @@ export default class GuideBorrowFormBase 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' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1387,7 +1387,7 @@ export default class GuideBorrowFormBase 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' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1448,7 +1448,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1556,7 +1556,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg,{viewparams:this.viewparams});
@@ -1630,7 +1630,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

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

@@ -1318,7 +1318,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' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1353,7 +1353,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' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1414,7 +1414,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' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1522,7 +1522,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' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg,{viewparams:this.viewparams});
@@ -1596,7 +1596,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' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (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

@@ -1421,7 +1421,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' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1456,7 +1456,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' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1517,7 +1517,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' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1625,7 +1625,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' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg,{viewparams:this.viewparams});
@@ -1699,7 +1699,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' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

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

@@ -376,13 +376,10 @@ export default class HasPanelKanBanBase extends Vue implements ControlInterface
      *
      * @memberof HasPanelKanBanBase
      */
-    @Watch('inputData', { deep: true } )
+    @Watch('inputData', { deep: true, immediate: true } )
     public onInputDataChange(newVal: any, oldVal: any){
         if(newVal){
             this.computedUIData(newVal);
-            this.layoutData = Util.deepCopy(newVal);
-            this.computeButtonState(newVal);
-            this.panelLogic('');
         }
     }
 
@@ -403,7 +400,6 @@ export default class HasPanelKanBanBase extends Vue implements ControlInterface
     public afterMounted () {
         const _this: any = this;
         _this.initLayout().then((result: any) => {
-            _this.onInputDataChange(this.inputData);
             _this.isLayoutLoadding = false;
         });
     }
@@ -417,7 +413,7 @@ export default class HasPanelKanBanBase extends Vue implements ControlInterface
     public computedUIData(newVal:any){
         if((this.dataModel.getDataItems instanceof Function) && this.dataModel.getDataItems().length >0){
             this.dataModel.getDataItems().forEach((item:any) =>{
-                this.data[item.name] = newVal[item.prop];
+                this.data[item.prop] = newVal[item.prop];
             })
         }
     }
@@ -507,7 +503,6 @@ export default class HasPanelKanBanBase extends Vue implements ControlInterface
             return;
         }
         const { name, value } = args;
-        this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
         this.panelLogic(name, index);

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

@@ -376,13 +376,10 @@ export default class HasPanelListBase extends Vue implements ControlInterface {
      *
      * @memberof HasPanelListBase
      */
-    @Watch('inputData', { deep: true } )
+    @Watch('inputData', { deep: true, immediate: true } )
     public onInputDataChange(newVal: any, oldVal: any){
         if(newVal){
             this.computedUIData(newVal);
-            this.layoutData = Util.deepCopy(newVal);
-            this.computeButtonState(newVal);
-            this.panelLogic('');
         }
     }
 
@@ -403,7 +400,6 @@ export default class HasPanelListBase extends Vue implements ControlInterface {
     public afterMounted () {
         const _this: any = this;
         _this.initLayout().then((result: any) => {
-            _this.onInputDataChange(this.inputData);
             _this.isLayoutLoadding = false;
         });
     }
@@ -417,7 +413,7 @@ export default class HasPanelListBase extends Vue implements ControlInterface {
     public computedUIData(newVal:any){
         if((this.dataModel.getDataItems instanceof Function) && this.dataModel.getDataItems().length >0){
             this.dataModel.getDataItems().forEach((item:any) =>{
-                this.data[item.name] = newVal[item.prop];
+                this.data[item.prop] = newVal[item.prop];
             })
         }
     }
@@ -507,7 +503,6 @@ export default class HasPanelListBase extends Vue implements ControlInterface {
             return;
         }
         const { name, value } = args;
-        this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
         this.panelLogic(name, index);

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

@@ -9,7 +9,7 @@
         <app-preset-text name="static_text1" :layoutModelDetails="layoutModelDetails"/>
         </template>
         <template #field_text_dynamic>
-        <app-preset-text name="field_text_dynamic" :value="layoutData.author" :layoutModelDetails="layoutModelDetails"/>
+        <app-preset-text name="field_text_dynamic" :value="layoutData.field_text_dynamic" :layoutModelDetails="layoutModelDetails"/>
         </template>
         <template #field_textbox>
         <app-panel-field name="field_textbox" :layoutModelDetails="layoutModelDetails" :value="layoutData.field_textbox"> <input-box type="text" name="field_textbox" :value="layoutData.field_textbox" :disabled="layoutModelDetails.field_textbox ? layoutModelDetails.field_textbox.disabled : false" @change="(value) => handleValueChange({ name: 'field_textbox', value})"> </input-box> </app-panel-field>
@@ -388,13 +388,10 @@ export default class ListpanelBase extends Vue implements ControlInterface {
      *
      * @memberof ListpanelBase
      */
-    @Watch('inputData', { deep: true } )
+    @Watch('inputData', { deep: true, immediate: true } )
     public onInputDataChange(newVal: any, oldVal: any){
         if(newVal){
             this.computedUIData(newVal);
-            this.layoutData = Util.deepCopy(newVal);
-            this.computeButtonState(newVal);
-            this.panelLogic('');
         }
     }
 
@@ -415,7 +412,6 @@ export default class ListpanelBase extends Vue implements ControlInterface {
     public afterMounted () {
         const _this: any = this;
         _this.initLayout().then((result: any) => {
-            _this.onInputDataChange(this.inputData);
             _this.isLayoutLoadding = false;
         });
     }
@@ -429,7 +425,7 @@ export default class ListpanelBase extends Vue implements ControlInterface {
     public computedUIData(newVal:any){
         if((this.dataModel.getDataItems instanceof Function) && this.dataModel.getDataItems().length >0){
             this.dataModel.getDataItems().forEach((item:any) =>{
-                this.data[item.name] = newVal[item.prop];
+                this.data[item.prop] = newVal[item.prop];
             })
         }
     }
@@ -519,7 +515,6 @@ export default class ListpanelBase extends Vue implements ControlInterface {
             return;
         }
         const { name, value } = args;
-        this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
         this.panelLogic(name, index);

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

@@ -364,13 +364,10 @@ export default class TIMELINEITEMLAYOUTPANELBase extends Vue implements ControlI
      *
      * @memberof TIMELINEITEMLAYOUTPANELBase
      */
-    @Watch('inputData', { deep: true } )
+    @Watch('inputData', { deep: true, immediate: true } )
     public onInputDataChange(newVal: any, oldVal: any){
         if(newVal){
             this.computedUIData(newVal);
-            this.layoutData = Util.deepCopy(newVal);
-            this.computeButtonState(newVal);
-            this.panelLogic('');
         }
     }
 
@@ -391,7 +388,6 @@ export default class TIMELINEITEMLAYOUTPANELBase extends Vue implements ControlI
     public afterMounted () {
         const _this: any = this;
         _this.initLayout().then((result: any) => {
-            _this.onInputDataChange(this.inputData);
             _this.isLayoutLoadding = false;
         });
     }
@@ -405,7 +401,7 @@ export default class TIMELINEITEMLAYOUTPANELBase extends Vue implements ControlI
     public computedUIData(newVal:any){
         if((this.dataModel.getDataItems instanceof Function) && this.dataModel.getDataItems().length >0){
             this.dataModel.getDataItems().forEach((item:any) =>{
-                this.data[item.name] = newVal[item.prop];
+                this.data[item.prop] = newVal[item.prop];
             })
         }
     }
@@ -495,7 +491,6 @@ export default class TIMELINEITEMLAYOUTPANELBase extends Vue implements ControlI
             return;
         }
         const { name, value } = args;
-        this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
         this.panelLogic(name, index);

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

@@ -364,13 +364,10 @@ export default class UsrBase extends Vue implements ControlInterface {
      *
      * @memberof UsrBase
      */
-    @Watch('inputData', { deep: true } )
+    @Watch('inputData', { deep: true, immediate: true } )
     public onInputDataChange(newVal: any, oldVal: any){
         if(newVal){
             this.computedUIData(newVal);
-            this.layoutData = Util.deepCopy(newVal);
-            this.computeButtonState(newVal);
-            this.panelLogic('');
         }
     }
 
@@ -391,7 +388,6 @@ export default class UsrBase extends Vue implements ControlInterface {
     public afterMounted () {
         const _this: any = this;
         _this.initLayout().then((result: any) => {
-            _this.onInputDataChange(this.inputData);
             _this.isLayoutLoadding = false;
         });
     }
@@ -405,7 +401,7 @@ export default class UsrBase extends Vue implements ControlInterface {
     public computedUIData(newVal:any){
         if((this.dataModel.getDataItems instanceof Function) && this.dataModel.getDataItems().length >0){
             this.dataModel.getDataItems().forEach((item:any) =>{
-                this.data[item.name] = newVal[item.prop];
+                this.data[item.prop] = newVal[item.prop];
             })
         }
     }
@@ -495,7 +491,6 @@ export default class UsrBase extends Vue implements ControlInterface {
             return;
         }
         const { name, value } = args;
-        this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
         this.panelLogic(name, 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: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -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: 'IBIZBOOKTestCLDataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -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: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -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: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

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

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

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

@@ -376,13 +376,10 @@ export default class Usr4Base extends Vue implements ControlInterface {
      *
      * @memberof Usr4Base
      */
-    @Watch('inputData', { deep: true } )
+    @Watch('inputData', { deep: true, immediate: true } )
     public onInputDataChange(newVal: any, oldVal: any){
         if(newVal){
             this.computedUIData(newVal);
-            this.layoutData = Util.deepCopy(newVal);
-            this.computeButtonState(newVal);
-            this.panelLogic('');
         }
     }
 
@@ -403,7 +400,6 @@ export default class Usr4Base extends Vue implements ControlInterface {
     public afterMounted () {
         const _this: any = this;
         _this.initLayout().then((result: any) => {
-            _this.onInputDataChange(this.inputData);
             _this.isLayoutLoadding = false;
         });
     }
@@ -417,7 +413,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
     public computedUIData(newVal:any){
         if((this.dataModel.getDataItems instanceof Function) && this.dataModel.getDataItems().length >0){
             this.dataModel.getDataItems().forEach((item:any) =>{
-                this.data[item.name] = newVal[item.prop];
+                this.data[item.prop] = newVal[item.prop];
             })
         }
     }
@@ -507,7 +503,6 @@ export default class Usr4Base extends Vue implements ControlInterface {
             return;
         }
         const { name, value } = args;
-        this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
         this.panelLogic(name, index);

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

@@ -364,13 +364,10 @@ export default class Usr5Base extends Vue implements ControlInterface {
      *
      * @memberof Usr5Base
      */
-    @Watch('inputData', { deep: true } )
+    @Watch('inputData', { deep: true, immediate: true } )
     public onInputDataChange(newVal: any, oldVal: any){
         if(newVal){
             this.computedUIData(newVal);
-            this.layoutData = Util.deepCopy(newVal);
-            this.computeButtonState(newVal);
-            this.panelLogic('');
         }
     }
 
@@ -391,7 +388,6 @@ export default class Usr5Base extends Vue implements ControlInterface {
     public afterMounted () {
         const _this: any = this;
         _this.initLayout().then((result: any) => {
-            _this.onInputDataChange(this.inputData);
             _this.isLayoutLoadding = false;
         });
     }
@@ -405,7 +401,7 @@ export default class Usr5Base extends Vue implements ControlInterface {
     public computedUIData(newVal:any){
         if((this.dataModel.getDataItems instanceof Function) && this.dataModel.getDataItems().length >0){
             this.dataModel.getDataItems().forEach((item:any) =>{
-                this.data[item.name] = newVal[item.prop];
+                this.data[item.prop] = newVal[item.prop];
             })
         }
     }
@@ -495,7 +491,6 @@ export default class Usr5Base extends Vue implements ControlInterface {
             return;
         }
         const { name, value } = args;
-        this.data[name] = value;
         this.layoutData[name] = value;
         this.layoutModelDetails[name].setData(value);
         this.panelLogic(name, index);

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

@@ -19,16 +19,6 @@
     }
   } ],
   "getPSDETreeColumns" : [ {
-    "caption" : "图书名称",
-    "codeName" : "ibizbookname",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "ibizbookname",
-    "name" : "ibizbookname",
-    "width" : 50,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
-  }, {
     "caption" : "作者",
     "codeName" : "author",
     "columnType" : "DEFGRIDCOLUMN",
@@ -48,6 +38,16 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
+  }, {
+    "caption" : "图书名称",
+    "codeName" : "ibizbookname",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "ibizbookname",
+    "name" : "ibizbookname",
+    "width" : 50,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
   } ],
   "getPSDETreeNodeRSs" : [ {
     "getChildPSDETreeNode" : {

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

@@ -75,16 +75,6 @@
       "id" : "TREEGRIDEX"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "name" : "ibizbookname",
-      "width" : 50,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
-    }, {
       "caption" : "作者",
       "codeName" : "author",
       "columnType" : "DEFGRIDCOLUMN",
@@ -104,6 +94,16 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
+    }, {
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "ibizbookname",
+      "name" : "ibizbookname",
+      "width" : 50,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
     } ],
     "getPSDETreeNodeRSs" : [ {
       "getChildPSDETreeNode" : {

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

@@ -278,7 +278,7 @@
 
 
     <!--输出实体[IBIZCUSTOMER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizcustomer-364-10">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizcustomer-366-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-364-4" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizcustomer-366-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>