n20-common-lib 1.3.186 → 1.3.187

package/package.json

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

package/src/components/InputNumber/index.vue

@@ -104,14 +104,13 @@ export default {
     value: {
       handler(val) {
         if (val && typeof val === 'string') {
-          val = Number(val.replace(/,/g, ''))
+          val = NumberP(val)
 
           this.$emit('input', isNaN(val) ? undefined : val)
           this.valueStr = this.num2str(val)
           return
         }
         this.valueStr = this.num2str(val)
-        this.preValue = this.valueStr
       },
       immediate: true
     }
@@ -133,28 +132,29 @@ export default {
       this.isFocus = true
       if (!this.disabled && this.valueStr) {
         this.valueStr = this.valueStr.replace(/,/g, '')
+        this.preValue = this.valueStr
       }
     },
     blurFn() {
       this.isFocus = false
-      let val = Number(this.valueStr.replace(/,/g, ''))
-      if (isNaN(val)) {
-        this.valueStr = ''
-      } else {
-        this.valueStr = this.num2str(val)
-      }
 
+      this.changeFn(this.valueStr)
       this.$emit('blur')
     },
     stepFn(ev) {
-      if (ev.code === 'ArrowUp' || ev.code === 'ArrowDown') {
-        let val = Number(this.valueStr.replace(/,/g, ''))
+      if ((ev.code === 'ArrowUp' || ev.code === 'ArrowDown') && !this.disabled) {
+        let val = NumberP(this.valueStr)
         if (!isNaN(val)) {
           ev.preventDefault()
           val = ev.code === 'ArrowUp' ? val + this.step : val - this.step
+          if (val < this.min) {
+            val = this.min
+          } else if (val > this.max) {
+            val = this.max
+          }
+
           let valueStr = Number(val.toFixed(9)).toString()
           this.valueStr = valueStr
-          this.changeFn(valueStr)
         }
       }
     },
@@ -166,16 +166,22 @@ export default {
       }
     },
     changeFn(valStr) {
-      valStr = valStr.replace(/,/g, '')
+      if (this.changeIng) return
+      this.changeIng = true
+      setTimeout(() => {
+        this.changeIng = false
+      })
+
+      valStr = valStr.trim()
+      let val = NumberP(valStr)
 
-      if (!valStr.trim() || isNaN(valStr)) {
+      if (isNaN(val)) {
         this.valueStr = ''
         this.$emit('input', undefined)
         this.$emit('change', undefined)
         return
       }
 
-      let val = Number(valStr)
       if (val < this.min) {
         val = this.min
       } else if (val > this.max) {
@@ -218,4 +224,15 @@ 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/LoginTemporary/form.vue

@@ -374,6 +374,9 @@ export default {
           } else if (supplier === 'netca') {
             // 网证通
             window.sessionStorage.setItem('signType', 'netcaSign')
+          } else if (supplier === 'NetSM3') {
+            // 网证通
+            window.sessionStorage.setItem('signType', 'NetSM3')
           } else {
             // 信安CA
             window.sessionStorage.setItem('signType', 'inetSign')