n20-common-lib 1.3.192 → 1.3.194

package/package.json

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

package/src/components/CascaderArea/index.vue

@@ -6,12 +6,7 @@
     :options="areaTree"
     :filterable="filterable"
     :clearable="clearable"
-    :props="{
-      value: 'regionNo',
-      label: 'regionName',
-      children: 'children',
-      expandTrigger: 'hover'
-    }"
+    :props="propsAs"
     v-on="$listeners"
   />
 </template>
@@ -44,6 +39,10 @@ export default {
     countryId: {
       type: String,
       default: 'CHN'
+    },
+    props: {
+      type: Object,
+      default: undefined
     }
   },
   data() {
@@ -52,6 +51,15 @@ export default {
     }
   },
   computed: {
+    propsAs() {
+      let _prop = {
+        value: 'regionNo',
+        label: 'regionName',
+        children: 'children',
+        expandTrigger: 'hover'
+      }
+      return Object.assign(_prop, this.props)
+    },
     areaKey() {
       return this.countryId === 'CHN' ? '_china_area_tree_' : `_${this.countryId}_area_tree_`
     },

package/src/components/DateSelect/index.vue

@@ -2,9 +2,9 @@
   <!--结算 日 周 月  年 时间选择控件封装 -->
   <div class="n20-date-select">
     <el-select v-model="type" placeholder="请选择" style="width: 65px" @change="dateTypeSelectChange">
-      <el-option v-for="(item, index) in SelectList" :key="index" :label="item" :value="item" />
+      <el-option v-for="(item, index) in selectList" :key="index" :label="item" :value="item" />
     </el-select>
-    <el-date-picker
+    <date-picker
       v-if="type === '日'"
       key="day"
       v-model="day"
@@ -16,10 +16,10 @@
       placeholder="选择日"
       @change="dayChange"
     />
-    <el-date-picker
+    <date-picker
       v-if="type === '周'"
-      v-model="week"
       key="week"
+      v-model="week"
       format="yyyy 第 WW 周"
       type="week"
       :picker-options="{ firstDayOfWeek: 1 }"
@@ -28,10 +28,10 @@
       @change="weekChange"
     />
 
-    <el-date-picker
+    <date-picker
       v-if="type === '月'"
-      v-model="month"
       key="month"
+      v-model="month"
       type="month"
       format="yyyy-MM"
       value-format="yyyy-MM"
@@ -39,9 +39,10 @@
       placeholder="选择月"
       @change="monthChange"
     />
-    <quarter-date-picker key="quarter" v-if="type === '季'" v-model="quarter" @change="handleChange" />
-    <el-date-picker key="year"
+    <quarter-date-picker v-if="type === '季'" key="quarter" v-model="quarter" @change="handleChange" />
+    <date-picker
       v-if="type === '年'"
+      key="year"
       v-model="year"
       type="year"
       format="yyyy"
@@ -54,13 +55,12 @@
 </template>
 
 <script>
+import datePicker from '../DatePicker/index.vue'
 import quarterDatePicker from './quarterDatePicker'
 import dayjs from 'dayjs'
 export default {
   name: 'SelectDatePicker',
-  components: {
-    quarterDatePicker
-  },
+  components: { datePicker, quarterDatePicker },
   props: {
     value: {
       type: [Array, String, Object],
@@ -72,7 +72,7 @@ export default {
       type: String,
       default: '日'
     },
-    SelectList: {
+    selectList: {
       type: Array,
       default: () => {
         return ['日', '周', '月', '季', '年']

package/src/components/DateSelect/quarterDatePicker.vue

@@ -63,7 +63,7 @@
       clearable
       @focus="changeFocus"
     >
-      <i slot="prefix" class="el-input__icon el-icon-date"></i>
+      <i slot="suffix" class="el-input__icon el-icon-date" :class="showValue && 'quarter-date-icon'"></i>
     </el-input>
   </el-popover>
 </template>
@@ -167,5 +167,8 @@ export default {
   }
 }
 </script>
-
-<style lang="scss"></style>
+<style>
+.el-date-editor:hover .quarter-date-icon {
+  display: none;
+}
+</style>

package/src/components/Filters/indexO.vue

@@ -27,10 +27,10 @@
     </div>
     <div class="text-c m-t m-b">
       <slot name="actions">
-        <el-button size="mini" type="primary" style="width: 76px" @click="filter">
+        <el-button type="primary" @click="filter">
           {{ filterText }}
         </el-button>
-        <el-button size="mini" plain style="width: 76px" @click="clear">
+        <el-button plain @click="clear">
           {{ clearText }}
         </el-button>
       </slot>

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/Layout/index.vue

@@ -398,11 +398,11 @@ export default {
               this.updateK = ''
             })
           } else {
-            window.postMessage({
-              updateActiveCache: true,
-              targetName: '*',
-              originName: 'main'
-            })
+            // window.postMessage({
+            //   updateActiveCache: true,
+            //   targetName: '*',
+            //   originName: 'main'
+            // })
             this.CompatibleUpdateCache(tab.route) // 兼容旧的子模块清除缓存
           }
         }

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,4 +1,3 @@
-import './utils/importGlobal.js' // 联合加载组件保存位置
 import './utils/storagePro.js' // 扩展Storage
 /** 提供组件给外部使用的入口 */
 import ContentLoading from './components/ContentLoading/index.vue'
@@ -87,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'
@@ -100,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'
@@ -220,7 +224,8 @@ export {
   // 方法
   auth,
   axios,
-  getJsonc,
+  $l,
+  N,
   downloadBlob,
   forEachs,
   list2tree,
@@ -233,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

@@ -0,0 +1,274 @@
+/* eslint-disable no-extend-native */
+let i = 1
+
+// 去括号
+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 negToPts = function (Els, k) {
+  if (/\+-/.test(Els[k])) {
+    Els[k] = Els[k].replace(/\+-/, '-')
+  }
+
+  if (/--/.test(Els[k])) {
+    Els[k] = Els[k].replace(/--/, '+')
+  }
+
+  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)
+      })
+    }
+  }
+
+  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 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(',')
+  }
+}
+
+const compute = function (Els, k, fc) {
+  let El = Els[k]
+  El.forEach((e, i) => {
+    if (/^El/.test(e)) {
+      El[i] = compute(Els, e, fc)
+    }
+  })
+
+  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
+}
+
+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
+  }
+}
+export function sub(m, n, decimal = 10) {
+  if (decimal) {
+    return nFloor(nFloor(m, decimal) - nFloor(n, decimal), decimal)
+  } else {
+    return m - n
+  }
+}
+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
+  }
+}
+
+/**
+ * @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: {} }
+
+    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)
+    }
+
+    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
+  }
+}
+/**
+ * @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 ''
+
+  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 ns = toString(n)
+
+  let intC = ''
+  let floatC = ''
+  let nss = ns.split('.')
+  if (nss.length === 2) {
+    intC = nss[0] || '0'
+    floatC = nss[1] || ''
+  } else {
+    intC = ns
+  }
+
+  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
+}
+
+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
+}
+
+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