n20-common-lib 2.5.5-beta.6 → 2.5.5-beta.8

package/src/components/AdvancedFilter/index.vue

@@ -1,38 +1,37 @@
 <template>
   <div :class="prefixCls">
-    <el-form v-if="visible" :class="prefixCls + '-body'">
+    <el-form v-if="visible" :class="prefixCls + '-body'" @keyup.enter.native="enter">
       <slot name="prefix"></slot>
       <el-form-item
-        v-for="(item, i) in dataC"
+        v-for="(item, i) in GroupData"
         :key="i"
         :class="[prefixCls + '-item', activeClass(item)]"
         :label="item.label"
+        :disabled="item.props && item.props.disabled"
       >
         <div :class="prefixCls + '-content'">
           <slot v-if="item.slotName" :name="item.slotName"></slot>
-          <formItemInput v-else :form="model" :item="item" @change="$emit('change')" />
+          <formItemInput v-else :form="model" :item="item" @blur="$emit('blur')" @change="$emit('change')" />
         </div>
-        <i :key="i" :class="[prefixCls + '-item-close', 'n20-icon-yichu']" @click="handleClose(item)"></i>
+        <i
+          v-if="!item.isDefault"
+          :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-input v-model="keyword" clearable class="input-w m-b-s" :placeholder="$lc('搜索筛选条件')" />
+          <filterItem :filter-list="filterListS" :check-array.sync="checkList" @checked="check" />
         </el-popover>
-        <el-link class="m-l-s f-s-s" :underline="false" icon="n20-icon-qingchu" @click="cleared"> 清除条件</el-link>
+        <el-link class="m-l-s f-s-s" :underline="false" icon="n20-icon-qingchu" @click="cleared">
+          {{ '清除条件' | $lc }}</el-link
+        >
       </el-form-item>
     </el-form>
-    <div v-else :width="width"></div>
   </div>
 </template>
 
@@ -40,8 +39,9 @@
 import formItemInput from './form-item-input.vue'
 import InputSearch from '../InputSearch/index.vue'
 import filterItem from './filterItem.vue'
