resolver-egretimp-plus 0.0.147 → 0.0.149

package/package.json

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

package/src/analysisComponent.jsx

@@ -1,4 +1,4 @@
-import { computed, defineAsyncComponent, getCurrentInstance, inject, onBeforeMount, provide, ref } from 'vue'
+import { computed, defineAsyncComponent, getCurrentInstance, inject, onBeforeMount, provide, ref, watch } from 'vue'
 import { commonPropsType, definePrivatelyProp, EXECTE_CLICK_EVENT_COMPONENTS, findComponent, getComponentPropsKeys, hasOwn, isPlainObject } from './utils/index.js'
 import { useVmodels } from './hooks/index.js'
 import { getRenderComponentProps, generateFormItemPolyfill } from './utils/index.js'
@@ -149,26 +149,37 @@ export default {
 
     // 获取组件中定义的props，赋值对应的属性====start====
     const componentProps = ref({})
+    const fnComponentkeys = ref([])
+    function getFncomponentProps() {
+      const obj = {}
+      fnComponentkeys.value.forEach(key => {
+        if (hasOwn(props.config, key)) {
+          obj[key] = props.config[key]
+        }
+      })
+      return obj
+    }
     if (typeof props.component === 'function') {
       props.component()?.then(res => {
-        const obj = {}
         if (res?.default?.emits) {
           initVmodels(res?.default?.emits)
         }
-        const propsKeys = getComponentPropsKeys(res?.default)
-        propsKeys.forEach(key => {
-          if (hasOwn(props.config, key)) {
-            obj[key] = props.config[key]
-          }
-        })
-        componentProps.value = obj
+        fnComponentkeys.value = getComponentPropsKeys(res?.default)
+        // 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) {
         initVmodels(props.component?.emits)
       }
     }
-    // 获取组件中定义的props，赋值对应的属性===en===
+    // 获取组件中定义的props，赋值对应的属性===end===
     const currentComponent = computed(() => {
       if (typeof props.component === 'function') {
         return defineAsyncComponent(props.component)
@@ -249,6 +260,7 @@ export default {
       console.error('component render failer', lang?.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn, props.config?.metaCode, err, instance, info)
     })
     return () => {
+      const componentProps = getFncomponentProps()
       const compProps = getRenderComponentProps({config: props.config, props, component: props.component, modelValue, selects, lang: lang.value})
       const compPropsOnClick = compProps?.onClick
       delete compProps.onClick
@@ -266,7 +278,7 @@ export default {
           onVnodeUnmounted={onVnodeUnmounted}
           {...currentAttrs.value}
           onClick={(e, params) => {onClick(e, params);compPropsOnClick?.(e)}}
-          {...componentProps.value}
+          {...componentProps}
           {...compProps}
           {...vModelObjs}
         ></currentComponent.value>

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

@@ -78,10 +78,8 @@ const initSelEmployee = async () => {
       placeholder: lang?.value?.indexOf('zh') > -1 ? props.placeholder : props.placeholderEn,
       // disabled: props.disabled,
       onSelectedChange: (data, arr) => {
-        if (data && data.length > 0) {
-          emit('change', data, arr, props)
-          modelValue.value = data && data.join(',')
-        }
+        emit('change', data, arr, props)
+        modelValue.value = data?.join(',') || ''
       }
     }
     if (props.disabled) {

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

@@ -7,6 +7,8 @@ import { useAttrs, computed } from 'vue'
 import { commonPropsType, formatDate, isDate } from '../../utils/index.js'
 
 const props = defineProps({
+  ...ElDatePicker.props,
+  ...commonPropsType,
   min: {
     type: [Date, String],
     default: null
@@ -15,8 +17,6 @@ const props = defineProps({
     type: [Date, String],
     default: null
   },
-  ...ElDatePicker.props,
-  ...commonPropsType,
 })
 
 const datePickerProps = computed(() => {
@@ -38,19 +38,19 @@ const disabledDate = (date) => {
   let dateTime = formatDate(date, 'yyyy-MM-dd')
   const newDate = new Date(dateTime)
   if (props.min) {
-    if (isDate(props.min)) {
-      return props.min.getTime() > newDate.getTime()
+    if (isDate(props.min) && props.min.getTime() > newDate.getTime()) {
+      return true
     }
-    if (typeof props.min === 'string') {
-      return new Date(props.min).getTime() > newDate.getTime()
+    if (typeof props.min === 'string' && new Date(props.min).getTime() > newDate.getTime()) {
+      return true
     }
   }
   if (props.max) {
-    if (isDate(props.max)) {
-      return props.max.getTime() < newDate.getTime()
+    if (isDate(props.max) && props.max.getTime() < newDate.getTime()) {
+      return true
     }
-    if (typeof props.max === 'string') {
-      return new Date(props.max).getTime() < newDate.getTime()
+    if (typeof props.max === 'string' && new Date(props.max).getTime() < newDate.getTime()) {
+      return true
     }
   }
   return false

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

@@ -1,6 +1,6 @@
 <template>
   <ElSelect class="custom-self-select" v-bind="{...attrs, ...selectProps }" v-model="value" @clear="clear">
-    <ElOption v-for="option in props.options"
+    <ElOption v-for="option in options"
       :key="option.columnValue"
       :label="lang.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc"
       :value="option.columnValue"
@@ -20,6 +20,7 @@ const props = defineProps({
   multiple: [String, Boolean],
   filterable: [String, Boolean],
   multipleLimit: [String, Number],
+  rangeOptions: Array
 })
 const attrs = useAttrs()
 
@@ -33,6 +34,9 @@ const isMutiple = computed(() => {
   return props.multiple == '1'
 })
 
+const options = computed(() => {
+  return props.options?.filter?.(item => props.rangeOptions?.some(subItem => subItem.columnValue == item.columnValue))
+})
 
 const value = computed({
   get() {
@@ -41,7 +45,7 @@ const value = computed({
       return val ? (isStrVal.value ? val.split(',') : val) : []
     } else {
       if (modelValue.value !== null && modelValue.value !== undefined) {
-        if (props.options?.some(item => item.columnValue == modelValue.value)) {
+        if (options.value?.some(item => item.columnValue == modelValue.value)) {
           props.config.isMatch = true
           return `${modelValue.value}`
         } else {

package/src/rules/eventsSupplement.js

@@ -28,7 +28,7 @@ import {
 import { ARG_FLAGS, MULTI_PAGE_META_LIST_TYPES } from '../utils/const'
 
 // import { commModal } from '../../../common/components/cmi/components/comm-modal-tip/index'
-import { formatDate, hasOwn, isPlainObject, parseExtendAttr } from '../utils/index';
+import { findComponent, formatDate, hasOwn, isPlainObject, parseExtendAttr } from '../utils/index';
 const valArrTypes = [...MULTI_PAGE_META_LIST_TYPES]
 const valBooleanTypes = []
 
@@ -211,15 +211,8 @@ const allInitEvents = {
     const { targetObj: target } = event
     if (!target) return
     const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
-    // if (target.indexOf('isSpecialPriceingApproval') > -1) {
-    //   console.log('rule===:', rule)
-    //   debugger
-    // }
     const configs = getCurrentComp.call(this, targetObj)
     // const oldDisplayTypes = []
-    // if (target.indexOf('amountBilled') > -1) {
-    //   debugger
-    // }
     configs.forEach((labelInfo) => {
       // const oldDisplayType = labelInfo && labelInfo.displayType
       // oldDisplayTypes.push(oldDisplayType)
@@ -232,10 +225,6 @@ const allInitEvents = {
     return () => {
       // 隐藏的效果需要晚点触发，才能正常执行清空等一些列需要组件操作
       return setTimeout(() => {
-        // if (target.indexOf('isSpecialPriceingApproval') > -1) {
-        //   console.log('rule===:', rule)
-        //   debugger
-        // }
         configs.forEach((labelInfo, idx) => {
           // const oldDisplayType = oldDisplayTypes[idx]
           labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '0')
@@ -326,16 +315,100 @@ const allInitEvents = {
     const { targetObj: target, targetObjVal = '' } = event
     if (!target) return
     const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
-    const range = targetObjVal.split('~')
+    let range = []
+    if (targetObjVal?.indexOf('~') > -1) {
+      range = targetObjVal.split('~')
+    } else {
+      range = targetObjVal.split(',')
+    }
     if (range && range.length) {
-      const min = range[0]
-      const max = range[1]
-      const currentVal = getConfigValue.call(this, targetObj, true)
-      if (min && lessThan(currentVal, min)) {
-        setFormVal.call(this, targetObj, min)
-      }
-      if (max && greaterThan(currentVal, max)) {
-        setFormVal.call(this, targetObj, max)
+      const oldPorpsList = []
+      const configs = getCurrentComp.call(this, targetObj)
+      configs.forEach(config => {
+        let updateFlag = false
+        const oldProps = {}
+        oldPorpsList.push(oldProps)
+        if (!config) return
+        const { config: currentConfig } = this
+        let val = ''
+        if (findComponent(['ElDatePicker'], config?.renderby || config?.metaType) !== -1) {
+          const min = range[0]
+          const max = range[1]
+          try {
+            val = parseExtendAttr(
+              {
+                extendAttr: JSON.stringify({min, max}),
+                metaCode: `event limitDataRange code:${config.metaCode}`
+              },
+              currentConfig?.bindValue
+            )
+          } catch (err) {
+            val = ''
+          }
+        } else if (findComponent(['ElSelect'], config?.renderby || config?.metaType) !== -1) {
+          try {
+            console.log('event==:', event)
+            val = parseExtendAttr(
+              {
+                extendAttr: JSON.stringify({rangeOptions: range}),
+                metaCode: `event limitDataRange code:${config.metaCode}`
+              },
+              currentConfig?.bindValue
+            )
+          } catch (err) {
+            val = ''
+          }
+        } else {
+          const currentVal = getConfigValue.call(this, targetObj, true)
+          if (min && lessThan(currentVal, min)) {
+            setFormVal.call(this, config, min)
+          }
+          if (max && greaterThan(currentVal, max)) {
+            setFormVal.call(this, config, max)
+          }
+          return
+        }
+        delete val.metaCode
+        if (!isPlainObject(val)) return
+        const porpsKeys = Object.keys(val)
+        porpsKeys.forEach(key => {
+          oldProps[key] = config[key]
+          if (!hasOwn(config, key)) {
+            // 如果有一个属性没有，就需要更新下组件，防止渲染不及时
+            updateFlag = true
+          }
+          if ((typeof val[key]) === 'string') {
+            const { config: currentConfig } = this
+            const bindValue = currentConfig?.bindValue
+            config[key] = val[key].replace(/\{([^}]+)\}/g, (originVal, matchVal) => {
+              if (matchVal.trimEnd().trimStart() === ARG_FLAGS.REF_VAL) {
+                return bindValue
+              }
+              if (matchVal.trimEnd().trimStart() === ARG_FLAGS.CURRENT_DATE) {
+                return formatDate(new Date(), 'yyyy-MM-dd')
+              }
+              return originVal
+            })
+          } else {
+            config[key] = val[key]
+          }
+        })
+        if (updateFlag) {
+          config?.wrapVm?.ctx?.$forceUpdate?.()
+        }
+      })
+      return () => {
+        // 需要晚点触发，才能正常执行清空等一些列需要组件操作
+        return setTimeout(() => {
+          configs.forEach((labelInfo, idx) => {
+            const oldProps = oldPorpsList[idx]
+            if (!labelInfo) return
+            const porpsKeys = Object.keys(oldProps)
+            porpsKeys.forEach(key => {
+              labelInfo[key] = oldProps[key]
+            })
+          })
+        }, 0)
       }
     }
   },
@@ -374,14 +447,12 @@ const allInitEvents = {
     } catch (err) {
       val = ''
     }
+    delete val.metaCode
     if (!isPlainObject(val)) return
 
     const configs = getCurrentComp.call(this, targetObj)
     const oldPorpsList = []
     const porpsKeys = Object.keys(val)
-    // if (target.indexOf('amountBilled') > -1) {
-    //   debugger
-    // }
     configs.forEach((labelInfo) => {
       let updateFlag = false
       const oldProps = {}

package/src/rules/ruleUtils.js

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { hasOwn } from "../utils"
+import { hasOwn, isPlainObject } from "../utils"
 import { MULTI_PAGE_META_LIST_TYPES, findComponent } from '../utils/index'
 
 // 这边是一些组件在执行规则的时候，如果还没有加载出来，规则会走不动，这边就是存储没走通的规则，等组件加载完之后，再去执行
@@ -36,6 +36,10 @@ export function setFormVal(pathStr, val) {
   if (!pathStr) {
     return
   }
+  if (isPlainObject(pathStr)) {
+    hasOwn(pathStr, 'refValue') && (pathStr.refValue = val)
+    return
+  }
   const { config } = this
   const configs = getRelateConfigs.call(this, pathStr, config)
   configs.forEach(cg => {

package/src/rulesImp/events.js

@@ -27,7 +27,7 @@ import {
 } from './ruleUtils'
 import { ARG_FLAGS, MULTI_PAGE_META_LIST_TYPES } from '../utils/const'
 
-import { formatDate, hasOwn, isPlainObject, parseExtendAttr } from '../utils/index';
+import { findComponent, formatDate, hasOwn, isPlainObject, parseExtendAttr } from '../utils/index';
 const valArrTypes = [...MULTI_PAGE_META_LIST_TYPES]
 const valBooleanTypes = []
 
@@ -382,16 +382,99 @@ const allInitEvents = {
     const { targetObj: target, targetObjVal = '' } = event
     if (!target) return
     const targetObj = `${target}`
-    const range = targetObjVal.split('~')
+    let range = []
+    if (targetObjVal?.indexOf('~') > -1) {
+      range = targetObjVal.split('~')
+    } else {
+      range = targetObjVal.split(',')
+    }
     if (range && range.length) {
-      const min = range[0]
-      const max = range[1]
-      const currentVal = getConfigValue.call(this, targetObj, true)
-      if (min && lessThan(currentVal, min)) {
-        setFormVal.call(this, targetObj, min)
-      }
-      if (max && greaterThan(currentVal, max)) {
-        setFormVal.call(this, targetObj, max)
+      const oldPorpsList = []
+      const configs = getCurrentComp.call(this, targetObj)
+      configs.forEach(config => {
+        let updateFlag = false
+        const oldProps = {}
+        oldPorpsList.push(oldProps)
+        if (!config) return
+        const { config: currentConfig } = this
+        let val = ''
+        if (findComponent(['ElDatePicker'], config?.renderby || config?.metaType) !== -1) {
+          const min = range[0]
+          const max = range[1]
+          try {
+            val = parseExtendAttr(
+              {
+                extendAttr: JSON.JSON({min, max}),
+                metaCode: `event limitDataRange code:${config.metaCode}`
+              },
+              currentConfig?.bindValue
+            )
+          } catch (err) {
+            val = ''
+          }
+        } else if (findComponent(['ElSelect'], config?.renderby || config?.metaType) !== -1) {
+          try {
+            val = parseExtendAttr(
+              {
+                extendAttr: JSON.JSON({rangeOptions: range}),
+                metaCode: `event limitDataRange code:${config.metaCode}`
+              },
+              currentConfig?.bindValue
+            )
+          } catch (err) {
+            val = ''
+          }
+        } else {
+          const currentVal = getConfigValue.call(this, targetObj, true)
+          if (min && lessThan(currentVal, min)) {
+            setFormVal.call(this, config, min)
+          }
+          if (max && greaterThan(currentVal, max)) {
+            setFormVal.call(this, config, max)
+          }
+          return
+        }
+        delete val.metaCode
+        if (!isPlainObject(val)) return
+        const porpsKeys = Object.keys(val)
+        porpsKeys.forEach(key => {
+          oldProps[key] = config[key]
+          if (!hasOwn(config, key)) {
+            // 如果有一个属性没有，就需要更新下组件，防止渲染不及时
+            updateFlag = true
+          }
+          if ((typeof val[key]) === 'string') {
+            const { config: currentConfig } = this
+            const bindValue = currentConfig?.bindValue
+            config[key] = val[key].replace(/\{([^}]+)\}/g, (originVal, matchVal) => {
+              if (matchVal.trimEnd().trimStart() === ARG_FLAGS.REF_VAL) {
+                return bindValue
+              }
+              if (matchVal.trimEnd().trimStart() === ARG_FLAGS.CURRENT_DATE) {
+                return formatDate(new Date(), 'yyyy-MM-dd')
+              }
+              return originVal
+            })
+          } else {
+            config[key] = val[key]
+          }
+        })
+        if (updateFlag) {
+          config?.wrapVm?.ctx?.$forceUpdate?.()
+        }
+      })
+      return () => {
+        // 需要晚点触发，才能正常执行清空等一些列需要组件操作
+        return setTimeout(() => {
+          configs.forEach((labelInfo, idx) => {
+            const oldProps = oldPorpsList[idx]
+            if (!labelInfo) return
+            const porpsKeys = Object.keys(oldProps)
+            porpsKeys.forEach(key => {
+              labelInfo[key] = oldProps[key]
+            })
+          })
+        }, 0)
       }
     }
   },

package/src/rulesImp/ruleUtils.js

@@ -1,4 +1,4 @@
-import { hasOwn } from "../utils"
+import { hasOwn, isPlainObject } from "../utils"
 
 export function getRelateConfigKeys(keys = [], path = '', relatePath = '') {
   const pathArr = path ? path.split('->') : []
@@ -77,6 +77,10 @@ export function setFormVal(pathStr, val) {
   if (!pathStr) {
     return
   }
+  if (isPlainObject(pathStr)) {
+    hasOwn(pathStr, 'refValue') && (pathStr.refValue = val)
+    return
+  }
   const configs = getCurrentComp.call(this, pathStr)
   configs.forEach(cg => {
     hasOwn(cg, 'refValue') && (cg.refValue = val)