n20-common-lib 1.2.16 → 1.2.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.2.16",
+  "version": "1.2.19",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -30,6 +30,7 @@
     "axios": "^0.21.4",
     "dayjs": "^1.10.6",
     "js-cookie": "^3.0.1",
+    "jsonwebtoken": "^8.5.1",
     "normalize.css": "^8.0.1",
     "numerify": "^1.2.9",
     "resize-detector": "^0.3.0",

package/src/assets/css/cl-secondary-tab.scss

@@ -14,12 +14,10 @@
       font-weight: 500;
       &::after {
         content: '';
-        position: absolute;
-        left: 0;
-        bottom: 0;
-        height: 2px;
-        width: 100%;
-        background-color: $--color-primary;
+        height: 6px;
+        background-color: #007aff;
+        display: block;
+        margin-top: -1px;
       }
     }
     &.is-disabled {

package/src/components/LoginTemporary/form.vue

@@ -177,6 +177,7 @@
 </template>
 
 <script>
+import decode from 'jsonwebtoken/decode'
 import axios from '../../utils/axios'
 import auth from '../../utils/auth'
 import qrCode from './qrcode.vue'
@@ -223,6 +224,7 @@ export default {
         accountPthon: '账户密码验证码登录'
       },
       theType: this.loginTypes[0],
+      userNo: undefined,
       form: {
         username: '',
         password: '',
@@ -243,7 +245,8 @@ export default {
         ]
       },
       fPwV: false,
-      codeNum: '验证码'
+      codeNum: '验证码',
+      getAzCount: 0
     }
   },
   methods: {
@@ -321,22 +324,41 @@ export default {
       })
     },
     // 获取加密参数
-    async authorizationCode(username, password, code) {
+    authorizationCode(username, password, code) {
+      this.getAzCount = this.getAzCount + 1
+
       let pwdArr = code ? [username, password, code] : [username, password]
       let pwd = pwdArr.join('@@')
 
-      let { data = {} } = await axios.get(
-        '/bems/prod_1.0/uas/api/authorization/authorizationCode',
-        {},
-        { loading: false }
-      )
-      try {
-        pwd = encode(pwd, data.authorizationValue)
-      } catch (error) {
-        this.loadingV = false
-        // this.$message.warning('密码加密错误')
-      }
-      this.pwd = pwd + '@@' + data.authorizationKey
+      return new Promise((resolve, reject) => {
+        if (this.getAzCount <= 3) {
+          axios
+            .get(
+              '/bems/prod_1.0/uas/api/authorization/authorizationCode',
+              {},
+              { loading: false }
+            )
+            .then(({ data = {} }) => {
+              try {
+                pwd = encode(pwd, data.authorizationValue)
+                this.pwd = pwd + '@@' + data.authorizationKey
+
+                this.getAzCount = 0
+                resolve()
+              } catch (error) {
+                console.error('密码加密错误:' + JSON.stringify(data))
+                this.authorizationCode(username, password, code) // 再次请求
+                  .then(resolve)
+                  .catch(reject)
+              }
+            })
+        } else {
+          // 当重新请求大于3次,抛出错误
+          this.$message.warning(`登录失败，请重新登录！`)
+          this.getAzCount = 0
+          reject()
+        }
+      })
     },
     // 账号/密码登录
     async passwordLogin() {
@@ -467,6 +489,14 @@ export default {
     // 登录成功后
     loginAfter(data) {
       auth.setToken(data.accessToken)
+      try {
+        let tokenObj = decode(data.accessToken)
+        let userInfo = JSON.parse(tokenObj.user_name)
+        this.userNo = userInfo.userNo
+      } catch (error) {
+        console.error('accessToken解析错误:' + data.accessToken)
+      }
+
       Promise.all([
         this.getUserInfo(),
         this.getMicroAppsInfo(),
@@ -483,7 +513,7 @@ export default {
     },
     // 获取用户基本信息
     async getUserInfo() {
-      let username = this.form.username
+      let username = this.userNo
       let { data } = await axios.get(
         // '/bems/prod_1.0/user/api/userController/userCltAdDep/' + username
         '/bems/prod_1.0/user/api/userController/userCltAdRole/' + username
@@ -517,7 +547,7 @@ export default {
         axios
           .post(
             '/bems/prod_1.0/user/api/userController/qryBusyInfoNo',
-            { uno: this.form.username },
+            { uno: this.userNo },
             { loading: false, noMsg: true }
           )
           .then(({ data: cltrelaMap = [] }) => {

package/src/directives/VHas/index.js

@@ -14,6 +14,20 @@ export function has(vals, clt) {
   }
 }
 
+export function hasG(vals, clt) {
+  let relaNos = []
+  if (clt) {
+    relaNos = getCltRela(clt)
+  } else {
+    relaNos = getRela().relaNosGlobal
+  }
+  if (typeof vals === 'string') {
+    return relaNos.includes(vals)
+  } else if (Array.isArray(vals)) {
+    return vals.some((val) => relaNos.includes(val))
+  }
+}
+
 const directive = {}
 directive.install = (Vue) => {
   Vue.prototype.$has = has
@@ -27,6 +41,18 @@ directive.install = (Vue) => {
       !has(binding.value, binding.arg) && el.parentNode.removeChild(el)
     }
   })
+  // 全局查找
+  Vue.prototype.$hasG = hasG
+
+  Vue.filter('isHasG', hasG)
+
+  Vue.filter('noHasG', (v, arg) => !hasG(v, arg))
+
+  Vue.directive('hasG', {
+    inserted(el, binding) {
+      !hasG(binding.value, binding.arg) && el.parentNode.removeChild(el)
+    }
+  })
 }
 
 export default directive

package/src/directives/VTitle/index.js

@@ -3,8 +3,10 @@ import Tooltip from './tooltip.vue'
 let timer = undefined
 
 function tipShow(el, tip) {
+  let _input = el.querySelector('.el-input__inner')
+  if (_input && !el.$tooltipTitle) el.$tooltipTitle = _input.value
   if (el.$tooltipTitle) {
-    let _el = el.querySelector('.el-input__inner') || el
+    let _el = _input || el
     if (!el.$tooltipTitleOverflow || _el.clientWidth < _el.scrollWidth) {
       tip.title = el.$tooltipTitle
       tip.$refs['title-pop'].referenceElm = el

package/src/utils/relaNo.js

@@ -20,6 +20,12 @@ export function setRela(name) {
       relaNos.find((r) => r.appNo === name)
     )
     console.log(relaObj, 'has权限列表')
+
+    let relaNosGlobal = []
+    relaNos.forEach((item) => {
+      relaNosGlobal.push.apply(relaNosGlobal, item.relaNos)
+    })
+    relaObj.relaNosGlobal = relaNosGlobal
     return
   }
   /* 兼容旧门户 */
@@ -31,6 +37,7 @@ export function setRela(name) {
       relaNos.push(item.relaNo)
     })
     relaObj.relaNos = relaNos
+    relaObj.relaNosGlobal = relaNos
   }
 }
 
@@ -61,7 +68,7 @@ export function getCltRela(clt) {
 }
 
 function aandb(a = [], b = []) {
-  if (a.length === 0 || a.length === 0) {
+  if (a.length === 0 || b.length === 0) {
     return []
   } else {
     return a.filter((ai) => b.includes(ai))