n20-common-lib 2.1.22 → 2.1.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.1.22",
+  "version": "2.1.23",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/ApprovalButtons/index.vue

@@ -52,13 +52,7 @@
           />
         </el-form-item>
         <template v-if="taskId && showBtn">
-          <show-app-opi
-            v-if="authList.includes('showAppOpi')"
-            class="flex-1 m-l-s"
-            :task-id="taskId"
-            :message.sync="messageC"
-            style="width: 20%"
-          />
+          <show-app-opi class="flex-1 m-l-s" :task-id="taskId" :message.sync="messageC" style="width: 20%" />
           <show-other-att
             v-if="authList.includes('showOtherAtt')"
             class="flex-1 m-l"

package/src/components/InputNumber/index.vue

@@ -1,11 +1,13 @@
 <template>
   <div class="n20-num-w" @mouseenter="isHove = true" @mouseleave="isHove = false">
     <el-input
+      ref="input"
       v-model="valueStr"
       class="n20-stc"
       :disabled="disabled"
       :placeholder="phd"
       :clearable="isClearable"
+      :validate-event="false"
       @clear="closeFn"
       @focus="focusFn"
       @input="inputFn"
@@ -24,9 +26,12 @@
 
 <script>
 import { $lc } from '../../utils/i18n/index'
