cloud-web-corejs 1.0.54-dev.721 → 1.0.54-dev.723

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.721",
+  "version": "1.0.54-dev.723",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/wf/content.vue

@@ -7,7 +7,7 @@
   >
     <template #default>
       <div
-        style="margin: -36px 0 8px 124px; position: relative; z-index: 2; height: 28px"
+        style="margin: -49px 0 16px 124px; position: relative; z-index: 2; height: 28px"
         v-if="!wfConfig.hiddenAllButton"
       >
         <el-button

package/src/components/xform/form-designer/form-widget/dialog/fileReferenceDialog.vue

@@ -293,7 +293,7 @@ export default {
       height: calc(100vh - 110px);
 
       &.nfootBtn {
-        height: calc(100vh - 58px)
+        height: calc(100vh - var(--xform-dialog-body-offset, 58px))
       }
     }
   }

package/src/components/xform/form-designer/form-widget/dialog/formDialog.vue

@@ -233,7 +233,7 @@ export default {
       height: calc(100vh - 110px);
 
       &.nfootBtn {
-        height: calc(100vh - 58px);
+        height: calc(100vh - var(--xform-dialog-body-offset, 58px));
       }
     }
   }

package/src/components/xform/form-designer/form-widget/dialog/formDrawer.vue

@@ -203,7 +203,7 @@ export default {
       height: calc(100vh - 110px);
 
       &.nfootBtn {
-        height: calc(100vh - 58px)
+        height: calc(100vh - var(--xform-dialog-body-offset, 58px))
       }
     }
   }

package/src/components/xform/form-designer/form-widget/field-widget/button-widget.vue

@@ -5,7 +5,7 @@
     <el-button ref="fieldEditor" :type="field.options.type" :size="field.options.size" class="button-sty"
                :plain="field.options.plain" :round="field.options.round"
                :circle="field.options.circle" :icon="field.options.icon"
-               :disabled="!designState &&field.options.disabled"
+               :disabled="!designState &&field.options.disabled" style="margin-right:12px"
                @click.native="handleButtonWidgetClick">
       {{ getI18nLabel(field.options.label)}}</el-button>
   </static-content-wrapper>

package/src/components/xform/form-designer/form-widget/field-widget/download-button-widget.vue

@@ -15,6 +15,7 @@
       class="button-sty"
       @click="clickHandle"
       icon="el-icon-download"
+      plain
       :disabled="!designState && field.options.disabled"
     >
       {{ getI18nLabel(field.options.label) }}

package/src/components/xform/form-designer/form-widget/field-widget/import-button-widget.vue

@@ -4,7 +4,7 @@
     :display-style="field.options.displayStyle"
     :parent-widget="parentWidget" :parent-list="parentList"
     :index-of-parent-list="indexOfParentList">
-    <el-button :type="field.options.type" class="button-sty" size="mini" icon="el-icon-download" @click="importHandle"
+    <el-button :type="field.options.type" class="button-sty" size="mini" icon="el-icon-download" plain @click="importHandle"
                :disabled="field.options.disabled">{{ getI18nLabel(field.options.label)}}
     </el-button>
   </static-content-wrapper>

package/src/components/xform/form-designer/form-widget/field-widget/import2-button-widget.vue

@@ -4,7 +4,7 @@
     :display-style="field.options.displayStyle"
     :parent-widget="parentWidget" :parent-list="parentList"
     :index-of-parent-list="indexOfParentList">
-    <el-button :type="field.options.type" class="button-sty" size="mini" icon="el-icon-download" @click="importHandle"
+    <el-button :type="field.options.type" class="button-sty" size="mini" icon="el-icon-download" plain @click="importHandle"
                :disabled="field.options.disabled">{{ getI18nLabel(field.options.label)}}
     </el-button>
   </static-content-wrapper>

package/src/components/xform/form-designer/form-widget/field-widget/table-export-button-widget.vue

@@ -9,7 +9,7 @@
     :index-of-parent-list="indexOfParentList"
   >
     <el-dropdown trigger="hover" :disabled="field.options.disabled">
-      <el-button type="primary" class="button-sty" size="mini">
+      <el-button type="primary" class="button-sty" size="mini" plain>
         <span>{{ getI18nLabel("列表导出") }}</span
         ><span class="line"></span> <i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>

