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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.722",
+  "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 - #{$xform-dialog-body-offset})
+        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 - #{$xform-dialog-body-offset});
+        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 - #{$xform-dialog-body-offset})
+        height: calc(100vh - var(--xform-dialog-body-offset, 58px))
       }
     }
   }

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

@@ -98,12 +98,12 @@ export default {
     }
 
     .form-widget-list {
-      min-height: calc(100vh - #{$xform-designer-body-offset});
+      min-height: calc(100vh - var(--xform-designer-body-offset, 98px));
       padding: 3px;
-      @if $xform-designer-detail-offset != null {
-        ::v-deep .detail-wrap .d-cont {
-          height: calc(100vh - #{$xform-designer-detail-offset}) !important;
-        }
+      // 明细区高度默认关闭：--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

@@ -88,7 +88,7 @@ export default {
 }
 
 .xform-designer-scroll {
-  height: calc(100vh - #{$xform-designer-scroll-offset});
+  height: calc(100vh - var(--xform-designer-scroll-offset, 125px));
 }
 
 .el-container.main-container {

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

@@ -118,7 +118,7 @@ export default {
   }
 
   .grid-height {
-    height: calc(100vh - #{$xform-column-grid-offset}) !important
+    height: calc(100vh - var(--xform-column-grid-offset, 84px)) !important
   }
 }
 </style>

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";