@nstc-business/imes 1.0.36 → 1.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstc-business/imes",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/measureCalc/helpers.js

@@ -141,8 +141,6 @@ export function sumIndicatorScores(nodes) {
   items.forEach(n => {
     const val = nodeScoreValue(n)
     if (val === null) return
-    const num = Number(val)
-    if (Number.isNaN(num)) return
     has = true
     total += num
   })
@@ -238,9 +236,7 @@ export function modelResultDigits(modelWrap) {
  */
 export function formatModelResultText(val, modelWrap, options = {}) {
   if (val === '' || val == null) return ''
-  const num = Number(val)
-  if (Number.isNaN(num)) return String(val)
-  let text = formatFixedDecimal(num, modelResultDigits(modelWrap))
+  let text = formatFixedDecimal(val, modelResultDigits(modelWrap))
   if (options.thousands) {
     text = addThousands(text)
   }
@@ -254,9 +250,7 @@ export function formatModelResultText(val, modelWrap, options = {}) {
  */
 export function formatScoreText(val, options = {}) {
   if (val === '' || val == null) return ''
-  const num = Number(val)
-  if (Number.isNaN(num)) return String(val)
-  let text = formatFixedDecimal(num, SCORE_DIGITS)
+  let text = formatFixedDecimal(val, SCORE_DIGITS)
   if (options.thousands) {
     text = addThousands(text)
   }

package/src/components/measureCalc/ui/InputNumber.vue

@@ -1,24 +1,146 @@
 <template>
-  <N20InputNumber
-    ref="inner"
-    v-bind="$attrs"
-    v-on="$listeners"
-    @copy.native="onCopy"
-    @cut.native="onCopy"
-  />
+  <div
+    class="n20-num-w"
+    @mouseenter="isHove = true"
+    @mouseleave="isHove = false"
+  >
+    <el-input
+      ref="input"
+      v-model="valueStr"
+      v-bind="$attrs"
+      class="n20-stc"
+      :disabled="disabled"
+      :placeholder="phd"
+      :clearable="isClearable"
+      :validate-event="false"
+      @focus="focusFn"
+      @input="inputFn"
+      @blur="blurFn"
+      @clear="clearFn"
+      @change="commit"
+      @keydown.native="stepFn"
+      @copy.native="onCopy"
+      @cut.native="onCopy"
+    >
+      <template v-if="type === 'rate'">
+        <span v-if="suffixV" slot="suffix" class="el-input__icon">{{
+          suffix
+        }}</span>
+      </template>
+    </el-input>
+  </div>
 </template>
 
 <script>
-import { InputNumber as N20InputNumber } from 'n20-common-lib'
-import {
-  resolveNumberClipboardText,
-  clearInputMaxlength
-} from './numberCopy'
+import { formatFixedDecimal } from './numberFormat'
+import { resolveNumberClipboardText, clearInputMaxlength } from './numberCopy'
+import { addDecimalText } from './numberStep'
+import { addThousands } from '../../common'
+
+/**
+ * 输入过程允许的中间态（去千分位后校验）：空、-、.、1、1.、.5、-1.2 等
+ */
+const NUM_RE = /^[+-]?(\d*(\.\d*)?|\.\d*)$/
 
 export default {
   name: 'InputNumber',
   inheritAttrs: false,
-  components: { N20InputNumber },
+  props: {
+    value: {
+      type: [Number, String],
+      default: undefined
+    },
+    type: {
+      type: String,
+      default: 'money',
+      validator(v) {
+        return ['money', 'rate'].includes(v)
+      }
+    },
+    min: {
+      type: Number,
+      default: -9999999999999.99
+    },
+    max: {
+      type: Number,
+      default: 9999999999999.99
+    },
+    step: {
+      type: Number,
+      default: 1
+    },
+    stepStrictly: {
+      type: Boolean,
+      default: false
+    },
+    disabled: {
+      type: Boolean,
+      default: undefined
+    },
+    isClearable: {
+      type: Boolean,
+      default: false
+    },
+    placeholder: {
+      type: String,
+      default: undefined
+    },
+    dNum: {
+      type: Number,
+      default: undefined
+    },
+    format: {
+      type: String,
+      default: undefined
+    },
+    suffix: {
+      type: String,
+      default: '%'
+    },
+    rangeAuto: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      valueStr: '',
+      isHove: false,
+      isFocus: false,
+      /** 输入过程/上次提交保留的精确数字文本（去千分位），回写不经过 Number() */
+      preciseText: '',
+      preValue: ''
+    }
+  },
+  computed: {
+    suffixV() {
+      if (!this.isClearable) return true
+      if (!this.valueStr) return true
+      if (!(this.isHove || this.isFocus)) return true
+      return false
+    },
+    phd() {
+      return this.placeholder || '请输入'
+    },
+    fNum() {
+      if (this.format) {
+        const i = this.format.indexOf('.')
+        return i === -1 ? 0 : this.format.length - i - 1
+      }
+      if (this.dNum || this.dNum === 0) {
+        return this.dNum
+      }
+      return this.type === 'rate' ? 4 : 2
+    }
+  },
+  watch: {
+    value: {
+      handler() {
+        this.renderFromValue()
+      },
+      immediate: true
+    }
+  },
   mounted() {
     this.clearMaxlength()
   },
@@ -57,10 +179,127 @@ export default {
             )
           : ''
       const text = resolveNumberClipboardText(input && input.value, selected)
-      const clip = (e && e.clipboardData) || (e && e.originalEvent && e.originalEvent.clipboardData)
+      const clip =
+        (e && e.clipboardData) ||
+        (e && e.originalEvent && e.originalEvent.clipboardData)
       if (!text || text === selected || !clip) return
       e.preventDefault()
       clip.setData('text/plain', text)
+    },
+    /**
+     * 内部 input 当前输入（去千分位、去空格）
+     */
+    rawText() {
+      const input = this.$el && this.$el.querySelector('input')
+      return input
+        ? String(input.value || '')
+            .replace(/,/g, '')
+            .trim()
+        : ''
+    },
+    /**
+     * 外部 value 变化 -> 精确格式化展示
+     * 字符串入参直接按十进制处理（formatFixedDecimal 不经过 Number），不丢高精度
+     */
+    renderFromValue() {
+      const val = this.value
+      if (val === '' || val == null) {
+        this.valueStr = ''
+        this.preciseText = ''
+        return
+      }
+      const text = formatFixedDecimal(val, this.fNum)
+      this.preciseText = text
+      this.valueStr = addThousands(text)
+    },
+    focusFn() {
+      this.isFocus = true
+      if (!this.disabled && this.valueStr) {
+        this.valueStr = this.valueStr.replace(/,/g, '')
+      }
+    },
+    /**
+     * 输入过程只做合法性校验，不格式化（保留完整精度）
+     */
+    inputFn(valStr) {
+      const raw = String(valStr || '')
+        .replace(/,/g, '')
+        .trim()
+      if (raw !== '-' && raw !== '' && !NUM_RE.test(raw)) {
+        this.valueStr = this.preValue
+      } else {
+        this.preValue = valStr
+        this.preciseText = raw
+      }
+    },
+    blurFn() {
+      this.isFocus = false
+      this.commit()
+      this.$emit('blur')
+    },
+    /**
+     * 失焦提交：按 fNum 精确四舍五入（字符串路径），回写字符串值，不经过 Number()
+     */
+    commit() {
+      if (this.disabled) return
+      const raw = this.preciseText
+      if (raw === '' || raw == null) {
+        this.valueStr = ''
+        const oVal = this.value
+        if (oVal || oVal === 0) {
+          this.$emit('input', undefined)
+          this.$emit('change', undefined)
+        }
+        return
+      }
+      let text = formatFixedDecimal(raw, this.fNum)
+      // min/max 钳制（值域内 Number 比较安全；钳制值用精确字符串格式化）
+      const num = Number(text)
+      if (num < this.min) {
+        text = formatFixedDecimal(this.min, this.fNum)
+      } else if (num > this.max) {
+        text = formatFixedDecimal(this.max, this.fNum)
+      }
+      this.preciseText = text
+      this.valueStr = addThousands(text)
+      const oVal = this.value
+      if (oVal !== text) {
+        this.$emit('input', text)
+        this.$emit('change', text)
+      }
+    },
+    clearFn() {
+      this.$emit('clear')
+    },
+    /**
+     * 上下键步进：基于精确字符串做十进制加减，避免 number 累加丢精度
+     */
+    stepFn(ev) {
+      if (
+        (ev.code === 'ArrowUp' || ev.code === 'ArrowDown') &&
+        !this.disabled
+      ) {
+        const raw = this.rawText()
+        if (raw === '' || raw === '-' || raw === '.') return
+        if (!NUM_RE.test(raw)) return
+        ev.preventDefault()
+        const delta = ev.code === 'ArrowUp' ? this.step : -this.step
+        let text = addDecimalText(raw, delta)
+        if (this.stepStrictly) {
+          const num = Number(text)
+          if (num % this.step !== 0) {
+            text = String(Math.round(num / this.step) * this.step)
+          }
+        }
+        const num = Number(text)
+        if (num < this.min) {
+          text = formatFixedDecimal(this.min, this.fNum)
+        } else if (num > this.max) {
+          text = formatFixedDecimal(this.max, this.fNum)
+        }
+        this.preciseText = text
+        this.valueStr = addThousands(text)
+      }
     }
   }
 }

package/src/components/measureCalc/ui/numberFormat.js

@@ -13,19 +13,34 @@
  * 人员：AI && 徐红飞
  * 入参：val 数字或数字字符串；digits 小数位数
  * 出参：格式化后的字符串；空值返回 ''；非数字字符串原样返回
- * 方法内容：先转最短十进制串再按位四舍五入补零，避开原生 toFixed 的精度噪声
+ * 方法内容：先转最短十进制串再按位四舍五入补零，避开原生 toFixed 的精度噪声；
+ * 字符串输入直接按十进制字符串处理，不经过 Number()（双精度只有约 15~17 位有效数字，
+ * 字符串一旦转 number 高精度小数即被舍入，例如 '160835267.0579509644' 会变成
+ * 160835267.05795097，精度无法恢复）
  */
 export function formatFixedDecimal(val, digits) {
   if (val === '' || val == null) return ''
   const raw = typeof val === 'string' ? val.replace(/,/g, '').trim() : val
   if (raw === '') return ''
-  if (typeof raw === 'string' && Number.isNaN(Number(raw))) {
-    return String(val)
+  const d = digits == null || digits === '' ? 2 : Number(digits)
+  if (!Number.isFinite(d) || d < 0) return String(val)
+
+  // 字符串数字：直接按十进制字符串四舍五入，不经过 Number()
+  if (typeof raw === 'string') {
+    if (/[eE]/.test(raw)) {
+      // 科学计数法字符串（如 '1.6e8'）：转 number 后展开，保持原行为
+      const n = Number(raw)
+      if (Number.isNaN(n)) return String(val)
+      return roundPlainDecimal(numberToPlainString(n), d)
+    }
+    if (!/^[+-]?(\d+(\.\d*)?|\.\d+)$/.test(raw)) {
+      return String(val) // 非数字字符串原样返回
+    }
+    return roundPlainDecimal(raw, d)
   }
-  const n = typeof raw === 'number' ? raw : Number(raw)
+
+  const n = raw
   if (Number.isNaN(n)) return String(val)
-  const d = digits == null || digits === '' ? 2 : Number(digits)
-  if (!Number.isFinite(d) || d < 0) return String(n)
   return roundPlainDecimal(numberToPlainString(n), d)
 }
 

package/src/components/measureCalc/ui/numberFormat.test.js

@@ -43,4 +43,23 @@ if (rounded !== '1.24') {
   throw new Error('四舍五入 1.239 保留 2 位应为 1.24，实际: ' + rounded)
 }
 
-console.log('numberFormat.test.js passed')
+// 高精度 number 字面量：双精度只有约 15~17 位有效数字，入参在解析时已舍入为最近可表示值，
+// 格式化结果只能基于该近似值（语言限制，非格式化层可恢复）
+const highPrecNumber = formatFixedDecimal(160835267.0579509644, 10)
+if (highPrecNumber !== '160835267.0579509700') {
+  throw new Error('number 入参受双精度限制应为 160835267.0579509700，实际: ' + highPrecNumber)
+}
+
+// 高精度数字字符串：不经过 Number()，应完整保留每一位小数
+const highPrecString = formatFixedDecimal('160835267.0579509644', 10)
+if (highPrecString !== '160835267.0579509644') {
+  throw new Error('字符串入参应完整保留 160835267.0579509644，实际: ' + highPrecString)
+}
+
+// 字符串入参四舍五入进位
+const carry = formatFixedDecimal('9.99999', 4)
+if (carry !== '10.0000') {
+  throw new Error('字符串进位 9.99999 保留 4 位应为 10.0000，实际: ' + carry)
+}
+
+console.log('numberFormat 用例全部通过')