resolver-egretimp-plus 0.0.218 → 0.0.220

package/package.json

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

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

@@ -63,9 +63,9 @@ const rootInstance = inject('_rootInstance', {})
 
 const routeQuery= route?.query
 
-const buttonAction = (...arg) => {
+const buttonAction = (e, params) => {
   const lastClick = () => {
-    attrs?.onClick?.(...arg) // 如果配置中有点击事件
+    attrs?.onClick?.(e, params) // 如果配置中有点击事件
   }
   const actionKey = props.config?.clickActionKey || props.config?.buttonActionKey || props.config?.hireRelat
   const actionFn = buttonActions[actionKey]
@@ -103,6 +103,12 @@ const buttonAction = (...arg) => {
     lastClick()
   }
 }
+
+defineExpose({
+  click: (params) => {
+    buttonAction(null, params)
+  }
+})
 </script>
 
 <template>

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

@@ -1,7 +1,7 @@
 <script setup>
 import Renderer from '../../renderer.jsx'
-import { computed, inject, useAttrs, defineEmits, defineProps, ref } from 'vue'
-import { commonPropsType, DISPLAY_HIDDEN } from '../../utils/index.js'
+import { computed, inject, useAttrs, defineEmits, defineProps, ref, watch } from 'vue'
+import { commonPropsType, DISPLAY_HIDDEN, hasOwn } from '../../utils/index.js'
 
 defineOptions({
   inheritAttrs: false
@@ -27,14 +27,35 @@ const collapseProps = computed(() => {
 })
 
 const pmPageMetaList = computed(() => {
-  return props.config?.pmPageMetaList?.filter(item => !item.collapseSlot) || []
+  return props.config?.pmPageMetaList || []
 })
+
+const showPageMeteList = computed(() => {
+  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN && item.hidden != '1')
+})
+
 const showCollapseBtn = computed(() => {
-  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN && item.hidden != '1')?.length > collapseLimt.value
+  return showPageMeteList.value?.length > collapseLimt.value
 })
-const showPageMeteList = computed(() => {
-  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN && item.hidden != '1').slice(0, isCollapse.value ? collapseLimt.value : Number.MAX_VALUE)
+
+// 定位到最后显示的组件在折叠组件中的索引
+const lasetLimitIdx = computed(() => {
+  const limt = isCollapse.value ? collapseLimt.value : Number.MAX_VALUE
+  return pmPageMetaList.value?.findIndex(item => item == showPageMeteList.value[limt - 1])
 })
+
+// 通过监听最后一个显示组件的索引，控制那些组件隐藏（通过collapseHidden控制隐藏）
+watch(lasetLimitIdx, (val) => {
+  pmPageMetaList.value?.forEach((item, index) => {
+    item.collapseHidden = '0'
+    if (val > -1 && index > val) {
+      item.collapseHidden = '1'
+    }
+  })
+}, {
+  immediate: true
+})
+
 const collapseLabel = computed(() => {
   const isCh = lang?.value?.indexOf('zh') > -1
   return isCollapse.value ? (isCh ? '更多' : 'More') : (isCh ? '收起' : 'Close')
@@ -48,7 +69,7 @@ function toCollapse() {
  <div :style="attrs.style">
     <cmi-collapse v-bind="{...attrs, ...collapseProps}">
       <div class="render-wrap">
-        <Renderer :config="showPageMeteList" v-model="modelValue"></Renderer>
+        <Renderer :config="pmPageMetaList" v-model="modelValue"></Renderer>
       </div>
       <div v-if="showCollapseBtn" class="collapse-wrap">
         <cmi-button type="text" size="small" @click="toCollapse">

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

@@ -10,7 +10,7 @@
     --el-collapse-header-font-size: 14px;
     // margin-bottom: var(--prmary-marign);
     .el-collapse-item__header {
-      padding-bottom: 16px;
+      padding-bottom: 12px;
       box-sizing: content-box;
     }
     .el-collapse-item__content {

package/src/utils/render.jsx

@@ -236,7 +236,7 @@ export function normalConfig({
   if (config.metaType == 'date-range') {
     pageConfig.type = 'daterange'
   }
-  if (config.metaType == 'card') {
+  if (config.metaType == 'card' && !hasOwn(pageConfig, 'needWrap')) {
     pageConfig.needWrap = '1'
   }
   // 在详情的情况下，配置组件是否显示
@@ -971,7 +971,7 @@ function isTransCellMobile(config, disabled) {
 }
 
 function isHidden({config}) {
-  return (typeof config.hidden === 'boolean' && config.hidden) || config.hidden === '1'
+  return (typeof config.hidden === 'boolean' && config.hidden) || config.hidden === '1' || config.collapseHidden == '1'
 }
 // 如果父级有一个是hidden了，那就表示hidden了
 function isChainHidden({config}) {