resolver-egretimp-plus 0.0.61 → 0.0.63

package/package.json

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

package/src/analysisComponent.jsx

@@ -48,6 +48,7 @@ export default {
       delete ret.onClick
       return ret
     })
+    const polyfillConfigs = inject('_polyfillConfigs', {})
     const buttonActions = inject('buttonActions', {})
     const route = useRoute()
     const routeQuery= route?.query
@@ -183,6 +184,7 @@ export default {
       executeEventOrchestration({
         props,
         axiosInstance: _axiosInstance?.value,
+        polyfillConfigs,
         rootValue: rootValue?.value,
         confirmInstance: confirmInstance?.value,
         dynamicMapComp,

package/src/components/helper/eventOrchestration.js

@@ -128,6 +128,7 @@ export function getTableConfig(outParamMappingList = [], { dynamicMapComp, dynam
 
 export function openDailg({
   rootValue,
+  polyfillConfigs,
   pagePopupMap,
   axiosInstance,
   dynamicMapComp,
@@ -181,9 +182,9 @@ export function openDailg({
 
   let rootStore = {}
   let dialogClose = null
-  const polyfillConfigs = {}
+  const initPolyfillConfigs = {}
   if (pagePopupMap.outDisplayTrigger) {
-    polyfillConfigs[pagePopupMap.outDisplayTrigger] = (config) => {
+    initPolyfillConfigs[pagePopupMap.outDisplayTrigger] = (config) => {
       return {
         onClick() {
           const outResult = rootStore.tableSelectedInfo?.map(item => {
@@ -204,7 +205,7 @@ export function openDailg({
     }
   }
   if (pagePopupMap.closedTrigger) {
-    polyfillConfigs[pagePopupMap.closedTrigger] = (config) => {
+    initPolyfillConfigs[pagePopupMap.closedTrigger] = (config) => {
       return {
         onClick() {
           dialogClose?.()
@@ -220,7 +221,10 @@ export function openDailg({
     axiosInstance: axiosInstance,
     lang,
     loadEvnetsReq: reqData,
-    polyfillConfigs,
+    polyfillConfigs: {
+      ...initPolyfillConfigs,
+      ...(polyfillConfigs || {})
+    },
     rootStoreChange: (val) => {
       rootStore = val
     }
@@ -299,7 +303,7 @@ function closePage(lcpPageClosedMapVO) {
   }
 }
 
-export async function executeEventOrchestration({props, axiosInstance, buttonActions, rootValue, confirmInstance, dynamicMapComp, messageInstance, openChildDialog, messageCb, lang, appContext } = {}) {
+export async function executeEventOrchestration({props, axiosInstance, polyfillConfigs, buttonActions, rootValue, confirmInstance, dynamicMapComp, messageInstance, openChildDialog, messageCb, lang, appContext } = {}) {
   const lcpPageRuleVOLis = props.config?.lcpPageRuleVOList || []
   const PageServiceMapVOList = props.config.lcpPageServiceMapVOList || []
   const mixinServiceConfig = PageServiceMapVOList.find(service => service.serviceType === '1')
@@ -336,6 +340,7 @@ export async function executeEventOrchestration({props, axiosInstance, buttonAct
     const dynamicHireRelat = props.config?.dynamicHireRelat
     openDailg({
       rootValue,
+      polyfillConfigs,
       pagePopupMap: lcpPagePopupMapVO,
       axiosInstance,
       dynamicMapComp,

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

@@ -8,10 +8,18 @@ const props = defineProps({
   ...commonPropsType,
 })
 
+const normalVal = computed(() => {
+  const findItem = props?.options?.find(item => item.columnValue == modelValue.value)
+  if (findItem) {
+    return lang?.value?.indexOf('zh') > -1 ? findItem.columnDesc_zh : findItem.columnDesc
+  }
+  return modelValue.value
+})
+
 const calcProps = computed(() => {
   return {
     title: lang?.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
-    desc: modelValue.value || props.config?.desc,
+    desc: normalVal.value || props.config?.desc,
     content: props.config?.content,
     to: props.config?.toHref,
     islink: props.config?.islink === '1',
@@ -25,20 +33,12 @@ const onChange = (e) => {
   modelValue.value = e.detail.value
 }
 
-const normalVal = computed(() => {
-  const findItem = props?.options?.find(item => item.columnValue == modelValue.value)
-  if (findItem) {
-    return lang?.value?.indexOf('zh') > -1 ? findItem.columnDesc_zh : findItem.columnDesc
-  }
-  return modelValue.value
-})
-
 </script>
 
 <template>
   <cmi-cell-group>
     <cmi-cell
-      :value="normalVal" v-bind="{ ...attrs, ...calcProps}" 
+      v-bind="{ ...attrs, ...calcProps}"
       @change="onChange"
     ></cmi-cell>
   </cmi-cell-group>

package/src/index.jsx

@@ -217,6 +217,7 @@ export default {
 
     provide('_parentRootValue', props.parentRootValue) 
     provide('_selectionsObj', props.selectionsObj) 
+    provide('_polyfillConfigs', props.polyfillConfigs)
 
     const rootForm = ref(null)
     provide('rootForm', rootForm)

package/src/utils/render.jsx

@@ -270,6 +270,7 @@ function parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue }, co
   if (!findKeys.length) {
     return
   }
+  // 层级写的越明确，就使用更明确的层级配置
   const findKey = findKeys.reduce((ret, key) => (hireRelat.lastIndexOf(ret) < hireRelat.lastIndexOf(key) ? ret : key))
   const polyObj = polyfillConfigs[findKey] && polyfillConfigs[findKey](config, instance, {parentRootValue})
   polyObj && Object.keys(polyObj).forEach(key => {
@@ -465,10 +466,13 @@ export function generateLayoutPolyfill(config, disabled, isH5) {
     props = {
       ...props,
       ...getDefaultColProps(config),
-      ...elColSpecialProsp(config),
     }
     
   }
+  props = {
+    ...props,
+    ...elColSpecialProsp(config),
+  }
   return node => {
     // 表格中中的列，是否需要转换为普通形式
     if (isPlainColumn(config, disabled)) {