n20-common-lib 1.3.30 → 1.3.31

package/package.json

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

package/src/components/InputNumber/index.vue

@@ -20,6 +20,7 @@
       :value="valueNum"
       :placeholder="phd"
       v-on="listeners"
+      @input.native="inputFn"
       @blur="blurFn"
       @change="changeFn"
     />
@@ -97,6 +98,7 @@ export default {
         if (val && typeof val === 'string' && val.includes(',')) {
           return this.$emit('input', Number(val.replace(/,/g, '')))
         }
+        this.preValue = val
         this.valueStr = this.num2str(val)
       },
       immediate: true
@@ -164,6 +166,13 @@ export default {
           }
           break
       }
+    },
+    inputFn({ target }) {
+      if (isNaN(target.value)) {
+        target.value = this.preValue
+      } else {
+        this.preValue = target.value
+      }
     }
   }
 }

package/src/components/Table/filters.js

@@ -0,0 +1,60 @@
+import numerify from 'numerify'
+import dayjs from 'dayjs'
+
+function tplFn(row, sc, mck, map = {}) {
+  let str = ''
+  sc.forEach((s, i) => {
+    str += s
+    let kA = mck[i]
+    if (kA && kA.length) {
+      let key = kA[0]
+      if (kA.length === 1) {
+        str += row[key]
+      } else {
+        let type = kA[1]
+        switch (type) {
+          case 'money':
+            str += numerify(row[key], '0,0.00')
+            break
+          case 'rate':
+            str += numerify(row[key], '0.000000')
+            break
+          case 'map':
+            str += map[row[key]]
+            break
+          case 'date':
+            str += dayjs(row[key]).format('YYYY-MM-DD')
+            break
+          case 'datetime':
+            str += dayjs(row[key]).format('YYYY-MM-DD HH:mm:ss')
+            break
+          case 'time':
+            str += dayjs(row[key]).format('HH:mm:ss')
+            break
+          default:
+            str += row[key]
+            break
+        }
+      }
+    }
+  })
+  return str
+}
+
+export function colfF(colf, map) {
+  if (typeof colf !== 'string') return colf
+  let sc = colf.split(/{.+?}/g) || []
+  let mc = colf.match(/{.+?}/g) || []
+  let mck = []
+  mc.forEach((t) => {
+    t = t.replace(/^{|\s+|}$/g, '').split('|')
+    mck.push(t)
+  })
+
+  return (row) => tplFn(row, sc, mck, map)
+}
+
+export function colftF(colft, fMap) {
+  if (typeof colft !== 'string') return colft
+  return fMap[colft]
+}

package/src/components/Table/index.vue

@@ -39,9 +39,22 @@
 </template>
 
 <script>
-import numerify from 'numerify'
-import dayjs from 'dayjs'
 import thSelectHeader from './ThSelectHeader.vue'
+import { colfF, colftF } from './filters'
+
+const columnRender = {
+  props: {
+    cRender: {
+      type: Function
+    },
+    row: {
+      type: Object
+    }
+  },
+  render(h) {
+    return this.cRender(h, this.row)
+  }
+}
 
 export default {
   name: 'Table',
@@ -120,75 +133,4 @@ export default {
     }
   }
 }
-
-const columnRender = {
-  props: {
-    cRender: {
-      type: Function
-    },
-    row: {
-      type: Object
-    }
-  },
-  render(h) {
-    return this.cRender(h, this.row)
-  }
-}
-
-function colfF(colf, map) {
-  if (typeof colf !== 'string') return colf
-  let sc = colf.split(/{.+?}/g) || []
-  let mc = colf.match(/{.+?}/g) || []
-  let mck = []
-  mc.forEach((t) => {
-    t = t.replace(/^{|\s+|}$/g, '').split('|')
-    mck.push(t)
-  })
-
-  return (row) => tplFn(row, sc, mck, map)
-}
-function tplFn(row, sc, mck, map = {}) {
-  let str = ''
-  sc.forEach((s, i) => {
-    str += s
-    let kA = mck[i]
-    if (kA && kA.length) {
-      let key = kA[0]
-      if (kA.length === 1) {
-        str += row[key]
-      } else {
-        let type = kA[1]
-        switch (type) {
-          case 'money':
-            str += numerify(row[key], '0,0.00')
-            break
-          case 'rate':
-            str += numerify(row[key], '0.000000')
-            break
-          case 'map':
-            str += map[row[key]]
-            break
-          case 'date':
-            str += dayjs(row[key]).format('YYYY-MM-DD')
-            break
-          case 'datetime':
-            str += dayjs(row[key]).format('YYYY-MM-DD HH:mm:ss')
-            break
-          case 'time':
-            str += dayjs(row[key]).format('HH:mm:ss')
-            break
-          default:
-            str += row[key]
-            break
-        }
-      }
-    }
-  })
-  return str
-}
-
-function colftF(colft, fMap) {
-  if (typeof colft !== 'string') return colft
-  return fMap[colft]
-}
 </script>