n20-common-lib 2.5.5-beta.2 → 2.5.5-beta.4

package/package.json

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

package/src/components/AdvancedFilter/form-item-input.vue

@@ -50,7 +50,16 @@
     :style="{
       width:
         form[item.value] && form[item.value].length > 0
-          ? 156 + 'px'
+          ? context.measureText(
+              item.options.find(
+                (r) =>
+                  r.value === form[item.value] ||
+                  (item.props && item.props.valueKey && r[item.props.valueKey] === form[item.value])
+              ).label
+            ).width *
+              1.4 +
+            48 +
+            'px'
           : 120 - 18 - context.measureText(item.label).width * 1.4 + 'px'
     }"
     v-bind="item.props"
@@ -150,10 +159,6 @@ export default {
       type: Object,
       default: undefined
     },
-    data: {
-      type: Array,
-      default: undefined
-    },
     item: {
       type: Object,
       default: undefined
@@ -165,16 +170,15 @@ export default {
     }
   },
   created() {
-    // if (this.item.reqOptions) {
-    //   this.getOptions()
-    // }
+    if (this.item.reqOptions) {
+      this.getOptions()
+    }
   },
   methods: {
     getOptions() {
       let reqOptions = this.item.reqOptions
       let url = reqOptions.url || ''
       url = url.includes('?') ? `${url}r=${Math.random()}` : `${url}?r=${Math.random()}`
-
       axios({
         ...reqOptions,
         url: url,

package/src/components/AdvancedFilter/index.vue

@@ -1,57 +1,54 @@
 <template>
   <div :class="prefixCls">
-    <div v-if="!visible && $slots.prefix" class="n20-advanced-filter-item" style="margin-bottom: 11px">
+    <el-form v-if="visible" :class="prefixCls + '-body'">
       <slot name="prefix"></slot>
-    </div>
-    <div v-if="!visible && $slots.suffix" class="n20-advanced-filter-item" style="border: none; margin-bottom: 11px">
-      <slot name="suffix"></slot>
-    </div>
-    <filterList
-      v-if="visible"
-      :width="width"
-      :form="model"
-      class="custom-advance-filter"
-      :prefix-cls="prefixCls"
-      :filter-id="filterId"
-      :filter-list="filterList"
-      @change="$emit('change', model)"
-      @clear="$emit('clear')"
-    >
-      <div
-        v-if="$slots.prefix"
-        slot="prefix"
-        class="el-form-item el-form-item--small n20-advanced-filter-item"
-        style="margin-bottom: 11px"
-      >
-        <slot name="prefix"></slot>
-      </div>
-      <template v-for="(item, i) in GroupData">
-        <template v-if="item && item.slotName" :slot="item.slotName">
-          <slot :name="item.slotName"></slot>
-        </template>
-      </template>
-      <div
-        v-if="$slots.suffix"
-        slot="suffix"
-        class="el-form-item el-form-item--small n20-advanced-filter-item"
-        style="border: none; margin-bottom: 11px"
+      <el-form-item
+        v-for="(item, i) in dataC"
+        :key="i"
+        :class="[prefixCls + '-item', activeClass(item)]"
+        :label="item.label"
       >
-        <slot name="suffix"></slot>
-      </div>
-    </filterList>
+        <div :class="prefixCls + '-content'">
+          <slot v-if="item.slotName" :name="item.slotName"></slot>
+          <formItemInput v-else :form="model" :item="item" @change="$emit('change')" />
+        </div>
+        <i :key="i" :class="[prefixCls + '-item-close', 'n20-icon-yichu']" @click="handleClose(item)"></i>
+      </el-form-item>
+      <slot name="suffix"></slot>
+      <el-form-item :class="prefixCls + '-add'">
+        <el-button v-popover:advanced_popover onlyicon plain icon="el-icon-plus" />
+        <el-popover ref="advanced_popover" placement="bottom-start" trigger="click">
+          <el-form>
+            <InputSearch
+              v-model="search"
+              clearable
+              class="input-w m-b-s"
+              :placeholder="$l('搜索筛选条件')"
+              @change="searchFn"
+            />
+            <filterItem :filter-list="filterListC" :check-array.sync="checkList" @checked="check" />
+          </el-form>
+        </el-popover>
+        <el-link class="m-l-s f-s-s" :underline="false" icon="n20-icon-qingchu" @click="cleared"> 清除条件</el-link>
+      </el-form-item>
+    </el-form>
     <div v-else :width="width"></div>
   </div>
 </template>
 
 <script>
-import filterList from './filterList.vue'
+import formItemInput from './form-item-input.vue'
+import InputSearch from '../InputSearch/index.vue'
+import filterItem from './filterItem.vue'
 
 import mixins from './mixins/index.js'
 const prefixCls = 'n20-advanced-filter'
 export default {
   name: 'AdvancedFilter',
   components: {
-    filterList
+    formItemInput,
+    InputSearch,
+    filterItem
   },
   mixins: [mixins],
   props: {
@@ -94,17 +91,96 @@ export default {
       showPop: false,
       showPopC: false,
       prefixCls,
+      dataC: [],
+      filterListC: [],
       remoteList: [],
       checkList: []
     }
   },
-
+  watch: {
+    GroupData: {
+      handler(value) {
+        this.dataC = value
+      },
+      immediate: true
+    },
+    filterList: {
+      handler(value) {
+        this.filterListC = value
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  mounted() {
+    this.getFilterList()
+  },
   methods: {
     setOptions(key, opts) {
       let item = this.filterList.find((f) => f.value === key)
       if (item) {
         item.options = opts || []
       }
+    },
+    activeClass(item) {
+      console.log(item)
+      let flag = ''
+      switch (item.type) {
+        case 'text':
+        case 'search':
+        case 'select':
+        case 'number':
+        case 'date':
+        case 'datetime':
+        case 'year':
+        case 'month':
+        case 'week':
+        case 'checkbox':
+        case 'radio':
+          flag = this.model[item.value] ? this.prefixCls + '-active' : ''
+          break
+        case 'numberrange':
+          flag = this.model[item.startValue] && this.model[item.endValue] ? this.prefixCls + '-active' : ''
+          break
+        case 'daterange':
+        case 'datetimerange':
+        case ' monthrange':
+          flag = this.model[item.startDate] && this.model[item.endDate] ? this.prefixCls + '-active' : ''
+          break
+      }
+      return flag
+    },
+    handleClose(item) {
+      let data = this.GroupData.filter((s) => {
+        return s.label !== item.label || s.value !== item.value
+      })
+      this.saveFilter(data).then(({ code }) => {
+        if (code === 200) {
+          this.getFilterList()
+        }
+      })
+    },
+    searchFn() {
+      this.filterListC = this.cloneDeepFList.filter((r) => {
+        return r.label.includes(this.search)
+      })
+    },
+    cleared() {
+      this.$emit('clear')
+    },
+    check(keys) {
+      this.checkList = keys
+      let groupFilter = []
+      if (keys.length > 0) {
+        keys.forEach((k) => {
+          groupFilter.push(this.filterList.find((s) => s.label === k))
+        })
+      }
+      this.saveFilter(groupFilter).then(({ code }) => {
+        if (code === 200) {
+          this.getFilterList()
+        }
+      })
     }
   }
 }

package/src/components/ApprovalRecord/index.vue

@@ -59,6 +59,10 @@ export default {
     procInstId: {
       type: String,
       default: undefined
+    },
+    buttonMode: {
+      type: Boolean,
+      default: true
     }
   },
   data() {

package/src/components/DatePicker/por.vue

@@ -51,6 +51,53 @@ let disabledDate_2 = (t) => {
   return t > now
 }
 
+let shortcuts_1 = [
+  {
+    text: $lc('最近一月'),
+    onClick(picker) {
+      const start = new Date()
+      const end = new Date()
+      start.setMonth(start.getMonth() - 1)
+      start.setHours(0, 0, 0)
+      end.setHours(23, 59, 59)
+      picker.$emit('pick', [start, end])
+    }
+  },
+  {
+    text: $lc('最近三月'),
+    onClick(picker) {
+      const start = new Date()
+      const end = new Date()
+      start.setMonth(start.getMonth() - 3)
+      start.setHours(0, 0, 0)
+      end.setHours(23, 59, 59)
+      picker.$emit('pick', [start, end])
+    }
+  },
+  {
+    text: $lc('最近六月'),
+    onClick(picker) {
+      const start = new Date()
+      const end = new Date()
+      start.setMonth(start.getMonth() - 6)
+      start.setHours(0, 0, 0)
+      end.setHours(23, 59, 59)
+      picker.$emit('pick', [start, end])
+    }
+  },
+  {
+    text: $lc('最近一年'),
+    onClick(picker) {
+      const start = new Date()
+      const end = new Date()
+      start.setFullYear(start.getFullYear() - 1)
+      start.setHours(0, 0, 0)
+      end.setHours(23, 59, 59)
+      picker.$emit('pick', [start, end])
+    }
+  }
+]
+
 let shortcuts_2 = [
   {
     text: $lc('最近一月'),
@@ -149,6 +196,10 @@ export default {
       type: Boolean,
       default: true
     },
+    startStop: {
+      type: Boolean,
+      default: false
+    },
     clearable: {
       type: Boolean,
       default: true
@@ -160,7 +211,8 @@ export default {
   },
   data() {
     let shortcuts = undefined
-    if (this.shortcuts && ['daterange', 'datetimerange'].includes(this.type)) shortcuts = shortcuts_2
+    if (this.shortcuts && ['daterange', 'datetimerange'].includes(this.type))
+      shortcuts = this.startStop ? shortcuts_2 : shortcuts_1
 
     this.pickerOptionsAs = Object.assign(
       {
@@ -171,7 +223,11 @@ export default {
       this.pickerOptions
     )
 
-    this.listeners = Object.assign({}, this.$listeners, { input: () => {}, change: () => {}, blur: this.HandleBlur })
+    this.listeners = Object.assign({}, this.$listeners, {
+      input: () => {},
+      change: () => {},
+      blur: this.HandleBlur
+    })
     return {}
   },
   computed: {

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/components/TablePro/index.vue

@@ -8,7 +8,6 @@
       :height="height"
       :class="{ 'cell-default-set--': cellDefault }"
       :checkbox-config="{ checkField: 'checked', checkMethod: forbidSelect }"
-      v-bind="Object.assign({ size: size }, $attrs, sizeBind)"
       show-overflow
       show-header-overflow
       :row-config="{ isHover: true, useKey: true, ...$attrs.rowConfig }"
@@ -23,6 +22,7 @@
         ...$attrs.sortConfig
       }"
       :filter-config="{ remote: true, iconNone: 'n20-icon-xiala-moren', iconMatch: 'n20-icon-xiala-moren' }"
+      v-bind="Object.assign({ size: size }, $attrs, sizeBind)"
       v-on="$listeners"
       @sort-change="(val) => customSortMethod(val)"
       @filter-change="filterChange"

package/src/components/Upload/uploadMsg.vue

@@ -13,7 +13,10 @@
       <template v-if="!hidePercent">
         <p v-if="!percentType">{{ '系统处理中，请稍等......' | $lc }}</p>
         <div v-else>
-          <div v-if="validateResult" class="m-b"><span class="m-r-m">导入文件</span>{{ validateResult.name }}</div>
+          <div v-if="validateResult" class="m-b">
+            <span class="m-r-m">{{ '导入文件' | $lc }}</span
+            >{{ validateResult.name }}
+          </div>
           <div class="flex-box">
             <div class="m-r-m">{{ '导入进度' | $lc }}</div>
             <div class="flex-item">

package/src/i18n.json

@@ -194,6 +194,9 @@
   "取消": {
     "en": "Cancel"
   },
+  "取消导入": {
+    "en": "Cancel import"
+  },
   "省市区级联": {
     "en": "Provincial, municipal and district cascade"
   },

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 = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'] //汉字的数字
+  var cnIntRadice = ['', '拾', '佰', '仟'] //基本单位
+  var cnIntUnits = ['', '万', '亿', '兆'] //对应整数部分扩展单位
+  var cnDecUnits = ['角', '分', '毫', '厘'] //对应小数部分单位
+  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
 }
 /**
  * 单个数字转换

package/src/components/AdvancedFilter/filterList.vue

@@ -1,163 +0,0 @@
-<template>
-  <el-form :class="prefixCls + '-body'">
-    <slot name="prefix"></slot>
-    <el-form-item
-      v-for="(item, i) in dataC"
-      :key="i"
-      :class="[prefixCls + '-item', activeClass(item)]"
-      :label="item.label"
-    >
-      <div :class="prefixCls + '-content'">
-        <slot v-if="item.slotName" :name="item.slotName"></slot>
-        <formItemInput v-else :form="form" :item="item" @change="$emit('change')" />
-      </div>
-      <i :key="i" :class="[prefixCls + '-item-close', 'n20-icon-yichu']" @click="handleClose(item)"></i>
-    </el-form-item>
-    <slot name="suffix"></slot>
-    <el-form-item :class="prefixCls + '-add'">
-      <el-button v-popover:advanced_popover onlyicon plain icon="el-icon-plus" />
-      <el-popover ref="advanced_popover" placement="bottom-start" trigger="click">
-        <el-form>
-          <InputSearch
-            v-model="search"
-            clearable
-            class="input-w m-b-s"
-            :placeholder="$l('搜索筛选条件')"
-            @change="searchFn"
-          />
-          <filterItem :filter-list="filterListC" :check-array.sync="checkList" @checked="check" />
-        </el-form>
-      </el-popover>
-      <el-link class="m-l-s f-s-s" :underline="false" icon="n20-icon-qingchu" @click="cleared"> 清除条件</el-link>
-    </el-form-item>
-  </el-form>
-</template>
-
-<script>
-import formItemInput from './form-item-input.vue'
-import InputSearch from '../InputSearch/index.vue'
-import filterItem from './filterItem.vue'
-import mixins from './mixins/index.js'
-
-export default {
-  name: 'FilterList',
-  components: {
-    filterItem,
-    InputSearch,
-    formItemInput
-  },
-  mixins: [mixins],
-  props: {
-    data: {
-      type: Array,
-      default: () => []
-    },
-    form: {
-      type: Object,
-      default: () => ({})
-    },
-    width: {
-      type: String,
-      default: '90%'
-    },
-    filterList: {
-      type: Array,
-      default: () => []
-    },
-    filterId: {
-      type: String,
-      default: ''
-    },
-    prefixCls: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      search: '',
-      dataC: [],
-      filterListC: []
-    }
-  },
-  watch: {
-    GroupData: {
-      handler(value) {
-        this.dataC = value
-      },
-      immediate: true
-    },
-    filterList: {
-      handler(value) {
-        this.filterListC = value
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  mounted() {
-    this.getFilterList()
-  },
-  methods: {
-    handleClose(item) {
-      let data = this.GroupData.filter((s) => {
-        return s.label !== item.label || s.value !== item.value
-      })
-      this.saveFilter(data).then(({ code }) => {
-        if (code === 200) {
-          this.getFilterList()
-        }
-      })
-    },
-    searchFn() {
-      this.filterListC = this.cloneDeepFList.filter((r) => {
-        return r.label.includes(this.search)
-      })
-    },
-    check(keys) {
-      this.checkList = keys
-      let groupFilter = []
-      if (keys.length > 0) {
-        keys.forEach((k) => {
-          groupFilter.push(this.filterList.find((s) => s.label === k))
-        })
-      }
-      this.saveFilter(groupFilter).then(({ code }) => {
-        if (code === 200) {
-          this.getFilterList()
-        }
-      })
-    },
-    activeClass(item) {
-      let flag = ''
-      switch (item.type) {
-        case 'text':
-        case 'search':
-        case 'select':
-        case 'number':
-        case 'date':
-        case 'datetime':
-        case 'year':
-        case 'month':
-        case 'week':
-        case 'checkbox':
-        case 'radio':
-          flag = this.form[item.value] && this.form[item.value].length > 0 ? this.prefixCls + '-active' : ''
-          break
-        case 'numberrange':
-          flag = this.form[item.startValue] && this.form[item.endValue] ? this.prefixCls + '-active' : ''
-          break
-        case 'daterange':
-        case 'datetimerange':
-        case ' monthrange':
-          flag = this.form[item.startDate] && this.form[item.endDate] ? this.prefixCls + '-active' : ''
-          break
-      }
-      return flag
-    },
-    cleared() {
-      this.$emit('clear')
-    }
-  }
-}
-</script>