n20-common-lib 2.9.85 → 2.9.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.9.85",
+  "version": "2.9.87",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -51,6 +51,7 @@
   "dependencies": {
     "axios": "*",
     "dayjs": "*",
+    "decimal.js": "^10.5.0",
     "js-cookie": "^3.0.1",
     "jsencrypt": "^3.3.2",
     "jsonwebtoken": "^8.5.1",
@@ -62,12 +63,12 @@
     "qrcode": "*",
     "resize-detector": "*",
     "strip-json-comments": "*",
+    "swiper": "8.4.5",
     "v-viewer": "1.6.4",
     "vue-jsonp": "2.0.0",
     "vuedraggable": "*",
     "webpack-duplicate-relano-plugin": "^0.1.0",
-    "xe-utils": "^3.5.11",
-    "swiper": "8.4.5"
+    "xe-utils": "^3.5.11"
   },
   "devDependencies": {
     "@babel/plugin-proposal-optional-chaining": "^7.14.5",

package/src/components/InputNumber/index.vue

@@ -1,5 +1,9 @@
 <template>
-  <div class="n20-num-w"  @mouseenter="isHove = true" @mouseleave="isHove = false">
+  <div
+    class="n20-num-w"
+    @mouseenter="isHove = true"
+    @mouseleave="isHove = false"
+  >
     <el-input
       ref="input"
       v-model="valueStr"
@@ -23,7 +27,9 @@
         <slot name="prefix"></slot>
       </template>
       <template v-if="type === 'rate'">
-        <span v-if="suffixV" slot="suffix" class="el-input__icon">{{ suffix }}</span>
+        <span v-if="suffixV" slot="suffix" class="el-input__icon">{{
+          suffix
+        }}</span>
       </template>
     </el-input>
   </div>
@@ -34,6 +40,8 @@ import emitter from '../../utils/element-ui-emitter'
 import { $lc } from '../../utils/i18n/index'
 import N from '../../utils/numberPor'
 
+import { Decimal } from 'decimal.js'
+
 export default {
   name: 'InputNumber',
   mixins: [emitter],
@@ -50,12 +58,28 @@ export default {
       }
     },
     min: {
-      type: Number,
-      default: -9999999999999.99
+      type: [Number, String],
+      default: -9999999999999.99,
+      validator(v) {
+        try {
+          new Decimal(v)
+          return true
+        } catch {
+          return false
+        }
+      }
     },
     max: {
-      type: Number,
-      default: 9999999999999.99
+      type: [Number, String],
+      default: 9999999999999.99,
+      validator(v) {
+        try {
+          new Decimal(v)
+          return true
+        } catch {
+          return false
+        }
+      }
     },
     step: {
       type: Number,
@@ -141,7 +165,9 @@ export default {
           if (val || val === 0) {
             let nF = N.toString(val).split('.')[1] || ''
             if (nF.length < this.fNum) {
-              return (this.valueStr = N.addThousands(N.subFixed(val, this.fNum)))
+              return (this.valueStr = N.addThousands(
+                N.subFixed(val, this.fNum)
+              ))
             }
           }
           this.valueStr = N.addThousands(val)
@@ -153,6 +179,9 @@ export default {
     }
   },
   methods: {
+    compare(a, b) {
+      return new Decimal(a).cmp(new Decimal(b)) === 1
+    },
     focusFn() {
       this.isFocus = true
       if (!this.disabled && this.valueStr) {
@@ -170,7 +199,10 @@ export default {
       this.$emit('clear')
     },
     stepFn(ev) {
-      if ((ev.code === 'ArrowUp' || ev.code === 'ArrowDown') && !this.disabled) {
+      if (
+        (ev.code === 'ArrowUp' || ev.code === 'ArrowDown') &&
+        !this.disabled
+      ) {
         let val = N(this.valueStr)
         if (!isNaN(val)) {
           ev.preventDefault()
@@ -203,6 +235,7 @@ export default {
       })
 
       let val = N(valStr)
+
       if (isNaN(val)) {
         this.valueStr = ''
         let oVal = this.value
@@ -225,13 +258,16 @@ export default {
             val = Math.round(N) * this.step
           }
         }
-        if (val < this.min) {
+
+        if (this.compare(this.min, val)) {
           val = this.min
-        } else if (val > this.max) {
+        } else if (this.compare(val, this.max)) {
           val = this.max
+        } else {
+          nStr = N.subFixed(val, this.fNum)
         }
-        nStr = N.subFixed(val, this.fNum)
-        this.valueStr = N.addThousands(nStr)
+
+        this.valueStr = N.addThousands(nStr || val)
       }
 
       this.$nextTick(() => {

package/src/plugins/Sign/SkfSign/index.js

@@ -29,7 +29,7 @@ function getDN() {
 
 /* 检测本地签名端口是否可用 */
 export function availableSign(fn, url) {
-  available = IWSAGetAvailable()
+  let available = IWSAGetAvailable()
   if (available) {
     fn && fn(available)
   } else {
@@ -41,7 +41,7 @@ export function availableSign(fn, url) {
 }
 
 function checkAvailable(fn, url, count) {
-  available = IWSAGetAvailable()
+  let available = IWSAGetAvailable()
   let name = window.NetSignDownloadName || 'NetSignCNG签名助手'
   if (available) {
     fn && fn(available)
@@ -101,7 +101,10 @@ export async function getSign(plain, dn) {
   }
   const checkRes = await getCertInfo(dn)
 
-  if (checkRes === -1 || ['dnListEmpty', 'dnIsEmpty', 'Empty'].includes(checkRes)) {
+  if (
+    checkRes === -1 ||
+    ['dnListEmpty', 'dnIsEmpty', 'Empty'].includes(checkRes)
+  ) {
     switch (checkRes) {
       case 'dnListEmpty':
         Message.warning('没有匹配到证书!')
@@ -124,7 +127,7 @@ export async function getSign(plain, dn) {
     closeOnClickModal: false,
     inputType: 'password'
   }).then(({ value }) => {
-    return performSign(plainText, value).then((signedData) => {
+    performSign(plainText, value).then((signedData) => {
       answer = signedData
     })
   })
@@ -142,7 +145,9 @@ export async function getCertInfo(dn) {
   return new Promise((resolve, reject) => {
     // 获取证书列表
     IWSASkfGetCertList(
-      process.env.VUE_APP_NetSign_ARG || window.VUE_APP_NetSign_ARG || 'WTSKFInterface.dll',
+      process.env.VUE_APP_NetSign_ARG ||
+        window.VUE_APP_NetSign_ARG ||
+        'WTSKFInterface.dll',
       (CertListData, errorCode) => {
         if (errorCode) {
           Message.error(codeDate[errorCode])
@@ -171,8 +176,6 @@ async function performSign(plainText, value) {
         Message.error(codeDate[errorCode])
         reject()
       }
-    }).catch(() => {
-      resolve()
     })
   })
 }