n20-common-lib 2.5.5 → 2.5.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.5.5",
+  "version": "2.5.7",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -116,4 +116,4 @@
     "last 2 versions",
     "not dead"
   ]
-}
+}

package/src/components/Pagination/index.vue

@@ -156,6 +156,13 @@ export default {
       this.pageObj[this.pageKey.size] = this.pageObjC[this.pageKey.size]
       this.pageObjC[this.pageKey.total] = this.pageObj[this.pageKey.total]
       this.$emit('change', this.pageObjC)
+    },
+    pageObj: {
+      immediate: true,
+      deep: true,
+      handler(newValue, oldValue) {
+        this.pageObjC = this.pageObj
+      }
     }
   },
   methods: {

package/src/utils/amountInWords.js

@@ -2,45 +2,80 @@ const CHINESE_NUMERALS = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒'
 
 /**
  *
- * @param {number|string} num 需转换的金额
+ * @param {number|string} amount 需转换的金额
  */
-export const convert = (num) => {
-  const digits = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']
-  const integerUnits = [
-    ['元', '万', '亿'],
-    ['', '拾', '佰', '仟']
-  ]
-  const negativeSign = num < 0 ? '欠' : ''
-  num = Math.abs(num)
-
-  let result = ''
-
-  // 处理小数部分
-  const decimal = Math.round((num - Math.floor(num)) * 100)
-  if (decimal > 0) {
-    result = digits[Math.floor(decimal / 10)] + '角' + digits[decimal % 10] + '分'
-  } else {
-    result = '整'
+export const convert = (money) => {
+  var cnNums = new Array('零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖') //汉字的数字
+  var cnIntRadice = new Array('', '拾', '佰', '仟') //基本单位
+  var cnIntUnits = new Array('', '万', '亿', '兆') //对应整数部分扩展单位
+  var cnDecUnits = new Array('角', '分', '毫', '厘') //对应小数部分单位
+  var cnInteger = '整' //整数金额时后面跟的字符
+  var cnIntLast = '元' //整数完以后的单位
+  //最大处理的数字
+  var maxNum = 999999999999999.9999
+  var integerNum //金额整数部分
+  var decimalNum //金额小数部分
+  //输出的中文金额字符串
+  var chineseStr = ''
+  var parts //分离金额后用的数组，预定义
+  if (money == '') {
+    return ''
   }
-  num = Math.floor(num)
 
-  // 处理整数部分
-  for (let i = 0; i < integerUnits[0].length && num > 0; i++) {
-    let temp = ''
-    for (let j = 0; j < integerUnits[1].length && num > 0; j++) {
-      temp = digits[num % 10] + integerUnits[1][j] + temp
-      num = Math.floor(num / 10)
+  money = parseFloat(money)
+  if (money >= maxNum) {
+    //超出最大处理数字
+    return '超出最大处理数字'
+  }
+  if (money == 0) {
+    chineseStr = cnNums[0] + cnIntLast + cnInteger
+    return chineseStr
+  }
+  //四舍五入保留两位小数,转换为字符串
+  money = Math.round(money * 100).toString()
+  integerNum = money.substr(0, money.length - 2)
+  decimalNum = money.substr(money.length - 2)
+  //获取整型部分转换
+  if (parseInt(integerNum, 10) > 0) {
+    var zeroCount = 0
+    var IntLen = integerNum.length
+    for (var i = 0; i < IntLen; i++) {
+      var n = integerNum.substr(i, 1)
+      var p = IntLen - i - 1
+      var q = p / 4
+      var m = p % 4
+      if (n == '0') {
+        zeroCount++
+      } else {
+        if (zeroCount > 0) {
+          chineseStr += cnNums[0]
+        }
+        //归零
+        zeroCount = 0
+        chineseStr += cnNums[parseInt(n)] + cnIntRadice[m]
+      }
+      if (m == 0 && zeroCount < 4) {
+        chineseStr += cnIntUnits[q]
+      }
     }
-    result = temp.replace(/(零.)*零$/, '').replace(/^$/, '零') + integerUnits[0][i] + result
+    chineseStr += cnIntLast
+  }
+  //小数部分
+  if (decimalNum != '') {
+    var decLen = decimalNum.length
+    for (var i = 0; i < decLen; i++) {
+      var n = decimalNum.substr(i, 1)
+      if (n != '0') {
+        chineseStr += cnNums[Number(n)] + cnDecUnits[i]
+      }
+    }
+  }
+  if (chineseStr == '') {
+    chineseStr += cnNums[0] + cnIntLast + cnInteger
+  } else if (decimalNum == '' || /^0*$/.test(decimalNum)) {
+    chineseStr += cnInteger
   }
-  return (
-    negativeSign +
-    result
-      .replace(/(零.)+/g, '零')
-      .replace(/零+$/, '')
-      .replace(/(零元)$/, '元')
-      .replace(/^整$/, '零元整')
-  )
+  return chineseStr
 }
 /**
  * 单个数字转换