resolver-egretimp-plus 0.0.165 → 0.0.167

package/package.json

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

package/src/analysisComponent.jsx

@@ -143,6 +143,7 @@ export default {
     }
 
     const { vModelObjs, initVmodels, modelValue } = useVmodels(props, emit) // 过个v-model绑定对象，实现可以组件过赋值
+    
     definePrivatelyProp(props.config, 'refValue', modelValue)
     // onBeforeMount(() => {
     //   defaultVal(props.config, modelValue) // 设置默认值
@@ -150,7 +151,6 @@ export default {
 
 
     // 获取组件中定义的props，赋值对应的属性====start====
-    const componentProps = ref({})
     const fnComponentkeys = ref([])
     function getFncomponentProps() {
       const obj = {}
@@ -167,14 +167,6 @@ export default {
           initVmodels(res?.default?.emits)
         }
         fnComponentkeys.value = getComponentPropsKeys(res?.default || res)
-        // const obj = {}
-        // const propsKeys = getComponentPropsKeys(res?.default)
-        // propsKeys.forEach(key => {
-        //   if (hasOwn(props.config, key)) {
-        //     obj[key] = props.config[key]
-        //   }
-        // })
-        // componentProps.value = obj
       })
     } else {
       if (props.component?.emits) {

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

@@ -57,6 +57,8 @@ export default {
     const pagenationEvents = computed(() => {
       return getCompEvents(ElPagination)
     })
+
+    const parentRootValue = inject('_parentRootValue', {})
     const selectionsObj = inject('_selectionsObj', {})
     const rootStore = inject('_rootStore', {})
     const lang = inject('lang')
@@ -180,7 +182,11 @@ export default {
         props.selectable = (row, index) => {
           let orginRet = true
           if (orginSelectable && typeof orginSelectable === 'function') {
-            orginRet = orginSelectable(row, index)
+            orginRet = orginSelectable(row, index, {
+              tableConfig: props.config,
+              rootValue: rootValue,
+              parentRootValue
+            })
           }
           let parentSelectionsRet = true
           if (selectionsObj.selections && selectionsObj.selections.length && selectionsObj.primaryKeys && selectionsObj.primaryKeys.length) {

package/src/rules/eventsSupplement.js

@@ -75,9 +75,15 @@ const allInitEvents = {
         const targetConfig = dynamicMapComp?.[matchs[1]]
         val = targetConfig?.bindValue || ''
       } else {
-        const curVal = getConfigValue.call(this, targetObj, true)
-        if (curVal || curVal == '0') {
-          val = curVal
+        const _assginKey = /^_assgin:(.+)$/
+        const matchs = val.match(_assginKey)
+        if (matchs?.[1]) {
+          val = matchs?.[1]
+        } else {
+          const curVal = getConfigValue.call(this, targetObj, true)
+          if (curVal || curVal == '0') {
+            val = curVal
+          }
         }
       }
     }

package/src/rules/ruleUtils.js

@@ -43,7 +43,19 @@ export function setFormVal(pathStr, val) {
   const { config } = this
   const configs = getRelateConfigs.call(this, pathStr, config)
   configs.forEach(cg => {
-    hasOwn(cg, 'refValue') && (cg.refValue = val)
+    if (hasOwn(cg, 'refValue')) {
+      cg.refValue = val
+    } else {
+      const { _mapComp } = this
+      if (_mapComp?.value?.[cg.hireRelat]) {
+        if (!penddingRules[cg.hireRelat]) {
+          penddingRules[cg.hireRelat] = []
+        }
+        if (!penddingRules[cg.hireRelat].some((item) => item?.rules === this?.rules && item?.config === this?.config)) {
+          penddingRules[cg.hireRelat].push(this)
+        }
+      }
+    }
   })
 }