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

app_Web/src/components/layout-element/index/app-index-nav-breadcrumb/app-index-nav-breadcrumb.vue

@@ -48,7 +48,7 @@ export default class AppIndexNavBreadcrumb extends Vue {
      * @type {number}
      * @memberof AppIndexNavBreadcrumb
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -57,7 +57,7 @@ export default class AppIndexNavBreadcrumb extends Vue {
      * @memberof AppIndexNavBreadcrumb
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
     
     /**

app_Web/src/components/layout-element/index/app-index-nav-tabs/app-index-nav-tabs.vue

@@ -31,7 +31,7 @@ export default class AppIndexNavTabs extends Vue {
      * @type {number}
      * @memberof AppIndexNavTabs
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -40,7 +40,7 @@ export default class AppIndexNavTabs extends Vue {
      * @memberof AppIndexNavTabs
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/index/app-index-org-select/app-index-org-select.vue

@@ -31,7 +31,7 @@ export default class AppIndexOrgSelect extends Vue {
      * @type {number}
      * @memberof AppIndexOrgSelect
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -40,7 +40,7 @@ export default class AppIndexOrgSelect extends Vue {
      * @memberof AppIndexOrgSelect
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/index/app-index-user-info/app-index-user-info.vue

@@ -31,7 +31,7 @@ export default class AppIndexUserInfo extends Vue {
      * @type {number}
      * @memberof AppIndexUserInfo
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -40,7 +40,7 @@ export default class AppIndexUserInfo extends Vue {
      * @memberof AppIndexUserInfo
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/interactive/app-preset-button/app-preset-button.vue

@@ -47,7 +47,7 @@ export default class AppPresetButton extends Vue {
      * @type {number}
      * @memberof AppPresetButton
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -56,7 +56,7 @@ export default class AppPresetButton extends Vue {
      * @memberof AppPresetButton
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/interactive/app-preset-qrcode/app-preset-qrcode.vue

@@ -46,7 +46,7 @@ export default class AppPresetQrCode extends Vue {
      * @type {number}
      * @memberof AppPresetQrCode
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -55,7 +55,7 @@ export default class AppPresetQrCode extends Vue {
      * @memberof AppPresetQrCode
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/interactive/app-preset-switch/app-preset-switch.vue

@@ -37,7 +37,7 @@ export default class AppPresetSwitch extends Vue {
      * @type {number}
      * @memberof AppPresetSwitch
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -46,7 +46,7 @@ export default class AppPresetSwitch extends Vue {
      * @memberof AppPresetSwitch
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/interactive/app-preset-text-input/app-preset-text-input.vue

@@ -39,7 +39,7 @@ export default class AppPresetTextInput extends Vue {
      * @type {number}
      * @memberof AppPresetTextInput
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -48,7 +48,7 @@ export default class AppPresetTextInput extends Vue {
      * @memberof AppPresetTextInput
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/login/app-login-button/app-login-button.vue

@@ -47,7 +47,7 @@ export default class AppLoginButton extends Vue {
      * @type {number}
      * @memberof AppLoginButton
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -56,7 +56,7 @@ export default class AppLoginButton extends Vue {
      * @memberof AppLoginButton
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/login/app-login-captcha/app-login-captcha.vue

@@ -44,8 +44,7 @@ export default class AppLoginCaptcha extends Vue {
      * @type {number}
      * @memberof AppLoginCaptcha
      */
-    @Prop({ default: 0 }) public index?: number;
-
+    @Prop() public index?: number;
 
     /**
      * 是否显示
@@ -69,7 +68,7 @@ export default class AppLoginCaptcha extends Vue {
      * @memberof AppLoginCaptcha
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/login/app-login-input/app-login-input.vue

@@ -59,7 +59,7 @@ export default class AppLoginInput extends Vue {
      * @type {number}
      * @memberof AppLoginInput
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -68,7 +68,7 @@ export default class AppLoginInput extends Vue {
      * @memberof AppLoginInput
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/login/app-login-message/app-login-message.vue

@@ -40,7 +40,7 @@ export default class AppLoginMessage extends Vue {
    * @type {number}
    * @memberof AppLoginMessage
    */
-  @Prop({ default: 0 }) public index?: number;
+  @Prop() public index?: number;
 
   /**
    * 项名称
@@ -49,7 +49,7 @@ export default class AppLoginMessage extends Vue {
    * @memberof AppLoginMessage
    */
   get itemName() {
-    return this.index ? `${this.name}_${this.index}` : this.name;
+    return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
   }
 
   /**

app_Web/src/components/layout-element/login/app-login-note-verify/app-login-note-verify.vue

@@ -50,7 +50,7 @@ export default class AppLoginNoteVerify extends Vue {
      * @type {number}
      * @memberof AppLoginNoteVerify
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -59,7 +59,7 @@ export default class AppLoginNoteVerify extends Vue {
      * @memberof AppLoginNoteVerify
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/login/app-login-org/app-login-org.vue

@@ -41,7 +41,7 @@ export default class AppLoginOrg extends Vue {
      * @type {number}
      * @memberof AppLoginOrg
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -50,7 +50,7 @@ export default class AppLoginOrg extends Vue {
      * @memberof AppLoginOrg
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/login/app-login-third/app-login-third.vue

@@ -47,7 +47,7 @@ export default class AppThirdLogin extends Vue {
      * @type {number}
      * @memberof AppThirdLogin
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -56,7 +56,7 @@ export default class AppThirdLogin extends Vue {
      * @memberof AppThirdLogin
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/media/app-field-image-dynamic/app-field-image-dynamic.vue

@@ -39,7 +39,7 @@ export default class AppFieldImageDynamic extends Vue {
      * @type {number}
      * @memberof AppFieldImageDynamic
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 值变更
@@ -58,7 +58,7 @@ export default class AppFieldImageDynamic extends Vue {
      * @memberof AppFieldImageDynamic
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/media/app-rawitem-carousel/app-rawitem-carousel.vue

@@ -60,7 +60,7 @@ export default class AppCarousel extends Vue {
      * @type {number}
      * @memberof AppCarousel
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -69,7 +69,7 @@ export default class AppCarousel extends Vue {
      * @memberof AppCarousel
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/media/app-rawitem-image/app-rawitem-image.vue

@@ -46,7 +46,7 @@ export default class AppRawItemImage extends Vue {
      * @type {number}
      * @memberof AppRawItemImage
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -55,7 +55,7 @@ export default class AppRawItemImage extends Vue {
      * @memberof AppRawItemImage
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/media/app-rawitem-video/app-rawitem-video.vue

@@ -42,7 +42,7 @@ export default class AppRawItemVideo extends Vue {
      * @type {number}
      * @memberof AppRawItemVideo
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 值变更
@@ -61,7 +61,7 @@ export default class AppRawItemVideo extends Vue {
      * @memberof AppRawItemVideo
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/structure/app-ctrl-pos/app-ctrl-pos.vue

@@ -31,7 +31,7 @@ export default class AppCtrlPos extends Vue {
      * @type {number}
      * @memberof AppCtrlPos
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -40,7 +40,7 @@ export default class AppCtrlPos extends Vue {
      * @memberof AppCtrlPos
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/structure/app-nav-pos/app-nav-pos.vue

@@ -43,7 +43,7 @@ export default class AppNavPos extends Vue {
      * @type {number}
      * @memberof AppNavPos
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 导航数据
@@ -60,7 +60,7 @@ export default class AppNavPos extends Vue {
      * @memberof AppNavPos
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/structure/app-scroll-container/app-scroll-container.vue

@@ -55,7 +55,7 @@ export default class AppScrollContainer extends Vue {
      * @type {number}
      * @memberof AppScrollContainer
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 布局模型详情
@@ -96,7 +96,7 @@ export default class AppScrollContainer extends Vue {
      * @memberof AppScrollContainer
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**
@@ -132,7 +132,7 @@ export default class AppScrollContainer extends Vue {
         if (curLayoutModel && curLayoutModel.details && curLayoutModel.details.length > 0) {
             curLayoutModel.details.forEach((key: string) => {
                 let childModelDetail: any;
-                if (this.index) {
+                if (this.index || this.index === 0) {
                     childModelDetail = this.layoutModelDetails[`${key}_${this.index}`];
                 } else {
                     childModelDetail = this.layoutModelDetails[key];
@@ -171,7 +171,7 @@ export default class AppScrollContainer extends Vue {
      *  获取项布局样式
      */
     public getItemPosStyle(name: string) {
-        const itemName = this.index ? `${name}_${this.index}` : name;
+        const itemName = (this.index || this.index === 0) ? `${name}_${this.index}` : name;
         let layoutModel = this.layoutModelDetails[itemName];
         if (layoutModel) {
             const childBoxSizeStyle: any = layoutModel.getBoxSizeStyle();

app_Web/src/components/layout-element/structure/app-simpleflex-container/app-simpleflex-container.vue

@@ -27,7 +27,7 @@ export default class AppSimpleFlexContainer extends Vue {
      * @type {number}
      * @memberof AppSimpleFlexContainer
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 布局模型详情
@@ -61,7 +61,7 @@ export default class AppSimpleFlexContainer extends Vue {
      * @memberof AppSimpleFlexContainer
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**
@@ -104,7 +104,7 @@ export default class AppSimpleFlexContainer extends Vue {
      */
     public getItemPosStyle(name: string) {
         let layoutModel: any;
-        if (this.index) {
+        if (this.index || this.index === 0) {
             layoutModel = this.layoutModelDetails[`${name}_${this.index}`];
         } else {
             layoutModel = this.layoutModelDetails[name];

app_Web/src/components/layout-element/structure/app-standard-container/app-standard-container.vue

@@ -38,7 +38,7 @@ export default class AppStandardContainer extends Vue {
      * @type {number}
      * @memberof AppStandardContainer
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 布局模型详情
@@ -63,7 +63,7 @@ export default class AppStandardContainer extends Vue {
      * @memberof AppStandardContainer
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**
@@ -137,7 +137,7 @@ export default class AppStandardContainer extends Vue {
      */
     public getItemPosStyle(name: string) {
         let layoutModel: any;
-        if (this.index) {
+        if ((this.index || this.index === 0)) {
             layoutModel = this.layoutModelDetails[`${name}_${this.index}`];
         } else {
             layoutModel = this.layoutModelDetails[name];

app_Web/src/components/layout-element/structure/app-tab-page/app-tab-page.vue

@@ -36,7 +36,7 @@ export default class AppTabPage extends Vue {
      * @type {number}
      * @memberof AppTabPage
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 布局模型详情变更
@@ -69,7 +69,7 @@ export default class AppTabPage extends Vue {
      * @memberof AppTabPage
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/structure/app-tab-panel/app-tab-panel.vue

@@ -35,7 +35,7 @@ export default class AppTabPanel extends Vue {
      * @type {number}
      * @memberof AppTabPanel
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -44,7 +44,7 @@ export default class AppTabPanel extends Vue {
      * @memberof AppTabPanel
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/text/app-preset-caption/app-preset-caption.vue

@@ -70,7 +70,7 @@ export default class AppPresetCaption extends Vue {
    * @type {number}
    * @memberof AppPresetCaption
    */
-  @Prop({ default: 0 }) public index?: number;
+  @Prop() public index?: number;
 
   /**
    * 项名称
@@ -79,7 +79,7 @@ export default class AppPresetCaption extends Vue {
    * @memberof AppPresetCaption
    */
   get itemName() {
-    return this.index ? `${this.name}_${this.index}` : this.name;
+    return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
   }
 
   /**

app_Web/src/components/layout-element/text/app-preset-text/app-preset-text.vue

@@ -87,7 +87,7 @@ export default class AppPresetText extends Vue {
      * @type {number}
      * @memberof AppPresetText
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -96,7 +96,7 @@ export default class AppPresetText extends Vue {
      * @memberof AppPresetText
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

app_Web/src/components/layout-element/text/app-preset-title/app-preset-title.vue

@@ -30,7 +30,7 @@ export default class AppPresetTitle extends Vue {
      * @type {number}
      * @memberof AppPresetTitle
      */
-    @Prop({ default: 0 }) public index?: number;
+    @Prop() public index?: number;
 
     /**
      * 项名称
@@ -39,7 +39,7 @@ export default class AppPresetTitle extends Vue {
      * @memberof AppPresetTitle
      */
     get itemName() {
-        return this.index ? `${this.name}_${this.index}` : this.name;
+        return (this.index || this.index === 0) ? `${this.name}_${this.index}` : this.name;
     }
 
     /**

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

@@ -698,7 +698,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
         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};
@@ -792,7 +792,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[] = [];
@@ -908,7 +908,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);
@@ -916,7 +916,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

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

app_Web/src/widgets/ibizorder/card-navigation-dataview/card-navigation-dataview-base.vue

@@ -736,7 +736,7 @@ export default class CardNavigationBase extends Vue implements ControlInterface
      */
     public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -830,7 +830,7 @@ export default class CardNavigationBase 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: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -946,7 +946,7 @@ export default class CardNavigationBase 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: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (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);
@@ -954,7 +954,7 @@ export default class CardNavigationBase 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: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){

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

@@ -319,7 +319,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) {
@@ -462,6 +462,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;
     
     /**
     * 是否嵌入关系界面
@@ -996,7 +1010,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZOrderPickupGridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZOrderSF1GridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1125,7 +1139,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1239,7 +1253,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){
@@ -2170,7 +2184,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if (Object.is(item.rowDataState, 'create')) {
                     if (!this.createAction) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2179,7 +2193,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if (Object.is(item.rowDataState, 'update')){
                     if (!this.updateAction) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2255,7 +2269,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

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

@@ -105,6 +105,21 @@ export default class MainModel {
         prop: 'n_ibizordername_like',
         dataType: 'QUERYPARAM'
       },
+      {
+        name: 'n_orderstate_eq',
+        prop: 'n_orderstate_eq',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_ordertime_gt',
+        prop: 'n_ordertime_gt',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_ordertime_lt',
+        prop: 'n_ordertime_lt',
+        dataType: 'QUERYPARAM'
+      },
 
         {
           name:'size',

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json

@@ -11,16 +11,6 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
   },
   "getPSDETreeColumns" : [ {
-    "caption" : "归还日期",
-    "codeName" : "returntime",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "returntime",
-    "name" : "returntime",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
-  }, {
     "caption" : "出版社",
     "codeName" : "press",
     "columnType" : "DEFGRIDCOLUMN",
@@ -60,6 +50,16 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
+  }, {
+    "caption" : "归还日期",
+    "codeName" : "returntime",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "returntime",
+    "name" : "returntime",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
   } ],
   "getPSDETreeNodeRSs" : [ {
     "getChildPSDETreeNode" : {

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

@@ -34,16 +34,6 @@
       "id" : "GANTT"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "归还日期",
-      "codeName" : "returntime",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "returntime",
-      "name" : "returntime",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
-    }, {
       "caption" : "出版社",
       "codeName" : "press",
       "columnType" : "DEFGRIDCOLUMN",
@@ -83,6 +73,16 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
+    }, {
+      "caption" : "归还日期",
+      "codeName" : "returntime",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "returntime",
+      "name" : "returntime",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
     } ],
     "getPSDETreeNodeRSs" : [ {
       "getChildPSDETreeNode" : {

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

@@ -702,6 +702,10 @@
   } ],
   "getPSDEViewCodeName" : "Usr3EditView",
   "getPSDEViewId" : "CA5E9C34-54D6-40DA-A97C-BB80464AA4C8",
+  "getPSSysPFPlugin" : {
+    "pluginType" : "VIEW_CUSTOM",
+    "pluginCode" : "bottomToolbar"
+  },
   "getPSViewLayoutPanel" : {
     "getAllPSPanelFields" : [ {
       "id" : "view_pagecaption"
@@ -2223,7 +2227,7 @@
     "modeltype" : "PSSYSVIEWLAYOUTPANEL"
   },
   "title" : "客户编辑视图",
-  "viewStyle" : "DEFAULT",
+  "viewStyle" : "bottomBtn",
   "viewType" : "DEEDITVIEW",
   "xDataControlName" : "form",
   "enableDP" : true,

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

@@ -3981,6 +3981,12 @@
     "refMode" : "CONTROLITEM",
     "refTag" : "FORM",
     "refTag2" : "FORMITEM"
+  }, {
+    "name" : "底部工具栏",
+    "pluginCode" : "bottomToolbar",
+    "pluginType" : "VIEW_CUSTOM",
+    "refMode" : "APPVIEW",
+    "refTag" : "DEEDITVIEW"
   }, {
     "name" : "快捷菜单",
     "pluginCode" : "QUICKMENUBAR",

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

@@ -15,6 +15,12 @@
     "refMode" : "CONTROLITEM",
     "refTag" : "FORM",
     "refTag2" : "FORMITEM"
+  }, {
+    "name" : "底部工具栏",
+    "pluginCode" : "bottomToolbar",
+    "pluginType" : "VIEW_CUSTOM",
+    "refMode" : "APPVIEW",
+    "refTag" : "DEEDITVIEW"
   }, {
     "name" : "快捷菜单",
     "pluginCode" : "QUICKMENUBAR",

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

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