resolver-egretimp-plus 0.1.117 → 0.1.119

package/package.json

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

package/src/components/helper/resolver.js

@@ -76,7 +76,10 @@ export async function executeLoadServices(services = [], {
         }
       }
     }
+    window?.performance?.mark('get_load_detal_start')
     const ret = await (axiosInstance.value && axiosInstance.value(reqConfig))
+    window?.performance?.mark('get_load_detal_end')
+    console.log('get_load_detal', window?.performance?.measure('get_load_detal', 'get_load_detal_start', 'get_load_detal_end'))
     if (resultToast(ret.data, messageInstance, { noSuccessIip: true })) {
       respCb && respCb(ret?.data?.result)
       return

package/src/hooks/pageConfig.js

@@ -62,9 +62,17 @@ export function useBuildInData({ messageInstance, loadingInstance, requestTraceI
     } else if (loadingInstance.show && typeof loadingInstance.show === 'function') {
       loadingInstance.show()
     }
+    window?.performance?.mark('get_config_start')
     buildInRequest(QUERY_PAGE_CONFIG_DATA, {...reqData, requestTraceId}).then(ret => {
+      window?.performance?.mark('get_config_end')
+      console.log('get_config', window?.performance?.measure('get_config', 'get_config_start', 'get_config_end'))
       if (resultToast(ret.data, messageInstance, { noSuccessIip: true })) {
         // pageConfig.value = normalPageConfigs(mock)
+        window?.performance?.mark('update_configs_start')
+        setTimeout(() => {
+          window?.performance?.mark('update_configs_end')
+          console.log('update_configs', window?.performance?.measure('update_configs', 'update_configs_start', 'update_configs_end'))
+        }, 0);
         pageConfig.value = normalPageConfigs(ret.data.result)
         try {
           configCb && configCb(pageConfig.value)

package/src/hooks/watchRuels.js

@@ -6,7 +6,9 @@ export function toWatchRules({
   rules,
   rootValue,
   mapComp,
+  dynamicMapComp,
   route,
+  messageInstance,
   lang,
 }) {
   const ruleKeys = Object.keys(rules)
@@ -33,6 +35,7 @@ export function toWatchRules({
         rulesDriver({
           rules: rules[originKey],
           mapComp,
+          dynamicMapComp,
           rootValue,
           route,
           lang,
@@ -47,7 +50,11 @@ export function toWatchRules({
 function watchRuleTrace({comps, rootValue, watchCb}, prefix = '', idx = 0, unWatchsList = []) {
   if (comps && comps.length) {
     const comp = comps[idx]
-    prefix += prefix ? `->${comp.metaCode}` : comp.metaCode
+    try {
+      prefix += prefix ? `->${comp.metaCode}` : comp.metaCode
+    } catch (error) {
+      debugger
+    }
     if (comps.length === (idx + 1)) {
       const unWatch = watch(() => getPathVal(unref(rootValue), prefix, '->'), (val) => {
         // 开始执行规则
@@ -72,17 +79,21 @@ function watchRuleTrace({comps, rootValue, watchCb}, prefix = '', idx = 0, unWat
             const childUnWatchs = []
             unWatchsList.push(childUnWatchs)
             const currentPrefix = `${prefix}[${index}]`
-            idx++
-            watchRuleTrace({comps, rootValue, watchCb}, currentPrefix, idx, [...unWatchsList])
+            const currentIdx = idx + 1
+            watchRuleTrace({comps, rootValue, watchCb}, currentPrefix, currentIdx, [...unWatchsList])
             _rowMapWatchs.set(row, {key: currentPrefix, childUnWatchs})
           }
         })
-        const mapKeys = _rowMapWatchs.keys()
-        mapKeys.forEach(row => {
-          if (!list.some(row2 => row2 === row)) {
-            _rowMapWatchs.get(row)?.childUnWatchs?.forEach(un => un?.())
-          }
-        })
+        try {
+          const mapKeys = _rowMapWatchs.keys()
+          Array.from(mapKeys).forEach(row => {
+            if (!list.some(row2 => row2 === row)) {
+              _rowMapWatchs.get(row)?.childUnWatchs?.forEach(un => un?.())
+            }
+          })
+        } catch (error) {
+          debugger
+        }
       }, {
         immediate: true
       })

package/src/index.jsx

@@ -283,6 +283,11 @@ export default {
                 emit('loadEvnetsCompleted', result)
               }, 20);
             } else {
+              window?.performance?.mark('update_load_detal_start')
+              setTimeout(() => {
+                window?.performance?.mark('update_load_detal_end')
+                console.log('update_load_detal', window?.performance?.measure('update_load_detal', 'update_load_detal_start', 'update_load_detal_end'))
+              }, 0);
               nativeDataLoad.value = true
               emit('update:modelValue', val)
               emit('loadEvnetsCompleted', result)
@@ -408,7 +413,9 @@ export default {
     //   rules: hireRelatMapRulesRef.value,
     //   rootValue: toRef(props, 'modelValue'),
     //   mapComp: mapCompRef.value,
+    //   dynamicMapComp,
     //   route,
+    //   messageInstance: props.messageInstance,
     //   lang: props.lang,
     // })
     onMounted(() => {