-import numerify from 'numerify'
+import emitter from '../../utils/element-ui-emitter'
+import N from '../../utils/numberPor'
+
 export default {
   name: 'InputNumber',
+  mixins: [emitter],
   props: {
     value: {
       type: [Number, String],
@@ -41,11 +46,11 @@ export default {
     },
     min: {
       type: Number,
-      default: -9999999999999
+      default: -9999999999999.99
     },
     max: {
       type: Number,
-      default: 9999999999999
+      default: 9999999999999.99
     },
     step: {
       type: Number,
@@ -78,6 +83,10 @@ export default {
     suffix: {
       type: String,
       default: '%'
+    },
+    rangeAuto: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -98,36 +107,37 @@ export default {
       } else {
         return $lc('请输入金额')
       }
+    },
+    fNum() {
+      if (this.format) {
+        let i_f = this.format.indexOf('.')
+        return i_f === -1 ? 0 : this.format.length - i_f - 1
+      }
+      if (this.dNum) {
+        return this.dNum
+      }
+      if (this.type === 'rate') {
+        return 4
+      }
+      if (this.type === 'money') {
+        return 2
+      }
+      return 2
     }
   },
   watch: {
     value: {
       handler(val) {
-        if (val && typeof val === 'string') {
-          val = NumberP(val)
-
-          this.$emit('input', isNaN(val) ? undefined : val)
-          this.valueStr = this.num2str(val)
-          return
+        if (this.rangeAuto) {
+          this.valueStr = N.addThousands(val)
+        } else {
+          this.valueStr = N.addThousands(N.subFixed(val, this.fNum))
         }
-        this.valueStr = this.num2str(val)
       },
       immediate: true
     }
   },
   methods: {
-    num2str(val = '') {
-      if (val === '' || val === null || val === undefined) {
-        return ''
-      }
-      switch (this.type) {
-        case 'rate':
-          return numerify(val, this.format || '0.0000')
-        case 'money':
-        default:
-          return numerify(val, this.format || '0,0.00')
-      }
-    },
     focusFn() {
       this.isFocus = true
       if (!this.disabled && this.valueStr) {
@@ -143,7 +153,7 @@ export default {
     },
     stepFn(ev) {
       if ((ev.code === 'ArrowUp' || ev.code === 'ArrowDown') && !this.disabled) {
-        let val = NumberP(this.valueStr)
+        let val = N(this.valueStr)
         if (!isNaN(val)) {
           ev.preventDefault()
           val = ev.code === 'ArrowUp' ? val + this.step : val - this.step
@@ -152,9 +162,11 @@ export default {
           } else if (val > this.max) {
             val = this.max
           }
-
-          let valueStr = Number(val.toFixed(9)).toString()
-          this.valueStr = valueStr
+          if (this.rangeAuto) {
+            this.valueStr = N.toString(val)
+          } else {
+            this.valueStr = N.subFixed(val, this.fNum)
+          }
         }
       }
     },
@@ -172,51 +184,42 @@ export default {
         this.changeIng = false
       })
 
-      valStr = valStr.trim()
-      let val = NumberP(valStr)
-
+      let val = N(valStr)
       if (isNaN(val)) {
         this.valueStr = ''
         this.$emit('input', undefined)
         this.$emit('change', undefined)
+        this.dispatch('ElFormItem', 'el.form.change', [undefined])
         return
       }
 
-      if (val < this.min) {
-        val = this.min
-      } else if (val > this.max) {
-        val = this.max
-      } else if (this.stepStrictly) {
-        let N = val / this.step
-        if (Number(N.toFixed(9)) !== Math.round(N)) {
-          val = Math.round(N) * this.step
+      let nStr
+      if (this.rangeAuto) {
+        nStr = N.toString(val)
+        this.valueStr = N.addThousands(valStr)
+      } else {
+        if (this.stepStrictly) {
+          let N = val / this.step
+          if (val % this.step !== 0) {
+            val = Math.round(N) * this.step
+          }
         }
+        if (val < this.min) {
+          val = this.min
+        } else if (val > this.max) {
+          val = this.max
+        }
+        nStr = N.subFixed(val, this.fNum)
+        this.valueStr = N.addThousands(nStr)
       }
-      this.valueStr = this.num2str(val)
 
-      switch (this.type) {
-        case 'rate':
-          {
-            let dNum = this.dNum !== undefined ? this.dNum : 4
-            let nVar = Number(val.toFixed(dNum))
-            this.$nextTick(() => {
-              this.$emit('input', nVar)
-              this.$emit('change', nVar)
-            })
-          }
-          break
-        case 'money':
-        default:
-          {
-            let dNum = this.dNum !== undefined ? this.dNum : 2
-            let nVar = Number(val.toFixed(dNum))
-            this.$nextTick(() => {
-              this.$emit('input', nVar)
-              this.$emit('change', nVar)
-            })
-          }
-          break
-      }
+      this.$nextTick(() => {
+        let nVar = Number(nStr)
+        this.$emit('input', nVar)
+        this.$emit('change', nVar)
+
+        this.dispatch('ElFormItem', 'el.form.change', [nVar])
+      })
     },
     closeFn() {
       this.$emit('input', undefined)
@@ -224,15 +227,4 @@ export default {
     }
   }
 }
-
-function NumberP(val) {
-  if (typeof val === 'string') {
-    val = val.replace(/,/g, '').trim()
-  }
-  if (val === undefined || val === null || val === '') {
-    return NaN
-  } else {
-    return Number(val)
-  }
-}
 </script>

package/src/components/Statis/statisItem.vue

@@ -21,12 +21,12 @@ export default {
     numerify({ label, value }, f, w, unit = '') {
       unit = unit ? (unit === true ? $lc('元') : unit) : ''
       if (!w) {
-        return numerify(value, f) + unit
+        return numerify(value, f, Math.floor) + unit
       } else {
         if (value > n) {
           return numerify(value / n, f) + $lc('万') + unit
         } else {
-          return numerify(value, f) + unit
+          return numerify(value, f, Math.floor) + unit
         }
       }
     }

package/src/components/Table/filters.js

@@ -14,10 +14,10 @@ function tplFn(row, sc, mck, map = {}) {
         let type = kA[1]
         switch (type) {
           case 'money':
-            str += numerify(row[key], '0,0.00')
+            str += numerify(row[key], '0,0.00', Math.floor)
             break
           case 'rate':
-            str += numerify(row[key], '0.000000')
+            str += numerify(row[key], '0.000000', Math.floor)
             break
           case 'map':
             str += map[row[key]]

package/src/index.js

@@ -1,6 +1,4 @@
-import importG from './utils/importGlobal.js' // 联合加载组件保存位置
 import './utils/storagePro.js' // 扩展Storage
-import './utils/numberPor.js' // 扩展Number
 /** 提供组件给外部使用的入口 */
 import ContentLoading from './components/ContentLoading/index.vue'
 import ContentNull from './components/ContentNull/index.vue'
@@ -88,7 +86,10 @@ import VHas from './directives/VHas/index.js'
 
 /** 注入方法 */
 import dayjs from 'dayjs'
-import numerify from 'numerify'
+import _numerify from 'numerify'
+function numerify(input, formatType, roundingFunction) {
+  return _numerify(input, formatType, roundingFunction || Math.floor)
+}
 import axios from './utils/axios.js'
 import auth from './utils/auth.js'
 import { msgPor, msgboxPor } from './utils/msgboxPor.js'
@@ -101,6 +102,8 @@ import list2tree from './utils/list2tree'
 import { has as isHas } from './directives/VHas/index.js'
 import { hasG as isHasG } from './directives/VHas/index.js'
 import asyncGetRelaNos from './utils/asyncGetRelaNos.js'
+import importG from './utils/importGlobal.js' // 联合加载组件保存位置
+import N from './utils/numberPor.js' // 扩展Number
 
 /** 国际化 */
 import i18n, { $l } from './utils/i18n'
@@ -221,8 +224,8 @@ export {
   // 方法
   auth,
   axios,
-  getJsonc,
-  importG,
+  $l,
+  N,
   downloadBlob,
   forEachs,
   list2tree,
@@ -235,7 +238,8 @@ export {
   dayjs,
   numerify,
   asyncGetRelaNos,
-  $l,
+  getJsonc,
+  importG,
   // 组件
   ContentLoading,
   ContentNull,

package/src/utils/element-ui-emitter.js

@@ -0,0 +1,19 @@
+export default {
+  methods: {
+    dispatch(componentName, eventName, params) {
+      var parent = this.$parent || this.$root
+      var name = parent.$options.componentName
+
+      while (parent && (!name || name !== componentName)) {
+        parent = parent.$parent
+
+        if (parent) {
+          name = parent.$options.componentName
+        }
+      }
+      if (parent) {
+        parent.$emit.apply(parent, [eventName].concat(params))
+      }
+    }
+  }
+}

package/src/utils/numberPor.js

@@ -1,168 +1,274 @@
 /* eslint-disable no-extend-native */
-if (!Number.add) {
-  let i = 1
+let i = 1
 
-  const add = function (n, decimal = 10) {
-    let rN = this + n
-    return decimal ? Number(rN.toFixed(decimal)) : rN
-  }
-  const sub = function (n, decimal = 10) {
-    let rN = this - n
-    return decimal ? Number(rN.toFixed(decimal)) : rN
+// 去括号
+const splitPts = function (obj) {
+  let mc = obj.mEl.match(/\([^()]+\)/g)
+  if (mc) {
+    mc.forEach((m) => {
+      let vk = 'El' + i++
+      obj.Els[vk] = m.replace(/\(|\)/g, '')
+      obj.mEl = obj.mEl.replace(m, vk)
+    })
+
+    return splitPts(obj)
+  } else {
+    return obj
   }
-  const mul = function (n, decimal = 10) {
-    let rN = this * n
-    return decimal ? Number(rN.toFixed(decimal)) : rN
+}
+// 负数转括号
+const negToPts = function (Els, k) {
+  if (/\+-/.test(Els[k])) {
+    Els[k] = Els[k].replace(/\+-/, '-')
   }
-  const div = function (n, decimal = 10) {
-    let rN = this / n
-    return decimal ? Number(rN.toFixed(decimal)) : rN
+
+  if (/--/.test(Els[k])) {
+    Els[k] = Els[k].replace(/--/, '+')
   }
 
-  // 去括号
-  const splitPts = function (obj) {
-    let mc = obj.mEl.match(/\([^()]+\)/g)
+  if (/\*-/.test(Els[k])) {
+    let mc = Els[k].match(/\*-[^+|-|*|/]+/g)
     if (mc) {
       mc.forEach((m) => {
         let vk = 'El' + i++
-        obj.Els[vk] = m.replace(/\(|\)/g, '')
-        obj.mEl = obj.mEl.replace(m, vk)
+        Els[vk] = m.replace('*', '0')
+        Els[k] = Els[k].replace(m, '*' + vk)
       })
+    }
+  }
 
-      return splitPts(obj)
-    } else {
-      return obj
+  if (/\/-/.test(Els[k])) {
+    let mc = Els[k].match(/\/-[^+|-|*|/]+/g)
+    if (mc) {
+      mc.forEach((m) => {
+        let vk = 'El' + i++
+        Els[vk] = m.replace('/', '0')
+        Els[k] = Els[k].replace(m, '/' + vk)
+      })
     }
   }
-  // 负数转括号
-  const negToPts = function (Els, k) {
-    if (/\+-/.test(Els[k])) {
-      Els[k] = Els[k].replace(/\+-/, '-')
+}
+// 乘除转括号
+const muldivToPts = function (Els, k) {
+  if (/\*|\//.test(Els[k]) && /\+|-/.test(Els[k])) {
+    let mc = Els[k].match(/[^+|-]*[*|/][^+|-]*/g)
+    if (mc) {
+      mc.forEach((m) => {
+        let vk = 'El' + i++
+        Els[vk] = m.replace(/\(|\)/g, '')
+        Els[k] = Els[k].replace(m, vk)
+      })
     }
+  }
+}
+// 符号切割运算
+const splitSmb = function (Els) {
+  for (let k in Els) {
+    Els[k + 'O'] = Els[k]
+    Els[k] = Els[k].replace(/\+|-|\*|\//g, (v) => ',' + v + ',')
+    Els[k] = Els[k].split(',')
+  }
+}
 
-    if (/--/.test(Els[k])) {
-      Els[k] = Els[k].replace(/--/, '+')
+const compute = function (Els, k, fc) {
+  let El = Els[k]
+  El.forEach((e, i) => {
+    if (/^El/.test(e)) {
+      El[i] = compute(Els, e, fc)
     }
+  })
 
-    if (/\*-/.test(Els[k])) {
-      let mc = Els[k].match(/\*-[^+|-|*|/]+/g)
-      if (mc) {
-        mc.forEach((m) => {
-          let vk = 'El' + i++
-          Els[vk] = m.replace('*', '0')
-          Els[k] = Els[k].replace(m, '*' + vk)
-        })
+  let L = El.length
+  let Val = Number(El[0])
+  for (let i = 1; i < L; i) {
+    if (['+', '-', '*', '/'].includes(El[i])) {
+      switch (El[i]) {
+        case '+':
+          Val = add(Val, Number(El[i + 1]), fc)
+          break
+        case '-':
+          Val = sub(Val, Number(El[i + 1]), fc)
+          break
+        case '*':
+          Val = mul(Val, Number(El[i + 1]), fc)
+          break
+        case '/':
+          Val = div(Val, Number(El[i + 1]), fc)
+          break
       }
+      i += 2
     }
+  }
+  return Val
+}
 
-    if (/\/-/.test(Els[k])) {
-      let mc = Els[k].match(/\/-[^+|-|*|/]+/g)
-      if (mc) {
-        mc.forEach((m) => {
-          let vk = 'El' + i++
-          Els[vk] = m.replace('/', '0')
-          Els[k] = Els[k].replace(m, '/' + vk)
-        })
-      }
-    }
+function nFloor(n, f) {
+  return Number(subFixed(n, f))
+}
+
+export function add(m, n, decimal = 10) {
+  if (decimal) {
+    return nFloor(nFloor(m, decimal) + nFloor(n, decimal), decimal)
+  } else {
+    return m + n
   }
-  // 乘除转括号
-  const muldivToPts = function (Els, k) {
-    if (/\*|\//.test(Els[k]) && /\+|-/.test(Els[k])) {
-      let mc = Els[k].match(/[^+|-]*[*|/][^+|-]*/g)
-      if (mc) {
-        mc.forEach((m) => {
-          let vk = 'El' + i++
-          Els[vk] = m.replace(/\(|\)/g, '')
-          Els[k] = Els[k].replace(m, vk)
-        })
-      }
-    }
+}
+export function sub(m, n, decimal = 10) {
+  if (decimal) {
+    return nFloor(nFloor(m, decimal) - nFloor(n, decimal), decimal)
+  } else {
+    return m - n
   }
-  // 符号切割运算
-  const splitSmb = function (Els) {
-    for (let k in Els) {
-      Els[k + 'O'] = Els[k]
-      Els[k] = Els[k].replace(/\+|-|\*|\//g, (v) => ',' + v + ',')
-      Els[k] = Els[k].split(',')
-    }
+}
+export function mul(m, n, decimal = 10) {
+  if (decimal) {
+    return nFloor(nFloor(m, decimal) * nFloor(n, decimal), decimal)
+  } else {
+    return m * n
+  }
+}
+export function div(m, n, decimal = 10) {
+  if (decimal) {
+    return nFloor(nFloor(m, decimal) / nFloor(n, decimal), decimal)
+  } else {
+    return m / n
   }
+}
 
-  const compute = function (Els, k, fc) {
-    let El = Els[k]
-    El.forEach((e, i) => {
-      if (/^El/.test(e)) {
-        El[i] = compute(Els, e, fc)
-      }
-    })
+/**
+ * @param {string} [evalStr='']
+ * @param {number} [decimal=10]
+ * @param {number} proceDecimal
+ * @return {number}
+ */
+export function evaluate(evalStr = '', decimal = 10, proceDecimal) {
+  if (decimal) {
+    i = 1
+    let obj = { mEl: evalStr.replace(/\s/g, ''), Els: {} }
 
-    let L = El.length
-    let Val = Number(El[0])
-    for (let i = 1; i < L; i) {
-      if (['+', '-', '*', '/'].includes(El[i])) {
-        switch (El[i]) {
-          case '+':
-            Val = Val.add(Number(El[i + 1]), fc)
-            break
-          case '-':
-            Val = Val.sub(Number(El[i + 1]), fc)
-            break
-          case '*':
-            Val = Val.mul(Number(El[i + 1]), fc)
-            break
-          case '/':
-            Val = Val.div(Number(El[i + 1]), fc)
-            break
-        }
-        i += 2
-      }
+    splitPts(obj)
+
+    let Els = obj.Els
+    Els['Elm'] = obj.mEl
+    obj = undefined
+
+    negToPts(Els, 'Elm')
+    for (let k in Els) {
+      k !== 'Elm' && negToPts(Els, k)
+    }
+
+    muldivToPts(Els, 'Elm')
+    for (let k in Els) {
+      k !== 'Elm' && muldivToPts(Els, k)
     }
-    return Val
+
+    splitSmb(Els)
+
+    let RES = compute(Els, 'Elm', proceDecimal || decimal)
+    RES = nFloor(RES, decimal)
+    return RES
+  } else {
+    // eslint-disable-next-line no-eval
+    eval('window._number_eval_res=' + evalStr)
+    let RES = window._number_eval_res
+    delete window._number_eval_res
+    return RES
   }
-  const evaluate = function (evalStr = '', decimal = 10, proceDecimal) {
-    if (decimal) {
-      i = 1
-      let obj = { mEl: evalStr.replace(/\s/g, ''), Els: {} }
+}
+/**
+ * @param {number}
+ * @return {string}
+ */
+export const subFixed = function (n, decimal = 6) {
+  let res = ''
+  if (n === undefined || n === null || n === '') return ''
+  let ns = toString(n)
+  if (isNaN(ns)) return ''
 
-      splitPts(obj)
+  let nss = ns.split('.')
+  let intC = nss[0] || '0'
+  let floatC = nss[1] || ''
+  if (decimal > 0) {
+    let floatCn = ''
+    for (let i = 0; i < decimal; i++) {
+      let fIs = floatC[i] || '0'
+      floatCn = floatCn + fIs
+    }
+    res = intC + '.' + floatCn
+  } else {
+    res = intC
+  }
+  return res
+}
+/**
+ * @param {number}
+ * @return {string}
+ */
+export const addThousands = function (n) {
+  let res = ''
+  if (n === undefined || n === null || n === '') {
+    return res
+  }
 
-      let Els = obj.Els
-      Els['Elm'] = obj.mEl
-      obj = undefined
+  let ns = toString(n)
 
-      negToPts(Els, 'Elm')
-      for (let k in Els) {
-        k !== 'Elm' && negToPts(Els, k)
-      }
+  let intC = ''
+  let floatC = ''
+  let nss = ns.split('.')
+  if (nss.length === 2) {
+    intC = nss[0] || '0'
+    floatC = nss[1] || ''
+  } else {
+    intC = ns
+  }
 
-      muldivToPts(Els, 'Elm')
-      for (let k in Els) {
-        k !== 'Elm' && muldivToPts(Els, k)
-      }
+  let L = intC.length
+  let intT = ''
+  for (let i = 1; i <= L; i++) {
+    intT = intC[L - i] + intT
+    if (i % 3 === 0 && i !== L) {
+      intT = ',' + intT
+    }
+  }
+  if (floatC) {
+    res = intT + '.' + floatC
+  } else {
+    res = intT
+  }
+  return res
+}
 
-      splitSmb(Els)
-
-      let RES = compute(Els, 'Elm', proceDecimal || decimal)
-      RES = RES.add(0, decimal)
-      return RES
-    } else {
-      // eslint-disable-next-line no-eval
-      eval('window._number_eval_res=' + evalStr)
-      let RES = window._number_eval_res
-      delete window._number_eval_res
-      return RES
+export const toString = function (n) {
+  let ns = n
+  if (typeof n === 'number') {
+    ns = n.toString()
+    if (ns.includes('e+')) {
+      ns = n.toLocaleString().replace(/,/g, '')
     }
+  } else if (typeof n === 'string') {
+    ns = n.replace(/,/g, '').trim()
   }
+  return ns
+}
 
-  Number.prototype.add = add
-  Number.prototype.sub = sub
-  Number.prototype.mul = mul
-  Number.prototype.div = div
-  /**
-   * @param {string} [evalStr='']
-   * @param {number} [decimal=10]
-   * @param {number} proceDecimal
-   * @return {number}
-   */
-  Number.eval = evaluate
+function N(val) {
+  if (typeof val === 'string') {
+    val = val.replace(/,/g, '').trim()
+  }
+  if (val === undefined || val === null || val === '') {
+    return NaN
+  } else {
+    return Number(val)
+  }
 }
+N.add = add
+N.sub = sub
+N.mul = mul
+N.div = div
+N.eval = evaluate
+N.evaluate = evaluate
+N.toString = toString
+N.subFixed = subFixed
+N.addThousands = addThousands
+
+export default N