n20-common-lib 2.4.41 → 2.4.43

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -482,7 +482,9 @@ export default {
     // 审批
     approvalFn() {
       if (this.required && !this.messageC) {
-        return this.errMsgFn($lc('批准'))
+        return this.errMsgFn(
+          this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
+        )
       }
       if (this.addTaskList.length > 0 && !this.addTaskType) {
         return this.addErrFn()
@@ -490,7 +492,10 @@ export default {
 
       this.beforeFn(this.beforeRatify, () => {
         axios.post('/bems/activiti/admin/todo/advance', this.getParam()).then(({ data }) => {
-          this.thenMsg(data, $lc('批准'))
+          this.thenMsg(
+            data,
+            this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
+          )
         })
       })
     },

package/src/components/FileUploadTable/index.vue

@@ -87,6 +87,7 @@
               :msg-type="null"
               :show-clear="false"
               :action="action"
+              :multiple="multiple"
               :headers="headers"
               :disabled="!row[keys.type] || row._typeDisabled"
               :accept="row[keys.type] | acceptFilter(typeOptions, fileAccept)"
@@ -94,7 +95,12 @@
               :http-request="uploadHttpRequest ? (options) => uploadHttpRequest(options, row) : undefined"
               :before-upload="(file) => beforeUploadFn(file, row)"
               :on-progress="(event) => onProgressFn(event, row)"
-              :on-success="(response, file, fileList) => onSuccessFn(response, file, fileList, row)"
+              :on-success="
+                (response, file, fileList) =>
+                  multiple
+                    ? MultipleSUccessFn(response, file, fileList, row)
+                    : onSuccessFn(response, file, fileList, row)
+              "
               :on-error="(err, file, fileList) => errorFn(err, file, fileList, row, $index)"
             />
           </slot>
@@ -243,7 +249,7 @@ import dayjs from 'dayjs'
 import axios from '../../utils/axios'
 import Upload from '../Upload/index.vue'
 import Dialog from '../Dialog/index.vue'
-
+import cloneDeep from 'lodash/cloneDeep'
 import 'viewerjs/dist/viewer.css'
 import importG from '../../utils/importGlobal.js'
 
@@ -381,6 +387,9 @@ export default {
     },
     keys() {
       return this.dataPorp.keys || keysD
+    },
+    multiple() {
+      return this.dataPorp.multiple || false
     }
   },
   methods: {
@@ -532,7 +541,6 @@ export default {
     onSuccessFn(response, file, fileList, row) {
       this.$set(row, '_name', file.name)
       this.$set(row, '_percent', 100)
-
       row[this.keys.time] = dayjs().format('YYYY-MM-DD HH:mm:ss')
 
       row[this.keys.url] = response.data
@@ -542,6 +550,26 @@ export default {
 
       this.$emit('on-success', file, row)
     },
+    MultipleSUccessFn(response, file, fileList, row) {
+      if (fileList.length > 1) {
+        let deepRow = cloneDeep(row)
+        this.tableData.shift()
+        setTimeout(() => {
+          this.tableData.splice(0, 0, {
+            _name: file.name,
+            _percent: 100,
+            [this.keys.time]: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            [this.keys.url]: response.data,
+            [this.keys.name]: file.name,
+            _status: 'success',
+            [this.keys.user]: deepRow[this.keys.user],
+            [this.keys.type]: deepRow[this.keys.type]
+          })
+        }, 100)
+      } else {
+        this.onSuccessFn(response, file, fileList, row)
+      }
+    },
     errorFn(err, file, fileList, row, $index) {
       this.$set(row, '_status', 'exception')
 

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

@@ -187,8 +187,8 @@
               <i class="el-icon-caret-right m-l-auto m-r-0"></i>
             </div>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item v-for="item in systemList" :key="item.id" @click.native="clickSystem(item)">
-                <span>{{ item.systemName }}</span>
+              <el-dropdown-item v-for="(item, i) in systemList" :key="i" @click.native="clickSystem(item)">
+                <span>{{ item.NAME }}</span>
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -404,14 +404,13 @@ export default {
     /**
      * 获取系统列表
      */
-    async getSystemList() {
-      const { data } = await axios.post(`/bems/portal/portalWidgetSystem/getAll`)
-      this.systemList = data
+    getSystemList() {
+      this.systemList = JSON.parse(localStorage.getItem('SYSTEM_LIST'))
     },
     async getTreeList(item) {
       let { data } = await axios.get(`/bems/1.0/menuTree/tree?t=${Date.now()}`, {
         resType: 1,
-        systemNo: item.systemCode
+        systemNo: item.NO
       })
       let layoutMenus = siteTree2menus(data || [])
       sessionStorage.setItem('menuTree', JSON.stringify(layoutMenus))
@@ -419,7 +418,7 @@ export default {
     async clickSystem(item) {
       await this.getTreeList(item)
       localStorage.setItem('pageInType', 'toFront')
-      window.localStorage.setItem('pageInSystemNo', item.systemCode)
+      window.localStorage.setItem('pageInSystemNo', item.NO)
       let { base = '/' } = this.$router.options
       if (!/\/$/.test(base)) base += '/'
 

package/src/components/LoginTemporary/form.vue

@@ -468,9 +468,13 @@ export default {
             }
           )
           .then((res) => {
+            this.loadingSub()
             this.loginAfter(res.data)
           })
-          .catch(this.getImgCode)
+          .catch(() => {
+            this.loadingSub()
+            this.getImgCode()
+          })
 
         return
       }

package/src/components/LoginTemporary/indexN.vue

@@ -487,6 +487,7 @@ export default {
             }
           })
           .finally(() => {
+            localStorage.setItem('SYSTEM_LIST', JSON.stringify(this.form.SYSTEM_LIST.filter((item) => item.OPEN)))
             resolve()
           })
       })

package/src/components/TablePro/index.vue

@@ -117,7 +117,7 @@ export default {
     let _this = this
     return {
       colsKey: 0,
-      sizeC: _this.size,
+      sizeC: localStorage.getItem('table-size') || _this.size,
       sizeBind: undefined,
       key: 0
     }

package/src/components/WorkCard/index.vue

@@ -64,6 +64,12 @@ export default {
 .work-card ::v-deep .el-badge__content {
   line-height: 14px;
 }
+.work-card .el-badge__content.is-fixed {
+  position: absolute;
+  top: 0;
+  right: -1px;
+  transform: scale(0.7) translateY(-50%) translateX(100%);
+}
 
 .work-card--empty-title {
   color: #cacaca;