resolver-egretimp-plus 0.1.114 → 0.1.116

package/package.json

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

package/src/components/packages-H5/CustomComponentCollapseH5.vue

@@ -61,14 +61,18 @@ watch(lasetLimitIdx, (val) => {
       }
       if (index === val) {
         if (item.metaType === 'cmi-cell') {
-          item.borderHidden = '1'
+          if (!showCollapseBtn.value) {
+            item.borderHidden = '1'
+          }
         }
       }
     }
   })
   if (val === -1) {
     if (lastShowPageMeteItem.value?.metaType === 'cmi-cell') {
-      lastShowPageMeteItem.value.borderHidden = '1'
+      if (!showCollapseBtn.value) {
+        lastShowPageMeteItem.value.borderHidden = '1'
+      }
     }
   }
 }, {

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

@@ -1,5 +1,5 @@
 <template>
-  <span class="custom-component-plain" :class="classObj" @click="clickAction">{{ props.formatter?.(value) ?? value }}</span>
+  <span class="custom-component-plain" :class="classObj" @click.stop.self="clickAction">{{ props.formatter?.(value) ?? value }}</span>
 </template>
 <script setup>
 import { findComponent } from '../../utils/common';
@@ -9,6 +9,10 @@ import dayjs from 'dayjs'
 import { isNaN } from '../../utils/is';
 import { useFormItem } from 'element-plus'
 
+defineOptions({
+  inheritAttrs: false
+})
+
 const { formItem: elFormItem } = useFormItem()
 const modelValue = defineModel()
 const props = defineProps({

package/src/hooks/watchRuels.js

@@ -0,0 +1,94 @@
+import rulesDriver from "../rulesOfDate/rulesDriver"
+import { getPathVal, isCycleConfig } from "../utils"
+import { unref, watch } from "vue"
+
+export function toWatchRules({
+  rules,
+  rootValue,
+  mapComp,
+  route,
+  lang,
+}) {
+  const ruleKeys = Object.keys(rules)
+  ruleKeys.forEach(originKey => {
+    let comps = []
+    let key = originKey
+    while (key) {
+      const comp = mapComp[key]
+      if (comp) {
+        comps.unshift(comp)
+        const convertkey = key.replace(/->\w*$/, '')
+        if (convertkey === key) {
+          key = ''
+        } else {
+          key = convertkey
+        }
+      } else {
+        comps = []
+        key = ''
+      }
+    }
+    if (comps && comps.length) {
+      function watchCb(currentPath) {
+        rulesDriver({
+          rules: rules[originKey],
+          mapComp,
+          rootValue,
+          route,
+          lang,
+          currentPath,
+        })
+      }
+      watchRuleTrace({comps, rootValue, watchCb})
+    }
+  })
+}
+
+function watchRuleTrace({comps, rootValue, watchCb}, prefix = '', idx = 0, unWatchsList = []) {
+  if (comps && comps.length) {
+    const comp = comps[idx]
+    prefix += prefix ? `->${comp.metaCode}` : comp.metaCode
+    if (comps.length === (idx + 1)) {
+      const unWatch = watch(() => getPathVal(unref(rootValue), prefix, '->'), (val) => {
+        // 开始执行规则
+        console.log('watch====:', prefix)
+        watchCb?.(prefix)
+      }, {
+        immediate: true
+      })
+      // 这边先执行，因为当前的_unWatchs里面只放子级的watch
+      unWatchsList?.forEach(list => {
+        list?.push(unWatch)
+      })
+      return
+    }
+    if (isCycleConfig(comp)) {
+      const _mapUnWatchs = comp._mapUnWatchs || (comp._mapUnWatchs = Object.create(null))
+      const _rowMapWatchs = _mapUnWatchs[prefix] || (_mapUnWatchs[prefix] = new Map())
+      watch(() => getPathVal(unref(rootValue), prefix, '->')?.length, () => {
+        const list = getPathVal(unref(rootValue), prefix, '->') || []
+        list.forEach((row, index) => {
+          if (!_rowMapWatchs.get(row)) {
+            const childUnWatchs = []
+            unWatchsList.push(childUnWatchs)
+            const currentPrefix = `${prefix}[${index}]`
+            idx++
+            watchRuleTrace({comps, rootValue, watchCb}, currentPrefix, idx, [...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?.())
+          }
+        })
+      }, {
+        immediate: true
+      })
+    } else {
+      idx++
+      watchRuleTrace({comps, rootValue, watchCb}, prefix, idx)
+    }
+  }
+}

package/src/index.jsx

@@ -8,6 +8,7 @@ import { generateRequester } from "./utils/request.js"
 import { executeLoadServices, resetConfigEventInit } from "./components/helper/resolver.js"
 import { createEmptyCopy, deepMerge } from "./utils/index.js"
 import { initBpm, SUBMIT_TYPE, bpmInstance } from "./bpm/bpmInstance.js"
+import { toWatchRules } from "./hooks/watchRuels.js"
 // import { RuleExecuter } from "./rulesImp/index.js"
 export default {
   name: 'Resolver',
@@ -212,9 +213,8 @@ export default {
     const rootStore = reactive({})
     const nativeDataLoad = ref(false)
     // const router = useRouter()
-    // const route = useRoute()
+    const route = useRoute()
     const router = {}
-    const route = {}
     const axiosInstance = ref(props.axiosInstance)
     watch(() => {
       return props.axiosConfig
@@ -403,6 +403,13 @@ export default {
         emit('update:modelValue', val)
       }
     })
+    // toWatchRules({
+    //   rules: hireRelatMapRulesRef.value,
+    //   rootValue: toRef(props, 'modelValue'),
+    //   mapComp: mapCompRef.value,
+    //   route,
+    //   lang: props.lang,
+    // })
     onMounted(() => {
       if (props.openBpm) {
         initBpm(props.bpmMessage, props.bpmActions, props.bpmConfigs, {