resolver-egretimp-plus 0.0.249 → 0.0.251

package/package.json

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

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

@@ -160,6 +160,7 @@ defineExpose({
 <style lang="scss">
 .open-child-frame {
   overflow-y: auto;
+  overflow-x: hidden;
   &.el-dialog {
     margin-top: 30px !important;
     margin-bottom: 30px;

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

@@ -67,7 +67,7 @@ const calcProps = computed(() => {
     islink: props.config?.islink === '1',
     icon: props.config?.icon,
     selfadaption: hasOwn(props.config, 'selfadaption') ? props.config.selfadaption === '1' : true,
-    noborder: props.config?.noborder === '1',
+    noborder: props.config?.noborder === '1' || props.config?.borderHidden === '1',
   }
 })
 const attrs = useAttrs()

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

@@ -34,6 +34,10 @@ const showPageMeteList = computed(() => {
   return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN && item.hidden != '1')
 })
 
+const lastShowPageMeteItem = computed(() => {
+  return showPageMeteList.value?.length ? showPageMeteList.value[showPageMeteList.value.length - 1] : null
+})
+
 const showCollapseBtn = computed(() => {
   return showPageMeteList.value?.length > collapseLimt.value
 })
@@ -48,17 +52,32 @@ const lasetLimitIdx = computed(() => {
 watch(lasetLimitIdx, (val) => {
   pmPageMetaList.value?.forEach((item, index) => {
     item.collapseHidden = '0'
-    if (val > -1 && index > val) {
-      item.collapseHidden = '1'
+    if (item.metaType === 'cmi-cell') {
+      item.borderHidden = '0'
+    }
+    if (val > -1) {
+      if (index > val) {
+        item.collapseHidden = '1'
+      }
+      if (index === val) {
+        if (item.metaType === 'cmi-cell') {
+          item.borderHidden = '1'
+        }
+      }
     }
   })
+  if (val === -1) {
+    if (lastShowPageMeteItem.value?.metaType === 'cmi-cell') {
+      lastShowPageMeteItem.value.borderHidden = '1'
+    }
+  }
 }, {
   immediate: true
 })
 
 const collapseLabel = computed(() => {
   const isCh = lang?.value?.indexOf('zh') > -1
-  return isCollapse.value ? (isCh ? '更多' : 'More') : (isCh ? '收起' : 'Close')
+  return isCollapse.value ? (isCh ? '更多' : 'More') : (isCh ? '收起' : 'Less')
 })
 function toCollapse() {
   isCollapse.value = !isCollapse.value
@@ -72,9 +91,9 @@ function toCollapse() {
         <Renderer :config="pmPageMetaList" v-model="modelValue"></Renderer>
       </div>
       <div v-if="showCollapseBtn" class="collapse-wrap">
-        <cmi-button type="text" size="small" @click="toCollapse">
+        <span class="collapse-span" @click="toCollapse">
           {{ collapseLabel }}
-        </cmi-button>
+        </span>
       </div>
     </cmi-collapse>
  </div>
@@ -93,6 +112,10 @@ function toCollapse() {
 .collapse-wrap {
   display: flex;
   justify-content: end;
+  & > .collapse-span {
+    color: #3271FE;
+    margin: 8px 16px 16px 16px;
+  }
 }
 </style>
 <style lang="scss">
@@ -107,4 +130,9 @@ function toCollapse() {
 .CustomComponentCollapseH5.CustomComponentCollapseH5.CustomComponentCollapseH5:last-child {
   margin-bottom: 0;
 }
+.CustomComponentTabsH5 {
+  .CustomComponentCollapseH5 {
+    margin-bottom: 0;
+  }
+}
 </style>

package/src/components/styles/CustomComponenTable.scss

@@ -85,13 +85,16 @@
         padding: 0 8px;
       }
     }
+    .el-input {
+      display: flex;
+    }
     .el-select__wrapper, .el-input__wrapper {
       box-shadow: none;
       border-bottom: 1px solid var(--el-border-color);
       padding: 0;
       border-radius: 0;
       background-color: transparent;
-      min-height: 26px;
+      min-height: 32px;
       &.is-focused {
         border-color: var(--el-color-primary);
       }