n20-common-lib 2.1.1 → 2.1.3

package/package.json

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

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

@@ -523,7 +523,9 @@ export default {
     getUserImg() {
       return this.$axios
         .get(`/bems/1.0/attach/${this.userNo}_img`, null, {
-          responseType: 'blob'
+          responseType: 'blob',
+          loading: false,
+          noMsg: true
         })
         .then((login) => {
           this.headerUserUrl = window.URL.createObjectURL(login)

package/src/components/LoginSetting/setItem.vue

@@ -229,8 +229,7 @@ export default {
         { label: $lc('账户密码登录'), value: 'account' },
         { label: $lc('手机验证码登录'), value: 'pthon' },
         { label: $lc('二维码扫码登录'), value: 'qrcode' },
-        { label: $lc('账户密码验证码登录'), value: 'accountPthon' },
-        { label: $lc('账号密码图形验证码登录'), value: 'accountImage' }
+        { label: $lc('账户密码验证码登录'), value: 'accountPthon' }
       ],
       systemItem: undefined
     }

package/src/components/LoginTemporary/form.vue

@@ -8,7 +8,7 @@
       <path d="M0,0L52,0L52,52Z" @click="cutQrcode" />
     </svg>
     <!-- 账号/密码登录 -->
-    <div v-if="theType === 'account' || theType === 'accountImage'" class="flex-item">
+    <div v-if="theType === 'account'" class="flex-item">
       <el-form
         ref="login-form"
         :model="form"
@@ -43,12 +43,12 @@
           </el-input>
           不自动填充密码End -->
         </el-form-item>
-        <el-form-item v-if="theType === 'accountImage'" class="m-b" :label="'图形验证码' | $lc" prop="imageCode">
+        <el-form-item class="m-b" :label="'图形验证码' | $lc" prop="imageCode">
           <br />
           <div class="flex-box">
             <el-input v-model="form.imageCode" class="flex-item m-r-s" :placeholder="'请输入图形验证码' | $lc" />
             <el-button plain class="p-a-0" @click="getImgCode">
-              <img v-if="imageUrl" :src="imageUrl" style="width: 80px; height: 28px" />
+              <img v-if="imageUrl" :src="imageUrl" style="width: 80px; height: 30px; margin-bottom: -2px" />
             </el-button>
           </div>
         </el-form-item>
@@ -192,8 +192,7 @@ export default {
         account: $lc('账号密码登录'),
         pthon: $lc('手机验证码登录'),
         qrcode: $lc('二维码扫码登录'),
-        accountPthon: $lc('账户密码验证码登录'),
-        accountImage: $lc('账号密码图形验证码登录')
+        accountPthon: $lc('账户密码验证码登录')
       },
       theType: this.loginTypes[0],
       userNo: undefined,
@@ -225,12 +224,15 @@ export default {
   watch: {
     loginTypes() {
       this.theType = this.loginTypes[0]
-      this.getImgCode()
+    },
+    theType: {
+      handler() {
+        this.getImgCode()
+      },
+      immediate: true
     }
   },
-  mounted() {
-    this.getImgCode()
-  },
+  mounted() {},
   methods: {
     // 忘记密码
     forgetPw() {
@@ -249,9 +251,11 @@ export default {
       }
     },
     getImgCode() {
-      if (this.theType === 'accountImage') {
-        // axios.get('/bems/prod_1.0/uas/api/authorization/captcha/image', null, { responseType: 'blob' })
-        this.imageUrl = require('./imgcode.png')
+      if (this.theType === 'account') {
+        this.imageUrl && URL.revokeObjectURL(this.imageUrl)
+        axios.get('/bems/prod_1.0/uas/api/authorization/captcha/image', null, { responseType: 'blob' }).then((blob) => {
+          this.imageUrl = URL.createObjectURL(blob)
+        })
       }
     },
     // 发送短信
@@ -316,13 +320,11 @@ export default {
             this.theType === 'account' && this.passwordLogin()
             this.theType === 'pthon' && this.phoneLogin()
             this.theType === 'accountPthon' && this.accountPthonLogin()
-            this.theType === 'accountImage' && this.passwordLogin()
           })
         } else {
           this.theType === 'account' && this.passwordLogin()
           this.theType === 'pthon' && this.phoneLogin()
           this.theType === 'accountPthon' && this.accountPthonLogin()
-          this.theType === 'accountImage' && this.passwordLogin()
         }
       })
     },
@@ -373,7 +375,7 @@ export default {
           username,
           password: this.pwd,
           code,
-          imageCode: this.theType === 'accountImage' ? imageCode : undefined
+          imageCode: imageCode || undefined
         },
         {
           loading: this.loadingSub
@@ -436,7 +438,7 @@ export default {
               code,
               sign,
               certDn,
-              imageCode: this.theType === 'accountImage' ? imageCode : undefined
+              imageCode: imageCode || undefined
             },
             {
               loading: this.loadingSub
@@ -460,7 +462,7 @@ export default {
             username,
             password: this.pwd,
             code,
-            imageCode: this.theType === 'accountImage' ? imageCode : undefined
+            imageCode: imageCode || undefined
           },
           { loading: this.loadingSub }
         )

package/src/components/LoginTemporary/index.vue

@@ -111,7 +111,15 @@ export default {
   },
   computed: {
     loginTypes() {
-      return this.pageData.LOGIN_MODE?.pmValue?.split(',') || this.jsonData.loginTypes || ['account']
+      let LOGIN_MODE = this.pageData.LOGIN_MODE?.pmValue
+      if (LOGIN_MODE) {
+        try {
+          LOGIN_MODE = JSON.parse(LOGIN_MODE)
+        } catch (error) {
+          LOGIN_MODE = LOGIN_MODE.split(',')
+        }
+      }
+      return LOGIN_MODE || this.jsonData.loginTypes || ['account']
     },
     loginBg() {
       if (this.pageData.BgImage) {