resolver-egretimp-plus 0.0.280 → 0.0.282

package/package.json

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

package/src/components/helper/eventOrchestration.js

@@ -15,7 +15,7 @@ function getPathVal(obj = {}, path) {
       return ret[key]
     }
     return null
-  }, obj) || ''
+  }, obj) ?? ''
 }
 function assignmentPathVal(obj = {}, path, val) {
   let paths = path

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

@@ -38,6 +38,11 @@ export default {
       type: Number,
       default: 2
     },
+    // 保留小数点0后缀
+    decimalSuffix: {
+      type: [Number, String],
+      default: '0'
+    },
     // 在显示金额的时候，可以显示的符号
     canShowFlag: {
       type: Array,
@@ -102,18 +107,10 @@ 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
-    })
+    // 开启金额展示的时候需要isFocus来控制格式的转换
+    const isFocus = ref(false)
     const displayValue = computed(() => {
-      return props.showMoney == '1' ? currentVal.value : modelValue.value
+      return props.showMoney == '1' ? (isFocus.value ? modelValue.value : formatValue(modelValue.value)) : modelValue.value
     })
     const isPagePopup = computed(() => {
       return props.config?.lcpPagePopupMapVO
@@ -132,19 +129,15 @@ export default {
       }
       if (!(isPagePopup.value && !isPagePopupAlwayEdit.value)) {
         ret['onUpdate:modelValue'] = (val) => {
-          if (props.showMoney == '1') {
-            currentVal.value = val
-          } else {
-            modelValue.value = val
-          }
+          modelValue.value = val
         }
         if (props.showMoney == '1') {
           ret['onFocus'] = () => {
-            currentVal.value = parseValue(currentVal.value)
+            isFocus.value = true
           }
           ret['onBlur'] = () => {
-            currentVal.value = formatValue(currentVal.value)
-            modelValue.value = parseValue(currentVal.value)
+            isFocus.value = false
+            modelValue.value = parseValue(formatValue(modelValue.value))
           }
         }
       } else {
@@ -265,7 +258,7 @@ export default {
       if (props.canShowFlag?.includes(String(value).toLowerCase())) {
         return value
       }
-      if (value === null || isNaN(value)) return ''
+      if (value === null || value === undefined) return ''
       let val = parseFloat(value)
       if (isNaN(val)) {
         return ''
@@ -275,7 +268,11 @@ export default {
       val = Math.max(props.min, Math.min(props.max, val))
 
       // 处理千分位
-      const parts = val.toFixed(props.decimal).split('.')
+      val = val.toFixed(props.decimal)
+      if (props.decimalSuffix != '1') {
+        val = parseFloat(val)
+      }
+      const parts = `${val}`.split('.')
       parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, props.moneySeg)
       
       // 添加货币符号
@@ -296,7 +293,16 @@ export default {
         return ''
       }
       // 移除所有非数字字符（保留负号和小数点）
-      const parsed = Number(value.replace(/[^\d.-]/g, ''))
+      let pointCount = 0
+      const repVal = `${value}`.replace(/[^\d.-]/g, '').replace(/(\.\d*)/g, (a) => {
+        const count = pointCount
+        pointCount ++
+        if (!count) {
+          return a
+        }
+        return ''
+      })
+      const parsed = Number(repVal)
       return isNaN(parsed) ? '' : parsed
     }
 

package/src/utils/render.jsx

@@ -787,7 +787,7 @@ function getFormItemExtendProps(config, lang, params) {
     class: {
       [`vertical-${config['label-vertical'] || config['labelVertical'] || 'center'}`]: true,
       'content-right': config.contentRight,
-      'hidden-label': config.labelWidth == 0 || config.labelWidth === '0px' || config.labelHidden == '1',
+      'hidden-label': (config.labelWidth == 0 || config.labelWidth === '0px' || config.labelHidden == '1') && !config.showLabel,
       [`label-position-${config['label-position'] || config['labelPosition'] || 'right'}`]: true // label-position 支持三个值，right、left、top
     },
     style,