resolver-egretimp-plus 0.0.132 → 0.0.134

package/package.json

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

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

@@ -73,12 +73,16 @@ const clickAction = () => {
 }
 
 function selectFormat(value) {
-  let valList = value
+  let valList = `${value}`
   const multiple = props?.config?.multiple == '1'
   const isStrVal = props.config?.valueType !== 'list'
   // 在满足多选，并且不是str格式的时候，就表示value为数组类型，取反就表示不满足的时候，需要转换成数组格式进行计算
   if (!(multiple && !isStrVal)) {
-    valList = valList ? (valList?.split(',') || []) : []
+    try {
+      valList = valList ? (valList?.split(',') || []) : []
+    } catch (error) {
+      debugger
+    }
   }
   return valList?.reduce((ret, val) => {
     const str = props?.options?.find(item => item.columnValue == val)?.[lang?.value?.indexOf('zh') > -1 ? 'columnDesc_zh' : 'columnDesc'] || ''

package/src/hooks/index.js

@@ -1,14 +1,10 @@
 import { computed, inject, nextTick, reactive } from "vue"
 import rulesDriver from '../rules/rulesDriver'
 import defaultVal from '../utils/defaultVal.js'
-import { isNonRefType } from "../utils"
+import { getValueDeep, isNonRefType, setValueDeep } from "../utils"
 // import { deepMerge } from '../utils'
 
 export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
-  // const hireRelatMapRules = inject('hireRelatMapRules')
-  // const dataLoad = inject('dataLoad')
-  // const dynamicMapComp = inject('dynamicMapComp')
-  // const lang = inject('lang')
   const { hireRelatMapRules, messageInstance, rootValue, ruleExecuter, dataLoad, dynamicMapComp, lang, _mapComp } = this
   const currentRules = hireRelatMapRules.value[config.hireRelat]
   let metaCodeKey = config.metaCode
@@ -21,9 +17,16 @@ export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
     const dynamicMapKey = config.dynamicHireRelat.replace(/->\w+$/, `->${metaCodeKey}`)
     config = dynamicMapComp[dynamicMapKey]
   }
-  return computed({
+  const retModelVale = computed({
     get() {
-      const val = (metaCodeKey ? props.modelValue?.[metaCodeKey] : props.modelValue) ?? null
+      if (!config) {
+        // 如果使用v-model:[]方式绑定非modelValue，可能会出现没有对应的config
+        return
+      }
+      const dynamicHireRelat = config.dynamicHireRelat
+      const val = getValueDeep(rootValue.value, dynamicHireRelat)
+
+      // const val = (metaCodeKey ? props.modelValue?.[metaCodeKey] : props.modelValue) ?? null
       if (modelKey === 'update:modelValue' && !val) {
         setTimeout(() => {
           defaultVal(config)
@@ -58,25 +61,33 @@ export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
       return val
     },
     set(val) {
-      const modelValue = props.modelValue
-      const metaCode = metaCodeKey
-      if (!metaCode) return
-      if (!modelValue) {
-        emit('update:modelValue', {
-          [metaCode]: val
-        })
-      } else {
-        // if (modelValue?.[metaCode]) {
-        //   if (typeof modelValue?.[metaCode] === 'object' || typeof val === 'object') {
-        //     val = deepMerge(val, modelValue?.[metaCode], 'union')
-        //   }
-        // }
-        if (isNonRefType(modelValue[metaCode]) && isNonRefType(val) && modelValue[metaCode] === val) {
-          // 这边的值没有变,就不用出触发下面的其他动作了
-          return
-        }
-        modelValue[metaCode] = val
+      if (!config) {
+        return
       }
+      const dynamicHireRelat = config.dynamicHireRelat
+      if (!setValueDeep(rootValue, dynamicHireRelat, val)) {
+        return
+      }
+
+      // const modelValue = props.modelValue
+      // const metaCode = metaCodeKey
+      // if (!metaCode) return
+      // if (!modelValue) {
+      //   emit('update:modelValue', {
+      //     [metaCode]: val
+      //   })
+      // } else {
+      //   // if (modelValue?.[metaCode]) {
+      //   //   if (typeof modelValue?.[metaCode] === 'object' || typeof val === 'object') {
+      //   //     val = deepMerge(val, modelValue?.[metaCode], 'union')
+      //   //   }
+      //   // }
+      //   if (isNonRefType(modelValue[metaCode]) && isNonRefType(val) && modelValue[metaCode] === val) {
+      //     // 这边的值没有变,就不用出触发下面的其他动作了
+      //     return
+      //   }
+      //   props.modelValue[metaCode] = val
+      // }
       if (config) {
         setTimeout(() => {
           ruleExecuter?.run({
@@ -99,6 +110,7 @@ export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
       }
     }
   })
+  return retModelVale
 }
 
 export function useVmodels(props, emit) {

package/src/index.jsx

@@ -128,6 +128,7 @@ export default {
       type: String,
     }
   },
+  emits: ['update:modelValue'],
   setup(props, { emit, attrs, expose }) {
     const ruleExecuter = null
     // const ruleExecuter = new RuleExecuter()
@@ -268,6 +269,7 @@ export default {
         return props.modelValue
       },
       set(val) {
+        debugger
         emit('update:modelValue', val)
       }
     })

package/src/renderer.jsx

@@ -37,6 +37,7 @@ export default {
         return props.modelValue
       },
       set(val) {
+        debugger
         emit('update:modelValue', val)
       }
     })

package/src/utils/common.js

@@ -1,6 +1,7 @@
 
 import { intersectionWith, isEqual, mergeWith, unionWith, isArray, cloneDeep } from 'lodash-es'
 import { isDate } from './is'
+import { isRef } from 'vue'
 export {
   cloneDeep,
   unionWith
@@ -303,3 +304,69 @@ export function definePrivatelyProp(obj, key, value, options) {
     ...op
   })
 }
+
+export function setValueDeep(obj, key = '', val) {
+  let isChange = false
+  if (key && obj) {
+    let beginObj = obj
+    if (isRef(obj)) {
+      beginObj = obj.value
+    }
+    const keyArr = key.split('->')
+    keyArr.reduce((ret, code, idx) => {
+      if (idx === keyArr.length - 1) {
+        const matchs = code.match(/(.+)\[(\d+)\]/)
+        if (matchs) {
+          const cod = matchs[1]
+          const idx = matchs[2]
+          !ret[cod] && (ret[cod] = [])
+
+          if (!(isNonRefType(ret[cod][idx]) && isNonRefType(val) && ret[cod][idx] === val)) {
+            isChange = true
+            ret[cod][idx] = val
+          }
+        } else {
+          if (!(isNonRefType(ret[code]) && isNonRefType(val) && ret[code] === val)) {
+            isChange = true
+            ret[code] = val
+          }
+        }
+      } else {
+        const matchs = code.match(/(.+)\[(\d+)\]/)
+        if (matchs) {
+          const cod = matchs[1]
+          const idx = matchs[2]
+          !ret[cod] && (ret[cod] = [])
+          !ret[cod][idx] && (ret[cod][idx] = {})
+          return ret[cod][idx]
+        } else {
+          !ret[code] && (ret[code] = {})
+          return ret[code]
+        }
+      }
+    }, beginObj)
+    if (isRef(obj)) {
+      obj.value = beginObj
+    }
+  }
+  return isChange
+}
+export function getValueDeep(obj, key) {
+  if (!key) {
+    return obj
+  }
+  const keyArr = key.split('->') || []
+  return keyArr.reduce((ret, code) => {
+    if (!ret) {
+      return ret
+    }
+    const matchs = code.match(/(.+)\[(\d+)\]/)
+    if (matchs) {
+      const cod = matchs[1]
+      const idx = matchs[2]
+      return ret?.[cod]?.[idx]
+    } else {
+      return ret[code]
+    }
+  }, obj)
+}