resolver-egretimp-plus 0.0.220 → 0.0.222

package/package.json

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

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

@@ -35,7 +35,7 @@ const amountFormat = computed(() => {
 })
 
 const calcProps = computed(() => {
-  let desc = normalVal.value || props.config?.desc
+  let desc = normalVal.value ?? props.config?.desc
   let title = lang?.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn
   try {
     if (desc?.toString) {

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

@@ -38,7 +38,7 @@ const value = computed({
   },
   set(val) {
     if (isMutiple.value) {
-      modelValue.value = val.join(',')
+      modelValue.value = Array.isArray(val) ? val.join(',') : val
     } else {
       modelValue.value = val
     }
@@ -61,7 +61,7 @@ const clear = () => {
   value.value = ''
 }
 const onChange = ({detail}) => {
-  value.value = detail.value || []
+  value.value = detail.value || ""
   props.config?.onChange(modelValue.value)
 }
 </script>

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

@@ -16,7 +16,32 @@ export default {
     textAreaCnt: {
       type: [Number, String],
       default: 2,
-    }
+    },
+    showMoney: {
+      type: String,
+      default: ''
+    },
+    // 小数位数
+    decimal: {
+      type: Number,
+      default: 2
+    },
+    // 是否显示货币符号
+    showSymbol: {
+      type: String,
+      default: ''
+    },
+    // 货币符号
+    symbol: {
+      type: String,
+      default: '¥'
+    },
+    // 符号位置：before/after
+    symbolPosition: {
+      type: String,
+      default: 'before',
+      validator: value => ['before', 'after'].includes(value)
+    },
   },
   emits: ['update:modelValue'],
   setup(props, { emit, attrs, expose }) {
@@ -43,6 +68,7 @@ export default {
       const ret = {
         ...inputProps.value
       }
+      delete ret.modelValue
       delete ret.suffixIcon
       delete ret.prefixIcon
       return ret
@@ -50,6 +76,7 @@ export default {
     const showTooltip = computed(() => {
       return props?.config?.showTooltip == '1' && props.disabled
     })
+    // 这个是真实的值
     const modelValue = computed({
       get() {
         return props.modelValue
@@ -58,6 +85,19 @@ export default {
         emit('update:modelValue', val)
       }
     })
+    // 如果开启了金额显示的话，需要有currentVal进行中间值展示
+    const currentVal = ref('')
+    watch(modelValue, (val) => {
+      const value = formatValue(val)
+      if (currentVal.value != value) {
+        currentVal.value = value
+      }
+    }, {
+      immediate: true
+    })
+    const displayValue = computed(() => {
+      return props.showMoney == '1' ? currentVal.value : modelValue.value
+    })
     const isPagePopup = computed(() => {
       return props.config?.lcpPagePopupMapVO
     })
@@ -71,11 +111,24 @@ export default {
     })
     const vmodelProps = computed(() => {
       const ret = {
-        modelValue: modelValue.value
+        modelValue: displayValue.value
       }
       if (!(isPagePopup.value && !isPagePopupAlwayEdit.value)) {
         ret['onUpdate:modelValue'] = (val) => {
-          modelValue.value = val
+          if (props.showMoney == '1') {
+            currentVal.value = val
+          } else {
+            modelValue.value = val
+          }
+        }
+        if (props.showMoney == '1') {
+          ret['onFocus'] = () => {
+            currentVal.value = parseValue(currentVal.value)
+          }
+          ret['onBlur'] = () => {
+            currentVal.value = formatValue(currentVal.value)
+            modelValue.value = parseValue(currentVal.value)
+          }
         }
       } else {
         ret['onClear'] = () => {
@@ -187,6 +240,37 @@ export default {
       }
       return ret
     }
+
+    // 格式化显示
+    function formatValue(value) {
+      if (value === null || isNaN(value)) return ''
+      let val = parseFloat(value)
+      if (isNaN(val)) {
+        return ''
+      }
+      // 处理千分位
+      const parts = val.toFixed(props.decimal).split('.')
+      parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+      
+      // 添加货币符号
+      const formatted = parts.join('.')
+      return props.showSymbol == '1'
+        ? props.symbolPosition === 'before'
+          ? `${props.symbol} ${formatted}`
+          : `${formatted} ${props.symbol}`
+        : formatted
+    }
+
+    // 解析输入值
+    function parseValue(value) {
+      if (value === undefined || value === null || value === '') {
+        return ''
+      }
+      // 移除所有非数字字符（保留负号和小数点）
+      const parsed = Number(value.replace(/[^\d.-]/g, ''))
+      return isNaN(parsed) ? '' : parsed
+    }
+
     expose({
       click: (params) => {
         attrs?.onClick?.(null, params)
@@ -195,7 +279,7 @@ export default {
     return () => {
       return (
         <div class="input-contrainer" {...inputWrapAttrs.value}>
-          <span ref={(e) => calcSpanRef.value = e} class="calc-span">{ modelValue.value }</span>
+          <span ref={(e) => calcSpanRef.value = e} class="calc-span">{ displayValue.value }</span>
           {
             polyfillInputWrap(
               <div class="input-wrap" ref={(e) => inputWrapRef.value = e}>

package/src/utils/render.jsx

@@ -758,6 +758,11 @@ function getFormItemExtendProps(config, lang, params) {
 function getFormItemRule(config, lang, params) {
   const required = config.requiredFlag === '1'
   const onlyRequiredFlag = config.onlyRequiredFlag
+  let trigger = ['blur', 'change']
+  // 如果是input框并且开启了金额显示
+  if (config.showMoney && config.metaType == 'ElInput') {
+    trigger = 'blur'
+  }
   const rules = [{
     // required,
     validator: (rule, value, callback) => {
@@ -769,7 +774,7 @@ function getFormItemRule(config, lang, params) {
         callback()
         return
       }
-      const val = config.bindValue
+      const val = config?.refValue
       const message = lang.indexOf('zh') > -1 ? `${config.metaNameZh}不能为空` : `${config.metaNameEn} can not be empty`
       if (!onlyRequiredFlag && required) {
         if (val === '' || val === null || val === undefined) {
@@ -786,7 +791,7 @@ function getFormItemRule(config, lang, params) {
         callback()
       }
     },
-    trigger: ['blur', 'change']
+    trigger,
   }]
   let regexPattern = []
   if (config.regexPattern) {
@@ -819,7 +824,8 @@ function getFormItemRule(config, lang, params) {
           callback()
           return
         }
-        const val = (config.bindValue === null || config.bindValue === undefined) ? '' : config.bindValue
+        const bingdValue = config?.refValue
+        const val = (bingdValue === null || bingdValue === undefined) ? '' : bingdValue
         if (!val) callback() // 为空不进行正则校验
         for (let i = 0; i < regexPattern.length; i++) {
           const validInfo = regexPattern[i]
@@ -838,7 +844,7 @@ function getFormItemRule(config, lang, params) {
         }
         callback()
       },
-      trigger: ['blur', 'change']
+      trigger,
     })
   }
   let validators = config.validators
@@ -858,7 +864,7 @@ function getFormItemRule(config, lang, params) {
             }
             return validator(rule, value, callback)
           },
-          trigger: ['blur', 'change']
+          trigger,
         })
       }
     })