resolver-egretimp-plus 0.0.29 → 0.0.31

package/package.json

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

package/src/components/helper/button.js

@@ -1,15 +1,101 @@
-export async function dispatchClickEvents  ({serviceList = [], axiosInstance, reqData, messageInstance}) {
+import { getRelateConfigKeys } from "../../rules/ruleUtils"
+
+export async function dispatchClickEvents  ({serviceList = [], axiosInstance, dynamicMapComp, rootValue, dynamicHireRelat, messageInstance}) {
+  const dynamicMapCompKeys = Object.keys(dynamicMapComp)
   for (let i = 0; i < serviceList.length; i++) {
     const service = serviceList[i]
-    const url = service.serviceCode
-    const ret = await (axiosInstance.value && axiosInstance.value({
-      url,
-      method: "post",
-      data: reqData
-    }))
-    if (!ret?.data?.success) {
-      messageInstance?.value?.error(ret?.data?.resultMessage || '')
-      await Promise.reject()
+    dispatchClickEvent(service, {dynamicMapComp, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageInstance})
+  }
+}
+
+export async function dispatchClickEvent(service, { dynamicMapComp, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageInstance }) {
+  let reqData = rootValue
+  let tableConfig = null
+  if (service.transactionType == '1') {
+    reqData = getReqData(service.inParamMappingList || [], {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat})
+    tableConfig = getTableConfig(service.outParamMappingList, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat })
+    if (tableConfig?.vm) {
+      reqData[service.pageNum || 'pageNum'] = tableConfig.vm.page?.pageNum
+      reqData[service.pageSize || 'pageSize'] = tableConfig.vm.page?.pageSize
+    }
+  }
+  const url = service.serviceCode
+  const ret = await (axiosInstance.value && axiosInstance.value({
+    url,
+    method: "post",
+    data: reqData
+  }))
+  // if (!ret?.data?.success) {
+  //   messageInstance?.value?.error(ret?.data?.resultMessage || '')
+  //   await Promise.reject()
+  //   return
+  // }
+  ret.data = {result: {pageTotalCount: 100, result: [{},{},{},{},{}]}}
+  initOutParamData(service.outParamMappingList, {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, outResult: ret.data})
+  if (tableConfig?.vm) {
+    const total = parseInt(ret.data?.result?.[service.pageTotalCount || 'pageTotalCount'])
+    tableConfig.vm.page.total = total
+    // tableConfig.vm?.changePage(total, 'total')
+  }
+}
+
+function getReqData(inParamMappingList = [], {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat}) {
+  return inParamMappingList.reduce((ret, params) => {
+    const { orignParam = '', destParam = '' } = params
+    const configCodes = getRelateConfigKeys(dynamicMapCompKeys, orignParam, dynamicHireRelat)
+    if (configCodes.length > 1) {
+      console.error('search arg muti', params, configCodes)
+    }
+    const configCode = configCodes[0]
+    const destParamArr = destParam?.split('.') || []
+    let currentObj = ret
+    destParamArr.forEach((item, idx) => {
+      if (idx + 1 === destParamArr.length) {
+        currentObj[item] = dynamicMapComp[configCode]?.refValue
+      } else {
+        if (!currentObj[item]) {
+          currentObj[item] = {}
+        }
+        currentObj = currentObj[item]
+      }
+    })
+    return ret
+  }, {})
+}
+
+function initOutParamData(outParamMappingList = [], { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, outResult = {} }) {
+  outParamMappingList.forEach(params => {
+    const { orignParam = '', destParam = '' } = params
+    const configCodes = getRelateConfigKeys(dynamicMapCompKeys, destParam, dynamicHireRelat)
+    if (configCodes.length > 1) {
+      console.error('search arg muti', params, configCodes)
+    }
+    const configCode = configCodes[0]
+    const compConfig = dynamicMapComp[configCode]
+   
+    if (compConfig) {
+      const orignParamArr = orignParam?.split('.') || []
+      const val = orignParamArr.reduce((ret, item) => {
+        if (!ret) return
+        return ret[item]
+      }, outResult)
+      compConfig.refValue = val
+    }
+  })
+}
+
+export function getTableConfig(outParamMappingList = [], { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat }) {
+  for(let i = 0; i < outParamMappingList.length; i ++) {
+    const params = outParamMappingList[i]
+    const { destParam = '' } = params
+    const configCodes = getRelateConfigKeys(dynamicMapCompKeys, destParam, dynamicHireRelat)
+    if (configCodes.length > 1) {
+      console.error('search arg muti', params, configCodes)
+    }
+    const configCode = configCodes[0]
+    const compConfig = dynamicMapComp[configCode]
+    if (compConfig.metaType === 'CustomComponentTable') {
+      return compConfig
     }
   }
 }

package/src/components/helper/resolver.js

@@ -26,4 +26,14 @@ export async function executeLoadServices(services = [], { axiosInstance, messag
     }
     respCb && respCb(ret?.data?.result)
   }
+}
+
+export function normalPageConfigs(pageConfig) {
+  const rootOptionComp = pageConfig?.pmPageMetaList?.find(item => item.metaCode === 'PC-root-panel' || item.metaCode === 'H5-root-panel')
+  if (rootOptionComp) {
+    pageConfig.pmPageMetaList = rootOptionComp.pmPageMetaList
+    delete rootOptionComp.pmPageMetaList
+    pageConfig.rootOptionComp = rootOptionComp
+  }
+  return pageConfig
 }

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

