resolver-egretimp-plus 0.0.101 → 0.0.104

package/package.json

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

package/src/components/packages-H5/CustomComponentCollapseH5.vue

@@ -45,16 +45,18 @@ function toCollapse() {
 </script>
 
 <template>
-  <cmi-collapse v-bind="{...attrs, ...collapseProps}">
-    <div class="render-wrap">
-      <Renderer :config="showPageMeteList" v-model="modelValue"></Renderer>
-    </div>
-    <div v-if="showCollapseBtn" class="collapse-wrap">
-      <cmi-button type="text" size="small" @click="toCollapse">
-        {{ collapseLabel }}
-      </cmi-button>
-    </div>
-  </cmi-collapse>
+ <div :style="attrs.style">
+    <cmi-collapse v-bind="{...attrs, ...collapseProps}">
+      <div class="render-wrap">
+        <Renderer :config="showPageMeteList" v-model="modelValue"></Renderer>
+      </div>
+      <div v-if="showCollapseBtn" class="collapse-wrap">
+        <cmi-button type="text" size="small" @click="toCollapse">
+          {{ collapseLabel }}
+        </cmi-button>
+      </div>
+    </cmi-collapse>
+ </div>
 </template>
 
 <style lang="scss">
@@ -72,3 +74,16 @@ function toCollapse() {
   justify-content: end;
 }
 </style>
+<style lang="scss">
+.CustomComponentCollapseH5:first-child {
+  margin-bottom: 16px;
+}
+.CustomComponentCollapseH5 + .CustomComponentCollapseH5 {
+  margin-bottom: 16px;
+}
+
+// 加权
+.CustomComponentCollapseH5.CustomComponentCollapseH5.CustomComponentCollapseH5:last-child {
+  margin-bottom: 0;
+}
+</style>

package/src/components/packages-web/CustomComponentDialog.vue

@@ -101,13 +101,31 @@ const dialogValue = computed({
 })
 // 是否显示确定按钮
 const showConfirmButton = computed(() => {
-  return !!(props.config?.showConfirmButton) || !!(props.config?.showConfirm)
+  return (
+    typeof props.config?.showConfirmButton === 'boolean' ? 
+      !!(props.config?.showConfirmButton) :
+      props.config.showConfirmButton === '1'
+  ) || (
+    typeof props.config?.showConfirm === 'boolean' ? 
+      !!(props.config?.showConfirm) :
+      props.config.showConfirm === '1'
+  )
 })
 // 是否显示确定关闭按钮
 const showCloseButton = computed(() => {
   return hasOwn(props.config, 'showCloseButton') ?
-    !!(props.config?.showCloseButton) :
-    hasOwn(props.config, 'showClose') ? !!(props.config?.showClose) : true
+    (
+      typeof props.config.showCloseButton === 'boolean' ?
+        !!(props.config.showCloseButton) :
+        props.config.showCloseButton === '1'
+    ) :
+    hasOwn(props.config, 'showClose') ?
+      (
+        typeof props.config.showClose === 'boolean' ?
+          !!(props.config.showClose) :
+          props.config.showClose === '1'
+      ) :
+    true
 })
 
 const toConfirm = async () => {

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

@@ -1,3 +1,7 @@
+.custom-component-card.el-card {
+  overflow: unset;
+}
+
 
 .el-card__body {
   padding: var(--prmary-marign-second) var(--prmary-marign) 0 var(--prmary-marign);

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

@@ -28,7 +28,7 @@
     }
   }
   .el-collapse-item__wrap {
-    overflow: none;
+    overflow: unset;
   }
   .el-collapse-item {
     position: relative;

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

@@ -40,4 +40,4 @@
 @import './tabs.scss';
 @import './tree.scss';
 @import './steps.scss';
-@import './dialog.scss'
+@import './dialog.scss';

package/src/utils/render.jsx

@@ -481,11 +481,11 @@ export function generateLayoutPolyfill(config, disabled, isH5) {
       }
     })
   }
+  props.class = {
+    [normalCapitalizeComponent(config.metaType)]: true,
+  }
   if (isElCol) {
-    props.class = {
-      [normalCapitalizeComponent(config.metaType)]: true,
-      'is-card': config?.needWrap, // 这个样式主要用于折叠上面，控制被卡片包裹的时候，下边距是16，没有被包裹的时候，是12
-    }
+    props.class['is-card'] = config?.needWrap, // 这个样式主要用于折叠上面，控制被卡片包裹的时候，下边距是16，没有被包裹的时候，是12
     props = {
       ...props,
       ...getDefaultColProps(config),