resolver-egretimp-plus 0.1.20 → 0.1.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "description": "交付体验渲染",
   "main": "./dist/web/index.js",
   "module": "./dist/web/index.js",

package/src/components/childDialog/src/index.vue

@@ -162,13 +162,19 @@ defineExpose({
   padding: 16px 20px 20px 20px;
   overflow-y: auto;
   overflow-x: hidden;
+
+  max-height: calc(100vh - 200px);
+  
   &.el-dialog {
-    margin-top: 30px !important;
-    margin-bottom: 30px;
+    margin-top: 100px !important;
+    margin-bottom: 100px;
   }
   .el-dialog__header {
     --el-dialog-title-font-size: 16px;
     min-height: 40px;
+    font-weight: 600;
+  }
+  .el-dialog__body {
   }
   &.hidden-head {
     & > .el-dialog__header {

package/src/rules/ruleUtils.js

@@ -47,7 +47,7 @@ export function setFormVal(pathStr, val) {
   configs.forEach(cg => {
     if (hasOwn(cg, 'refValue')) {
       if (cg.metaType === 'ElSelect') {
-        val = formatSelectVal({config, val: val})
+        val = formatSelectVal({config: cg, val: val, isActive: true})
       }
       cg.refValue = val
     } else {

package/src/theme/element/components/button.scss

@@ -4,6 +4,8 @@
   --el-button-text-color: #1F2329;
   --el-font-size-base: 14px;
   --el-font-weight-primary: 400;
+
+  padding: 5px 18px;
 }
 .el-button--large {
   padding: 8px 12px;
@@ -20,7 +22,7 @@
 }
 .el-button--def {
   --el-button-size: 32px;
-  padding: 8px 8px;
+  padding: 5px 8px;
   height: var(--el-button-size);
 }
 .el-button:hover {

package/src/theme/element/components/card.scss

@@ -4,5 +4,5 @@
 
 
 .el-card__body {
-  padding: var(--prmary-marign-second) var(--prmary-marign) 0 var(--prmary-marign);
+  padding: var(--prmary-marign) var(--prmary-marign) 0 var(--prmary-marign);
 }

package/src/theme/element/components/collapse.scss

@@ -11,8 +11,10 @@
     --el-collapse-header-text-color: #1F2329;
     // margin-bottom: var(--prmary-marign);
     .el-collapse-item__header {
-      padding-bottom: 12px;
+      padding-bottom: 16px;
       box-sizing: content-box;
+      height: unset;
+      max-height: var(--el-collapse-header-height);
     }
     .el-collapse-item__content {
       padding-bottom: 0;

package/src/theme/element/components/dialog.scss

@@ -6,6 +6,7 @@
   
   .el-dialog__header {
     display: none;
+    font-weight: bold;
   }
   .el-dialog__body {
     height: 100%;
@@ -13,7 +14,7 @@
       // line-height: 46px;
       margin-bottom: 16px;
       font-size: 14px;
-      font-weight: 500;
+      font-weight: 600;
       color: #1F2329;
     }
     .content {

package/src/theme/element/components/tabs.scss

@@ -11,6 +11,8 @@
   }
 }
 .el-tabs {
+  --el-text-color-primary: #1F2329;
+  
   // display: block;
   border-radius: 4px;
   overflow: hidden;
@@ -19,9 +21,13 @@
   }
 }
 .el-tabs__item {
+  padding: 0 16px;
   min-height: var(--el-tabs-header-height);
   height: unset;
 }
+.el-tabs__header {
+  margin: 0 0 16px;
+}
 .tabs-level-1 {
   --el-tabs-header-height: 49px;
   &.full-border {

package/src/utils/defaultVal.js

@@ -43,10 +43,11 @@ export default function defaultVal(config) {
 
 export function formatSelectVal({
   config,
-  val
+  val,
+  isActive = false
 }) {
   let retValue = val
-  if (!isHidden({config})) {
+  if (!isHidden({config}) || isActive) {
     const valueType = config?.valueType
     const separator = config?.separator
     if (valueType == VALUE_TYPES.STRING) {
@@ -61,10 +62,10 @@ export function formatSelectVal({
       if ((val && isString(val)) || isNumber(val)) {
         retValue = `${val}`?.split(separator)
         if (valueType == VALUE_TYPES.OBJECT) {
-          retValue = val?.reduce((ret, item, idx) => {ret[idx] = item; return ret;}, {})
+          retValue = retValue?.reduce((ret, item, idx) => {ret[idx] = item; return ret;}, {})
         }
       }
     }
   }
-  return val
+  return retValue
 }