@@ -6,6 +6,7 @@ import { commonPropsType, TABLE_COLUMN_NOT_RENDER_META_TYPE, DISPLAY_SHOW, compa
 import '../styles/CustomComponenTable.scss'
 
 export default {
+  name: 'CustomComponentTable',
   props: {
     ...commonPropsType,
     ...ElTable.props,
@@ -133,7 +134,7 @@ export default {
      */
     const rowColumnConfgsMap = new Map()
     watch(() => {
-      return props.refValue?.value
+      return props.refValue?.value?.length
     }, (length) => {
       let list = []
       if (length) {
@@ -167,7 +168,7 @@ export default {
       props.config.multiPmPageMetaList = list
     }, {
       immediate: true,
-      deep: true,
+      // deep: true,
     })
     // 统计行定义 ====start======
     const totalMetaCodes = computed(() => {
@@ -342,6 +343,9 @@ export default {
       multipleSelection,
       selectedRow,
       page,
+      changePage: (val, key) => {
+        page[key || 'pageNum'] = val
+      },
       ...tableExpose
     })
 

package/src/components/packages-web/ElButton.vue

@@ -9,6 +9,7 @@ import { defineProps, inject, getCurrentInstance, computed, useAttrs } from 'vue
 import { commonPropsType } from '../../utils/index.js'
 import { useRoute } from 'vue-router'
 import { dispatchClickEvents } from '../helper/button.js';
+import { getRelateConfigKeys } from '../../rules/ruleUtils.js';
 
 const appContext = getCurrentInstance()?.appContext
 
@@ -64,8 +65,8 @@ 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, {
@@ -81,10 +82,13 @@ const buttonAction = () => {
   
   const PageServiceMapVOList = props.config.lcpPageServiceMapVOList
   if (PageServiceMapVOList?.length) {
+    const dynamicHireRelat = props.config?.dynamicHireRelat
     dispatchClickEvents({
       serviceList: PageServiceMapVOList,
       axiosInstance: _axiosInstance,
-      reqData: rootValue?.value,
+      rootValue: rootValue?.value,
+      dynamicMapComp,
+      dynamicHireRelat,
       messageInstance
     })
   }

package/src/components/packages-web/ElSelect.vue

@@ -1,5 +1,5 @@
 <template>
-  <ElSelect class="custom-self-select" v-bind="{...selectProps, ...attrs }" v-model="value" @clear="clear">
+  <ElSelect class="custom-self-select" v-bind="{...attrs, ...selectProps }" v-model="value" @clear="clear">
     <ElOption v-for="option in props.options"
       :key="option.columnValue"
       :label="lang.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc"
@@ -60,6 +60,13 @@ const selectProps = computed(() => {
   if (attrs.placeholder === null || attrs.placeholder === undefined) {
     attrs.placeholder = ''
   }
+  if (typeof attrs.filterable === 'string') {
+    attrs.filterable = attrs.filterable == '1'
+  }
+  if (typeof attrs.multiple === 'string') {
+    attrs.multiple = attrs.multiple == '1'
+  }
+  attrs.multipleLimit = parseInt(attrs.multipleLimit)
   return attrs
 })
 const lang = inject('lang')

package/src/components/packages-web/ElText.vue

@@ -1,5 +1,5 @@
 <template>
-  <ElText v-bind="{...elRowProps, ...attrs}" @click="clickAction" >
+  <ElText v-bind="{...attrs, ...elRowProps,}" @click="clickAction" >
     {{props.refValue.value}}
   </ElText>
 </template>