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

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

 <template>
-    <div :class="[model.sysCss, 'app-login-button']" :style="containerStyle">
-        <i-button @click="handleClick" :type="curStyle">
-            <template v-if="model.sysImage">
-                <i v-if="model.sysImage.iconcls" :class="model.sysImage.iconcls"/>
-                <img v-else-if="model.sysImage.imagePath" :src="model.sysImage.imagePath" />
-            </template>
-            <span v-show="model.isShowCaption">{{ model.caption }}</span>
+    <div :class="curClassName" :style="curStyle">
+        <i-button 
+        @click="handleClick" 
+        :disabled="disabled"
+        :title="curTooltip" 
+        :type="buttonType">
+           <div :class="['button-content', iconAlign.toLowerCase()]">
+                <span v-if="cssClass || imagePath" class="icon">
+                    <i v-if="cssClass" :class="cssClass" />
+                    <img v-else :src="imagePath" />
+                </span>
+                <span v-if="showCaption" class="caption">{{ curCaption }}</span>
+            </div>
         </i-button>
     </div>
 </template>
 
 <script lang="ts">
-import { PanelButtonModel } from "@/model/panel-detail";
 import { Vue, Component, Prop } from "vue-property-decorator";
 
 @Component({})
@@ -20,7 +25,7 @@ export default class AppLoginButton extends Vue {
     /**
      * 名称
      *
-     * @type {PanelButtonModel}
+     * @type {string}
      * @memberof AppLoginButton
      */
     @Prop() public name!: string;
@@ -28,10 +33,10 @@ export default class AppLoginButton extends Vue {
     /**
      * 模型
      *
-     * @type {PanelButtonModel}
+     * @type {any}
      * @memberof AppLoginButton
      */
-    @Prop() public model!: PanelButtonModel;
+    @Prop() public layoutModelDetails: any;
 
     /**
      * 类型
@@ -41,29 +46,154 @@ export default class AppLoginButton extends Vue {
      */
     @Prop() public defaultStyle?: string;
 
+    /**
+     * 加载状态
+     *
+     * @memberof AppLoginButton
+     */
+    @Prop({ default: false }) public loading?: boolean;
+
+    /**
+     * 标题
+     *
+     * @memberof AppLoginButton
+     */
+    get curCaption() {
+        const layoutModel = this.layoutModelDetails[this.name];
+        return layoutModel.caption;
+    }
+
+    /**
+     * 提示信息
+     *
+     * @memberof AppLoginButton
+     */
+    get curTooltip() {
+         const layoutModel = this.layoutModelDetails[this.name];
+        return layoutModel.tooltip;
+    }
+
+    /**
+     * 显示标题
+     *
+     * @memberof AppLoginButton
+     */
+    get showCaption() {
+        const layoutModel = this.layoutModelDetails[this.name];
+        return layoutModel.isShowCaption;
+    }
+
     /**
      * 当前按钮类型
      *
      * @type {string}
      * @memberof AppLoginButton
      */
-    get curStyle(): string {
-        if (this.model.renderMode == 'LINK') {
+    get buttonType(): string {
+        const layoutModel = this.layoutModelDetails[this.name];
+        if (layoutModel.renderMode == 'LINK') {
             return 'text';
-        } else if (this.model.buttonStyle != "DEFAULT" && this.defaultStyle) {
+        } else if (layoutModel.buttonStyle != "DEFAULT" && this.defaultStyle) {
             return this.defaultStyle;
         } else {
-            return this.model.buttonStyle.toLowerCase();
+            if (
+                Object.is(layoutModel.buttonStyle, 'DEFAULT') ||
+                Object.is(layoutModel.buttonStyle, 'STYLE2') ||
+                Object.is(layoutModel.buttonStyle, 'STYLE3') ||
+                Object.is(layoutModel.buttonStyle, 'STYLE4')
+            ) {
+                return 'default';
+            } else if (Object.is(layoutModel.buttonStyle, 'DANGER')) {
+                return 'error';
+            } else if (Object.is(layoutModel.buttonStyle, 'INVERSE')) {
+                return 'primary';
+            } else {
+                return layoutModel.buttonStyle.toLowerCase();
+            }
         }
     }
 
     /**
-     * 按钮样式
+     * 当前容器样式
+     * 
+     * @memberof AppLoginButton
+     */
+    get curStyle(){
+        const layoutModel = this.layoutModelDetails[this.name];
+        return layoutModel.getElementStyle();
+    }
+
+    /**
+     * 禁用
      * 
-     * @type {string}
      * @memberof AppLoginButton
      */
-    public containerStyle: any = null;
+    get disabled(){
+        const layoutModel = this.layoutModelDetails[this.name];
+        return layoutModel.disabled;
+    }
+
+    /**
+     * 类名
+     *
+     * @memberof AppLoginButton
+     */
+    get curClassName(){
+        const layoutModel = this.layoutModelDetails[this.name];
+        return `app-login-button ${this.name} ${layoutModel.sysCss}`;
+    }
+
+    /**
+     * 图片路径
+     *
+     * @memberof AppLoginButton
+     */
+    get imagePath() {
+        const layoutModel = this.layoutModelDetails[this.name];
+        let imagePath = '';
+        if (layoutModel.sysImage) {
+            imagePath = layoutModel.sysImage.imagePath;
+        } else if (layoutModel.uiAction) {
+            imagePath = layoutModel.uiAction.imagePath;
+        }
+        return imagePath;
+    }
+
+    /**
+     * 图标
+     *
+     * @memberof AppLoginButton
+     */
+    get cssClass() {
+        const layoutModel = this.layoutModelDetails[this.name];
+        let cssClass = '';
+        if (layoutModel.sysImage) {
+            cssClass = layoutModel.sysImage.iconcls;
+        } else if (layoutModel.uiAction) {
+            cssClass = layoutModel.uiAction.iconcls;
+        }
+        return cssClass;
+    }
+
+    /**
+     * 图标方向
+     *
+     * @memberof AppLoginButton
+     */
+    get iconAlign() {
+        const layoutModel = this.layoutModelDetails[this.name];
+        return layoutModel.iconAlign || 'LEFT';
+    }
+
+    /**
+     * 按钮幽灵属性，使按钮背景透明
+     *
+     * @memberof AppLoginButton
+     */
+    get buttonGhost() {
+        const layoutModel = this.layoutModelDetails[this.name];
+        return Object.is(layoutModel.buttonStyle, 'INVERSE');
+    }
 
     /**
      * 处理点击
@@ -75,11 +205,6 @@ export default class AppLoginButton extends Vue {
         this.$emit("itemClick", this.name);
     }
 
-    public mounted() {
-        if (this.model) {
-            this.containerStyle = this.model.getElementStyle();
-        }
-    }
 }
 </script>
 

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

 <template>
-    <div :class="[model.sysCss, 'app-login-captcha']" :style="containerStyle">
+    <div :class="curClassName" :style="curStyle">
         <auth-puzzle-vcode :show="show" @success="onSuccess" @fail="onFail" />
         <i-button :type="type" @click="executeOpen">验证</i-button>
     </div>
 </template>
 
 <script lang="ts">
-import { PanelUserControlModel } from "@/model/panel-detail";
 import { Vue, Component, Prop } from "vue-property-decorator";
 import AuthPuzzleVcode from "./vue-puzzle-code/vue-puzzle-code.vue";
 @Component({
@@ -21,7 +20,7 @@ export default class AppLoginCaptcha extends Vue {
      * @type {string}
      * @memberof AppLoginCaptcha
      */
-    @Prop() public model!: PanelUserControlModel;
+    @Prop() public layoutModelDetails: any;
 
     /**
      * 值
@@ -40,12 +39,24 @@ export default class AppLoginCaptcha extends Vue {
     @Prop() public name!: string;
 
     /**
-     * 容器样式
+     * 当前容器样式
      * 
-     * @type {any}
      * @memberof AppLoginCaptcha
      */
-    public containerStyle: any = null;
+    get curStyle(){
+        const layoutModel = this.layoutModelDetails[this.name];
+        return layoutModel.getElementStyle();
+    }
+
+    /**
+     * 类名
+     *
+     * @memberof AppLoginCaptcha
+     */
+    get curClassName(){
+        const layoutModel = this.layoutModelDetails[this.name];
+        return `app-login-captcha ${this.name} ${layoutModel.sysCss}`;
+    }
 
     /**
      * 是否显示
@@ -57,10 +68,7 @@ export default class AppLoginCaptcha extends Vue {
      */
     public type: string = 'default';
 
-    public mounted() {
-        if (this.model) {
-            this.containerStyle = this.model.getElementStyle();
-        }
+    public created() {
         if (this.value) {
             this.type = 'success';
         }

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

 <template>
-    <div :class="[model.sysCss, 'app-login-input']" :style="containerStyle">
+    <div :class="curClassName" :style="curStyle">
         <i-input
             size='large'
             :prefix='defaultIcon'
@@ -7,13 +7,12 @@
             :type="defaultType"
             :disabled="disabled"
             :readonly="readonly"
-            :placeholder="model.caption">
+            :placeholder="curCaption">
         </i-input>
     </div>
 </template>
 
 <script lang="ts">
-import { PanelFieldModel } from '@/model/panel-detail';
 import { Vue, Component, Prop } from 'vue-property-decorator';
 
 @Component({
@@ -23,10 +22,10 @@ export default class AppLoginInput extends Vue {
     /**
      * 模型
      *
-     * @type {string}
+     * @type {any}
      * @memberof AppLoginInput
      */
-    @Prop() public model!: PanelFieldModel;
+    @Prop() public layoutModelDetails: any;
     
     /**
      * 值
@@ -61,28 +60,34 @@ export default class AppLoginInput extends Vue {
     @Prop() public defaultType?: string;
 
         /**
-     * 容器样式
+     * 标题
      *
-     * @type {any}
      * @memberof AppLoginInput
      */
-    public containerStyle: any = null;
+    get curCaption() {
+        const layoutModel = this.layoutModelDetails[this.name];
+        return layoutModel.caption;
+    }
 
     /**
-     * 禁用模式
+     * 当前容器样式
      * 
-     * @type {any}
      * @memberof AppLoginInput
      */
-    public disabled: boolean = false;
+    get curStyle(){
+        const layoutModel = this.layoutModelDetails[this.name];
+        return layoutModel.getElementStyle();
+    }
 
     /**
-     * 只读模式
+     * 类名
      *
-     * @type {any}
      * @memberof AppLoginInput
      */
-    public readonly: boolean = false;
+    get curClassName(){
+        const layoutModel = this.layoutModelDetails[this.name];
+        return `app-login-input ${this.name} ${layoutModel.sysCss}`;
+    }
 
     /**
      * 当前值
@@ -103,12 +108,24 @@ export default class AppLoginInput extends Vue {
         this.$emit('valueChange', { name: this.name, value: val });
     }
 
-    public mounted() {
-        if (this.model) {
-            this.containerStyle = this.model.getElementStyle();
-            this.disabled = Object.is(this.model.fieldState, '1');
-            this.readonly = Object.is(this.model.fieldState, '2'); 
+    /**
+     * 禁用
+     * 
+     * @memberof AppPresetSwitch
+     */
+    get disabled() {
+        const layoutModel = this.layoutModelDetails[this.name];
+        return layoutModel.disabled;
     }
+
+    /**
+     * 只读
+     * 
+     * @memberof AppPresetSwitch
+     */
+    get readonly() {
+        const layoutModel = this.layoutModelDetails[this.name];
+        return layoutModel.readonly;
     }
     
 }

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

 <template>
-  <div :class="[model.sysCss, 'app-login-message']" :style="containerStyle">
+  <div :class="curClassName" :style="curStyle">
     <alert v-show="value" type="error" show-icon>{{ value }}</alert>
   </div>
 </template>
 
 <script lang='ts'>
-import { PanelFieldModel } from "@/model/panel-detail";
 import { Component, Vue, Prop } from "vue-property-decorator";
 
 @Component({})
@@ -14,16 +13,16 @@ export default class AppLoginMessage extends Vue {
     /**
      * 模型
      *
-     * @type {string}
-     * @memberof AppLoginInput
+     * @type {any}
+     * @memberof AppLoginMessage
      */
-    @Prop() public model!: PanelFieldModel;
+    @Prop() public layoutModelDetails: any;
     
     /**
      * 值
      *
      * @type {string}
-     * @memberof AppLoginInput
+     * @memberof AppLoginMessage
      */
     @Prop() public value!: string;
 
@@ -31,22 +30,28 @@ export default class AppLoginMessage extends Vue {
      * 名称
      *
      * @type {string}
-     * @memberof AppLoginInput
+     * @memberof AppLoginMessage
      */
     @Prop() public name!: string;
 
     /**
-     * 容器样式
+     * 当前容器样式
      * 
-     * @type {any}
-     * @memberof AppLoginInput
+     * @memberof AppLoginMessage
      */
-    public containerStyle: any = null;
-
-    public mounted() {
-        if (this.model) {
-            this.containerStyle = this.model.getElementStyle();
+    get curStyle(){
+        const layoutModel = this.layoutModelDetails[this.name];
+        return layoutModel.getElementStyle();
     }
+
+    /**
+     * 类名
+     *
+     * @memberof AppLoginMessage
+     */
+    get curClassName(){
+        const layoutModel = this.layoutModelDetails[this.name];
+        return `app-login-message ${this.name} ${layoutModel.sysCss}`;
     }
 
 }

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

 <template>
-    <div :class="[model.sysCss, 'app-login-note-verify']" :style="containerStyle">
+    <div :class="curClassName" :style="curStyle">
         <div class="content">
             <i-input
                 size="default"
@@ -26,7 +26,6 @@
 </template>
 
 <script lang="ts">
-import { PanelFieldModel } from "@/model/panel-detail";
 import { Vue, Component, Prop } from "vue-property-decorator";
 
 @Component({})
@@ -34,16 +33,16 @@ export default class AppLoginNoteVerify extends Vue {
     /**
      * 模型
      *
-     * @type {string}
-     * @memberof AppLoginInput
+     * @type {any}
+     * @memberof AppLoginNoteVerify
      */
-    @Prop() public model!: PanelFieldModel;
+    @Prop() public layoutModelDetails: any;
 
     /**
      * 值
      *
      * @type {string}
-     * @memberof AppLoginInput
+     * @memberof AppLoginNoteVerify
      */
     @Prop() public value!: string;
 
@@ -51,7 +50,7 @@ export default class AppLoginNoteVerify extends Vue {
      * 名称
      *
      * @type {string}
-     * @memberof AppLoginInput
+     * @memberof AppLoginNoteVerify
      */
     @Prop() public name!: string;
 
@@ -113,17 +112,23 @@ export default class AppLoginNoteVerify extends Vue {
     public timer: any = null;
 
     /**
-     * 容器样式
+     * 当前容器样式
      * 
-     * @type {any}
-     * @memberof AppLoginInput
+     * @memberof AppLoginNoteVerify
      */
-    public containerStyle: any = null;
-
-    public mounted() {
-        if (this.model) {
-            this.containerStyle = this.model.getElementStyle();
+    get curStyle(){
+        const layoutModel = this.layoutModelDetails[this.name];
+        return layoutModel.getElementStyle();
     }
+
+    /**
+     * 类名
+     *
+     * @memberof AppLoginNoteVerify
+     */
+    get curClassName(){
+        const layoutModel = this.layoutModelDetails[this.name];
+        return `app-login-note-verify ${this.name} ${layoutModel.sysCss}`;
     }
 
     /**

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

 <template>
-    <div :class="[model.sysCss, 'app-login-org']" :style="containerStyle">
+    <div :class="curClassName" :style="curStyle">
         <Select v-model="curKey">
             <Option v-for="(item, index) in items" :value="item.value" :key="item.value">{{ item.label }}</Option>
         </Select>
     </div>
 </template>
 <script lang='ts'>
-import { PanelFieldModel } from '@/model/panel-detail';
 import { Vue, Component, Prop } from 'vue-property-decorator';
 
 @Component({})
@@ -34,7 +33,7 @@ export default class AppLoginOrg extends Vue {
      * @type {*}
      * @memberof AppLoginOrg
      */
-    @Prop() public model!: PanelFieldModel;
+    @Prop() public layoutModelDetails: any;
 
     /**
      * 当前值
@@ -63,12 +62,24 @@ export default class AppLoginOrg extends Vue {
     public items: Array<any> = [];
 
     /**
-     * 容器样式
+     * 当前容器样式
      * 
-     * @type {any}
-     * @memberof AppLoginInput
+     * @memberof AppLoginOrg
      */
-    public containerStyle: any = null;
+    get curStyle(){
+        const layoutModel = this.layoutModelDetails[this.name];
+        return layoutModel.getElementStyle();
+    }
+
+    /**
+     * 类名
+     *
+     * @memberof AppLoginOrg
+     */
+    get curClassName(){
+        const layoutModel = this.layoutModelDetails[this.name];
+        return `app-login-org ${this.name} ${layoutModel.sysCss}`;
+    }
 
     /**
      * 组件初始化数据，vue生命周期
@@ -77,9 +88,6 @@ export default class AppLoginOrg extends Vue {
      */
     public created() {
         this.getOrgData();
-        if (this.model) {
-            this.containerStyle = this.model.getElementStyle();
-        }
     }
 
     /**

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

 <template>
-    <div :class="[model.sysCss, 'app-login-third']" :style="containerStyle">
+    <div :class="curClassName" :style="curStyle">
         <div class="app-login-third__title">{{ $t("components.login.other") }}</div>
         <div class="app-login-third__content">
             <div class="sign-btn" @click="handleThirdLogin('DINGDING')">
@@ -13,7 +13,6 @@
 </template>
 
 <script lang="ts">
-import { PanelUserControlModel } from "@/model/panel-detail";
 import { Component, Prop, Vue } from "vue-property-decorator";
 @Component({})
 export default class AppThirdLogin extends Vue {
@@ -21,16 +20,16 @@ export default class AppThirdLogin extends Vue {
     /**
      * 模型
      *
-     * @type {string}
-     * @memberof AppLoginInput
+     * @type {any}
+     * @memberof AppThirdLogin
      */
-    @Prop() public model!: PanelUserControlModel;
+    @Prop() public layoutModelDetails: any;
     
     /**
      * 值
      *
      * @type {string}
-     * @memberof AppLoginInput
+     * @memberof AppThirdLogin
      */
     @Prop() public value!: string;
 
@@ -38,22 +37,28 @@ export default class AppThirdLogin extends Vue {
      * 名称
      *
      * @type {string}
-     * @memberof AppLoginInput
+     * @memberof AppThirdLogin
      */
     @Prop() public name!: string;
 
     /**
-     * 容器样式
+     * 当前容器样式
      * 
-     * @type {any}
-     * @memberof AppLoginInput
+     * @memberof AppThirdLogin
      */
-    public containerStyle: any = null;
-
-    public mounted() {
-        if (this.model) {
-            this.containerStyle = this.model.getElementStyle();
+    get curStyle(){
+        const layoutModel = this.layoutModelDetails[this.name];
+        return layoutModel.getElementStyle();
     }
+
+    /**
+     * 类名
+     *
+     * @memberof AppThirdLogin
+     */
+    get curClassName(){
+        const layoutModel = this.layoutModelDetails[this.name];
+        return `app-login-input ${this.name} ${layoutModel.sysCss}`;
     }
     
     /**

app_Web/src/pages/sample/ibizbookoption-view-layout/ibizbookoption-view-layout-base.vue

@@ -39,7 +39,7 @@
         </app-preset-button>
         </template>
         <template #button_openview1>
-        <app-login-button class="app-reset-button" name="button_openview1"  :model="layoutModelDetails.button_openview1" defaultStyle='success' @itemClick="handleButtonClick" />
+        <app-login-button class="app-reset-button" name="button_openview1"  :layoutModelDetails="layoutModelDetails" defaultStyle='success' @itemClick="handleButtonClick" />
         </template>
     </app-standard-container>
         </template>

app_Web/src/pages/sample/index/index-base.vue

@@ -76,7 +76,7 @@
             <app-index-user-info name="auth_userinfo1" :layoutModelDetails="layoutModelDetails"></app-index-user-info>
         </template>
         <template #auth_logout1>
-        <app-login-button class="app-logout-button" name="auth_logout1"  :model="layoutModelDetails.auth_logout1" @itemClick="handleButtonClick" />
+        <app-login-button class="app-logout-button" name="auth_logout1"  :layoutModelDetails="layoutModelDetails" @itemClick="handleButtonClick" />
         </template>
     </app-simpleflex-container>
         </template>

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

@@ -5,34 +5,34 @@
         <template #container1>
     <app-standard-container name="container1" :layoutModelDetails="layoutModelDetails">
         <template #userid>
-        <app-login-input class="app-login-user" name="userid" :model="layoutModelDetails.userid" :value="layoutData.userid" defaultIcon="ios-contact" @valueChange="handleValueChange" />
+        <app-login-input class="app-login-user" name="userid" :layoutModelDetails="layoutModelDetails" :value="layoutData.userid" defaultIcon="ios-contact" @valueChange="handleValueChange" />
         </template>
         <template #auth_password>
-        <app-login-input class="app-login-password" name="auth_password" defaultType="password" :model="layoutModelDetails.auth_password" :value="layoutData.auth_password" defaultIcon="ios-key" @valueChange="handleValueChange" />
+        <app-login-input class="app-login-password" name="auth_password" defaultType="password" :layoutModelDetails="layoutModelDetails" :value="layoutData.auth_password" defaultIcon="ios-key" @valueChange="handleValueChange" />
         </template>
         <template #auth_orgpick>
-        <app-login-org name="auth_orgpick" :model="layoutModelDetails.auth_orgpick" :value="layoutData.auth_orgpick" @valueChange="handleValueChange" />
+        <app-login-org name="auth_orgpick" :layoutModelDetails="layoutModelDetails" :value="layoutData.auth_orgpick" @valueChange="handleValueChange" />
         </template>
         <template #auth_loginbutton1>
-        <app-login-button class="app-login-button" name="auth_loginbutton1"  :model="layoutModelDetails.auth_loginbutton1" defaultStyle='primary' @itemClick="handleButtonClick" />
+        <app-login-button class="app-login-button" name="auth_loginbutton1"  :layoutModelDetails="layoutModelDetails" defaultStyle='primary' @itemClick="handleButtonClick" />
         </template>
         <template #auth_resetinput1>
-        <app-login-button class="app-reset-button" name="auth_resetinput1"  :model="layoutModelDetails.auth_resetinput1" defaultStyle='success' @itemClick="handleButtonClick" />
+        <app-login-button class="app-reset-button" name="auth_resetinput1"  :layoutModelDetails="layoutModelDetails" defaultStyle='success' @itemClick="handleButtonClick" />
         </template>
         <template #auth_logout1>
-        <app-login-button class="app-logout-button" name="auth_logout1"  :model="layoutModelDetails.auth_logout1" @itemClick="handleButtonClick" />
+        <app-login-button class="app-logout-button" name="auth_logout1"  :layoutModelDetails="layoutModelDetails" @itemClick="handleButtonClick" />
         </template>
         <template #auth_captcha1>
-        <app-login-captcha name="auth_captcha1" :model="layoutModelDetails.auth_captcha1" :value="layoutData.auth_captcha1" @valueChange="handleValueChange" />
+        <app-login-captcha name="auth_captcha1" :layoutModelDetails="layoutModelDetails" :value="layoutData.auth_captcha1" @valueChange="handleValueChange" />
         </template>
         <template #auth_verificationcode>
-        <app-login-note-verify name="auth_verificationcode" :model="layoutModelDetails.auth_verificationcode" :value="layoutData.auth_verificationcode" @valueChange="handleValueChange" />
+        <app-login-note-verify name="auth_verificationcode" :layoutModelDetails="layoutModelDetails" :value="layoutData.auth_verificationcode" @valueChange="handleValueChange" />
         </template>
         <template #auth_loginmsg>
-        <app-login-message name="auth_loginmsg" :model="layoutModelDetails.auth_loginmsg" :value="layoutData.auth_loginmsg" />
+        <app-login-message name="auth_loginmsg" :layoutModelDetails="layoutModelDetails" :value="layoutData.auth_loginmsg" />
         </template>
         <template #auth_sso1>
-        <app-login-third name="auth_sso1" :model="layoutModelDetails.auth_sso1" :value="layoutData.auth_sso1" />
+        <app-login-third name="auth_sso1" :layoutModelDetails="layoutModelDetails" :value="layoutData.auth_sso1" />
         </template>
     </app-standard-container>
         </template>

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

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

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

@@ -291,7 +291,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZOrderSF1GridViewBase
+     * @memberof IBIZOrderPickupGridViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -413,20 +413,6 @@ 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;
     
     /**
     * 是否嵌入关系界面
@@ -959,7 +945,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -1054,7 +1040,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1160,7 +1146,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: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2077,7 +2063,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: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -2085,7 +2071,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: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){
@@ -2152,7 +2138,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

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

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

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

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

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

@@ -345,13 +345,6 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
-    /**
-     * 打开新建数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public newdata: any;
     /**
      * 打开编辑数据视图
      *
@@ -882,7 +875,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -977,7 +970,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1083,7 +1076,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: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -1976,7 +1969,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: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -1984,7 +1977,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: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizsample0021){
@@ -2051,7 +2044,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

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

@@ -11,6 +11,16 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
   },
   "getPSDETreeColumns" : [ {
+    "caption" : "作者",
+    "codeName" : "author",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "author",
+    "name" : "author",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
+  }, {
     "caption" : "图书名称",
     "codeName" : "ibizbookname",
     "columnType" : "DEFGRIDCOLUMN",
@@ -40,16 +50,6 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
-  }, {
-    "caption" : "作者",
-    "codeName" : "author",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "author",
-    "name" : "author",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
   }, {
     "caption" : "借出日期",
     "codeName" : "lendouttime",

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

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

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

@@ -34,6 +34,16 @@
       "id" : "GANTT"
     },
     "getPSDETreeColumns" : [ {
+      "caption" : "作者",
+      "codeName" : "author",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "author",
+      "name" : "author",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
+    }, {
       "caption" : "图书名称",
       "codeName" : "ibizbookname",
       "columnType" : "DEFGRIDCOLUMN",
@@ -63,16 +73,6 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
-    }, {
-      "caption" : "作者",
-      "codeName" : "author",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "author",
-      "name" : "author",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
     }, {
       "caption" : "借出日期",
       "codeName" : "lendouttime",

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

@@ -75,11 +75,11 @@
       "id" : "TREEGRIDEX"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "作者",
-      "codeName" : "author",
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "author",
-      "name" : "author",
+      "dataItemName" : "ibizbookname",
+      "name" : "ibizbookname",
       "width" : 50,
       "widthUnit" : "px",
       "enableExpand" : false,
@@ -95,11 +95,11 @@
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
+      "caption" : "作者",
+      "codeName" : "author",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "name" : "ibizbookname",
+      "dataItemName" : "author",
+      "name" : "author",
       "width" : 50,
       "widthUnit" : "px",
       "enableExpand" : false,