n20-common-lib 2.5.14 → 2.5.16

package/package.json

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

package/src/assets/css/cl-form-item.scss

@@ -1,7 +1,7 @@
 $--s: 1024px;
 $--m: 1600px;
 $--l: 1920px;
-$--input-max: 300px;
+$--input-max: 224px;
 
 .el-form-item[span],
 .el-form-item[span-s],
@@ -30,6 +30,7 @@ $--input-max: 300px;
 
 @media only screen and (max-width: $--l) {
   @for $i from 0 through 24 {
+
     .el-form-item[span-l='#{$i}'],
     .el-form-item[span-lg='#{$i}'] {
       width: (1 / 24 * $i * 100) * 1%;
@@ -108,10 +109,12 @@ $--input-max: 300px;
 .el-textarea__inner {
   padding-left: 10px;
   padding-right: 10px;
+
   &[oreadonly] {
     border-color: $--border-color-base;
   }
 }
+
 .el-input-number.is-without-controls .el-input__inner {
   padding-left: 10px;
   padding-right: 10px;
@@ -563,12 +566,14 @@ $--input-max: 300px;
     font-size: 16px;
     transition: all 0.3s;
   }
+
   &.has-value {
     &:hover {
       .el-range__icon {
         display: none;
       }
     }
+
     &.is-disabled {
       .el-range__icon {
         display: initial;
@@ -676,6 +681,7 @@ $--input-max: 300px;
   .el-input__suffix {
     font-size: 14px;
   }
+
   .el-icon-circle-close {
     pointer-events: all;
     cursor: pointer;
@@ -694,10 +700,12 @@ $--input-max: 300px;
     .el-select__input {
       margin-left: 10px;
     }
+
     .el-input__suffix {
       display: none;
     }
   }
+
   &.is-clearable {
     .el-select {
       .el-input__inner {
@@ -705,6 +713,7 @@ $--input-max: 300px;
       }
     }
   }
+
   .el-input__suffix {
     z-index: 1;
   }
@@ -728,6 +737,7 @@ $--input-max: 300px;
 /* 脱离form-item校验 */
 .rule-key__is-error {
   position: relative;
+
   .el-input__inner,
   .el-input__inner:focus,
   .el-textarea__inner,
@@ -735,6 +745,7 @@ $--input-max: 300px;
     border-color: $--color-danger;
   }
 }
+
 .rule-key__error_msg {
   color: $--color-danger;
   font-size: 12px;
@@ -750,8 +761,9 @@ $--input-max: 300px;
 }
 
 .n20-approval-Button {
+
   .el-form-item--small .el-form-item__content,
   .el-form-item--small .el-form-item__label {
     line-height: 1.5;
   }
-}
+}

package/src/components/Layout/indexN.vue

@@ -93,7 +93,7 @@ export default {
   data() {
     let headerH = 48
     let tabsH = 28
-    let clientM = 4
+    let clientM = 8
 
     return {
       dnsKey: this.isTest || (process.env.NODE_ENV === 'production' && process.env.VUE_APP_KEEP_ALIVE === 'true'),

package/src/utils/amountInWords.js

@@ -1,40 +1,61 @@
-const CHINESE_NUMERALS = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']
-
 /**
  *
  * @param {number|string} amount 需转换的金额
  */
-export const convert = (money) => {
-  var cnNums = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'] //汉字的数字
-  var cnIntRadice = ['', '拾', '佰', '仟'] //基本单位
-  var cnIntUnits = ['', '万', '亿', '兆'] //对应整数部分扩展单位
-  var cnDecUnits = ['角', '分', '毫', '厘'] //对应小数部分单位
-  var cnInteger = '整' //整数金额时后面跟的字符
-  var cnIntLast = '元' //整数完以后的单位
+export function 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 integerNum
+  //金额小数部分
+  var decimalNum
   //输出的中文金额字符串
   var chineseStr = ''
-  var parts //分离金额后用的数组，预定义
+  var minusStr = '负'
+  var minusFlag = false
+  //分离金额后用的数组，预定义
+  var parts
   if (money == '') {
     return ''
   }
-
   money = parseFloat(money)
   if (money >= maxNum) {
     //超出最大处理数字
-    return '超出最大处理数字'
+    return ''
   }
+
   if (money == 0) {
-    chineseStr = cnNums[0] + cnIntLast + cnInteger
+    chineseStr = cnNums[0] + cnIntLast
     return chineseStr
   }
-  //四舍五入保留两位小数,转换为字符串
-  money = Math.round(money * 100).toString()
-  integerNum = money.substr(0, money.length - 2)
-  decimalNum = money.substr(money.length - 2)
+
+  //转换为字符串
+  money = money.toString()
+  if (money.indexOf('-') !== -1) {
+    minusFlag = true
+    money = Math.abs(money).toString()
+  }
+  if (money.indexOf('.') == -1) {
+    integerNum = money
+    decimalNum = ''
+  } else {
+    parts = money.split('.')
+    integerNum = parts[0]
+    decimalNum = parts[1].substr(0, 4)
+  }
+
   //获取整型部分转换
   if (parseInt(integerNum, 10) > 0) {
     var zeroCount = 0
@@ -72,22 +93,12 @@ export const convert = (money) => {
   }
   if (chineseStr == '') {
     chineseStr += cnNums[0] + cnIntLast + cnInteger
-  } else if (decimalNum == '' || /^0*$/.test(decimalNum)) {
+  } else if (decimalNum == '') {
     chineseStr += cnInteger
   }
-  return chineseStr
-}
-/**
- * 单个数字转换
- * @param {number | string} number
- * @returns {string}
- */
-export const singleConvert = (number) => {
-  const res = CHINESE_NUMERALS[number] || number
 
-  if (!res) {
-    console.error('The number is invalid')
+  if (minusFlag) {
+    chineseStr = minusStr + chineseStr
   }
-
-  return res
+  return chineseStr
 }