-
-import mixins from './mixins/index.js'
+import axios from '../../utils/axios.js'
+import { $lc } from '../../utils/i18n/index.js'
+import cloneDeep from 'lodash/cloneDeep'
 const prefixCls = 'n20-advanced-filter'
 export default {
   name: 'AdvancedFilter',
@@ -50,12 +50,7 @@ export default {
     InputSearch,
     filterItem
   },
-  mixins: [mixins],
   props: {
-    type: {
-      type: String,
-      default: ''
-    },
     visible: {
       type: Boolean,
       default: false
@@ -64,18 +59,6 @@ export default {
       type: Array,
       default: () => []
     },
-    defaultShow: {
-      type: Number,
-      default: 5
-    },
-    labelWidth: {
-      type: [String, Number],
-      default: undefined
-    },
-    width: {
-      type: String,
-      default: '90%'
-    },
     model: {
       type: Object,
       default: () => ({})
@@ -87,32 +70,46 @@ export default {
   },
   data() {
     return {
-      search: '',
-      showPop: false,
-      showPopC: false,
+      keyword: '',
       prefixCls,
-      dataC: [],
-      filterListC: [],
       remoteList: [],
-      checkList: []
+      GroupData: [],
+      checkList: [],
+      filterListC: [],
+      checkC: [],
+      userNo: sessionStorage.getItem('userNo')
     }
   },
-  watch: {
-    GroupData: {
-      handler(value) {
-        this.dataC = value
+  computed: {
+    filterListS: {
+      get() {
+        if (!this.keyword) {
+          return this.filterList
+        } else {
+          const keywordLowerCase = this.keyword
+          return this.filterList.filter((item) => item.label.includes(keywordLowerCase))
+        }
       },
-      immediate: true
+      set(v) {
+        return v
+      }
+    }
+  },
+  watch: {
+    visible: {
+      handler(val) {
+        val && this.getFilterList()
+      }
     },
-    filterList: {
+    model: {
       handler(value) {
-        this.filterListC = value
+        this.$emit('change', value)
       },
-      deep: true,
-      immediate: true
+      deep: true
     }
   },
-  mounted() {
+  created() {
+    this.filterListC = cloneDeep(this.filterList)
     this.getFilterList()
   },
   methods: {
@@ -123,19 +120,28 @@ export default {
       }
     },
     activeClass(item) {
-      console.log(item)
       let flag = ''
       switch (item.type) {
+        case 'select':
+          if (item.multiple) {
+            flag = this.model[item.value] && this.model[item.value].length ? this.prefixCls + '-active' : ''
+          } else {
+            flag = this.model[item.value] ? this.prefixCls + '-active' : ''
+          }
+          break
         case 'text':
         case 'search':
-        case 'select':
         case 'number':
         case 'date':
         case 'datetime':
         case 'year':
         case 'month':
         case 'week':
+          flag = this.model[item.value] ? this.prefixCls + '-active' : ''
+          break
         case 'checkbox':
+          flag = this.model[item.value] && this.model[item.value].length ? this.prefixCls + '-active' : ''
+          break
         case 'radio':
           flag = this.model[item.value] ? this.prefixCls + '-active' : ''
           break
@@ -151,7 +157,41 @@ export default {
       return flag
     },
     handleClose(item) {
+      switch (item.type) {
+        case 'select':
+          this.model[item.value] = item.multiple ? [] : null
+          break
+        case 'text':
+        case 'search':
+        case 'number':
+        case 'date':
+        case 'datetime':
+        case 'year':
+        case 'month':
+        case 'radio':
+        case 'week':
+          this.model[item.value] = null
+          break
+        case 'checkbox':
+          this.model[item.value] = []
+
+          break
+        case 'numberrange':
+          this.model[item.startValue] = null
+          this.model[item.endValue] = null
+          break
+        case 'daterange':
+        case 'datetimerange':
+        case ' monthrange':
+          this.model[item.startDate] = null
+          this.model[item.endDate] = null
+          break
+      }
       let data = this.GroupData.filter((s) => {
+        if (s.label !== item.label) {
+          s.checked = true
+          return s
+        }
         return s.label !== item.label || s.value !== item.value
       })
       this.saveFilter(data).then(({ code }) => {
@@ -160,27 +200,96 @@ export default {
         }
       })
     },
-    searchFn() {
-      this.filterListC = this.cloneDeepFList.filter((r) => {
-        return r.label.includes(this.search)
-      })
-    },
     cleared() {
       this.$emit('clear')
     },
+    enter() {
+      this.$emit('enter', this.model)
+    },
+
     check(keys) {
+      // 保存当前选择的过滤条件
       this.checkList = keys
-      let groupFilter = []
+      let saveCheckArr = []
+      // 如果keys数组不为空
       if (keys.length > 0) {
+        // 遍历keys数组
         keys.forEach((k) => {
-          groupFilter.push(this.filterList.find((s) => s.label === k))
+          // 遍历filterList数组
+          this.filterList.forEach((el) => {
+            // 判断当前元素是否在keys数组中
+            const found = keys.find((k) => k.label === el.label)
+            if (found) {
+              // 如果在keys数组中找到了当前元素，将其checked属性设置为true
+              el.checked = true
+              saveCheckArr.push(el)
+            } else {
+              // 如果在keys数组中未找到当前元素，将其checked属性设置为false
+              el.checked = false
+            }
+          })
         })
       }
-      this.saveFilter(groupFilter).then(({ code }) => {
+      // 保存过滤条件
+      this.saveFilter(saveCheckArr).then(({ code }) => {
+        // 如果保存成功
         if (code === 200) {
+          // 重新获取过滤条件列表
           this.getFilterList()
         }
       })
+    },
+    /**
+     * 保存筛选条件
+     * @param data
+     */
+    saveFilter(data) {
+      return new Promise((resolve) => {
+        axios
+          .post(
+            `/bems/prod_1.0/user/pageHabit?t=${Date.now()}`,
+            {
+              userNo: this.userNo,
+              pageId: this.filterId,
+              showStructure: JSON.stringify(data)
+            },
+            { loading: false, noMsg: true }
+          )
+          .then((res) => {
+            resolve(res)
+          })
+      })
+    },
+    /**
+     * 获取筛选条件
+     */
+    getFilterList() {
+      axios
+        .post(
+          `/bems/prod_1.0/user/pageHabit/list?t=${Date.now()}`,
+          {
+            userNo: this.userNo,
+            pageId: this.filterId
+          },
+          { loading: false, noMsg: true }
+        )
+        .then(({ data }) => {
+          let _data = JSON.parse(data)
+          if (_data && _data.length > 0) {
+            this.GroupData = this.filterList.filter((item) => {
+              return _data.find((i) => i.checked && item.label === i.label)
+            })
+          } else {
+            this.GroupData = this.filterList.filter((item) => {
+              if (item.isDefault) {
+                item.checked = true
+                return item
+              }
+            })
+          }
+          this.checkList = this.GroupData
+          this.checkC = cloneDeep(this.checkList)
+        })
     }
   }
 }

package/src/components/FileUploadTable/index.vue

@@ -467,7 +467,6 @@ export default {
       if (this.getFileMethod) {
         return this.getFileMethod(row, type)
       }
-
       let _url = row[this.keys.url]
       this.seePrefix && (_url = this.seePrefix + _url)
       if (_url) {
@@ -475,15 +474,15 @@ export default {
           // 预览
           return {
             url: `/api/onlinePreview?beid=${row[this.keys.url]}`,
-            name: row.name + '.html',
-            sameOrg: this.seeTypes.test(row.name)
+            name: row[this.keys.name] + '.html',
+            sameOrg: this.seeTypes.test(row[this.keys.name])
           }
         } else {
           // 下载
-          let blob = await this.$axios.get(`/api/neams/eamsbaserecord/download/${row[this.keys.url]}`, null, {
+          let blob = await this.$axios.get(`/neams/eamsbaserecord/download/${row[this.keys.url]}`, null, {
             responseType: 'blob'
           })
-          let name = row.name || blob.name
+          let name = row[this.keys.name] || blob.name
           return {
             url: URL.createObjectURL(blob),
             name: name,

package/src/components/Layout/HeaderWrap/indexN.vue

@@ -67,11 +67,11 @@
       </el-dropdown-menu>
     </el-dropdown>
 
-    <el-tooltip v-if="!hideDowApp" :content="'帮助文档' | $lc">
+    <el-tooltip v-if="!hideHelpDoc" :content="'帮助文档' | $lc">
       <span class="set-user-btn iconfont icon-bangzhuwendang header-color m-l-lg" @click="openHelp"></span>
     </el-tooltip>
 
-    <el-tooltip v-if="!hideHelpDoc" :content="'客户端下载' | $lc">
+    <el-tooltip v-if="!hideDowApp" :content="'客户端下载' | $lc">
       <span class="set-user-btn iconfont icon-kehuduanxiazai header-color m-l-lg" @click="dowApp"></span>
     </el-tooltip>
 

package/src/components/LoginTemporary/form.vue

@@ -248,9 +248,7 @@ export default {
       immediate: true
     }
   },
-  mounted() {
-    console.log(this.showForgetBtn)
-  },
+  mounted() {},
   methods: {
     // 忘记密码
     forgetPw() {

package/src/components/LoginTemporary/indexN.vue

@@ -322,7 +322,7 @@ export default {
       sltSys: {},
       loginBg: 'none',
       inspectionV: false,
-      isImageCode: false
+      isImageCode: undefined
     }
   },
   computed: {
@@ -383,7 +383,7 @@ export default {
       return form
     },
     imgCode() {
-      return this.showImageCode ?? this.isImageCode
+      return this.isImageCode ?? this.showImageCode
     }
   },
   watch: {
@@ -415,9 +415,11 @@ export default {
   },
   methods: {
     getIsImgCode() {
-      axios.get(`/bems/prod_1.0/uas/api/authorization/isimgcode`).then(({ data }) => {
-        this.isImageCode = data
-      })
+      axios
+        .get(`/bems/prod_1.0/uas/api/authorization/isimgcode`, null, { loading: false, noMsg: true })
+        .then(({ data }) => {
+          this.isImageCode = data
+        })
     },
     async loginThenT() {
       if (this.sltSys?.NO) {

package/src/components/TablePro/index.vue

@@ -66,17 +66,24 @@
           v-bind="item"
         />
       </template>
+      <template #empty>
+        <slot name="empty">
+          <empty type="empty" content="暂无数据" :height="200" :width="200" />
+        </slot>
+      </template>
     </vxe-table>
     <tableSetSize v-if="showSetsize" :size="sizeC" v-bind="$attrs" @update:size="sizeUp" @resize="sizeSet" />
   </div>
 </template>
 
 <script>
+import empty from '../Empty'
 import tableSetSize from '../TableSetSize/index.vue'
 export default {
   name: 'TablePro',
   components: {
-    tableSetSize
+    tableSetSize,
+    empty
   },
   props: {
     data: {

package/src/components/Upload/uploadMsg.vue

@@ -60,9 +60,9 @@
                 :width="column.width"
                 :align="column.align"
                 :show-overflow-tooltip="column.showOverflowTooltip"
+                :formatter="item.formatter | colfF(item.formatterMap)"
               >
                 <template slot-scope="scope">
-                  <!-- eslint-disable-next-line vue/no-v-html -->
                   <span v-html="scope.row[column.prop]"></span>
                 </template>
               </el-table-column>
@@ -104,6 +104,7 @@
 
 <script>
 import { $lc } from '../../utils/i18n/index'
+import { colfF } from '../Table/filters.js'
 export default {
   name: 'UploadMsg',
   props: {
@@ -145,6 +146,9 @@ export default {
       default: false
     }
   },
+  filters: {
+    colfF
+  },
   computed: {
     progressV: {
       get() {

package/src/directives/VRuleKey/index.js

@@ -123,22 +123,30 @@ directive.install = (Vue) => {
     bind(el, binding, node) {
       let _this = node.child
 
+      // 获取表单验证规则
       let ruleForm = _this.$attrs['rule-form'] || _this.$attrs['ruleForm']
       ruleForm && el.classList.add(ruleForm)
 
+      // 获取表单验证错误隐藏
       let rErr = _this.$attrs['rule-error-hide'] || _this.$attrs['ruleErrorHide']
       rErr = rErr !== 'true' && rErr !== true
 
+      // 表单验证
       el[VD] = (val, type) => {
         let _val = _this[binding.value || 'value']
         let _rules = getRules(_this.$attrs['rules'], type)
         if (_rules.length > 0) {
+          // 验证表单
           return Promise.all(_rules.map((rule) => validateRoule(rule, _val)))
             .then(() => {
+              // 验证通过，隐藏错误
               hideErr(el, rErr)
+              return Promise.resolve(true)
             })
             .catch((err) => {
+              // 验证失败，显示错误
               showErr(el, err, rErr)
+              return Promise.resolve(false)
             })
         } else {
           return Promise.resolve()
@@ -160,6 +168,8 @@ directive.install = (Vue) => {
       // })
     }
   })
+  Vue.prototype.$rulesValidateForm = rulesValidateForm
+  Vue.prototype.$rulesValidateFormClear = rulesValidateFormClear
 }
 
 function rulesValidateForm(query, fn) {
@@ -170,8 +180,12 @@ function rulesValidateForm(query, fn) {
       typeof el[VD] === 'function' && validateList.push(el[VD](undefined, 'submit'))
     })
     return Promise.all(validateList)
-      .then(() => {
-        fn && fn(true)
+      .then((res) => {
+        if (res.includes(false)) {
+          fn && fn(false)
+        } else {
+          fn && fn(true)
+        }
       })
       .catch(() => {
         fn && fn(false)

package/src/i18n.json

@@ -21,7 +21,7 @@
     "en": "Online preview is not supported, please"
   },
   "已选合计": {
-    "en": "Selected total"
+    "en": "Total selected"
   },
   "天!": {
     "en": "God!"
@@ -300,7 +300,7 @@
     "en": "Article."
   },
   "笔数": {
-    "en": "Number of pens"
+    "en": "Counts"
   },
   "重新上传": {
     "en": "upload again"

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
 }