package/src/components/xform/form-designer/form-widget/field-widget/tableexportbuttonwidget.vue

@@ -5,7 +5,7 @@
     :parent-widget="parentWidget" :parent-list="parentList"
     :index-of-parent-list="indexOfParentList">
     <el-dropdown trigger="hover">
-      <el-button type="primary" class="button-sty" size="mini">
+      <el-button type="primary" class="button-sty" size="mini" plain>
         <span>{{ getI18nLabel('列表导出') }}</span><span class="line"></span> <i
         class="el-icon-arrow-down el-icon--right"></i>
       </el-button>

package/src/components/xform/form-designer/form-widget/field-widget/tempStorage-widget.vue

@@ -11,7 +11,7 @@
     :sub-form-col-index="subFormColIndex"
     :sub-form-row-id="subFormRowId"
   >
-    <span class="button-sty" v-if="designState">
+    <span class="button-sty nobg" v-if="designState">
       <el-button type="success" class="btn-connect" icon="iconfont icon-zancun" plain
         >暂存</el-button
       >

package/src/components/xform/form-designer/form-widget/index.vue

@@ -98,8 +98,13 @@ export default {
     }
 
     .form-widget-list {
-      min-height: calc(100vh - 98px);
+      min-height: calc(100vh - var(--xform-designer-body-offset, 98px));
       padding: 3px;
+      // 明细区高度默认关闭：--xform-designer-detail-height 未设置时回退为 revert(等同不写该规则)
+      // 目标项目在自己的 :root 覆盖，如 --xform-designer-detail-height: calc(100vh - 200px)
+      ::v-deep .detail-wrap .d-cont {
+        height: var(--xform-designer-detail-height, revert) !important;
+      }
     }
   }
 

package/src/components/xform/form-designer/index.vue

@@ -44,7 +44,7 @@
           </toolbar-panel>
         </el-header>
         <el-main class="form-widget-main">
-          <el-scrollbar class="container-scroll-bar" style="height:calc(100vh - 125px)">
+          <el-scrollbar class="container-scroll-bar xform-designer-scroll">
             <v-form-widget :designer="designer" :form-config="designer.formConfig" ref="formRef"></v-form-widget>
           </el-scrollbar>
         </el-main>
@@ -87,6 +87,10 @@ export default {
   font-family: inherit !important;
 }
 
+.xform-designer-scroll {
+  height: calc(100vh - var(--xform-designer-scroll-offset, 125px));
+}
+
 .el-container.main-container {
   background: #fff;
 

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/columnRenderDialog.vue

@@ -89,8 +89,7 @@ export default {
   }
 }
 </script>
