resolver-egretimp-plus 0.1.121 → 0.1.123

package/src/utils/render.jsx

@@ -1,7 +1,7 @@
 import { getCodeMapRules } from '../rules/rulesDriver.js'
 import SimpleFormItemPc from '../components/simpleFormItemPc'
 import { resolveAssetComponents, findComponent, compareComponet, normalPixel, isPlainObject, hasOwn, isFnStr, normalCapitalizeComponent, capitalize, camelize, formatDate, definePrivatelyProp, extend, getPathVal, cloneDeep, generateUniqueId} from './common.js'
-import { resolveComponent, inject, watch, unref, markRaw } from 'vue'
+import { resolveComponent, inject, watch, unref, markRaw, reactive } from 'vue'
 import CustomComponentColH5 from '../components/packages-H5/CustomComponentColH5.vue'
 import {
   commonPropsType,
@@ -39,6 +39,7 @@ import loadModule from './loadModule.js'
 import { h } from 'vue'
 import dayjs from 'dayjs'
 import { OPEN_DATA_RULES } from '../config.js'
+import { useVmodels } from '../hooks/reactive.js'
 
 export const COFNGI_KEY_EVENT_FLAG = /^on[A-Z]/
 
@@ -138,6 +139,7 @@ export function parsePageConfig({
   const hireRelatMapRules = getCodeMapRules(config._originConfig)
   // formConfig.pmPageMetaList = config.pmPageMetaList
   const cbs = []
+  window?.performance?.mark('noraml_config_start')
   let { pageConfig, mapComp } = normalConfig({
     requestTraceId,
     dialogReq,
@@ -159,12 +161,50 @@ export function parsePageConfig({
   cbs.forEach((cb) => {
     cb()
   })
+  window?.performance?.mark('noraml_config_end')
+  console.log('noraml_config', window?.performance?.measure('noraml_config', 'noraml_config_start', 'noraml_config_end'))
   return {
     pageConfig,
     mapComp,
     hireRelatMapRules
   }
 }
+
+// 数组中行数据位置变了，需要控制multipagemtalist中的配置对应正确的dynamicMapComp映射
+function correctConfigDynamicMap(dynamicMapComp, dynamicHireRelat) {
+  if (dynamicMapComp[dynamicHireRelat]) {
+    // 替换倒数第二个的[idx]中的idx值
+    const existConfig = dynamicMapComp[dynamicHireRelat]
+    const changedDynamicHireRelat = dynamicHireRelat.replace(/([^->\[\]]*)(\[\d*\])(->[^->]*)$/, (_, b, c, d) => {
+        return `${b}[${existConfig.rowIndex}]${d}`
+    })
+    if (changedDynamicHireRelat !== dynamicHireRelat) {
+      correctConfigDynamicMapHandler({config: existConfig, dynamicMapComp, changedDynamicHireRelat})
+    }
+  }
+}
+
+function correctConfigDynamicMapHandler({config, dynamicMapComp, changedDynamicHireRelat}) {
+  if (changedDynamicHireRelat === config.dynamicHireRelat) {
+    return
+  }
+  config.dynamicHireRelat = changedDynamicHireRelat
+  correctConfigDynamicMap(dynamicMapComp, changedDynamicHireRelat)
+  dynamicMapComp[changedDynamicHireRelat] = config
+  if (config.pmPageMetaList && config.pmPageMetaList.length) {
+    if (isCycleConfig(config)) {
+      config.multiPmPageMetaList?.forEach((pmPageMetaList, idx) => {
+        pmPageMetaList.forEach(cg => {
+          correctConfigDynamicMapHandler({config: cg, dynamicMapComp, changedDynamicHireRelat: `${changedDynamicHireRelat}[${idx}]->${cg.metaCode}`})
+        })
+      })
+    } else {
+      config.pmPageMetaList.forEach(cg => {
+        correctConfigDynamicMapHandler({config: cg, dynamicMapComp, changedDynamicHireRelat: `${changedDynamicHireRelat}->${cg.metaCode}`})
+      })
+    }
+  }
+}
 /**
  * {
  *  children: [], // 子元素
@@ -188,13 +228,19 @@ export function normalConfig({
   parentRootValue,
   parentDynamicMapComp,
   noParsePageMetaList,
+  changeConfig,
+  notParseConfig,
 }, config, hireRelat = '', mapComp = {}, needformItem = false, dynamicHireRelat = '', unWatchsList = []) {
+
   const metaCode = config.metaCode || ''
-  hireRelat += hireRelat ? `->${metaCode}` : metaCode
   dynamicHireRelat += dynamicHireRelat ? `->${metaCode}` : metaCode
-
+  hireRelat += hireRelat ? `->${metaCode}` : metaCode
   const originMetaType = config.metaType
-  const metaType = normalMetaType(config.metaType)
+  let metaType = originMetaType
+
+  if (!notParseConfig) {
+    metaType = normalMetaType(config.metaType)
+  }
 
   // 这个对象是不可以被配置进行覆盖
   const extendNativeObj = {
@@ -206,79 +252,80 @@ export function normalConfig({
     wrapVm: null, // 当前组件的实例（也就是analysisComponent）
     hireRelat,
     parent: null, // 这个是执行过程中，动态获取的
-    dynamicHireRelat: '', // 这个也是执行过程中，动态获取的层级
   }
 
   if (OPEN_DATA_RULES) {
-    extendNativeObj.dynamicHireRelat = dynamicHireRelat
+    if (changeConfig) {
+      // 设置multiPmPageMetaList的时候，如果数组变了，如果数组中的值变换了位置，需要对dynamicMapComp设置正确的映射
+      correctConfigDynamicMap(dynamicMapComp, dynamicHireRelat)
+    }
+    config.dynamicHireRelat = dynamicHireRelat
     dynamicMapComp[dynamicHireRelat] = config
-    // extendNativeObj._rootValue = rootValue
     definePrivatelyProp(config, '_rootValue', rootValue)
+    definePrivatelyProp(config, 'refValue', useVmodels(config).modelValue)
   }
 
-  let extendAttrObj = parseExtendAttr(config)
-  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
-  }
-  if (config.defStyle) {
-    extendObj.style = parseDefStyle(config.defStyle)
-  }
-  // 组件是根据数据进行动态循环渲染，这边需要进行特殊处理，确保config配置项独立
-  if (findComponent(MULTI_PAGE_META_LIST_TYPES, extendAttrObj.renderby) !== -1 || findComponent(MULTI_PAGE_META_LIST_TYPES, metaType) !== -1) {
-    extendObj.multiPmPageMetaList = []
-  }
-  // let pageConfig = {
-  //   ...extendObj,
-  //   ...config,
-  //   ...extendAttrObj,
-  //   ...extendNativeObj,
-  // }
-
-  extend(config, extendObj, true)
-  extend(config, extendAttrObj)
-  extend(config, extendNativeObj)
+  if (!notParseConfig) {
+    let extendAttrObj = parseExtendAttr(config)
+    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
+    }
+    if (config.defStyle) {
+      extendObj.style = parseDefStyle(config.defStyle)
+    }
+    // 组件是根据数据进行动态循环渲染，这边需要进行特殊处理，确保config配置项独立
+    if (isCycleConfig({renderby: extendAttrObj.renderby, metaType})) {
+      extendObj.multiPmPageMetaList = reactive([])
+    }
+  
+    extend(config, extendObj, true)
+    extend(config, extendAttrObj)
+    extend(config, extendNativeObj)
+  }
 
   let pageConfig = config
 
-  if (originMetaType == 'textarea') {
-    pageConfig.type = 'textarea'
-  }
-  if (originMetaType == 'time-range') {
-    pageConfig['isRange'] = true
-  }
-  if (originMetaType == 'date-range') {
-    pageConfig.type = 'daterange'
-  }
-  if (originMetaType == 'card' && !hasOwn(pageConfig, 'needWrap')) {
-    pageConfig.needWrap = '1'
-  }
-  // 在详情的情况下，配置组件是否显示
-  if (mode === MODE.DETAIL) {
-    if (pageConfig.detailExtendAttr) {
-      const detailExtendAttrObj = parseExtendAttr({
-        extendAttr: typeof pageConfig.detailExtendAttr === 'string' ? pageConfig.detailExtendAttr : JSON.stringify(pageConfig.detailExtendAttr),
-        metaCode: `detail-${pageConfig.metaCode}`
-      })
-      extend(pageConfig, detailExtendAttrObj)
+  if (!notParseConfig) {
+    if (originMetaType == 'textarea') {
+      pageConfig.type = 'textarea'
+    }
+    if (originMetaType == 'time-range') {
+      pageConfig['isRange'] = true
+    }
+    if (originMetaType == 'date-range') {
+      pageConfig.type = 'daterange'
+    }
+    if (originMetaType == 'card' && !hasOwn(pageConfig, 'needWrap')) {
+      pageConfig.needWrap = '1'
+    }
+    // 在详情的情况下，配置组件是否显示
+    if (mode === MODE.DETAIL) {
+      if (pageConfig.detailExtendAttr) {
+        const detailExtendAttrObj = parseExtendAttr({
+          extendAttr: typeof pageConfig.detailExtendAttr === 'string' ? pageConfig.detailExtendAttr : JSON.stringify(pageConfig.detailExtendAttr),
+          metaCode: `detail-${pageConfig.metaCode}`
+        })
+        extend(pageConfig, detailExtendAttrObj)
 
+      }
+      pageConfig.hidden = pageConfig.detailHidden || pageConfig.hidden
     }
-    pageConfig.hidden = pageConfig.detailHidden || pageConfig.hidden
-  }
-  // 在日志的情况下，配置组件是否显示
-  if (mode === MODE.LOG) {
-    if (pageConfig.logExtendAttr) {
-      const logExtendAttrObj = parseExtendAttr({
-        extendAttr: typeof pageConfig.logExtendAttr === 'string' ? pageConfig.logExtendAttr : JSON.stringify(pageConfig.logExtendAttr),
-        metaCode: `log-${pageConfig.metaCode}`
-      })
-      extend(pageConfig, logExtendAttrObj)
+    // 在日志的情况下，配置组件是否显示
+    if (mode === MODE.LOG) {
+      if (pageConfig.logExtendAttr) {
+        const logExtendAttrObj = parseExtendAttr({
+          extendAttr: typeof pageConfig.logExtendAttr === 'string' ? pageConfig.logExtendAttr : JSON.stringify(pageConfig.logExtendAttr),
+          metaCode: `log-${pageConfig.metaCode}`
+        })
+        extend(pageConfig, logExtendAttrObj)
+      }
+      pageConfig.hidden = pageConfig.logHidden || pageConfig.hidden
     }
-    pageConfig.hidden = pageConfig.logHidden || pageConfig.hidden
-  }
 
-  mapComp[hireRelat] = pageConfig
-  parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue, parentDynamicMapComp }, pageConfig)
+    mapComp[hireRelat] = pageConfig
+    parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue, parentDynamicMapComp }, pageConfig)
+  }
   
   if (!OPEN_DATA_RULES) {
     // 如果有子项，需要进行递归遍历
@@ -311,13 +358,18 @@ export function normalConfig({
   
     function normalPmPageMetaList(config) {
       const isCycleFlag = isCycleConfig(config)
-      config.pmPageMetaList = simpleNormalPmPageMetaList(config.pmPageMetaList, dynamicHireRelat, unWatchsList, isCycleFlag)
+      config.pmPageMetaList = simpleNormalPmPageMetaList({
+        pmPageMetaList: config.pmPageMetaList,
+        dynamicHireRelat,
+        unWatchsList,
+        noParsePageMetaList: isCycleFlag,
+        changeConfig
+      })
 
       definePrivatelyProp(config, '_rowColumnConfgsMap', markRaw(new Map()))
       config._unPageMetaListWatch?.() // 删除当前的监听
       if (isCycleFlag) {
         const currentUnWatchsList = [...unWatchsList]
-        definePrivatelyProp(config, 'multiPmPageMetaList', [])
 
         // 这边先执行，因为当前的_unWatchs里面只放子级的watch
         const oldUnWatchsList = [...currentUnWatchsList]
@@ -325,11 +377,12 @@ export function normalConfig({
         definePrivatelyProp(config, '_unWatchs', markRaw([]))
         currentUnWatchsList?.push(config._unWatchs)
 
-        config._unPageMetaListWatch = watch(() => getPathVal(unref(config._rootValue), config.dynamicHireRelat, '->'), (val) => {
-        // config._unPageMetaListWatch = watch(() => config._rootValue?.cycle, (val) => {
-          const list = getPathVal(unref(config._rootValue), config.dynamicHireRelat, '->')
+        
+        config._unPageMetaListWatch = watch(() => getPathVal(unref(rootValue), config.dynamicHireRelat, '->'), (val) => {
+          const list = getPathVal(unref(rootValue), config.dynamicHireRelat, '->')
           if (list && list.length) {
-            config.multiPmPageMetaList = list.map((row, idx) => {
+            const cbFns = []
+            const pageMetaList = list.map((row, idx) => {
               const columnsCgs = config._rowColumnConfgsMap.get(row)
               if (columnsCgs) {
                 columnsCgs.forEach(config => {
@@ -355,11 +408,23 @@ export function normalConfig({
                   definePrivatelyProp(ret, 'parent', config) // 这边手动设置一下，防止组件复用的时候不会刷新，造成parent的丢失
                   return ret
                 })
-                simpleNormalPmPageMetaList(retColumnConfigs, `${dynamicHireRelat}[${idx}]`, currentUnWatchsList)
+                retColumnConfigs = reactive(retColumnConfigs)
+                cbFns.push(() => {
+                  simpleNormalPmPageMetaList({
+                    pmPageMetaList: retColumnConfigs,
+                    dynamicHireRelat: `${config.dynamicHireRelat}[${idx}]`,
+                    unWatchsList: currentUnWatchsList,
+                    noParsePageMetaList: false,
+                    changeConfig: true,
+                    notParseConfig: true,
+                  })
+                })
                 config._rowColumnConfgsMap.set(row, retColumnConfigs)
                 return retColumnConfigs
               }
             })
+            config.multiPmPageMetaList = reactive(pageMetaList)
+            cbFns.forEach(cb => cb())
             
             const mapKeys = config._rowColumnConfgsMap.keys()
             Array.from(mapKeys).forEach(row => {
@@ -375,6 +440,7 @@ export function normalConfig({
         }, {
           immediate: true,
           deep: true,
+          // flush: 'sync'
         })
 
         oldUnWatchsList?.forEach(list => {
@@ -382,7 +448,7 @@ export function normalConfig({
         })
       }
   
-      function simpleNormalPmPageMetaList(pmPageMetaList, dynamicHireRelat, unWatchsList, noParsePageMetaList) {
+      function simpleNormalPmPageMetaList({pmPageMetaList, dynamicHireRelat, unWatchsList, noParsePageMetaList, changeConfig, notParseConfig}) {
         return pmPageMetaList.map(metaItem => {
           const { pageConfig } = normalConfig({
             requestTraceId,
@@ -400,6 +466,8 @@ export function normalConfig({
             parentRootValue,
             parentDynamicMapComp,
             noParsePageMetaList,
+            changeConfig,
+            notParseConfig,
           }, metaItem, hireRelat, mapComp, needformItem || [FORM_META_TYPE, FORM_META_TYPE_H5].includes(metaType), dynamicHireRelat, unWatchsList)
           return pageConfig
         })?.sort((a, b) => a.seqNo - b.seqNo)
@@ -500,13 +568,13 @@ export function isPlainColumn(config, disabled) {
 export function canHiddenConfig(config) {
   let retFlag = OPEN_DATA_RULES && config.hidden == '1'
   if (!retFlag) return false
-
+  
   let travseConfigs = [config]
   let currentConfig = null
   while(travseConfigs.length) {
     currentConfig = travseConfigs.shift()
     // 如果子级别中有onVnodeMounted、onMounted中一个有值，就表示需要进行渲染
-    if (config.onVnodeMounted || config.onMounted) {
+    if (currentConfig.onVnodeMounted || currentConfig.onMounted || currentConfig.immediateClickEvent) {
       return false
     }
     if (isCycleConfig(currentConfig)) {

package/src/utils/request.js

@@ -2,7 +2,7 @@ import axios from 'axios'
 import qs from 'qs'
 import { AUTH_CODE, NOT_AUTH_APIS, PASSWORD, USER_NAME, USER_TYPE } from '../enums'
 import { LCP_LOGIN, REFRESH_TOKEN } from '../api/builtIn'
-import { HashingFactory } from './cipher'
+import { EncryptionFactory, HashingFactory } from './cipher'
 import dayjs from 'dayjs'
 import { resultToast } from './respone'
 
@@ -85,8 +85,13 @@ export function initInterceptors(messageInstance) {
   )
 }
 
+const encryptKey = '%cmi_lcp@10086#S'
 export function buildInRequest(url, data, config = {}) {
+  const randomUuidStr = `${data.busiIdentityId}_${data.requestTraceId}`
   const reqConfig = {
+    headers: {
+      'randomUuid': EncryptionFactory.createAesEncryption({ key: encryptKey, iv: encryptKey }).encrypt(randomUuidStr)
+    },
     url,
     ...config
   }