n20-common-lib 2.5.38 → 2.5.40

package/package.json

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

package/src/components/ApprovalButtons/showAppOpi.vue

@@ -53,17 +53,37 @@ export default {
     getData() {
       if (this.andUser) {
         axios.post('/bems/activiti/actAppOpi/queryAppOpiAndUser', null, { loading: false }).then(({ data }) => {
-          this.approveMsgList = data || []
+          this.approveMsgList = this.getOnlyData(data || [])
         })
       } else {
         axios.post('/bems/activiti/actAppOpi/queryAppOpi', null, { loading: false }).then(({ data }) => {
-          this.approveMsgList = data.list || []
+          this.approveMsgList = this.getOnlyData(data.list || [])
         })
       }
     },
+    getOnlyData(data) {
+      const length = data.length
+      if (length === 0) {
+        return result
+      }
+      let result = []
+      const suggestionMap = {}
+      for (let i = 0; i < length; i++) {
+        let currentItem = data[i]
+        let suggestion = currentItem.suggestion
+        if (!suggestionMap[suggestion]) {
+          suggestionMap[suggestion] = true
+          result.push(currentItem)
+        }
+      }
+      return result
+    },
     changeFn() {
       // if (this.approveMsgSlt?.length) {
-      this.$emit('update:message', this.approveMsgSlt.join('\n'))
+      this.$emit(
+        'update:message',
+        Array.isArray(this.approveMsgSlt) ? this.approveMsgSlt.join('\n') : this.approveMsgSlt
+      )
       // }
     }
   }

package/src/index.js

@@ -1,7 +1,7 @@
 import './utils/storagePro.js' // 扩展Storage
 /** 提供组件给外部使用的入口 */
-import Anchor from './components/Anchor/index.vue'
 import AnchorItem from './components/Anchor/AnchorItem.vue'
+import Anchor from './components/Anchor/index.vue'
 
 import ApprovalButtons from './components/ApprovalButtons/index.vue'
 import ApproveCard from './components/ApprovalCard/ApproveCard.vue'
@@ -51,9 +51,9 @@ import StatisPopover from './components/Statis/statisPopover.vue'
 import Step from './components/Step/index.vue'
 import Suspend from './components/Suspend/index.vue'
 import Table from './components/Table/index.vue'
-import TablePro from './components/TablePro/index.vue'
 import TableOperate from './components/TableOperateColumn/OperateBtns.vue'
 import TableOperateColumn from './components/TableOperateColumn/index.vue'
+import TablePro from './components/TablePro/index.vue'
 import TableProOperateColumn from './components/TableProOperateColumn/index.vue'
 import TableSetSize from './components/TableSetSize'
 import Task from './components/Task/index.vue'
@@ -62,9 +62,9 @@ import TimePicker from './components/TimePicker/index.vue'
 import Upload from './components/Upload/index.vue'
 import WornPagination from './components/WornPagination/index.vue'
 
-import Tree from './components/Tree/index.vue'
-import SelectTreePro from './components/SelectTree/pro.vue'
 import AdvancedFilter from './components/AdvancedFilter/index.vue'
+import SelectTreePro from './components/SelectTree/pro.vue'
+import Tree from './components/Tree/index.vue'
 
 // 新版日期选择框
 import BusiDatePicker from './components/DateSelect/busiDate.vue'
@@ -92,12 +92,12 @@ import ApprovalRecordZjk from './components/ApprovalRecord/index-zjk.vue'
 /** 注入指令 */
 import VClickOutside from './directives/VClickOutside/index.js'
 import VDrag from './directives/VDrag/index.js'
+import VErrorMessage from './directives/VErrorMessage/index.js'
 import VHas from './directives/VHas/index.js'
 import VMove from './directives/VMove/index.js'
 import VRuleKey from './directives/VRuleKey/index.js'
 import { HoverTooltip, TitleDirective } from './directives/VTitle/index.js'
 import VTableLoading from './directives/loading/index.js'
-import VErrorMessage from './directives/VErrorMessage/index.js'
 
 /** 注入方法 */
 import dayjs from 'dayjs'
@@ -109,7 +109,7 @@ import auth from './utils/auth.js'
 import axios from './utils/axios.js'
 import downloadBlob from './utils/downloadBlob.js'
 import forEachs from './utils/forEachs'
-import { setTabs, refreshTab } from './utils/handleTab.js'
+import { refreshTab, setTabs } from './utils/handleTab.js'
 import imgLoad from './utils/imgLoad.js'
 import importG from './utils/importGlobal.js' // 联合加载组件保存位置
 import list2tree from './utils/list2tree'
@@ -120,7 +120,7 @@ function numerify(input, formatType, roundingFunction) {
   return _numerify(input, formatType, roundingFunction || Math.floor)
 }
 
-import { convert, singleConvert } from './utils/amountInWords.js'
+import { convert } from './utils/amountInWords.js'
 
 /** 国际化 */
 import i18n, { $l } from './utils/i18n'
@@ -251,6 +251,7 @@ export default {
 const linkClose = closeTab
 export {
   $l,
+  AdvancedFilter,
   Anchor,
   AnchorItem,
   ApprovalButtons,
@@ -303,6 +304,7 @@ export {
   SelectLazy,
   SelectTree,
   SelectTreeLazy,
+  SelectTreePro,
   ShowColumn,
   Sifting,
   Stamp,
@@ -312,15 +314,16 @@ export {
   Step,
   Suspend,
   Table,
-  TablePro,
   TableOperate,
   TableOperateColumn,
+  TablePro,
   TableProOperateColumn,
   TableSetSize,
   TableTransfer,
   Task,
   TertiaryTab,
   TimePicker,
+  Tree,
   Upload,
   UploadMsg,
   WorkCard,
@@ -330,14 +333,13 @@ export {
   auth,
   axios,
   closeTab,
+  convert,
   dayjs,
   downloadBlob,
   forEachs,
   getJsonc,
   imgLoad,
   importG,
-  convert,
-  singleConvert,
   // 权限
   isHas,
   isHasG,
@@ -347,12 +349,9 @@ export {
   list2tree,
   numerify,
   operatingStatus,
+  refreshTab,
   repairEl,
   // 页签/路由
   setTabs,
-  refreshTab,
-  Tree,
-  SelectTreePro,
-  AdvancedFilter,
   version
 }