n20-common-lib 1.3.49 → 1.3.50

package/package.json

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

package/src/assets/css/cl-form-item.scss

@@ -510,7 +510,7 @@ $--input-max: 304px;
   }
 }
 
-.el-select .el-input__inner{
+.el-select .el-input__inner {
   text-overflow: ellipsis;
 }
 
@@ -694,9 +694,25 @@ $--input-max: 304px;
       margin-left: 10px;
     }
   }
-
-  .el-select .el-input__suffix {
-    display: none;
+  &[clearable] {
+    .el-select {
+      .el-input__inner {
+        padding-right: 48px;
+      }
+      .el-input__suffix {
+        right: 26px;
+        .el-icon-arrow-up {
+          display: none;
+        }
+      }
+    }
+  }
+  &:not([clearable]) {
+    .el-select {
+      .el-input__suffix {
+        display: none;
+      }
+    }
   }
 }
 

package/src/components/InputSearch/index.vue

@@ -62,9 +62,11 @@ export default {
   },
   methods: {
     visibleChangeFn(val) {
-      if (val && !this.$refs['input-search']['multiple']) {
-        this.$refs['input-search']['selectedLabel'] =
-          this.$refs['input-search']['currentPlaceholder']
+      if (val && !this.multiple) {
+        if (this.value || this.value === 0) {
+          this.$refs['input-search']['selectedLabel'] =
+            this.$refs['input-search']['currentPlaceholder']
+        }
       }
     },
     changeFn(val) {

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

@@ -80,21 +80,20 @@
         <el-dropdown-item command="changePassword" divided>{{
           '修改密码' | $l(i18n)
         }}</el-dropdown-item>
+        <el-dropdown-item v-if="customOpt.mydeal" command="myDeal" divided>{{
+          '我的交易' | $l(i18n)
+        }}</el-dropdown-item>
         <el-dropdown-item
-          v-if="customOpt.mydeal !== false"
-          command="myDeal"
-          divided
-          >{{ '我的交易' | $l(i18n) }}</el-dropdown-item
-        >
-        <el-dropdown-item
-          v-if="customOpt.agency && customOpt.agency.show"
-          command="myAgency"
+          v-if="customOpt.switchuser"
+          command="switchUser"
           divided
+          >{{ '切换用户' | $l(i18n) }}</el-dropdown-item
         >
+        <el-dropdown-item v-if="customOpt.agency" command="myAgency" divided>
           <div class="flex-box flex-v">
             <span>{{ '工作代理' | $l(i18n) }}</span>
             <el-badge
-              v-if="customOpt.agency.underway"
+              v-if="underway"
               class="m-l-auto font-size-small color-primary"
               is-dot
               type="primary"
@@ -169,6 +168,14 @@
     >
       <noticePop ref="noticeContent" :num.sync="noticeNum" />
     </el-popover>
+    <el-dialog
+      :visible.sync="scV"
+      :title="'切换用户' | $l(i18n)"
+      append-to-body
+      width="600px"
+    >
+      <switchUser :visible.sync="scV" :user-no="userNo" />
+    </el-dialog>
   </div>
 </template>
 
@@ -179,8 +186,9 @@ import { themeList } from '../../../utils/theme.config.js'
 import dialogWrap from '../../Dialog/index.vue'
 import changePwd from './changePwd.vue'
 import noticePop from './noticePop.vue'
-import axios from '../../../utils/axios'
+import switchUser from './switchUser.vue'
 
+import axios from '../../../utils/axios'
 import getJsonc from '../../../assets/getJsonc'
 import realUrl from '../../../assets/realUrl'
 import auth from '../../../utils/auth'
@@ -208,6 +216,9 @@ const i18n = {
   我的交易: {
     en: 'My deal'
   },
+  切换用户: {
+    en: 'Switch User'
+  },
   工作代理: {
     en: 'My agency'
   },
@@ -247,7 +258,8 @@ export default {
   components: {
     dialogWrap,
     changePwd,
-    noticePop
+    noticePop,
+    switchUser
   },
   inject: {
     customOpt: {
@@ -264,6 +276,7 @@ export default {
       headerTitle: undefined,
       headerUserUrl: undefined,
       userInfo: {},
+      userNo: window.sessionStorage.getItem('userNo'),
       durationTime: '00小时00分00秒',
       cpwdV: false,
       langV: false,
@@ -273,6 +286,8 @@ export default {
       themeVal: window.localStorage.getItem('pageTheme') || 'default',
       noticeNum: 0,
       rolesList: [],
+      scV: false,
+      underway: false,
       i18n
     }
   },
@@ -295,12 +310,16 @@ export default {
     setUserVisible(v) {
       if (v) {
         let userInfo = JSON.parse(sessionStorage.getItem('userInfo') || '{}')
+
+        this.userNo = userInfo.uno
         this.userInfo = {
           userName: userInfo.uname,
           companyName: userInfo.cltName
         }
         this.rolesList = userInfo.roles || []
 
+        this.customOpt.agency && this.getProxyAuthIing()
+
         let loginTime = sessionStorage.getItem('loginTime')
         if (loginTime) {
           this.setDurationTime(loginTime)
@@ -356,6 +375,15 @@ export default {
         case 'logOut':
           this.logOut()
           break
+        case 'myDeal':
+          this.$router.push('/activiti/alreadyToExamine')
+          break
+        case 'myAgency':
+          this.$router.push('/user-web/agency')
+          break
+        case 'switchUser':
+          this.switchUser()
+          break
         default:
           this.$emit('custom-event', { type: c })
           break
@@ -393,6 +421,9 @@ export default {
       // alert('修改密码')
       this.cpwdV = true
     },
+    switchUser() {
+      this.scV = true
+    },
     logOut() {
       // alert('退出登录')
       this.$confirm(
@@ -406,6 +437,16 @@ export default {
       ).then(() => {
         auth.removeToken()
       })
+    },
+    // 检查是否代理中
+    async getProxyAuthIing() {
+      let res = await axios.get(
+        `/bems/prod_1.0/user/wfUserProxyAuth/check/ongoing/${this.userNo}`,
+        null,
+        { loading: false, noMsg: true }
+      )
+
+      this.underway = !!res.data
     }
   }
 }

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

@@ -0,0 +1,67 @@
+<template>
+  <el-table :data="userListBanck" style="width: 100%">
+    <el-table-column type="index" label="序号" />
+    <el-table-column prop="uno" label="账号" width="180" />
+    <el-table-column prop="cltName" label="单位" />
+    <el-table-column width="100" label="操作">
+      <template slot-scope="{ row }">
+        <el-button v-if="userNo === row.uno" type="text" disabled
+          >当前用户</el-button
+        >
+        <el-button v-else type="text" @click="handleChange(row.uno)"
+          >切换</el-button
+        >
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script>
+import axios from '../../../utils/axios'
+import auth from '../../../utils/auth'
+
+export default {
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    userNo: {
+      type: String,
+      default: undefined
+    }
+  },
+  data() {
+    return {
+      userListBanck: [{}]
+    }
+  },
+  created() {
+    axios
+      .get(
+        `/bems/prod_1.0/user/api/userController/queryUserListByUserNo/${this.userNo}`
+      )
+      .then(({ data }) => {
+        this.userListBanck = data
+      })
+  },
+  methods: {
+    handleChange(uno) {
+      axios
+        .get(`/bems/prod_1.0/uas/api/authorization/switchUser/${uno}`)
+        .then(({ data }) => {
+          this.$emit('update:visible', false)
+
+          window.sessionStorage.setItem('_auto_login_ing_', true)
+          window.sessionStorage.setItem(
+            '_auto_login_data_',
+            JSON.stringify(data)
+          )
+          auth.toLogin()
+        })
+    }
+  }
+}
+</script>
+
+<style></style>

package/src/components/LoginTemporary/index.vue

@@ -1,5 +1,15 @@
 <template>
+  <div v-if="alV" v-loading="alV" class="login-wrap">
+    <loginForm
+      ref="login-form"
+      :login-types="LOGIN_MODE || loginTypes"
+      :login-then="loginThen"
+      class="login-form"
+      style="display: none"
+    />
+  </div>
   <div
+    v-else
     class="login-wrap"
     :style="{
       backgroundImage: BgImage ? `url(${BgImage})` : `url(${loginBg})`
@@ -66,6 +76,14 @@ export default {
     loginThen: {
       type: Function,
       default: undefined
+    },
+    autoLogin: {
+      type: Boolean,
+      default: false
+    },
+    autoLoginDate: {
+      type: Object,
+      default: undefined
     }
   },
   data() {
@@ -82,10 +100,20 @@ export default {
       loginLogoHeight: 'auto',
       loginLogoText: '',
       sloganHtml: '',
-      operateType: 'login'
+      operateType: 'login',
+      alV: false
     }
   },
   created() {
+    if (this.autoLogin) {
+      this.autoLoginSC()
+      return
+    }
+    if (window.sessionStorage.getItem('_auto_login_ing_')) {
+      this.autoLoginSS()
+      return
+    }
+
     this.removeStorage()
     this.init()
   },
@@ -159,6 +187,37 @@ export default {
     },
     getChangetype(val) {
       this.operateType = val
+    },
+    autoLoginSC() {
+      this.alV = true
+      let alData = this.autoLoginDate
+      this.removeStorage()
+      if (alData && alData.accessToken) {
+        this.autoLoginFn(alData)
+      } else {
+        this.$watch('autoLoginDate', (alData) => {
+          if (alData && alData.accessToken) {
+            this.removeStorage()
+            this.autoLoginFn(alData)
+          }
+        })
+      }
+    },
+    autoLoginSS() {
+      this.alV = true
+      let alDataStr = window.sessionStorage.getItem('_auto_login_data_')
+      this.removeStorage()
+      if (alDataStr) {
+        let alData = JSON.parse(alDataStr)
+        if (alData && alData.accessToken) {
+          this.autoLoginFn(alData)
+        }
+      }
+    },
+    autoLoginFn(alData) {
+      this.$nextTick(() => {
+        this.$refs['login-form']?.loginAfter(alData)
+      })
     }
   }
 }

package/src/utils/auth.js

@@ -2,6 +2,7 @@
 import Cookies from 'js-cookie'
 
 const STORAGE = window.sessionStorage
+let ownLoginPath = '/login'
 
 const auth = {
   stokenKey: 'token',
@@ -18,6 +19,7 @@ const auth = {
     return Cookies.get(this.cokenKey)
   },
   setToken(val) {
+    this.tokenVal = val
     Cookies.set(this.cokenKey, val, { expires: 1 })
     STORAGE.setItem(this.stokenKey, val)
   },
@@ -25,7 +27,7 @@ const auth = {
     this.tokenVal = ''
     Cookies.remove(this.cokenKey)
     STORAGE.removeItem(this.stokenKey)
-    toLogin()
+    auth.toLogin()
   },
   setLoginPath(router) {
     let { base = '/', mode = 'history' } = router.options
@@ -36,21 +38,19 @@ const auth = {
       ownLoginPath = window.location.origin + base + 'login'
     }
     // 判断有没有token,没有直接跳到登录页
-    auth.getToken() || toLogin()
+    auth.getToken() || auth.toLogin()
+  },
+  toLogin() {
+    let hrefOld = window.location.href
+    let loginHref = window.__POWERED_BY_QIANKUN__
+      ? window.location.origin + '/login'
+      : ownLoginPath
+    if (hrefOld !== loginHref) {
+      window.location.href = loginHref
+    }
   }
 }
-auth.cokenKey = 'Admin-Token'
 
-let ownLoginPath = '/login'
-function toLogin() {
-  let hrefOld = window.location.href
-  let loginHref = window.__POWERED_BY_QIANKUN__
-    ? window.location.origin + '/login'
-    : ownLoginPath
-  if (hrefOld !== loginHref) {
-    history.pushState(null, null, loginHref)
-    window.location.reload()
-  }
-}
+auth.cokenKey = 'Admin-Token'
 
 export default auth