n20-common-lib 1.3.105 → 1.3.107

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -84,7 +84,12 @@
       append-to-body
       top="7.5vh"
     >
-      <carboncopy-prop :carbon-copy-list="addTaskList" @close="setAddtaskV = false" @confirm="setAddtaskOk" />
+      <carboncopy-prop
+        type="addtask"
+        :carbon-copy-list="addTaskList"
+        @close="setAddtaskV = false"
+        @confirm="setAddtaskOk"
+      />
     </cl-dialog>
   </div>
 </template>

package/src/components/ApprovalButtons/setCarboncopyProp.vue

@@ -81,6 +81,10 @@ export default {
     carbonCopyList: {
       type: Array,
       default: () => []
+    },
+    type: {
+      type: String,
+      default: undefined
     }
   },
   data() {
@@ -112,6 +116,9 @@ export default {
   },
   methods: {
     getList() {
+      if (this.type === 'addtask' && window._isAddtask_get_userlist_extend_data_) {
+        this.searchObj = Object.assign(this.searchObj, window._isAddtask_get_userlist_extend_data_)
+      }
       this.$axios
         .post('/bems/activiti/online/chdUserInfo', {
           data: this.searchObj,

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

@@ -19,18 +19,24 @@
     />
     <el-divider class="header-wrap-logo-hr" direction="vertical" />
     <!-- eslint-disable-next-line vue/no-v-html -->
-    <h3 class="header-title" v-html="headerTitle"></h3>
-    <el-tooltip :content="'帮助文档' | $lc">
-      <span class="set-user-btn n20-icon-xinxitishi header-color" @click="openHelp"></span>
+    <h3 class="header-title m-r-auto" v-html="headerTitle"></h3>
+    <el-tooltip v-if="!hideHelpDoc" :content="'帮助文档' | $lc">
+      <span class="set-user-btn n20-icon-xinxitishi header-color m-l-m" @click="openHelp"></span>
     </el-tooltip>
 
     <el-dropdown class="m-l-m" trigger="click" placement="bottom" size="medium" @command="setUserFn">
       <span class="set-user-btn el-icon-setting header-color"></span>
 
       <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item icon="el-icon-document" command="setLang">{{ '语言切换' | $lc }} </el-dropdown-item>
-        <el-dropdown-item icon="el-icon-document" command="dowApp">{{ '客户端下载' | $lc }}</el-dropdown-item>
-        <el-dropdown-item icon="el-icon-document" command="setTheme">{{ '主题设置' | $lc }}</el-dropdown-item>
+        <el-dropdown-item v-if="!hideLang" icon="el-icon-document" command="setLang"
+          >{{ '语言切换' | $lc }}
+        </el-dropdown-item>
+        <el-dropdown-item v-if="!hideDowApp" icon="el-icon-document" command="dowApp">{{
+          '客户端下载' | $lc
+        }}</el-dropdown-item>
+        <el-dropdown-item v-if="!hideTheme" icon="el-icon-document" command="setTheme">{{
+          '主题设置' | $lc
+        }}</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
 
@@ -150,6 +156,8 @@ import dayjs from 'dayjs'
 import duration from 'dayjs/plugin/duration'
 dayjs.extend(duration)
 
+import { siteTree2menus } from '../../LoginTemporary/utils'
+
 const prefix = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || process.env.BASE_URL || '/'
 
 export default {
@@ -186,6 +194,10 @@ export default {
       headerColor: undefined,
       headerBgUrl: undefined,
       headerBgColor: undefined,
+      hideHelpDoc: undefined,
+      hideLang: undefined,
+      hideDowApp: undefined,
+      hideTheme: undefined,
       userInfo: {},
       userNo: window.sessionStorage.getItem('userNo'),
       durationTime: $lc('00小时00分00秒'),
@@ -213,6 +225,10 @@ export default {
       this.headerColor = _layoutData.headerColor
       this.headerBgUrl = realUrl(_layoutData.headerBgUrl)
       this.headerBgColor = _layoutData.headerBgColor
+      this.hideHelpDoc = _layoutData.hideHelpDoc
+      this.hideLang = _layoutData.hideLang
+      this.hideDowApp = _layoutData.hideDowApp
+      this.hideTheme = _layoutData.hideTheme
 
       if (_loginSetting !== 'JSON') {
         axios.get(`/bems/1.0/sysSetting/list`, null, { loading: false, noMsg: true }).then(({ data }) => {
@@ -257,17 +273,21 @@ export default {
     },
     // 打开帮助文档
     openHelp() {
-      axios.get(`/bems/1.0/userManual`, {}, { responseType: 'blob' }).then((res) => {
-        if (!res.size) {
-          this.$message.error($lc('暂无帮助文档，请联系管理员！'))
-          return
-        }
-        let url = window.URL.createObjectURL(res)
-        let win = window.open(url, $lc('帮助文档'))
-        setTimeout(function () {
-          win.document.title = $lc('帮助文档')
-        }, 1000)
-      })
+      axios
+        .get(`/bems/1.0/userManual`, {}, { responseType: 'blob' })
+        .then((res) => {
+          let url = window.URL.createObjectURL(res)
+          let win = window.open(url, $lc('帮助文档'))
+          setTimeout(function () {
+            win.document.title = $lc('帮助文档')
+          }, 1000)
+        })
+        .catch(({ code }) => {
+          if (code === 404) {
+            this.$message.error($lc('暂无帮助文档，请联系管理员！'))
+            return
+          }
+        })
     },
     setUserFn(c) {
       switch (c) {
@@ -304,7 +324,15 @@ export default {
       this.langV = false
       window.localStorage.setItem('pageLang', this.langVal)
       Cookies.set('language', ['zh-cn', 'zh-hk'].includes(this.langVal) ? 'zh' : this.langVal)
-      window.location.reload()
+
+      window.localStorage.setItem('pre-change-pageLang', this.langVal)
+      auth.setReqLang()
+      axios.get('/bems/1.0/menuTree/tree').then(({ data }) => {
+        data || (data = [])
+        let layoutMenus = siteTree2menus(data)
+        sessionStorage.setItem('menuTree', JSON.stringify(layoutMenus))
+        window.location.reload()
+      })
     },
     setTheme({ value }) {
       this.themeVal = value

package/src/utils/auth.js

@@ -3,10 +3,7 @@ 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]
+let reqLang = undefined
 
 const auth = {
   stokenKey: 'token',
@@ -53,6 +50,11 @@ const auth = {
       window.location.href = loginHref
     }
   },
+  setReqLang() {
+    let langMap = { 'zh-cn': 'zh_CN', en: 'en_US', 'zh-hk': 'zh_TW' }
+    let langKey = window.localStorage.getItem('pageLang') || 'zh-cn'
+    reqLang = langMap[langKey]
+  },
   setHeaders(headers, desc) {
     let token = auth.getToken()
     let defaultHd = {
@@ -73,6 +75,7 @@ const auth = {
   }
 }
 
+auth.setReqLang()
 auth.cokenKey = 'Admin-Token'
 
 export default auth

package/src/utils/axios.js

@@ -135,7 +135,7 @@ function request(opt) {
         if (opt.responseType === 'blob') {
           let filename = getFilename(res.headers['content-disposition'])
           filename && res.data && (res.data.name = filename.replace(/"/g, ''))
-          res.data.size === 0 ? reject(opt.url + $lc('请求返回文件大小0KB')) : resolve(res.data)
+          res.data.size === 0 ? reject({ code: 404, msg: opt.url + $lc('请求返回文件大小0KB') }) : resolve(res.data)
         } else {
           if (typeof res.data === 'object' && res.data.data === undefined) {
             res.data.data = {}