n20-common-lib 1.3.75 → 1.3.76

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -15,6 +15,16 @@
         </div>
         <div v-if="authList.includes('isAddtask')" class="flex-1">
           <el-form-item label="加签" class="m-b">
+            <label slot="label">
+              <span>加签</span>
+              <el-tooltip placement="top">
+                <span class="n20-icon-xinxitishi m-l-ss" style="position: static"></span>
+                <div slot="content" style="width: 16em; line-height: 1.6">
+                  会签并行：增加一个会签节点，全部审批人同意才可通过审批<br />
+                  普通串行：按照加签人数增加节点，每个节点审批通过才可完成当前加签流程
+                </div>
+              </el-tooltip>
+            </label>
             <div class="flex-box">
               <el-select v-model="addTaskType" placeholder="请选择审批方式" style="width: 10em">
                 <!-- <el-option label="普通节点" value="1" /> -->
@@ -214,10 +224,9 @@ export default {
     beforeFn(bFn, callFn) {
       if (!bFn) {
         callFn()
-      } else if (bFn instanceof Promise) {
-        bFn().then(callFn)
-      } else if (bFn instanceof Function) {
-        bFn(callFn)
+      } else {
+        let F = bFn(callFn)
+        F.then && F.then(callFn)
       }
     },
     // 驳回

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

@@ -202,6 +202,12 @@ export default {
     noticePop,
     switchUser
   },
+  props: {
+    beforeLogout: {
+      type: Function,
+      default: undefined
+    }
+  },
   inject: {
     customOpt: {
       type: Object,
@@ -373,9 +379,17 @@ export default {
           type: 'warning'
         }
       ).then(() => {
-        axios.delete('/bems/prod_1.0/uas/api/authorization/logout').then(() => {
-          auth.removeToken()
-        })
+        if (this.beforeLogout) {
+          let F = this.beforeLogout(this.logoutA)
+          F.then && F.then(this.logoutA)
+        } else {
+          this.logoutA()
+        }
+      })
+    },
+    logoutA() {
+      axios.delete('/bems/prod_1.0/uas/api/authorization/logout').then(() => {
+        auth.removeToken()
       })
     },
     // 检查是否代理中

package/src/components/Layout/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="layout-wrap">
-    <headerWrap class="header-wrap" @custom-event="(par) => $emit('custom-event', par)" />
+    <headerWrap class="header-wrap" :before-logout="beforeLogout" @custom-event="(par) => $emit('custom-event', par)" />
     <asideNav :menus="menusC" :active-nav="activeNavC" :collapse.sync="collapse" @menu-click="menuClick" />
     <tabsNav
       class="tabs-nav-wrap"
@@ -52,6 +52,10 @@ export default {
     isTest: {
       type: Boolean,
       default: false
+    },
+    beforeLogout: {
+      type: Function,
+      default: undefined
     }
   },
   data() {

package/src/components/Upload/index.vue

@@ -2,7 +2,7 @@
   <el-upload
     ref="upload"
     :action="action"
-    :headers="headers"
+    :headers="headers | headersF"
     :accept="accept"
     :multiple="multiple"
     :file-list="fileList"
@@ -44,9 +44,15 @@
 </template>
 
 <script>
+import auth from '../../utils/auth'
 import uploadMsg from './uploadMsg.vue'
 export default {
   name: 'Upload',
+  filters: {
+    headersF(headers) {
+      return auth.setHeaders(headers)
+    }
+  },
   components: {
     uploadMsg
   },
@@ -83,13 +89,7 @@ export default {
     },
     headers: {
       type: Object,
-      default: () => ({
-        token: 'Bearer ' + window.sessionStorage.getItem('token') || 'main-token',
-        Authorization: 'Bearer ' + window.sessionStorage.getItem('token') || 'main-token',
-        OperationDesc: 'default',
-        timestamp: Date.now(),
-        requestKey: Date.now()
-      })
+      default: () => ({})
     },
     size: {
       type: [String, Number],

package/src/utils/auth.js

@@ -4,6 +4,10 @@ import Cookies from 'js-cookie'
 const STORAGE = window.sessionStorage
 let ownLoginPath = '/login'
 
+let langMap = { 'zh-cn': 'zh_CN', en: 'en_US', 'zh-hk': 'zh_TW' }
+let langKey = window.localStorage.getItem('pageLang') || 'zh-cn'
+let reqLang = langMap[langKey]
+
 const auth = {
   stokenKey: 'token',
   cokenKey: 'token',
@@ -29,7 +33,6 @@ const auth = {
     STORAGE.removeItem(this.stokenKey)
     auth.toLogin()
   },
-
   setLoginPath(router) {
     let { base = '/', mode = 'history' } = router.options
     ;/\/$/.test(base) || (base += '/')
@@ -50,7 +53,18 @@ const auth = {
       window.location.href = loginHref
     }
   },
+  setHeaders(headers, desc) {
+    let token = auth.getToken()
+    let defaultHd = {
+      Authorization: token ? 'Bearer ' + token : 'Basic TlNUQzpWVkIxVG1sVlVURlNMemxyTkhoc2VtNXdObFJaUVQwOQ==',
+      OperationDesc: desc ? encodeURI(desc) : 'default',
+      timestamp: Date.now(),
+      requestKey: Date.now(),
+      lang: reqLang
+    }
 
+    return Object.assign(defaultHd, headers)
+  },
   // 自定义跳转路径
   customURL(url) {
     sessionStorage.setItem('customLoginUrl', url)

package/src/utils/axios.js

@@ -58,15 +58,7 @@ const config = {
 const axios = _axios.create(config)
 
 axios.interceptors.request.use((opt) => {
-  let token = auth.getToken()
-  let headers = {
-    Authorization: token ? 'Bearer ' + token : 'Basic TlNUQzpWVkIxVG1sVlVURlNMemxyTkhoc2VtNXdObFJaUVQwOQ==',
-    OperationDesc: opt.OperationDesc ? encodeURI(opt.OperationDesc) : 'default',
-    timestamp: Date.now(),
-    requestKey: Date.now()
-  }
-  opt.headers = Object.assign(headers, opt.headers)
-
+  opt.headers = auth.setHeaders(opt.headers, opt.OperationDesc)
   return opt
 })