-<style>
-<style>
+<style lang="scss">
 .designer-drawer1{
   left: 150px;
   right: 10px;
@@ -119,7 +118,7 @@ export default {
   }
 
   .grid-height {
-    height: calc(100vh - 84px) !important
+    height: calc(100vh - var(--xform-column-grid-offset, 84px)) !important
   }
 }
 </style>

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -4060,7 +4060,7 @@ export const businessFields = [
     formItemFlag: !1,
     options: {
       name: "",
-      label: "保存并提交流程",
+      label: "保存并提交",
       columnWidth: "200px",
       size: "",
       displayStyle: "block",

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -147,6 +147,8 @@ modules = {
       dynamicColumnsPreloaded: false,
       dynamicColumnsInitResolved: false,
       dynamicColumnsInitSkipped: false,
+      // 列/网格未就绪时 setValue 只缓存数据，置此标志延后行 schema 构建
+      pendingSchemaInit: false,
     };
   },
   watch: {
@@ -725,10 +727,34 @@ modules = {
       let $grid = this.getGridTable();
       this.fieldModel = rows;
 
+      // 方向1：列/网格尚未就绪时（如 created 阶段 setFormData 广播触发），
+      // 只缓存数据，跳过行 schema 构建，避免 initFieldSchemaData 因无列而进入
+      // $nextTick 自递归忙循环导致页面卡死；待 mounted 建好列后由
+      // flushPendingSchemaInit 统一补建一次。
+      if (!this.isTableSchemaReady()) {
+        this.pendingSchemaInit = true;
+        return;
+      }
+
       this.initRowIdData();
       this.initFieldSchemaData();
       // $grid.loadData(rows);
     },
+    /** @returns {Boolean} 网格列是否已就绪（可安全构建行级 schema）。 */
+    isTableSchemaReady() {
+      return this.getTableFullColumns().length > 0;
+    },
+    /** mounted 建好列后补建一次被延后的行 schema。 */
+    flushPendingSchemaInit() {
+      if (!this.pendingSchemaInit) return;
+      if (!this.isTableSchemaReady()) return;
+      this.pendingSchemaInit = false;
+      let rows = this.getValue();
+      if (Array.isArray(rows) && rows.length) {
+        this.initRowIdData();
+        this.initFieldSchemaData();
+      }
+    },
     /** @returns {Array} 表单模型中的当前扁平数据。 */
     getValue() {
       return this.formModel[this.fieldKeyName];
@@ -2587,6 +2613,8 @@ modules = {
       this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         this.vxeOption = opts;
         this.applyCompareRowClassName();
+        // 列已就绪，补建 created 阶段被延后的行 schema
+        this.flushPendingSchemaInit();
         this.tryAutoLoadDynamicColumns().finally(() => {
           if (!isQueryTable) {
             setTimeout(() => {

package/src/layout/components/AppMain.vue

@@ -96,7 +96,7 @@ export default {
 }
 
 .fixed-header + .app-main {
-  padding-top: 32px;
+  padding-top: 33px;
 }
 
 .hasTagsView {

package/src/layout/components/Sidebar/default.vue

@@ -1103,6 +1103,7 @@ export default {
       padding: 0 11px;
       height: 48px;
       line-height: 48px;
+      overflow: hidden;
       &:hover,
       &.is-active {
         background-color: rgba(0, 0, 0, 0.29);
@@ -1115,7 +1116,7 @@ export default {
 
         &.iconfont {
           margin-right: 5px;
-          font-size: 19px;
+          font-size: 18px;
           float: left;
         }
 

package/src/views/bd/setting/formVersion/ftHistoryDialog.vue

@@ -15,9 +15,8 @@
       :fullscreen="true"
     >
       <div
-        class="cont"
         id="containt"
-        style="height: calc(100vh - 48px); overflow: hidden"
+        style="height: calc(100vh - 58px); overflow: hidden"
       >
         <el-tabs ref="xTabs" v-model="activeName" class="tab-box">
           <el-tab-pane :label="$t1('详情')" name="first">
@@ -483,7 +482,10 @@ export default {
 .grid-height {
   height: calc(100vh - 106px) !important;
 }
-::v-deep .detail-wrap .d-cont {
-  height: calc(100vh - 148px) !important;
+::v-deep .detail-wrap{
+  margin:-8px -10px 0;
+  .d-cont {
+    height: calc(100vh - 148px) !important;
+  }
 }
 </style>

package/src/views/bd/setting/formVersion/reverButton.vue

@@ -1,5 +1,5 @@
 <template>
-  <span style="cursor: unset">
+  <span style="cursor: unset;margin-right: 10px;">
     <el-button
       type="primary"
       plain

package/src/views/user/login/default.vue

@@ -169,14 +169,6 @@ export default {
   background: url(~@/resources/images/bg-login5.jpg) center center/cover no-repeat;
 }
 
-.login-container.chigo {
-  background: url(~@/resources/images/bg-login6.jpg) center center/cover no-repeat;
-}
-
-.login-container.pcp {
-  background: url(~@/resources/images/bg-login8.jpg) center center/cover no-repeat;
-}
-
 .el-select-dropdown {
   right: 5px;
   top: 25px;

package/src/views/user/login/indexMixin.js

@@ -307,16 +307,7 @@ export default {
       }
     },
     changeBackground() {
-      if (
-        location.host.indexOf("pcp.sc.5mall.com") >= 0 ||
-        location.host.indexOf("pip.bears.com.cn") >= 0
-      ) {
-        this.backgroundClass = "pcp";
-      } else if (location.host.indexOf("chigo.sc.5mall.com") >= 0) {
-        this.backgroundClass = "chigo";
-      } else {
-        this.backgroundClass = "tc";
-      }
+      this.backgroundClass = "tc";
     },
     login() {
       let url = window.MAIN_WEB_PREFIX + "/index.html/#/login";