resolver-egretimp-plus 0.1.57 → 0.1.59

package/package.json

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

package/src/analysisComponent.jsx

@@ -230,7 +230,7 @@ export default {
       
       // 如果已经有dynamicHireRelat值的时候，就不需要再进行以下赋值了
       if (config?.dynamicHireRelat_bak) {
-        definePrivatelyProp(config, 'dynamicHireRelat', `__@__${props.mode}__${config.dynamicHireRelat_bak}`)
+        definePrivatelyProp(config, 'dynamicHireRelat', `${config.dynamicHireRelat_bak}__@__${props.mode}__`)
       } else {
         const dynamicHireRelat = parent?.dynamicHireRelat ?  `${parent?.dynamicHireRelat}${hasOwn(config, 'rowIndex') ? `[${config.rowIndex}]` : ''}->${(config.metaCode || '')}` : config.metaCode
         definePrivatelyProp(config, 'dynamicHireRelat', dynamicHireRelat)

package/src/components/helper/eventOrchestration.js

@@ -2,7 +2,7 @@ import { isArray, isHasVal, isNull, isUndefined } from "../../utils/is"
 import { DATA_VALID_RULE_EXECUTE } from "../../api/builtIn"
 import { getRelateConfigKeys } from "../../rules/ruleUtils"
 import { RESULT_CODE, resultToast } from "../../utils/respone"
-import { assignmentPathVal, getPathVal, isPromise, modelValueDeepMerge, parseExtendAttr, unionWith } from "../../utils/index"
+import { assignmentPathVal, definePrivatelyProp, getPathVal, isPromise, modelValueDeepMerge, parseExtendAttr, unionWith } from "../../utils/index"
 import { buildInRequest } from "../../utils/request"
 import { bpmInstance } from "../../bpm/bpmInstance"
 
@@ -21,148 +21,174 @@ export async function dispatchClickEvent(service, {
   dynamicHireRelat, axiosInstance, messageCb, compConfig,
   messageInstance, lang, beforeRequestService, afterRequestService 
 }) {
-  let reqData = rootValue || {}
-  let tableConfig = null
-  const serviceCustomProps = parseExtendAttr({extendAttr: service.extendAttr})
+  if (service.transactionType == '1') {
+    const tableConfig = getTableConfig(service.outParamMappingList, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat })
+    if (tableConfig) {
+      definePrivatelyProp(tableConfig, 'serviceSizeChange', (val, props, page) => {
+        toExecute()
+      })
+      definePrivatelyProp(tableConfig, 'serviceCurrentChange', (val, props, page) => {
+        toExecute(false)
+      })
+    }
+  }
+  // 把执行逻辑封装成一个方法
+  async function toExecute(resetPageNum = true) {
+    let reqData = rootValue || {}
+    let tableConfig = null
+    const serviceCustomProps = parseExtendAttr({extendAttr: service.extendAttr})
 
-  let normalBeforeRequestService = null
-  let normalAfterRequestService = null
-  // 定义的请求前钩子
-  const configBeforeRequestService = compConfig?.beforeRequestService
-  if (configBeforeRequestService || beforeRequestService) {
-    normalBeforeRequestService = async (...arg) => {
-      let beforeRequestServiceRet = true
-      if (beforeRequestService) {
-        beforeRequestServiceRet = beforeRequestService?.(...arg)
-      }
-      const beforeRequestServiceRetValid = await beforeRequestServiceRet
-      if (beforeRequestServiceRetValid === false) {
-        return false
+    let normalBeforeRequestService = null
+    let normalAfterRequestService = null
+    // 定义的请求前钩子
+    const configBeforeRequestService = compConfig?.beforeRequestService
+    if (configBeforeRequestService || beforeRequestService) {
+      normalBeforeRequestService = async (...arg) => {
+        let beforeRequestServiceRet = true
+        if (beforeRequestService) {
+          beforeRequestServiceRet = beforeRequestService?.(...arg)
+        }
+        const beforeRequestServiceRetValid = await beforeRequestServiceRet
+        if (beforeRequestServiceRetValid === false) {
+          return false
+        }
+        if (configBeforeRequestService) {
+          return configBeforeRequestService?.(...arg)
+        } else {
+          return true
+        }
       }
-      if (configBeforeRequestService) {
-        return configBeforeRequestService?.(...arg)
-      } else {
-        return true
+    }
+    // 定义的请求后钩子
+    const configAfterRequestService = compConfig?.afterRequestService
+    if (configAfterRequestService || afterRequestService) {
+      normalAfterRequestService = async (...arg) => {
+        await afterRequestService?.(...arg)
+        await configAfterRequestService?.(...arg)
       }
     }
-  }
-  // 定义的请求后钩子
-  const configAfterRequestService = compConfig?.afterRequestService
-  if (configAfterRequestService || afterRequestService) {
-    normalAfterRequestService = async (...arg) => {
-      await afterRequestService?.(...arg)
-      await configAfterRequestService?.(...arg)
+    if (service.transactionType == '1') {
+      reqData = getReqData(service.inParamMappingList || [], {emptyUpdate: true, dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat})
+      tableConfig = getTableConfig(service.outParamMappingList, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat })
+      if (tableConfig?.vm) {
+        if (resetPageNum) {
+          // 控制表格组件中分页变化不会出发监听
+          definePrivatelyProp(tableConfig, 'serviceCurrentChangeLoad', true)
+          tableConfig.vm.page.pageNum = 1
+          setTimeout(() => {
+            definePrivatelyProp(tableConfig, 'serviceCurrentChangeLoad', false)
+          }, 200);
+        }
+        if (!isUndefined(tableConfig.vm.page?.pageNum) && !isNull(tableConfig.vm.page?.pageNum) ) {
+          assignmentPathVal(reqData, service.pageNum || 'pageNum', tableConfig.vm.page?.pageNum)
+        }
+        if (!isUndefined(tableConfig.vm.page?.pageSize) && !isNull(tableConfig.vm.page?.pageSize) ) {
+          assignmentPathVal(reqData, service.pageSize || 'pageSize', tableConfig.vm.page?.pageSize)
+        }
+      }
+      reqData = {
+        ...reqData,
+        // ...dialogReq
+      }
     }
-  }
 
-  if (service.transactionType == '1') {
-    reqData = getReqData(service.inParamMappingList || [], {emptyUpdate: true, dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat})
-    tableConfig = getTableConfig(service.outParamMappingList, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat })
-    if (tableConfig?.vm) {
-      if (!isUndefined(tableConfig.vm.page?.pageNum) && !isNull(tableConfig.vm.page?.pageNum) ) {
-        assignmentPathVal(reqData, service.pageNum || 'pageNum', tableConfig.vm.page?.pageNum)
-      }
-      if (!isUndefined(tableConfig.vm.page?.pageSize) && !isNull(tableConfig.vm.page?.pageSize) ) {
-        assignmentPathVal(reqData, service.pageSize || 'pageSize', tableConfig.vm.page?.pageSize)
+    const url = service.serviceCode
+    const httpMethod = service.httpMethod || "post"
+
+    let reqResult = {
+      aid_language: lang,
+      requestTraceId,
+      pmHandleBusinessIdentity: {
+        busiIdentityId: service.busiIdentityId,
+        pageMetaId: service.pageMetaId,
+        tenantId: service.tenantId,
+        mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
+      },
+      
+    }
+    // 控制是否需要传入默认参数 ===== start=====
+    const notDefaultParmas = serviceCustomProps?.notDefaultParmas
+    if (notDefaultParmas) {
+      reqResult = {
       }
     }
-    reqData = {
-      ...reqData,
-      // ...dialogReq
+    const mergeObj = modelValueDeepMerge(reqResult, reqData)
+    reqResult = mergeObj
+    // 控制是否需要传入默认参数 ===== end=====
+
+    let beforeRequestServiceRet = true
+    if (normalBeforeRequestService) {
+      beforeRequestServiceRet = normalBeforeRequestService({
+        dynamicMapComp,
+        requestTraceId, 
+        mixinServiceConfig, 
+        rootValue, 
+        dynamicHireRelat, 
+        compConfig,
+        service,
+        reqData: reqResult
+      })
+    }
+    const beforeRequestServiceRetValid = await beforeRequestServiceRet
+    if (beforeRequestServiceRetValid === false) {
+      return
     }
-  }
-  const url = service.serviceCode
-  const httpMethod = service.httpMethod || "post"
 
-  let reqResult = {
-    aid_language: lang,
-    requestTraceId,
-    pmHandleBusinessIdentity: {
-      busiIdentityId: service.busiIdentityId,
-      pageMetaId: service.pageMetaId,
-      tenantId: service.tenantId,
-      mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
-    },
-    
-  }
-  const notDefaultParmas = serviceCustomProps?.notDefaultParmas
-  if (notDefaultParmas) {
-    reqResult = {
+    const reqConfig = {
+      url,
+      method: httpMethod,
+      data: reqResult
+    }
+    if (httpMethod.toLocaleLowerCase() === 'get') {
+      reqConfig.params = reqResult
+      delete reqConfig.data
+    }
+    const ret = await (axiosInstance && axiosInstance(reqConfig))
+    if (normalAfterRequestService) {
+      await normalAfterRequestService(ret, {
+        dynamicMapComp,
+        requestTraceId, 
+        mixinServiceConfig, 
+        rootValue, 
+        dynamicHireRelat, 
+        compConfig,
+        service,
+        reqData: reqResult
+      })
     }
-  }
-  const mergeObj = modelValueDeepMerge(reqResult, reqData)
-  reqResult = mergeObj
 
-  let beforeRequestServiceRet = true
-  if (normalBeforeRequestService) {
-    beforeRequestServiceRet = normalBeforeRequestService({
-      dynamicMapComp,
-      requestTraceId, 
-      mixinServiceConfig, 
-      rootValue, 
-      dynamicHireRelat, 
-      compConfig,
+    const noSuccessIip = httpMethod.toLocaleLowerCase() === 'get' || service.transactionType == '1' || serviceCustomProps?.noSuccessIip
+    const toastParmas = {
+      messageCb,
       service,
-      reqData: reqResult
-    })
-  }
-  const beforeRequestServiceRetValid = await beforeRequestServiceRet
-  if (beforeRequestServiceRetValid === false) {
-    return
-  }
-
-  const reqConfig = {
-    url,
-    method: httpMethod,
-    data: reqResult
-  }
-  if (httpMethod.toLocaleLowerCase() === 'get') {
-    reqConfig.params = reqResult
-    delete reqConfig.data
-  }
-  const ret = await (axiosInstance && axiosInstance(reqConfig))
-  if (normalAfterRequestService) {
-    await normalAfterRequestService(ret, {
-      dynamicMapComp,
-      requestTraceId, 
-      mixinServiceConfig, 
-      rootValue, 
-      dynamicHireRelat, 
       compConfig,
-      service,
-      reqData: reqResult
-    })
-  }
-
-  const noSuccessIip = httpMethod.toLocaleLowerCase() === 'get' || service.transactionType == '1' || serviceCustomProps?.noSuccessIip
-  const toastParmas = {
-    messageCb,
-    service,
-    compConfig,
-    noSuccessIip
-  }
-  if (serviceCustomProps.resultCodeKey) {
-    toastParmas.resultCodeKey = serviceCustomProps.resultCodeKey
-  }
-  if (!resultToast(ret?.data, messageInstance, toastParmas)) {
-    await Promise.reject()
-    return
-  }
-  // ret.data = {result: {pageTotalCount: 100, result: [{},{},{},{},{}]}}
-  initOutParamData(service.outParamMappingList, {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, outResult: ret.data})
-  if (tableConfig?.vm) {
-    let totalObj = ret.data?.result
-    let pageTotalCountKey = service.pageTotalCount
-    const deepMatch = /^_deep:(.+)$/
-    const matchs = service.pageTotalCount?.match(deepMatch)
-    if (matchs) {
-      totalObj = ret.data
-      pageTotalCountKey = matchs[1]
+      noSuccessIip
+    }
+    if (serviceCustomProps.resultCodeKey) {
+      toastParmas.resultCodeKey = serviceCustomProps.resultCodeKey
+    }
+    if (!resultToast(ret?.data, messageInstance, toastParmas)) {
+      await Promise.reject()
+      return
+    }
+    // ret.data = {result: {pageTotalCount: 100, result: [{},{},{},{},{}]}}
+    initOutParamData(service.outParamMappingList, {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, outResult: ret.data})
+    if (tableConfig?.vm) {
+      let totalObj = ret.data?.result
+      let pageTotalCountKey = service.pageTotalCount
+      const deepMatch = /^_deep:(.+)$/
+      const matchs = service.pageTotalCount?.match(deepMatch)
+      if (matchs) {
+        totalObj = ret.data
+        pageTotalCountKey = matchs[1]
+      }
+      const total = parseInt(getPathVal(totalObj || {}, pageTotalCountKey || 'pageCount'))
+      tableConfig.vm.page.total = total
+      // tableConfig.vm?.changePage(total, 'total')
     }
-    const total = parseInt(getPathVal(totalObj || {}, pageTotalCountKey || 'pageCount'))
-    tableConfig.vm.page.total = total
-    // tableConfig.vm?.changePage(total, 'total')
   }
+
+  toExecute()
 }
 
 function getReqData(inParamMappingList = [], {emptyUpdate, dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat}) {

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

@@ -3,7 +3,7 @@ import { ElPagination } from 'element-plus'
 import ElTable, { ElTableColumn } from '../table'
 import Renderer from '../../renderer.jsx'
 import { computed, inject, watch, h, ref, reactive } from 'vue'
-import { commonPropsType, TABLE_COLUMN_NOT_RENDER_META_TYPE, DISPLAY_SHOW, compareComponet, isPlainObject, hasOwn, cloneDeep, isPromise, isPlainColumn, generateUniqueId, calcDisable, camelize, capitalize, DISPLAY_HIDDEN, definePrivatelyProp } from '../../utils/index.js'
+import { commonPropsType, TABLE_COLUMN_NOT_RENDER_META_TYPE, DISPLAY_SHOW, compareComponet, isPlainObject, hasOwn, cloneDeep, isPromise, isPlainColumn, generateUniqueId, calcDisable, camelize, capitalize, DISPLAY_HIDDEN, definePrivatelyProp, isArray } from '../../utils/index.js'
 // import '../styles/CustomComponenTable.scss'
 
 export default {
@@ -432,32 +432,33 @@ export default {
     })
     
     // 页码变动
-    watch(() => page.pageNum, (val) => {
+    watch(() => page.pageNum, async (val) => {
+      if (props.config?.serviceCurrentChangeLoad) {
+        return
+      }
       const fn = props.config?.currentChange
-      const ret = fn && fn(val, props, page)
-      if (ret) {
-        if (isPromise(ret)) {
-          ret.then((res) => {
-            res && (modelValue.value = res)
-          })
-        } else {
-          modelValue.value = ret
-        }
+      const ret = await fn?.(val, props, page)
+      if (ret && isArray(ret)) {
+        modelValue.value = ret
       }
+
+      // 以下是配置的点击事件服务所绑定的调用方法 ==== start ======
+      const serviceFn = props.config?.serviceCurrentChange
+      serviceFn?.(val, props, page)
+      // 以下是配置的点击事件服务所绑定的调用方法 ==== end ======
     })
     // 页面大小变动
-    watch(() => page.pageSize, (val) => {
+    watch(() => page.pageSize, async (val) => {
       const fn = props.config?.sizeChange
-      const ret = fn && fn(val, props, page)
-      if (ret) {
-        if (isPromise(ret)) {
-          ret.then((res) => {
-            res && (modelValue.value = res)
-          })
-        } else {
-          modelValue.value = ret
-        }
+      const ret = await fn?.(val, props, page)
+      if (ret && isArray(ret)) {
+        modelValue.value = ret
       }
+
+      // 以下是配置的点击事件服务所绑定的调用方法 ==== start ======
+      const serviceFn = props.config?.serviceSizeChange
+      serviceFn?.(val, props, page)
+      // 以下是配置的点击事件服务所绑定的调用方法 ==== end ======
     })
 
     const tableExposeKeys = [

package/src/rules/ruleUtils.js

@@ -70,7 +70,7 @@ function getRelateConfigs(codesStr, config, type) {
   let normalDynamicHireRelat = dynamicHireRelat
   let preFlagStr = ''
   // 这个规则是因为在日志直接拷贝配置的时候，在analysisComponent组件中会在前面额外加上 这个 标识 所以需要转换一下
-  const preFlagStrReg = /^(__@__[^(->)]*__)/
+  const preFlagStrReg = /(__@__[^(->)]*__)$/
   const preFlagStrMatchs = dynamicHireRelat?.match(preFlagStrReg)
   if (preFlagStrMatchs) {
     preFlagStr = preFlagStrMatchs[1]
@@ -122,10 +122,10 @@ function getRelateConfigs(codesStr, config, type) {
   const { dynamicMapComp, _mapComp } = this
   let retConfigs = []
   if (sameStr) {
-    retConfigs = [dynamicMapComp[`${preFlagStr}${sameStr}`]]
+    retConfigs = [dynamicMapComp[`${sameStr}${preFlagStr}`]]
   } else {
     const code = diffCodes.shift()
-    retConfigs = [dynamicMapComp[`${preFlagStr}${code}`]]
+    retConfigs = [dynamicMapComp[`${code}${preFlagStr}`]]
   }
   while (diffCodes.length) {
     const code = diffCodes.shift()

package/src/rulesImp/ruleUtils.js

@@ -1,8 +1,20 @@
 import { hasOwn, isPlainObject } from "../utils"
 
 export function getRelateConfigKeys(keys = [], path = '', relatePath = '') {
+  // 这边逻辑目前主要是为了兼容日志的时候，也可以正常使用规则========start=====
+  let normalRelatePath = relatePath
+  let preFlagStr = ''
+  // 这个规则是因为在日志直接拷贝配置的时候，在analysisComponent组件中会在前面额外加上 这个 标识 所以需要转换一下
+  const preFlagStrReg = /(__@__[^(->)]*__)$/
+  const preFlagStrMatchs = relatePath?.match(preFlagStrReg)
+  if (preFlagStrMatchs) {
+    preFlagStr = preFlagStrMatchs[1]
+    normalRelatePath = normalRelatePath?.replace(preFlagStrReg, '')
+  }
+  // 这边逻辑目前主要是为了兼容日志的时候，也可以正常使用规则========end=====
+
+  const relatePathArr = normalRelatePath ? normalRelatePath.split('->') : []
   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) {
@@ -20,7 +32,7 @@ export function getRelateConfigKeys(keys = [], path = '', relatePath = '') {
     const noramlPathCode = pathCode.replace(/([\[\]]{1})/g, (_,b) => {return `\\${b}`})
     return ret + (ret ? `->${noramlPathCode}(\\[\\d+\\])?` : `${noramlPathCode}(\\[\\d+\\])?`)
   }, '')
-  const normalPathReg = new RegExp(`^${normalPath}$`)
+  const normalPathReg = new RegExp(`^${normalPath}${preFlagStr}$`)
   return keys.filter(code => {
     return normalPathReg.test(code)
   })

package/src/utils/render.jsx

@@ -277,55 +277,55 @@ export function normalConfig({
 
   mapComp[hireRelat] = pageConfig
   parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue, parentDynamicMapComp }, pageConfig)
-  if(pageConfig.lcpPageServiceMapVOList?.length) {
-    cbs.push(() => {
-      const tabsServices = getTableServices(pageConfig.lcpPageServiceMapVOList, {dynamicMapComp: mapComp, dynamicMapCompKeys: Object.keys(mapComp), hireRelat})
-      tabsServices.forEach((({mixinServiceConfig, tableConfig, service}) => {
-        const orginCurrentChange = tableConfig.currentChange
-        tableConfig.currentChange = (val, props, page) => {
-          orginCurrentChange && orginCurrentChange(val, props, page)
-          const dynamicMapComp = props.config.dynamicMapComp
-          const dynamicMapCompKeys = Object.keys(dynamicMapComp)
-          const dynamicHireRelat = props.config.dynamicHireRelat
-          dispatchClickEvent(service, {
-            requestTraceId,
-            dialogReq,
-            mixinServiceConfig, 
-            lang,
-            dynamicMapComp,
-            dynamicMapCompKeys,
-            dynamicHireRelat,
-            rootValue,
-            messageCb,
-            compConfig: pageConfig,
-            axiosInstance,
-            messageInstance
-          })
-        }
-        const orginSizeChange = tableConfig.sizeChange
-        tableConfig.sizeChange = (val, props, page) => {
-          orginSizeChange && orginSizeChange(val, props, page)
-          const dynamicMapComp = props.config.dynamicMapComp
-          const dynamicMapCompKeys = Object.keys(dynamicMapComp)
-          const dynamicHireRelat = props.config.dynamicHireRelat
-          dispatchClickEvent(service, {
-            requestTraceId,
-            dialogReq,
-            mixinServiceConfig, 
-            lang,
-            dynamicMapComp,
-            dynamicMapCompKeys,
-            dynamicHireRelat,
-            rootValue,
-            messageCb,
-            compConfig: pageConfig,
-            axiosInstance,
-            messageInstance
-          })
-        }
-      }))
-    })
-  }
+  // if(pageConfig.lcpPageServiceMapVOList?.length) {
+  //   cbs.push(() => {
+  //     const tabsServices = getTableServices(pageConfig.lcpPageServiceMapVOList, {dynamicMapComp: mapComp, dynamicMapCompKeys: Object.keys(mapComp), hireRelat})
+  //     tabsServices.forEach((({mixinServiceConfig, tableConfig, service}) => {
+  //       const orginCurrentChange = tableConfig.currentChange
+  //       tableConfig.currentChange = (val, props, page) => {
+  //         orginCurrentChange && orginCurrentChange(val, props, page)
+  //         const dynamicMapComp = props.config.dynamicMapComp
+  //         const dynamicMapCompKeys = Object.keys(dynamicMapComp)
+  //         const dynamicHireRelat = props.config.dynamicHireRelat
+  //         dispatchClickEvent(service, {
+  //           requestTraceId,
+  //           dialogReq,
+  //           mixinServiceConfig, 
+  //           lang,
+  //           dynamicMapComp,
+  //           dynamicMapCompKeys,
+  //           dynamicHireRelat,
+  //           rootValue,
+  //           messageCb,
+  //           compConfig: pageConfig,
+  //           axiosInstance,
+  //           messageInstance
+  //         })
+  //       }
+  //       const orginSizeChange = tableConfig.sizeChange
+  //       tableConfig.sizeChange = (val, props, page) => {
+  //         orginSizeChange && orginSizeChange(val, props, page)
+  //         const dynamicMapComp = props.config.dynamicMapComp
+  //         const dynamicMapCompKeys = Object.keys(dynamicMapComp)
+  //         const dynamicHireRelat = props.config.dynamicHireRelat
+  //         dispatchClickEvent(service, {
+  //           requestTraceId,
+  //           dialogReq,
+  //           mixinServiceConfig, 
+  //           lang,
+  //           dynamicMapComp,
+  //           dynamicMapCompKeys,
+  //           dynamicHireRelat,
+  //           rootValue,
+  //           messageCb,
+  //           compConfig: pageConfig,
+  //           axiosInstance,
+  //           messageInstance
+  //         })
+  //       }
+  //     }))
+  //   })
+  // }
   return {
     mapComp,
     pageConfig