resolver-egretimp-plus 0.0.45 → 0.0.46

package/package.json

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

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

@@ -2,7 +2,6 @@
 import { defineProps, inject, getCurrentInstance, computed, useAttrs } from 'vue'
 import { commonPropsType } from '../../utils/index.js'
 import { useRoute } from 'vue-router'
-import { dispatchClickEvents } from '../helper/eventOrchestration.js';
 
 const appContext = getCurrentInstance()?.appContext
 
@@ -41,7 +40,6 @@ const label = computed(() => {
 const route = useRoute()
 const buttonActions = inject('buttonActions', {})
 
-const messageInstance = inject('_messageInstance')
 const dynamicMapComp = inject('dynamicMapComp')
 const hireRelatMapRules = inject('hireRelatMapRules')
 const components = inject('components')
@@ -49,12 +47,11 @@ const selects = inject('selects')
 const rootValue = inject('rootValue')
 const dataLoad = inject('dataLoad')
 const rootForm = inject('rootForm')
-const _axiosInstance = inject('_axiosInstance')
 const routeQuery= route?.query
 
 
-const buttonAction = () => {
-  attrs?.onClick?.(e) // 如果配置中有点击事件
+const buttonAction = (...arg) => {
+  attrs?.onClick?.(...arg) // 如果配置中有点击事件
   const actionKey = props.config?.clickActionKey || props.config?.buttonActionKey || props.config?.hireRelat
   const actionFn = buttonActions[actionKey]
   actionFn && actionFn(props, {
@@ -67,16 +64,6 @@ const buttonAction = () => {
     rootForm,
     routeQuery
   }, appContext)
-  
-  const PageServiceMapVOList = props.config.lcpPageServiceMapVOList
-  if (PageServiceMapVOList?.length) {
-    dispatchClickEvents({
-      serviceList: PageServiceMapVOList,
-      axiosInstance: _axiosInstance,
-      reqData: rootValue?.value,
-      messageInstance
-    })
-  }
 }
 </script>
 

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

@@ -1,7 +1,7 @@
 <script setup>
-import { computed, inject, resolveComponent, useAttrs } from "vue";
+import { computed, inject, ref, resolveComponent, useAttrs } from "vue";
 import Renderer from '../../renderer.jsx'
-import { commonPropsType, hasOwn } from '../../utils/index.js'
+import { commonPropsType, DISPLAY_HIDDEN, hasOwn } from '../../utils/index.js'
 
 const modelValue = defineModel()
 const props = defineProps({
@@ -12,6 +12,9 @@ const props = defineProps({
   noborder: [Boolean, String],
   cardbgcolor: String,
 })
+
+const collapseLimt = 5
+const isCollapse = ref(true)
 const attrs = useAttrs()
 const lang = inject('lang')
 const cmiProps = computed(() => {
@@ -27,17 +30,35 @@ const cmiProps = computed(() => {
 const pmPageMetaList = computed(() => {
   return props.config?.pmPageMetaList?.filter(item => !item.collapseSlot) || []
 })
-
+const showCollapseBtn = computed(() => {
+  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN)?.length > collapseLimt
+})
+const showPageMeteList = computed(() => {
+  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN).slice(0, isCollapse.value ? collapseLimt : Number.MAX_VALUE)
+})
+const collapseLabel = computed(() => {
+  const isCh = lang?.value?.indexOf('zh') > -1
+  return isCollapse.value ? (isCh ? '更多' : 'More') : (isCh ? '收起' : 'Close')
+})
+function toCollapse() {
+  isCollapse.value = !isCollapse.value
+}
 </script>
 <template>
-  <div style="">
-
-  </div>
   <cmi-card v-bind="{...cmiProps, ...attrs}">
     <div slot="content">
-      <Renderer :config="pmPageMetaList" v-model="modelValue"></Renderer>
+      <Renderer :config="showPageMeteList" v-model="modelValue"></Renderer>
+      <div v-if="showCollapseBtn" class="collapse-wrap">
+        <cmi-button type="text" size="small" @click="toCollapse">
+          {{ collapseLabel }}
+        </cmi-button>
+      </div>
     </div>
   </cmi-card>
 </template>
 <style lang="scss">
+.collapse-wrap {
+  display: flex;
+  justify-content: end;
+}
 </style>

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

@@ -1,12 +1,14 @@
 <script setup>
 import Renderer from '../../renderer.jsx'
-import { computed, inject, useAttrs, defineEmits, defineProps } from 'vue'
-import { commonPropsType } from '../../utils/index.js'
+import { computed, inject, useAttrs, defineEmits, defineProps, ref } from 'vue'
+import { commonPropsType, DISPLAY_HIDDEN } from '../../utils/index.js'
 
 defineOptions({
   inheritAttrs: false
 })
 
+const collapseLimt = 5
+const isCollapse = ref(true)
 const modelValue = defineModel()
 const attrs = useAttrs()
 const lang = inject('lang')
@@ -25,13 +27,46 @@ const collapseProps = computed(() => {
 const pmPageMetaList = computed(() => {
   return props.config?.pmPageMetaList?.filter(item => !item.collapseSlot) || []
 })
+const showCollapseBtn = computed(() => {
+  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN)?.length > collapseLimt
+})
+const showPageMeteList = computed(() => {
+  return pmPageMetaList.value.filter(item => item.displayType != DISPLAY_HIDDEN).slice(0, isCollapse.value ? collapseLimt : Number.MAX_VALUE)
+})
+const collapseLabel = computed(() => {
+  const isCh = lang?.value?.indexOf('zh') > -1
+  return isCollapse.value ? (isCh ? '更多' : 'More') : (isCh ? '收起' : 'Close')
+})
+function toCollapse() {
+  isCollapse.value = !isCollapse.value
+}
 </script>
 
 <template>
   <cmi-collapse v-bind="{...attrs, ...collapseProps}">
-    <Renderer :config="pmPageMetaList" v-model="modelValue"></Renderer>
+    <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>
 </template>
 
 <style lang="scss">
+.render-wrap {
+  div:last-child {
+    cmi-cell {
+      &::after {
+        display: none;
+      }
+    }
+  }
+}
+.collapse-wrap {
+  display: flex;
+  justify-content: end;
+}
 </style>

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

@@ -367,7 +367,7 @@ export default {
             {
               tableColumnConfigs.value.map((columnConfg, configIdx) => {
                 return columnConfg.displayType == DISPLAY_HIDDEN ? null : (
-                  <ElTableColumn key={columnConfg.requiredFlag} {...getTableColumnProps(columnConfg, configIdx)}>
+                  <ElTableColumn key={columnConfg.requiredFlag + columnConfg.metaCode} {...getTableColumnProps(columnConfg, configIdx)}>
                     {{
                       header: () => (
                         <span className='head-span' title={lang.value.indexOf('zh') > -1 ? columnConfg.metaNameZh : columnConfg.metaNameEn}>

package/src/utils/render.jsx

@@ -167,9 +167,6 @@ export function normalConfig({
   }
   
   let extendAttrObj = parseExtendAttr(config)
-  if (metaType == 'cmi-card') {
-    debugger
-  }
   let extendObj = {
     removeCol: findComponent(NOT_NEED_COL_ITEM_META_TYPE, extendAttrObj.renderby) !== -1 || findComponent(NOT_NEED_COL_ITEM_META_TYPE, metaType) !== -1,
     needformItem: (findComponent(NOT_NEED_FORM_ITEM_META_TYPE, extendAttrObj.renderby) !== -1 || findComponent(NOT_NEED_FORM_ITEM_META_TYPE, metaType) !== -1) ? false : needformItem, // 表示这个配置项对应的渲染组件是否需要formItem进行包装 移动端是cmi-form-item