n20-common-lib 2.2.1 → 2.2.2

package/package.json

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

package/src/components/LoginTemporary/form.vue

@@ -43,7 +43,7 @@
           </el-input>
           不自动填充密码End -->
         </el-form-item>
-        <el-form-item class="m-b" :label="'图形验证码' | $lc" prop="imageCode">
+        <el-form-item v-if="showImageCode" 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" />
@@ -186,6 +186,10 @@ export default {
     extraForm: {
       type: Object,
       default: () => ({})
+    },
+    showImageCode: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -256,12 +260,18 @@ export default {
       }
     },
     getImgCode() {
-      if (this.theType === 'account') {
+      if (this.theType === 'account' && this.showImageCode) {
         this.$set(this.form, 'imageCode', '')
         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)
-        })
+        axios
+          .get('/bems/prod_1.0/uas/api/authorization/captcha/image', null, {
+            responseType: 'blob',
+            loading: false,
+            noMsg: true
+          })
+          .then((blob) => {
+            this.imageUrl = URL.createObjectURL(blob)
+          })
       }
     },
     // 发送短信

package/src/components/LoginTemporary/index.vue

@@ -1,12 +1,12 @@
 <template>
-  <div v-if="alV" v-loading="alV" class="login-wrap">
+  <div v-if="alV" v-loading="alV" class="login-wrap" element-loading-custom-class="auto-login-loading">
     <loginForm
       ref="login-form"
+      class="login-form"
       :before-login="beforeLogin"
       :login-types="loginTypes"
       :login-then="loginThen"
       :async-rela-nos="asyncRelaNos"
-      class="login-form"
       style="display: none"
     />
   </div>
@@ -20,11 +20,12 @@
     <div doc="登录页标语" v-html="loginSloganHtml"></div>
     <loginForm
       v-if="operateType === 'login'"
+      class="login-form"
       :before-login="beforeLogin"
       :login-types="loginTypes"
       :login-then="loginThen"
       :async-rela-nos="asyncRelaNos"
-      class="login-form"
+      :show-image-code="showImageCode"
       @changType="getChangetype"
     >
       <div slot="header" class="login-form-header m-b text-c">{{ '欢 迎 登 录' | $lc }}</div>
@@ -84,6 +85,10 @@ export default {
     asyncRelaNos: {
       type: Boolean,
       default: false
+    },
+    showImageCode: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

package/src/components/LoginTemporary/indexN.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="width: 100vw; height: 100vh; overflow: hidden">
-    <div v-if="alV" v-loading="alV" class="login-wrap">
+    <div v-if="alV" v-loading="alV" class="login-wrap" element-loading-custom-class="auto-login-loading">
       <loginForm
         ref="login-form"
         :before-login="beforeLogin"
@@ -87,6 +87,7 @@
         :login-then="loginThenT"
         :async-rela-nos="asyncRelaNos"
         :extra-form="extraForm"
+        :show-image-code="showImageCode"
         @changType="getChangetype"
       >
         <div slot="header" class="login-form-header m-b text-c">{{ '欢 迎 登 录' | $lc }}</div>
@@ -173,6 +174,10 @@ export default {
     asyncRelaNos: {
       type: Boolean,
       default: false
+    },
+    showImageCode: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -531,8 +536,10 @@ export default {
   position: absolute;
   right: 103px;
   top: 50%;
-  transform: translateY(-50%);
+  width: 324px;
+  min-height: 360px;
   padding: 30px 30px 18px !important;
+  transform: translateY(-50%);
   background: #f7f6f6;
 }
 .login-bg-light .login-form {

package/src/utils/axios.js

@@ -111,9 +111,9 @@ function errorFn(status, msg, noMsg, isErr, res) {
   } else if (status === 500 || (isErr && msg.includes('500'))) {
     noMsg || showMsg($lc('500，服务器链接失败！'))
   } else if (status === 'ECONNABORTED' && msg.includes('timeout')) {
-    showMsg($lc('请求超时'))
+    noMsg || showMsg($lc('请求超时'))
   } else if (msg === 'Network Error') {
-    showMsg($lc('请求错误'))
+    noMsg || showMsg($lc('请求错误'))
   } else if (status >= 900 || status === -1) {
     noMsg || showMsg(msg)
   } else {