resolver-egretimp-plus 0.0.29 → 0.0.31

package/src/hooks/pageConfig.js

@@ -2,13 +2,29 @@ import { parsePageConfig } from "../utils"
 import { ref } from 'vue'
 import { buildInRequest } from "../utils/request"
 import { GET_SYS_PARAM_CACHE, QUERY_PAGE_CONFIG_DATA } from "../api/builtIn"
+import { normalPageConfigs } from "../components/helper/resolver"
+import mock from "./mock"
 
 export function usePageConfig() {
   const pageConfigRef = ref(null)
   const hireRelatMapRulesRef = ref(null)
   const mapCompRef = ref(null)
-  function initPageConfig(config, lang, polyfillConfigs, instance, isH5) {
-    const { pageConfig, mapComp, hireRelatMapRules } = parsePageConfig(config, lang, polyfillConfigs, instance, isH5)
+  function initPageConfig({
+    config,
+    lang,
+    polyfillConfigs,
+    instance,
+    isH5,
+    rootValue,
+    axiosInstance,
+    messageInstance
+  }) {
+    const { pageConfig, mapComp, hireRelatMapRules } = parsePageConfig({
+      config, lang, polyfillConfigs, instance, isH5,
+      rootValue,
+      axiosInstance,
+      messageInstance
+    })
     pageConfigRef.value = pageConfig
     hireRelatMapRulesRef.value = hireRelatMapRules
     mapCompRef.value = mapComp
@@ -31,7 +47,8 @@ export function useBuildInData(messageTipInstance, loadingInstance) {
     }
     buildInRequest(QUERY_PAGE_CONFIG_DATA, reqData).then(ret => {
       if (ret.data.success) {
-        pageConfig.value = ret.data.result
+        pageConfig.value = normalPageConfigs(mock)
+        // pageConfig.value = normalPageConfigs(ret.data.result)
         getSelects(ret.data.result?.pmBusinessIdentityVO?.tenantId)
         return
       }

package/src/index.jsx

@@ -75,11 +75,11 @@ export default {
       default: () => ({composeComponents: {}})
     },
     loadingInstance: {
-      type: Object,
+      type: [Object, Function],
       default: () => null
     },
     messageInstance: {
-      type: Object,
+      type: [Object, Function],
       default: () => null
     },
     loadEvnetsReq: {
@@ -109,7 +109,16 @@ export default {
     const instance = getCurrentInstance()
     const { initPageConfig, pageConfigRef, mapCompRef, hireRelatMapRulesRef } = usePageConfig()
 
-    initPageConfig(props.config, props.lang, props.polyfillConfigs, instance, props.isH5)
+    initPageConfig({
+      config: props.config,
+      lang: props.lang, 
+      polyfillConfigs: props.polyfillConfigs,
+      instance,
+      isH5: props.isH5,
+      rootValue: props.modelValue,
+      axiosInstance,
+      messageInstance: props.messageInstance
+    })
     // 触发加载事件执行
     executeLoadServices(
       props.config?.pmPageServiceMapVOList || [],
@@ -126,7 +135,16 @@ export default {
     )
 
     watch(toRef(props, 'config'), () => {
-      initPageConfig(props.config, props.lang, props.polyfillConfigs, instance, props.isH5)
+      initPageConfig({
+        config: props.config,
+        lang: props.lang, 
+        polyfillConfigs: props.polyfillConfigs,
+        instance,
+        isH5: props.isH5,
+        rootValue: props.modelValue,
+        axiosInstance,
+        messageInstance: props.messageInstance
+      })
       executeLoadServices(
         props.config?.pmPageServiceMapVOList || [],
         {

package/src/resolver-common.vue

@@ -14,11 +14,11 @@ const props = defineProps({
     default: () => ({composeComponents: {}})
   },
   loadingInstance: {
-    type: Object,
+    type: [Object, Function],
     default: () => null
   },
   messageInstance: {
-    type: Object,
+    type: [Object, Function],
     default: () => null
   },
 })

package/src/rules/ruleUtils.js

@@ -205,4 +205,30 @@ export function generateConfigsHireRelat(configs, hireRelat = '', retObj = {}) {
     }
   })
   return retObj
+}
+
+export function getRelateConfigKeys(keys = [], path = '', relatePath = '') {
+  const pathArr = path ? path.split('->') : []
+  const relatePathArr = relatePath ? relatePath.split('->') : []
+  let diffIdx = -1 // 此标识表示，是从那个所以开始，code不一样了
+  let currentIdx = 0
+  while(diffIdx === -1 && currentIdx < pathArr.length && currentIdx < relatePathArr.length) {
+    const pathCode = pathArr[currentIdx]
+    const pathCodeReg = new RegExp(`^${pathCode}(\\[\\d+\\])?$`)
+    const relateCode = relatePathArr[currentIdx]
+    if (pathCodeReg.test(relateCode)) {
+      pathArr.splice(currentIdx, 1, relateCode)
+      currentIdx++
+    } else {
+      diffIdx = currentIdx
+    }
+  }
+  const normalPath = pathArr.reduce((ret, pathCode) => {
+    const noramlPathCode = pathCode.replace(/([\[\]]{1})/g, (_,b) => {return `\\${b}`})
+    return ret + (ret ? `->${noramlPathCode}(\\[\\d+\\])?` : `${noramlPathCode}(\\[\\d+\\])?`)
+  }, '')
+  const normalPathReg = new RegExp(`^${normalPath}$`)
+  return keys.filter(code => {
+    return normalPathReg.test(code)
+  })
 }

package/src/utils/render.jsx

@@ -25,6 +25,7 @@ import { preserveCheck } from './preserveFunc.js'
 import { isArray, isFunction, isString } from './is.js'
 import CustomComponentPlain from '../components/packages-web/CustomComponentPlain.vue'
 import QuestionFilled from '../components/icons/question-filled.vue'
+import { dispatchClickEvent, dispatchClickEvents, getTableConfig } from '../components/helper/button.js'
 
 // 解析配置中的defStyle属性
 export function parseDefStyle(defStyle) {
@@ -100,12 +101,28 @@ function generateFormConfig(lang = 'zh', isH5) {
  * 
  * @param {*} config 通过接口获取的配置对象
  */
-export function parsePageConfig(config, lang, polyfillConfigs, instance, isH5) {
+export function parsePageConfig({
+  config, lang, polyfillConfigs, instance, isH5,
+  rootValue,
+  axiosInstance,
+  messageInstance
+}) {
   if (!config) return {}
   const formConfig = generateFormConfig(lang, isH5)
   const hireRelatMapRules = getCodeMapRules(config)
   formConfig.pmPageMetaList = config.pmPageMetaList
-  let { pageConfig, mapComp } = normalConfig({ polyfillConfigs, instance }, formConfig)
+  const cbs = []
+  let { pageConfig, mapComp } = normalConfig({
+    polyfillConfigs,
+    instance,
+    cbs,
+    rootValue,
+    axiosInstance,
+    messageInstance
+  }, formConfig)
+  cbs.forEach((cb) => {
+    cb()
+  })
   return {
     pageConfig,
     mapComp,
@@ -119,7 +136,14 @@ export function parsePageConfig(config, lang, polyfillConfigs, instance, isH5) {
  * }
  * @param {*} config 
  */
-export function normalConfig({ polyfillConfigs, instance }, config, hireRelat = '', mapComp = {}, needformItem = false) {
+export function normalConfig({ 
+  polyfillConfigs,
+  instance,
+  cbs = [],
+  rootValue,
+  axiosInstance,
+  messageInstance
+}, config, hireRelat = '', mapComp = {}, needformItem = false) {
   const metaCode = config.metaCode || ''
   hireRelat += hireRelat ? `->${metaCode}` : metaCode
 
@@ -153,7 +177,14 @@ export function normalConfig({ polyfillConfigs, instance }, config, hireRelat =
   // 如果有子项，需要进行递归遍历
   if (config.pmPageMetaList && config.pmPageMetaList.length) {
     config.pmPageMetaList = config.pmPageMetaList.map(metaItem => {
-      const { pageConfig } = normalConfig({ polyfillConfigs, instance }, metaItem, hireRelat, mapComp, needformItem || [FORM_META_TYPE].includes(metaType))
+      const { pageConfig } = normalConfig({
+        cbs,
+        polyfillConfigs,
+        instance,
+        rootValue,
+        axiosInstance,
+        messageInstance 
+      }, metaItem, hireRelat, mapComp, needformItem || [FORM_META_TYPE].includes(metaType))
       return pageConfig
     })?.sort((a, b) => a.seqNo - b.seqNo)
   }
@@ -177,12 +208,53 @@ export function normalConfig({ polyfillConfigs, instance }, config, hireRelat =
   }
   mapComp[hireRelat] = pageConfig
   parsePolyfillConfigs({ polyfillConfigs, instance }, pageConfig)
+  if(pageConfig.lcpPageServiceMapVOList?.length) {
+    cbs.push(() => {
+      const tabsServices = getTableServices(pageConfig.lcpPageServiceMapVOList, {dynamicMapComp: mapComp, dynamicMapCompKeys: Object.keys(mapComp), hireRelat})
+      tabsServices.forEach((({tableConfig, service}) => {
+        tableConfig.currentChange = (val, props, page) => {
+          setTimeout(() => {
+            debugger
+            const dynamicMapComp = props.config.dynamicMapComp
+            const dynamicMapCompKeys = Object.keys(dynamicMapComp)
+            const dynamicHireRelat = props.config.dynamicHireRelat
+            dispatchClickEvent(service, { dynamicMapComp,  dynamicMapCompKeys, dynamicHireRelat, rootValue, axiosInstance, messageInstance })
+          }, 0);
+        }
+        tableConfig.sizeChange = (val, props, page) => {
+          setTimeout(() => {
+            const dynamicMapComp = props.config.dynamicMapComp
+            const dynamicMapCompKeys = Object.keys(dynamicMapComp)
+            const dynamicHireRelat = props.config.dynamicHireRelat
+            dispatchClickEvent(service, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, rootValue, axiosInstance, messageInstance })
+          }, 0);
+        }
+      }))
+    })
+  }
   return {
     mapComp,
     pageConfig
   }
 }
 
+// 从按钮的服务编排中，获取到按钮中配置的表格中的config，并且绑定表格的分页
+function getTableServices(lcpPageServiceMapVOList = [], { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat }) {
+  const searchServices = lcpPageServiceMapVOList.filter(service => service.transactionType == '1')
+  if (searchServices.length) {
+    return searchServices.map(service => {
+      const tableConfig = getTableConfig(service?.outParamMappingList, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat })
+      if (tableConfig) {
+        return {
+          tableConfig,
+          service
+        }
+      }
+    }).filter(item => !!item)
+  }
+  return []
+}
+
 function parsePolyfillConfigs({ polyfillConfigs, instance }, config) {
   const hireRelat = config.hireRelat
   const findKeys = Object.keys(polyfillConfigs).filter(key => hireRelat.endsWith(key))