resolver-egretimp-plus 0.0.284 → 0.0.286

package/package.json

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

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

@@ -38,6 +38,11 @@ const props = defineProps({
     type: Number,
     default: 2
   },
+  // 保留小数点0后缀
+  decimalSuffix: {
+    type: [Number, String],
+    default: '0'
+  },
   // 在显示金额的时候，可以显示的符号
   canShowFlag: {
     type: Array,
@@ -147,7 +152,14 @@ function formatValue(value) {
   val = Math.max(props.min, Math.min(props.max, val))
 
   // 处理千分位
-  const parts = val.toFixed(props.decimal).split('.')
+  if (props.decimal != '-1') {
+    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, ',')
   
   // 添加货币符号

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

@@ -109,8 +109,9 @@ export default {
     })
     // 开启金额展示的时候需要isFocus来控制格式的转换
     const isFocus = ref(false)
+    const currentVal = ref('')
     const displayValue = computed(() => {
-      return props.showMoney == '1' ? (isFocus.value ? modelValue.value : formatValue(modelValue.value)) : modelValue.value
+      return props.showMoney == '1' ? (isFocus.value ? currentVal.value : formatValue(modelValue.value)) : modelValue.value
     })
     const isPagePopup = computed(() => {
       return props.config?.lcpPagePopupMapVO
@@ -129,15 +130,20 @@ export default {
       }
       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 = modelValue.value
             isFocus.value = true
           }
           ret['onBlur'] = () => {
+            modelValue.value = parseValue(formatValue(currentVal.value))
             isFocus.value = false
-            modelValue.value = parseValue(formatValue(modelValue.value))
           }
         }
       } else {
@@ -268,7 +274,9 @@ export default {
       val = Math.max(props.min, Math.min(props.max, val))
 
       // 处理千分位
-      val = val.toFixed(props.decimal)
+      if (props.decimal != '-1') {
+        val = val.toFixed(props.decimal)
+      }
       if (props.decimalSuffix != '1') {
         val = parseFloat(val)
       }

package/src/utils/render.jsx

@@ -959,7 +959,7 @@ function normalLabelTipContent(content = '') {
 function createFormLable(config, lang = 'zh') {
   const ElTooltip = resolveComponent('el-tooltip')
   const elIcon = resolveComponent('el-icon')
-  const required = config.requiredFlag === '1'
+  const required = config.requiredFlag === '1' && config.hiddenRequiredFlag != '1'
   const slots = {}
   slots.default = () => {
     return <span class="label-tip"><elIcon size="17">