resolver-egretimp-plus 0.0.250 → 0.0.252

package/package.json

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

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,10 +52,25 @@ 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
 })
@@ -111,4 +130,9 @@ function toCollapse() {
 .CustomComponentCollapseH5.CustomComponentCollapseH5.CustomComponentCollapseH5:last-child {
   margin-bottom: 0;
 }
+.CustomComponentTabsH5 {
+  .CustomComponentCollapseH5 {
+    margin-bottom: 0;
+  }
+}
 </style>

package/src/components/packages-web/CustomComponentTable.jsx

@@ -475,7 +475,9 @@ export default {
       },
       ...tableExpose
     })
-
+    const dataList = computed(() => {
+      return totalRow.value?.length ? [...tableData.value, ...totalRow.value] : tableData.value
+    })
     // console.log('dynamicMapComp===:', inject('dynamicMapComp'))
     return () => {
       return (
@@ -484,7 +486,7 @@ export default {
             ref={(e) => {tableRef.value = e}}
             highlight-current-row={selectable.value || tableProps.value?.highlightCurrentRow ? true : false}
             onCurrentChange={selectable.value || tableProps.value?.highlightCurrentRow ? currentChange : () => {}}
-            data={[...tableData.value, ...totalRow.value]}
+            data={dataList.value}
             onSelectionChange={handleSelectionChange}
             onSortChange={onSortChange}
           >

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);
       }