n20-common-lib 3.3.19 → 3.3.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.3.19",
+  "version": "3.3.21",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/InputNumber/index.vue

@@ -161,7 +161,7 @@ export default {
   watch: {
     value: {
       handler(val) {
-        if (this.isHighPrecision()) {
+        if (this.isHighPrecision() || this.isAdaptivePrecision()) {
           if (val === undefined || val === null || val === '') {
             this.valueStr = ''
           } else {
@@ -230,18 +230,11 @@ export default {
 
       const decimalPart = normalized.split('.')[1] || ''
       if (this.isAdaptivePrecision()) {
-        const originalValue = String(value).replace(/,/g, '').trim()
-        const originalFraction = originalValue.match(/\.(\d*)$/)
-        const decimalPlaces = originalFraction
-          ? originalFraction[1].length
-          : decimalPart.length
-        if (decimalPlaces < this.fNum) {
-          return decimalToFixed(normalized, this.fNum)
-        }
-        if (decimalPlaces > this.maxDecimalPlaces()) {
-          return decimalToFixed(normalized, this.maxDecimalPlaces())
-        }
-        return decimalToFixed(normalized, decimalPlaces)
+        // 先按最大位数舍入，再移除无意义尾零，最后补齐 format 指定的最少位数。
+        // 舍入后重新规范化，避免进位产生的尾零被保留为额外的小数精度。
+        const roundedValue = normalizeDecimal(decimalToFixed(normalized, this.maxDecimalPlaces()))
+        const decimalPlaces = (roundedValue.split('.')[1] || '').length
+        return decimalToFixed(roundedValue, Math.max(this.fNum, decimalPlaces))
       }
       const roundedValue = this.rangeAuto && decimalPart.length >= this.fNum
         ? normalized
@@ -269,7 +262,7 @@ export default {
     },
     stepFn(ev) {
       if ((ev.code === 'ArrowUp' || ev.code === 'ArrowDown') && !this.disabled) {
-        if (this.isHighPrecision()) {
+        if (this.isHighPrecision() || this.isAdaptivePrecision()) {
           const currentValue = normalizeDecimal(this.valueStr)
           if (!currentValue) return
 
@@ -320,7 +313,7 @@ export default {
         this.changeIng = false
       })
 
-      if (this.isHighPrecision()) {
+      if (this.isHighPrecision() || this.isAdaptivePrecision()) {
         const normalized = normalizeDecimal(valStr)
         if (!normalized) {
           this.valueStr = ''
@@ -336,6 +329,14 @@ export default {
 
         let nextValue = this.normalizeHighPrecisionValue(valStr)
 
+        // 低精度纯数字输入沿用严格步长校正；高精度字符串仍保持原有处理方式。
+        if (!this.isHighPrecision() && this.type === 'number' && this.stepStrictly) {
+          const numericValue = N(normalized)
+          if (numericValue % this.step !== 0) {
+            nextValue = N.toString(Math.round(numericValue / this.step) * this.step)
+          }
+        }
+
         if (compareDecimal(nextValue, this.min) < 0) {
           nextValue = normalizeDecimal(this.min)
         } else if (compareDecimal(nextValue, this.max) > 0) {
@@ -346,15 +347,29 @@ export default {
 
         const formatted = this.type === 'number' ? nextValue : N.addThousands(nextValue)
         this.valueStr = formatted
-        this.$nextTick(() => {
-          const oldValue = normalizeDecimal(this.value)
-          const normalizedNextValue = normalizeDecimal(nextValue)
-          if (oldValue !== normalizedNextValue) {
-            this.$emit('input', nextValue)
-            this.$emit('change', nextValue)
-            this.dispatch('ElFormItem', 'el.form.change', [nextValue])
+        if (this.isAdaptivePrecision()) {
+          const emittedValue = this.shouldEmitString() ? nextValue : Number(nextValue)
+          const valueChanged = normalizeDecimal(this.value) !== normalizeDecimal(nextValue)
+          // 格式变化也同步 v-model，并在 blur 前回传，避免显示已补零但提交值仍带多余尾零。
+          if (this.value !== emittedValue) {
+            this.$emit('input', emittedValue)
           }
-        })
+          // 仅规范化尾零不算数值变化，避免重复触发业务 change 和表单校验。
+          if (valueChanged) {
+            this.$emit('change', emittedValue)
+            this.dispatch('ElFormItem', 'el.form.change', [emittedValue])
+          }
+        } else {
+          this.$nextTick(() => {
+            const oldValue = normalizeDecimal(this.value)
+            const normalizedNextValue = normalizeDecimal(nextValue)
+            if (oldValue !== normalizedNextValue) {
+              this.$emit('input', nextValue)
+              this.$emit('change', nextValue)
+              this.dispatch('ElFormItem', 'el.form.change', [nextValue])
+            }
+          })
+        }
         return
       }