resolver-egretimp-plus 0.0.136 → 0.0.138

package/package.json

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

package/src/analysisComponent.jsx

@@ -185,18 +185,14 @@ export default {
 
     const configLinks = [parent, ...props.additionConfigs, props.config]
     configLinks.reduce((parent, config) => {
-      definePrivatelyProp(props.config, 'parent', parent)
+      definePrivatelyProp(config, 'parent', parent)
       
       config.dynamicMapComp = dynamicMapComp
-      config.dynamicHireRelat = parent?.dynamicHireRelat ?  `${parent?.dynamicHireRelat}${hasOwn(props.config, 'rowIndex') ? `[${props.config.rowIndex}]` : ''}->${(props.config.metaCode || '')}` : props.config.metaCode
-      config.dynamicHireRelat && (dynamicMapComp[props.config.dynamicHireRelat] = props.config)
-      return parent
+      config.dynamicHireRelat = parent?.dynamicHireRelat ?  `${parent?.dynamicHireRelat}${hasOwn(config, 'rowIndex') ? `[${config.rowIndex}]` : ''}->${(config.metaCode || '')}` : config.metaCode
+      config.dynamicHireRelat && (dynamicMapComp[config.dynamicHireRelat] = config)
+      return config
     })
 
-    // props.config.parent = parent
-    // props.config.dynamicMapComp = dynamicMapComp
-    // props.config.dynamicHireRelat = parent?.dynamicHireRelat ?  `${parent?.dynamicHireRelat}${hasOwn(props.config, 'rowIndex') ? `[${props.config.rowIndex}]` : ''}->${(props.config.metaCode || '')}` : props.config.metaCode
-    // props.config.dynamicHireRelat && (dynamicMapComp[props.config.dynamicHireRelat] = props.config)
     provide('parent', props.config)
 
     const _isH5 = inject('_isH5')

package/src/components/childDialog/index.js

@@ -1,38 +1,39 @@
 import ChildDialog from './src/index.vue'
 import { createVNode, render } from 'vue'
 
-let instance = null
-
-export function openChildDialog(options = {}, appContext) {
-  const initData = options.initData || {}
-  if (instance) {
-    Object.keys(options).forEach(key => {
-      instance.props[key] = options[key]
-
+export function generateOpenChildDialog() {
+  let instance = null
+  return function openChildDialog(options = {}, appContext) {
+    const initData = options.initData || {}
+    if (instance) {
+      Object.keys(options).forEach(key => {
+        instance.props[key] = options[key]
+  
+      })
+      instance.vm.exposed.dialogVisible.value = true
+      // instance?.vm?.exposed?.clearData()
+      instance?.vm?.exposed?.initData(initData)
+      return instance.close
+    }
+    const container = document.createElement('div')
+    const vnode = createVNode(ChildDialog, {
+      ...options,
     })
-    instance.vm.exposed.dialogVisible.value = true
-    // instance?.vm?.exposed?.clearData()
-    instance?.vm?.exposed?.initData(initData)
-    return instance.close
-  }
-  const container = document.createElement('div')
-  const vnode = createVNode(ChildDialog, {
-    ...options,
-  })
-  vnode.appContext = appContext
-  render(vnode, container)
-  document.body.appendChild(container.firstElementChild)
-
-  instance = {
-    vnode,
-    vm: vnode.component,
-    props: vnode.component?.props,
-    close: () => {
-      vnode.component.exposed.dialogVisible.value = false
+    vnode.appContext = appContext
+    render(vnode, container)
+    document.body.appendChild(container.firstElementChild)
+  
+    instance = {
+      vnode,
+      vm: vnode.component,
+      props: vnode.component?.props,
+      close: () => {
+        vnode.component.exposed.dialogVisible.value = false
+      }
     }
+    vnode.component.exposed.dialogVisible.value = true
+    vnode.component.exposed?.initData(initData)
+  
+    return instance.close
   }
-  vnode.component.exposed.dialogVisible.value = true
-  vnode.component.exposed?.initData(initData)
-
-  return instance.close
-}
+}

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

@@ -113,12 +113,12 @@ export default {
       const ret = sortList.reduce((ret, item) => {
         ret = ret.sort((a, b) => {
           if (a[item.prop] === '' || a[item.prop] === undefined || a[item.prop] === null) {
-            return item.order === 'descending' ? -1 : 1
+            return item.order === 'descending' ? 1 : -1
           }
           if (b[item.prop] === '' || b[item.prop] === undefined || b[item.prop] === null) {
-            return item.order === 'descending' ? 1 : -1
+            return item.order === 'descending' ? -1 : 1
           }
-          return (a[item.prop] > b[item.prop] ? (item.order === 'descending' ? 1 : -1) : a[item.prop] === b[item.prop] ? 0 : (item.order === 'descending' ? -1 : 1))
+          return (a[item.prop] > b[item.prop] ? (item.order === 'descending' ? -1 : 1) : a[item.prop] === b[item.prop] ? 0 : (item.order === 'descending' ? 1 : -1))
         })
         return ret
       }, [...(normalTableData.value || [])])

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

@@ -17,7 +17,8 @@ const appContext = getCurrentInstance()?.appContext
 const props = defineProps({
   ...commonPropsType,
   ...ElButton.props,
-  plain: [String, Boolean]
+  plain: [String, Boolean],
+  circle: [String, Boolean]
 })
 const calcPorps = computed(() => {
   const ret = Object.keys(ElButton.props).reduce((total, key) => {

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

@@ -173,7 +173,7 @@ export default {
           <span ref={(e) => calcSpanRef.value = e} class="calc-span">{ modelValue.value }</span>
           {
             polyfillInputWrap(
-              <div v-else class="input-wrap" ref={(e) => inputWrapRef.value = e}>
+              <div class="input-wrap" ref={(e) => inputWrapRef.value = e}>
                 <ElInput {...vmodelProps.value} {...{...normalAttrs.value, ...normalInputProps.value}}>
                   {
                     getInputSolts()

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

@@ -1,5 +1,5 @@
 <template>
-  <ElInputNumber v-bind="{...inputNumberProps, ...attrs}" @blur="normalValue" :class="[textAlignClass]" :key="updateKey" v-model="modeValue"></ElInputNumber>
+  <ElInputNumber v-bind="{...inputNumberProps, ...attrs}" @blur="normalValue" :class="[textAlignClass]" :key="updateKey" v-model="inputNumberValue"></ElInputNumber>
 </template>
 <script setup>
 import { ElInputNumber } from 'element-plus'
@@ -13,6 +13,8 @@ const props = defineProps({
   },
   ...ElInputNumber.props,
   ...commonPropsType,
+  step: [String, Number],
+  modeValue: [String, Number]
 })
 const textAlignClass = computed(() => {
   return props.textAlign === 'right' ? 'text-right' :
@@ -32,10 +34,21 @@ const inputNumberProps = computed(() => {
   if (props.config?.precise && !isNaN(props.config.minValue)) {
     ret.precision = props.config.precise
   }
+  if (ret.step) {
+    ret.step = parseFloat(ret.step)
+  }
   return ret
 })
 const attrs = useAttrs()
 const modeValue = defineModel()
+const inputNumberValue = computed({
+  get() {
+    return parseFloat(modeValue.value)
+  },
+  set(val) {
+    modeValue.value = val
+  }
+})
 // 目前有问题，可以输入--跟e字符串
 const updateKey = ref(false)
 const normalValue = () => {

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

@@ -17,7 +17,9 @@ const modelValue = defineModel()
 const props = defineProps({
   ...ElSelect.props,
   ...commonPropsType,
-  multiple: [String, Boolean]
+  multiple: [String, Boolean],
+  filterable: [String, Boolean],
+  multipleLimit: [String, Number],
 })
 const attrs = useAttrs()
 

package/src/hooks/index.js

@@ -1,8 +1,7 @@
 import { computed, inject, nextTick, reactive } from "vue"
 import rulesDriver from '../rules/rulesDriver'
 import defaultVal from '../utils/defaultVal.js'
-import { getValueDeep, isNonRefType, setValueDeep } from "../utils"
-// import { deepMerge } from '../utils'
+import {isNonRefType, modelValueDeepMerge } from "../utils"
 
 export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
   const { hireRelatMapRules, messageInstance, rootValue, ruleExecuter, dataLoad, dynamicMapComp, lang, _mapComp } = this
@@ -23,10 +22,7 @@ export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
         // 如果使用v-model:[]方式绑定非modelValue，可能会出现没有对应的config
         return
       }
-      const dynamicHireRelat = config.dynamicHireRelat
-      const val = getValueDeep(rootValue.value, dynamicHireRelat)
-
-      // const val = (metaCodeKey ? props.modelValue?.[metaCodeKey] : props.modelValue) ?? null
+      const val = (metaCodeKey ? props.modelValue?.[metaCodeKey] : props.modelValue) ?? null
       if (modelKey === 'update:modelValue' && !val) {
         setTimeout(() => {
           defaultVal(config)
@@ -64,30 +60,25 @@ export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
       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 = modelValueDeepMerge(val, modelValue[metaCode])
+          }
+        }
+        if (isNonRefType(modelValue[metaCode]) && isNonRefType(val) && modelValue[metaCode] === val) {
+          // 这边的值没有变,就不用出触发下面的其他动作了
+          return
+        }
+        props.modelValue[metaCode] = 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
-      //   }
-      //   props.modelValue[metaCode] = val
-      // }
       if (config) {
         setTimeout(() => {
           ruleExecuter?.run({

package/src/index.jsx

@@ -128,7 +128,7 @@ export default {
       type: String,
     }
   },
-  emits: ['update:modelValue'],
+  emits: ['update:modelValue', 'rootStoreChange'],
   setup(props, { emit, attrs, expose }) {
     const ruleExecuter = null
     // const ruleExecuter = new RuleExecuter()
@@ -235,7 +235,14 @@ export default {
     provide('buttonActions', props.buttonActions)
     provide('components', toRef(props, 'components'))
     provide('selects', toRef(props, 'selects'))
-    provide('rootValue', toRef(props, 'modelValue')) // 绑定进入的跟数据
+    provide('rootValue', computed({
+      get() {
+        return props.modelValue
+      },
+      set(val) {
+        emit('update:modelValue', val)
+      }
+    })) // 绑定进入的跟数据
     provide('lang', toRef(props, 'lang'))
     provide('dataLoad', dataLoad) // 是否可以开始执行规则初始化
     provide('dialogComponents', props.dialogComponents) // 是否可以开始执行规则初始化

package/src/resolver-web.vue

@@ -4,7 +4,7 @@ import { ElMessage, ElMessageBox } from "element-plus"
 import { loadingInstance } from './components/loading'
 import { computed, ref, useAttrs } from 'vue';
 import Resolver from './resolver-common.vue'
-import { openChildDialog } from './components/childDialog';
+import { generateOpenChildDialog } from './components/childDialog';
 import { generateUniqueId } from './utils/common.js';
 
 const props = defineProps({
@@ -26,7 +26,7 @@ const props = defineProps({
   openChildDialogInstance: {
     type: [Function],
     default: () => {
-      return openChildDialog
+      return generateOpenChildDialog()
     }
   },
   requestTraceId: {

package/src/rules/parseCondition.js

@@ -199,9 +199,6 @@ export function parseCondition(rule) {
   // } else {
     conditionsRet = conditions.map(condition => {
       const { refType, refValue, targetType, targetValue } = condition
-      if (refValue?.indexOf('onlyDisplayPricingParameters') > -1) {
-        debugger
-      }
       // if (refValue === 'studentId') {
       //   debugger
       // }

package/src/utils/common.js

@@ -210,6 +210,53 @@ export function deepMerge(
   return ret
 }
 
+export function modelValueDeepMerge(
+  source,
+  target,
+) {
+  if (!target) {
+    return source;
+  }
+  if (!source) {
+    return target;
+  }
+  let ret = mergeWith(source, target, (sourceValue, targetValue) => {
+    if (!targetValue) {
+      return sourceValue
+    }
+    if (!sourceValue) {
+      return targetValue
+    }
+    if (isArray(sourceValue) && isArray(targetValue)) {
+      const ret = []
+      let idx = 0
+      for(;idx < sourceValue.length && idx < targetValue.length; i ++) {
+        ret.push(modelValueDeepMerge[sourceValue[idx], targetValue[idx]])
+      }
+      if (idx < sourceValue.length) {
+        ret.push(...sourceValue.slice(idx))
+      } else {
+        ret.push(...targetValue.slice(idx))
+      }
+      return ret
+    }
+    if (isPlainObject(targetValue) && isPlainObject(sourceValue)) {
+      return deepMerge(sourceValue, targetValue, mergeArrays);
+    }
+    return targetValue;
+  });
+  if (Array.isArray(source)) {
+    if (ret && !Array.isArray(ret)) {
+      let arr = []
+      Object.keys(ret).forEach(key => {
+        arr[key] = ret[key]
+      })
+      ret = arr
+    }
+  }
+  return ret
+}
+
 export function isFnStr(str) {
   // 匹配具名函数和匿名函数（但不包括箭头函数）
   const functionRegex = /^\s*(?:function\s*(?:\w+\s*)?\([^()]*\)\s*\{[\s\S]*?\})\s*$/

package/src/utils/const.js

@@ -151,14 +151,14 @@ export const commonPropsType = {
   },
   placeholder: {
     type: String,
-    default: () => [],
+    default: () => '',
     getValue(config, props, modelValue, selects, lang) {
       return (lang?.indexOf('zh') > -1 ? config.defPlacehold : config.defPlaceholdEn) || ''
     }
   },
   placeholderEn: {
     type: String,
-    default: () => [],
+    default: () => '',
     getValue(config, props, modelValue, selects, lang) {
       return config.defPlaceholdEn
     }

package/src/utils/render.jsx

@@ -831,15 +831,13 @@ function createFormLable(config, lang = 'zh') {
         {required ? <span style="color: #f5222d; margin-right: 3px">*</span> : null}
         <span>{lang.indexOf('zh') > -1 ? config.metaNameZh : config.metaNameEn}</span>
       </span>
-      <ElTooltip
-        effect="dark"
-        content={lang.indexOf('zh') > -1 ? config.hintContentZh : config.hintContentEn}
-        placement="top"
-      >
-        {
-          config.hintFlag == '1' ? <span class="label-tip"><elIcon><QuestionFilled /></elIcon></span> : null
-        }
-      </ElTooltip>
+      {
+        config.hintFlag == '1' ? (
+          <ElTooltip effect="dark" content={lang.indexOf('zh') > -1 ? config.hintContentZh : config.hintContentEn} placement="top">
+            <span class="label-tip"><elIcon><QuestionFilled /></elIcon></span>
+          </ElTooltip>
+        ) : null
+      }
     </div>
   )
 }