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

app_Web/src/components/app-form-group/app-form-group.scss

 .app-form-group {
-
-    >.ivu-card-head {
-        >p {
-            >i {
-                margin-right: 8px;
-                cursor: pointer;
-            }
-        }
+    .app-form-group-caption {
+        padding-left: 20px;
     }
-
-    >.ivu-card-extra {
-
-        .item-extract-mode {
-            display: flex;
-
-            .item {
-                margin-left: 12px;
-            }
-        }
+    .collapse-icon {
+        font-size: 20px;
+        margin-right: 20px;
     }
-}
-
-.app-form-group.app-group-collapse-contant {
-
-    .ivu-card-body {
-        display: none;
+    >.ivu-card-body {
+        padding: 20px 5px 10px 5px;
+    }
+    &.app-group-collapse-content {
+        >.ivu-card-head {
+            color: var(--app-color-gray-200);
+            height: 48px;
+            border-bottom: none;
+        }
+        >.ivu-card-body {
+            display: none;
+        }
     }
-}
-
-.app-group-flex {
-    height: 100%;
-    overflow-y: auto;
-    overflow-x: hidden;
 
-    >.ivu-card-body {
-        height: calc(100% - 51px);
+    &.app-group-flex {
+        height: 100%;
         overflow-y: auto;
         overflow-x: hidden;
+
+        >.ivu-card-body {
+            height: calc(100% - 51px);
+            overflow-y: auto;
+            overflow-x: hidden;
+        }
     }
 }
\ No newline at end of file

app_Web/src/components/app-form-group/app-form-group.vue

@@ -12,12 +12,12 @@
                 </app-form-group2>
         </template>
         <template v-else>
-            <card v-if="isShowCaption === true" :bordered="false" :dis-hover="true" :class="classes">
-                <p class='' slot='title'>
-                     <icon v-if="titleBarCloseMode !== 0" :type="collapseContant ? 'ios-arrow-dropright-circle' : 'ios-arrow-dropdown-circle'"
+            <card v-if="isShowCaption === true" :dis-hover="true" :class="classes">
+                <span class='app-form-group-caption' slot='title'>
+                    <icon v-if="titleBarCloseMode !== 0" :type="collapseContent ? 'md-add' : 'md-remove'" class="collapse-icon"
                     @click="clickCollapse"></icon>
                     <span :class="titleClass">{{caption}}</span>
-                </p>
+                </span>
                 <template v-if="uiActionGroup">
                     <a slot='extra'>
                         <template v-if="uiActionGroup.extractMode && Object.is(uiActionGroup.extractMode, 'ITEMS')">
@@ -61,7 +61,7 @@
                                         <span v-show="detail.visabled" :style="{'pointer-events':detail.disabled?'none':'auto','color':detail.disabled?'#7b7979':'#2d8cf0'}" class='item' @click="doUIAction($event, detail)">
                                             <template v-if="detail.isShowIcon">
                                                 <template v-if="detail.icon && !Object.is(detail.icon, '')">
-                                                    <i :class="detail.icon" ></i>
+                                                    <i :class="detail.icon"></i>
                                                 </template>
                                                 <template v-if="!(detail.icon && !Object.is(detail.icon, ''))">
                                                     <div v-if="detail.img && !Object.is(detail.img, '')">
@@ -283,7 +283,7 @@ export default class AppFormGroup extends Vue {
      * @type {boolean}
      * @memberof AppFormGroup
      */
-    public collapseContant: boolean = false;
+    public collapseContent: boolean = false;
 
     /**
      * 计算样式
@@ -295,7 +295,7 @@ export default class AppFormGroup extends Vue {
     get classes(): string[] {
         return [
             'app-form-group',
-            this.isShowCaption && this.collapseContant ? 'app-group-collapse-contant' : '',
+            this.isShowCaption && this.collapseContent ? 'app-group-collapse-content' : '',
             this.isInfoGroupMode ? 'app-info-group-mode' : '',
             Object.is(this.layoutType, 'FLEX') ? 'app-group-flex': ''
         ];
@@ -318,7 +318,7 @@ export default class AppFormGroup extends Vue {
      * @memberof AppFormGroup
      */
     public created() {
-        this.collapseContant = this.titleBarCloseMode === 2 ? true : false;
+        this.collapseContent = this.titleBarCloseMode === 2 ? true : false;
     }
 
     /**
@@ -327,7 +327,7 @@ export default class AppFormGroup extends Vue {
      * @memberof AppFormGroup
      */
     public clickCollapse(): void {
-        this.collapseContant = !this.collapseContant;
+        this.collapseContent = !this.collapseContent;
     }
 
     /**

app_Web/src/components/app-form-item/app-form-item.scss

 .app-form-item {
-  height: 100%;
-  padding: 0 6px;
-  .editor {
-      height: 100%;
-      .ivu-form-item-content {
-          height: 100%;
-          min-height: 36px;
-      }
-  }
-  .app-form-item-label {
-      line-height: 21px;
-      padding: 6px 10px 6px 0px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-  }
+    height: 100%;
+    padding: 0 15px;
+
+    .app-form-item-label {
+        line-height: 21px;
+        padding: 6px 10px 6px 0px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        padding-left: 7px;
+        &.app-form-item-label--required {
+            padding-left: 0;
+        }
+    }
+
+    .required {
+        color: var(--app-color-red);
+    }
 }
 
-.app-form-item.label-top, .app-form-item.label-bottom {
-  .app-form-item-label {
-      display: block;
-  }
+.app-form-item.label-top,
+.app-form-item.label-bottom {
+    .app-form-item-label {
+        display: block;
+    }
 }
 
-.app-form-item.label-left, .app-form-item.label-right {
-  .app-form-item-label, .editor {
-      height: 100%;
-  }
+.app-form-item.label-left,
+.app-form-item.label-right {
+
+    .app-form-item-label,
+    .editor {
+        height: 100%;
+    }
 }
 
 .app-form-item.label-left {
-  .app-form-item-label {
-      float: left;
-      text-align: right;
-  }
+    .app-form-item-label {
+        float: left;
+    }
 }
 
 .app-form-item.label-right {
-  .app-form-item-label {
-      float: right;
-      padding: 6px 0px 6px 10px;
-  }
+    .app-form-item-label {
+        float: right;
+        padding: 6px 0px 6px 10px;
+    }
 }
 
 .app-form-item.label-none {
-  >.app-form-item-label {
-      display: none !important;
-  }
+    >.app-form-item-label {
+        display: none !important;
+    }
 }
\ No newline at end of file

app_Web/src/components/app-form-item/app-form-item.vue

@@ -30,18 +30,18 @@
                 :style="labelstyle"
                 :class="labelclasses"
             >
-                <span v-if="required" style="color:red;">* </span>
-                    <span v-if="!isEmptyCaption">
-                        <el-tooltip v-if="isShowTip" placement="top" effect="light">
-                            <span v-html="caption"></span>
-                            <template >
-                                <span slot="content" v-html="caption" ></span>
-                            </template>
-                        </el-tooltip>
-                        <template v-if="!isShowTip">
-                            <span v-html="caption" ></span>
+                <span v-show="required" class="required">*</span>
+                <span v-if="!isEmptyCaption">
+                    <el-tooltip v-if="isShowTip" placement="top" effect="light">
+                        <span v-html="caption"></span>
+                        <template >
+                            <span slot="content" v-html="caption" ></span>
                         </template>
-                    </span>
+                    </el-tooltip>
+                    <template v-if="!isShowTip">
+                        <span v-html="caption" ></span>
+                    </template>
+                </span>
             </span>
             <div
                 v-if="Object.is(this.labelPos,'TOP') || Object.is(this.labelPos,'LEFT') || Object.is(this.labelPos,'RIGHT')"
@@ -221,9 +221,7 @@ export default class AppFormItem extends Vue {
    * @memberof AppFormItem
    */
   get labelclasses(): string {
-    return this.labelStyle
-      ? this.labelStyle + " app-form-item-label"
-      : "app-form-item-label";
+      return `app-form-item-label ${this.required ? 'app-form-item-label--required' : ''} ${this.labelStyle || ''}`
   }
 
   /**

app_Web/src/layout/edit-view-layout/edit-view-layout.scss

 .edit-view-layout {
-    
+    height: 100%;
+    padding: 0;
+    box-shadow: none;
+    background-color: transparent;
+    .view-header {
+        display: flex;
+        flex-direction: column;
+        .view-header__content {
+            display: flex;
+            justify-content: space-between;
+        }
+    }
 }
\ No newline at end of file

app_Web/src/pages/sample/app-index-view2/main.ts

@@ -13,6 +13,7 @@ import i18n from '@/locale'
 import 'element-ui/lib/theme-chalk/index.css';
 import 'view-design/dist/styles/iview.css';
 import 'ibiz-vue-lib/lib/ibiz-vue-lib.css';
+import 'font-awesome/css/font-awesome.css';
 import '@/styles/default.scss';
 
 import VueAMap from 'vue-amap';

app_Web/src/pages/sample/index/main.ts

@@ -13,6 +13,7 @@ import i18n from '@/locale'
 import 'element-ui/lib/theme-chalk/index.css';
 import 'view-design/dist/styles/iview.css';
 import 'ibiz-vue-lib/lib/ibiz-vue-lib.css';
+import 'font-awesome/css/font-awesome.css';
 import '@/styles/default.scss';
 
 import VueAMap from 'vue-amap';

app_Web/src/pages/ungroup/app-index-view/main.ts

@@ -13,6 +13,7 @@ import i18n from '@/locale'
 import 'element-ui/lib/theme-chalk/index.css';
 import 'view-design/dist/styles/iview.css';
 import 'ibiz-vue-lib/lib/ibiz-vue-lib.css';
+import 'font-awesome/css/font-awesome.css';
 import '@/styles/default.scss';
 
 import VueAMap from 'vue-amap';

app_Web/src/styles/default.scss

-// @import '../../node_modules/font-awesome/scss/font-awesome.scss';
-@import'/assets/styles/index.css';
-@import '../theme/blue.theme.scss';
-@import '../theme/dark-blue.theme.scss';
-@import '../theme/default.theme.scss';
-@import './app-code-list.scss';
 @import './var.scss';
 @import './element/index.scss';
 @import './iview/index.scss';
+@import './blue.theme.scss';
+@import './dark-blue.theme.scss';
+@import './default.theme.scss';
+@import './app-code-list.scss';
 
 #app {
     height: 100vh;

app_Web/src/styles/iview/card.scss

+.ivu-card {
+    .ivu-card-head {
+        font-size: 16px;
+        padding: 0;
+        height: 54px;
+        font-weight: bold;
+        display: flex;
+        align-items: center;
+        color: var(--app-color-black);
+        border-bottom: 1px solid var(--app-color-gray-235);
+    }
+    &.ivu-card-bordered {
+        border-color: var(--app-color-gray-235);
+        border-radius: 0;
+    }
+}
\ No newline at end of file

app_Web/src/styles/iview/data-picker.scss

+.ivu-date-picker-transfer{
+    .ivu-date-picker-cells-cell-selected:hover em, 
+    .ivu-date-picker-cells-cell-selected em{
+        background: var(--app-color-blue);
+        color: var(--app-color-white);
+    }
+    .ivu-date-picker-cells-cell-selected em{
+        box-shadow: inset 0 0 0 1px var(--app-color-blue)
+    }
+    .ivu-date-picker-cells-cell-today em::after{
+        background-color: var(--app-color-blue);
+    }
+    .ivu-date-picker-cells-focused em{
+        border-color: var(--app-color-blue);
+        box-shadow: inset 0 0 0 1px var(--app-color-blue)
+    }
+    .ivu-time-picker-cells-cell-selected{
+         color: var(--app-color-blue);
+    }
+}
\ No newline at end of file

app_Web/src/styles/iview/form-item.scss

+.ivu-form-item {
+    margin-bottom: 10px;
+}
\ No newline at end of file

app_Web/src/styles/iview/index.scss

@@ -3,4 +3,7 @@
 @import './checkbox-group.scss';
 @import './select.scss';
 @import './input.scss';
-@import './dropdown.scss';
+@import './dropdown.scss';
\ No newline at end of file
+@import './form-item.scss';
+@import './card.scss';
+@import './data-picker.scss';
\ No newline at end of file

app_Web/src/styles/theme/blue.theme.scss

+/***    BRGIN:默认蓝色主题    ***/
+.app_theme_blue {
+    > .ivu-layout-has-sider > .ivu-layout > header{
+      .app-theme-icon {
+          color: #6ba1d1;
+      }
+  }
+  
+  > .ivu-layout {
+    > .ivu-layout-sider {
+        background-color: #4276a4;
+        .sider-top {
+          color: hsla(0,0%,100%,.8);
+          background-color: #4276a4;
+          >.page-logo{
+            >.menuicon:hover{
+                background-color: #2d5f8b;
+              }
+          }
+      }
+    }
+  }
+  div.ivu-divider{
+    background-color: #c9dff5;
+  }
+}
+/***    END:默认蓝色主题   ***/
\ No newline at end of file

app_Web/src/styles/theme/dark-blue.theme.scss

+/***    BRGIN:默认Dark Blue主题    ***/
+.app_theme_darkblue {
+    > .ivu-layout-has-sider > .ivu-layout > header{
+        .app-theme-icon {
+            color: #606d80;
+        }
+    }
+    > .ivu-layout {
+        > .ivu-layout-sider {
+            background-color: #20222A;
+            .sider-top {
+                color: hsla(0,0%,100%,.8);
+                background-color: #20222A;
+                >.page-logo{
+                    >.menuicon:hover{
+                        background-color:#060708;
+                    }
+                }
+            }
+        }
+    }
+
+    .sider-top{
+        color:#fff;
+    }
+    div.ivu-divider{
+      background-color: #b4bcc8;
+    }
+}
+  /***    END:默认Dark Blue主题   ***/
\ No newline at end of file

app_Web/src/styles/theme/default.theme.scss

+/***    BRGIN:默认亮色主题    ***/
+.app-default-theme {
+    > .ivu-layout-has-sider > .ivu-layout > header {
+        .app-theme-icon {
+            color: #aaaaaa;
+        }
+    }
+    > .ivu-layout {
+        > .ivu-layout-sider {
+            background-color: #f6f6f6;
+            .sider-top {
+                background-color: #f6f6f6;
+                >.page-logo{
+                    >.menuicon:hover{
+                        background-color: #fff;
+                        color:#000;
+                      }
+                  }
+            }
+        }
+    }
+    div.ivu-divider{
+      background-color: #b3b3b3;
+    }
+  }
+  /***    END:默认亮色主题   ***/
\ No newline at end of file

app_Web/src/styles/var.scss

 :root {
-    --app-color-primary: #3880ff;
-    --app-color-primary-rgb: 56,128,255;
-    --app-color-primary-contrast: #ffffff;
-    --app-color-primary-contrast-rgb: 255,255,255;
-    --app-color-primary-shade: #3171e0;
-    --app-color-primary-tint: #4c8dff;
-  
-    --app-color-secondary: #0cd1e8;
-    --app-color-secondary-rgb: 12,209,232;
-    --app-color-secondary-contrast: #ffffff;
-    --app-color-secondary-contrast-rgb: 255,255,255;
-    --app-color-secondary-shade: #0bb8cc;
-    --app-color-secondary-tint: #24d6ea;
-  
-    --app-color-tertiary: #7044ff;
-    --app-color-tertiary-rgb: 112,68,255;
-    --app-color-tertiary-contrast: #ffffff;
-    --app-color-tertiary-contrast-rgb: 255,255,255;
-    --app-color-tertiary-shade: #633ce0;
-    --app-color-tertiary-tint: #7e57ff;
-  
-    --app-color-success: #10dc60;
-    --app-color-success-rgb: 16,220,96;
-    --app-color-success-contrast: #ffffff;
-    --app-color-success-contrast-rgb: 255,255,255;
-    --app-color-success-shade: #0ec254;
-    --app-color-success-tint: #28e070;
-  
-    --app-color-warning: #ffce00;
-    --app-color-warning-rgb: 255,206,0;
-    --app-color-warning-contrast: #ffffff;
-    --app-color-warning-contrast-rgb: 255,255,255;
-    --app-color-warning-shade: #e0b500;
-    --app-color-warning-tint: #ffd31a;
-  
-    --app-color-danger: #f04141;
-    --app-color-danger-rgb: 245,61,61;
-    --app-color-danger-contrast: #ffffff;
-    --app-color-danger-contrast-rgb: 255,255,255;
-    --app-color-danger-shade: #d33939;
-    --app-color-danger-tint: #f25454;
-  
-    --app-color-dark: #222428;
-    --app-color-dark-rgb: 34,34,34;
-    --app-color-dark-contrast: #ffffff;
-    --app-color-dark-contrast-rgb: 255,255,255;
-    --app-color-dark-shade: #1e2023;
-    --app-color-dark-tint: #383a3e;
-  
-    --app-color-medium: #989aa2;
-    --app-color-medium-rgb: 152,154,162;
-    --app-color-medium-contrast: #ffffff;
-    --app-color-medium-contrast-rgb: 255,255,255;
-    --app-color-medium-shade: #86888f;
-    --app-color-medium-tint: #a2a4ab;
-  
-    --app-color-light: #f4f5f8;
-    --app-color-light-rgb: 244,244,244;
-    --app-color-light-contrast: #000000;
-    --app-color-light-contrast-rgb: 0,0,0;
-    --app-color-light-shade: #d7d8da;
-    --app-color-light-tint: #f5f6f9;
-
     // 安永黑
     --app-color-black: #2E2E38;
     // 安永灰1
     --app-color-gray-100: #747480;
     // 安永灰2
     --app-color-gray-200: #C4C4CD;
+    // 安永灰2 35%
+    --app-color-gray-235: #E7E7E7;
     // 安永灰2 50%
     --app-color-gray-250: #E1E1E6;
     // 安永灰4

app_Web/src/widgets/ibizappctrl/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizappeditor/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizappextendeditor/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizappview/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

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

@@ -712,7 +712,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: 'IBIZBOOKUsr4ListView_layout' + (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 };
@@ -748,7 +748,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public async loadDraft(opt: any = {},mode?:string): Promise<any> {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (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/ibizbook/guide-borrow-form-form/guide-borrow-form-form-base.vue

@@ -1378,7 +1378,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1429,7 +1429,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1499,7 +1499,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_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1607,7 +1607,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_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1799,7 +1799,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_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/guide-borrow-form-form/guide-borrow-form-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

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

@@ -1344,7 +1344,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1395,7 +1395,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1465,7 +1465,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_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1573,7 +1573,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_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1765,7 +1765,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_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (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.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

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

@@ -1447,7 +1447,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1499,7 +1499,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1569,7 +1569,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_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1677,7 +1677,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_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1869,7 +1869,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_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (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.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizbook/inter-func-form-2-form/inter-func-form-2-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizbook/inter-func-form-form/inter-func-form-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizbook/main-2-form/main-2-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizbook/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizbook/main-layout-form/main-layout-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizbook/major-state-form-form/major-state-form-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

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

@@ -670,7 +670,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -706,7 +706,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {},mode?:string): Promise<any> {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/rules-form-form/rules-form-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizbook/usr1206025757-form/usr1206025757-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizbook/usr1207735605-form/usr1207735605-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

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

@@ -48,18 +48,18 @@
                     <div v-show="flag" class="batch-toolbar">
                                 <div class='toolbar-container'>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="usr2dataviewdataview_batchtoolbarModels.deuiaction1.visabled" :disabled="usr2dataviewdataview_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="dataview_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction1.visabled" :disabled="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="dataviewexpbar_dataview_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-edit'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
                 </tooltip>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="usr2dataviewdataview_batchtoolbarModels.deuiaction2.visabled" :disabled="usr2dataviewdataview_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="dataview_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
+                        <i-button v-show="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction2.visabled" :disabled="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="dataviewexpbar_dataview_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
                             <i class='fa fa-remove'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
                 </tooltip>
             </div>
                     </div>
@@ -202,18 +202,18 @@ export default class Usr2Base extends Vue implements ControlInterface {
     public appEntityService: IBIZBOOKEntityService = new IBIZBOOKEntityService({ $store: this.$store });
 
     /**
-     * dataview_batchtoolbar 部件 click 事件
+     * dataviewexpbar_dataview_batchtoolbar 部件 click 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof Usr2Base
      */
-    public dataview_batchtoolbar_click($event: any, $event2?: any) {
+    public dataviewexpbar_dataview_batchtoolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'deuiaction1')) {
-            this.dataview_batchtoolbar_deuiaction1_click(null, 'dataview_batchtoolbar', $event2);
+            this.dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(null, 'dataviewexpbar_dataview_batchtoolbar', $event2);
         }
         if (Object.is($event.tag, 'deuiaction2')) {
-            this.dataview_batchtoolbar_deuiaction2_click(null, 'dataview_batchtoolbar', $event2);
+            this.dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(null, 'dataviewexpbar_dataview_batchtoolbar', $event2);
         }
     }
     
@@ -226,7 +226,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataview_batchtoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+    public dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -254,7 +254,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataview_batchtoolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
+    public dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -282,7 +282,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataview_memo1_u37f11a8_click(params: any = {}, tag?: any, $event?: any) {
+    public dataviewexpbar_dataview_memo1_u37f11a8_click(params: any = {}, tag?: any, $event?: any) {
         // 取数
         let datas: any[] = [];
         let xData: any = null;
@@ -309,7 +309,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataview_memo1_uc365542_click(params: any = {}, tag?: any, $event?: any) {
+    public dataviewexpbar_dataview_memo1_uc365542_click(params: any = {}, tag?: any, $event?: any) {
         // 取数
         let datas: any[] = [];
         let xData: any = null;
@@ -337,7 +337,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKUsr2DataViewBase
+     * @memberof IBIZBOOKDataViewExpViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -363,7 +363,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKUsr2DataViewBase
+     * @memberof IBIZBOOKDataViewExpViewBase
      */
     public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
@@ -427,6 +427,12 @@ export default class Usr2Base extends Vue implements ControlInterface {
         }
         let result: boolean = true;
         Object.assign(actionData, args);
+        if ('selectionchange'.indexOf(eventName) !== -1) {
+            result = await this.execute_dataviewexpbar_selectionchange_ctrl_logic(actionData) && result;
+        }
+        if ('load'.indexOf(eventName) !== -1) {
+            result = await this.execute_dataviewexpbar_load_ctrl_logic(actionData) && result;
+        }
         if (!result) {
             return false;
         }
@@ -434,6 +440,30 @@ export default class Usr2Base extends Vue implements ControlInterface {
         return true;
     }
 
+    /**
+     * 部件逻辑 -- dataviewexpbar_selectionchange
+     *
+     * @param {string} eventName 部件事件名称
+     * @param {any[]} data 数据
+     * @param {*} event 源事件对象
+     * @memberof Usr2Base
+     */
+    public async execute_dataviewexpbar_selectionchange_ctrl_logic(actionData: any): Promise<boolean> {
+        console.log('暂未支持 CUSTOM 类型');
+        return true;
+    }
+    /**
+     * 部件逻辑 -- dataviewexpbar_load
+     *
+     * @param {string} eventName 部件事件名称
+     * @param {any[]} data 数据
+     * @param {*} event 源事件对象
+     * @memberof Usr2Base
+     */
+    public async execute_dataviewexpbar_load_ctrl_logic(actionData: any): Promise<boolean> {
+        console.log('暂未支持 CUSTOM 类型');
+        return true;
+    }
 
 
 
@@ -678,9 +708,9 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKUsr2DataView
+     * @memberof IBIZBOOKDataViewExpView
      */
-    public usr2dataviewdataview_batchtoolbarModels: any = {
+    public dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels: any = {
         deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
         deuiaction2: { name: 'deuiaction2', actiontarget: 'NONE', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
@@ -1005,7 +1035,7 @@ export default class Usr2Base 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: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -1100,7 +1130,7 @@ export default class Usr2Base 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: 'IBIZBOOKUsr2DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1217,7 +1247,7 @@ export default class Usr2Base 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: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (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);
@@ -1225,7 +1255,7 @@ export default class Usr2Base 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: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){
@@ -1327,16 +1357,16 @@ export default class Usr2Base extends Vue implements ControlInterface {
 	public uiAction(data: any, tag: any, $event: any) {
         $event.stopPropagation();
         if(Object.is('Edit', tag)) {
-            this.dataview_batchtoolbar_deuiaction1_click(data, tag, $event);
+            this.dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(data, tag, $event);
         }
         if(Object.is('Remove', tag)) {
-            this.dataview_batchtoolbar_deuiaction2_click(data, tag, $event);
+            this.dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(data, tag, $event);
         }
         if(Object.is('Edit', tag)) {
-            this.dataview_memo1_u37f11a8_click(data, tag, $event);
+            this.dataviewexpbar_dataview_memo1_u37f11a8_click(data, tag, $event);
         }
         if(Object.is('Remove', tag)) {
-            this.dataview_memo1_uc365542_click(data, tag, $event);
+            this.dataviewexpbar_dataview_memo1_uc365542_click(data, tag, $event);
         }
     }
 

app_Web/src/widgets/ibizcpu/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizcustom/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizcustomer/add-data-form-form/add-data-form-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizcustomer/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizhardware/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder-detail/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

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

@@ -964,7 +964,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZOrderDetailSGridView9" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZOrderDetailSGridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1123,7 +1123,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderDetailSGridView9' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZOrderDetailSGridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1237,7 +1237,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: 'IBIZOrderDetailSGridView9'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2132,7 +2132,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: 'IBIZOrderDetailSGridView9'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2141,7 +2141,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: 'IBIZOrderDetailSGridView9'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2217,7 +2217,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderDetailSGridView9' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZOrderDetailSGridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

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

@@ -97,6 +97,7 @@ export default class MainModel {
           name: 'ibizorderdetail',
           prop: 'ibizorderdetailid',
         },
+
         {
           name:'size',
           prop:'size',

app_Web/src/widgets/ibizorder-detail/main2-2-form/main2-2-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder-detail/main2-form/main2-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder-detail/main3-form/main3-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder-detail/ui-0007-form/ui-0007-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder/data-0024-form/data-0024-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder/form10-form/form10-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder/form30-form/form30-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder/form40-form/form40-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder/main2-form/main2-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder/main3-form/main3-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder/main4-form/main4-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder/main5-form/main5-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder/sform-form/sform-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder/ui-0018-form/ui-0018-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder/uipart-0006-form/uipart-0006-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder/uipart-0009-2-form/uipart-0009-2-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder/uipart-0009-form/uipart-0009-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder/uipart-0010-form/uipart-0010-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder/uipart-0011-form/uipart-0011-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizorder/updateform-form/updateform-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0001/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0001/main2-form/main2-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0001/main3-form/main3-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0001/main4-form/main4-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0001/main5-form/main5-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0002/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0003/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0014/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0018/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0021/before-sign-form/before-sign-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0021/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0021/main2-form/main2-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0021/operation-form-form/operation-form-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0021/refuse-form-form/refuse-form-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0021/start001-form/start001-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0021/transfer-form/transfer-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0021/usr1114284368-form/usr1114284368-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0021/usr1114790802-form/usr1114790802-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0021/usr1116029485-form/usr1116029485-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0021/usr1116490270-form/usr1116490270-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0021/usr1116681664-form/usr1116681664-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsample0021/usr1116895321-form/usr1116895321-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizsoftware-suit/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizstorage/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibiztask/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibiztaskteam/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/ibizuniproduct/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

app_Web/src/widgets/micro-component/main-form/main-form.scss

@@ -7,7 +7,6 @@
 }
 .app-form {
     overflow: auto;
-    padding: 6px;
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
@@ -45,7 +44,7 @@
 .app-form{
   // 表单行间距
   .app-form-item{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
   }
   // 表单按钮margin
   .app-form-button{

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

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

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

@@ -20,6 +20,18 @@
     }
   } ],
   "getPSDETreeColumns" : [ {
+    "caption" : "图书名称",
+    "codeName" : "ibizbookname",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "ibizbookname",
+    "mOSFilePath" : "psdetreecols/ibizbookname",
+    "name" : "ibizbookname",
+    "rTMOSFilePath" : "psdetreecols/ibizbookname",
+    "width" : 50,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
+  }, {
     "caption" : "作者",
     "codeName" : "author",
     "columnType" : "DEFGRIDCOLUMN",
@@ -43,18 +55,6 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
-  }, {
-    "caption" : "图书名称",
-    "codeName" : "ibizbookname",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "ibizbookname",
-    "mOSFilePath" : "psdetreecols/ibizbookname",
-    "name" : "ibizbookname",
-    "rTMOSFilePath" : "psdetreecols/ibizbookname",
-    "width" : 50,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
   } ],
   "getPSDETreeNodeRSs" : [ {
     "getChildPSDETreeNode" : {

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

@@ -42,6 +42,18 @@
       "id" : "GANTT"
     },
     "getPSDETreeColumns" : [ {
+      "caption" : "归还日期",
+      "codeName" : "returntime",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "returntime",
+      "mOSFilePath" : "psdetreecols/returntime",
+      "name" : "returntime",
+      "rTMOSFilePath" : "psdetreecols/returntime",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
+    }, {
       "caption" : "出版社",
       "codeName" : "press",
       "columnType" : "DEFGRIDCOLUMN",
@@ -89,18 +101,6 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
-    }, {
-      "caption" : "归还日期",
-      "codeName" : "returntime",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "returntime",
-      "mOSFilePath" : "psdetreecols/returntime",
-      "name" : "returntime",
-      "rTMOSFilePath" : "psdetreecols/returntime",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
     } ],
     "getPSDETreeNodeRSs" : [ {
       "getChildPSDETreeNode" : {

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

@@ -88,6 +88,18 @@
       "id" : "TREEGRIDEX"
     },
     "getPSDETreeColumns" : [ {
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "ibizbookname",
+      "mOSFilePath" : "psdetreecols/ibizbookname",
+      "name" : "ibizbookname",
+      "rTMOSFilePath" : "psdetreecols/ibizbookname",
+      "width" : 50,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
+    }, {
       "caption" : "作者",
       "codeName" : "author",
       "columnType" : "DEFGRIDCOLUMN",
@@ -111,18 +123,6 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
-    }, {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "mOSFilePath" : "psdetreecols/ibizbookname",
-      "name" : "ibizbookname",
-      "rTMOSFilePath" : "psdetreecols/ibizbookname",
-      "width" : 50,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
     } ],
     "getPSDETreeNodeRSs" : [ {
       "getChildPSDETreeNode" : {