@lambo-design/login-form 1.0.0-beta.32 → 1.0.0-beta.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/login-form",
-  "version": "1.0.0-beta.32",
+  "version": "1.0.0-beta.36",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -10,8 +10,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@lambo-design/core": "^4.7.1-beta.175",
-    "@lambo-design/shared": "^1.0.0-beta.334"
+    "@lambo-design/core": "^4.7.1-beta.176",
+    "@lambo-design/shared": "^1.0.0-beta.357"
   },
   "scripts": {
     "release": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

package/src/login-form.vue

@@ -51,6 +51,9 @@
     <FormItem v-if="captchaMethod === t('login-form.other.captcha-method-slide-image')">
       <Button long :disabled="isDisabled" @click="showSlideVerify">{{ buttonText }}</Button>
     </FormItem>
+    <FormItem v-if="captchaMethod === '文字点选' || captchaMethod === '语序点选' || captchaMethod === '旋转验证码'">
+      <Button long :disabled="isDisabled" @click="showWordClickVerify">{{ buttonText }}</Button>
+    </FormItem>
     <FormItem v-if="captchaMethod === t('login-form.other.captcha-method-message-center') && channelDataList.length > 0 && channelDataList.length !== 1">
       <span class="login-method-label">请选择登录验证方式</span>
       <ButtonGroup style="display: flex;">
@@ -135,6 +138,7 @@ export default {
     templateId:{type: String},
     mailConfigId:{type: String},
     isSlideVerify:{type: Boolean},
+    isWordClickVerify:{type: Boolean},
     buttonText: {type:String}, // 初始按钮文本
     isDisabled: {type:Boolean},
     channelDataList:{
@@ -285,6 +289,34 @@ export default {
         this.$Message.error(this.t('login-form.box.form-user-name'));
       }
     },
+    showWordClickVerify(){
+      if (this.form.userName && this.form.userName.trim().length > 0){
+        let params = {
+          userName: this.form.userName,
+          password: this.form.password,
+          validCodeInput: this.form.validCode,
+          validCodeId: this.validCodeId
+        }
+        if (this.pasCryptor) {
+          params.pasCryptor = this.pasCryptor;
+          params.pasEncode = this.getCryptorPassword(this.form.password,this.form.validCode,this.pasCryptor);
+        } else {
+          params.pasMd5 = this.getCryptorPassword(this.form.password,this.form.validCode,'md5');
+          params.pasSm3 = this.getCryptorPassword(this.form.password,this.form.validCode,'sm3');
+        }
+        this.$emit('show-word-click-verify', true, params, this.captchaMethod)
+
+        this.setLocalUserId(this.form.userName)
+        if (this.rememberMe == true) {
+          this.setLocalStorage(this.form.userName)
+        }
+        if (this.rememberMe == false) {
+          this.clearLocalStorage();
+        }
+      }else{
+        this.$Message.error(this.t('login-form.box.form-user-name'));
+      }
+    },
     handleSubmit() {
       this.$refs.loginForm.validate((valid) => {
         if (this.captchaMethod === this.t('login-form.other.captcha-method-message-center') && !this.selectedLoginMethod) {
@@ -295,8 +327,13 @@ export default {
             && !this.isSlideVerify){
           this.$Message.error(this.t('login-form.box.form-rule-click-login'));
         }
+        const isWordClickMethod = this.captchaMethod === '文字点选' || this.captchaMethod === '语序点选' || this.captchaMethod === '旋转验证码'
+        if(valid && isWordClickMethod && !this.isWordClickVerify){
+          this.$Message.error(this.t('login-form.box.form-rule-click-login'));
+        }
         if (valid && ((this.captchaMethod == this.t('login-form.other.captcha-method-slide-image')
-            && this.isSlideVerify) || this.captchaMethod != this.t('login-form.other.captcha-method-slide-image'))) {
+            && this.isSlideVerify) || (isWordClickMethod && this.isWordClickVerify) 
+            || (!isWordClickMethod && this.captchaMethod != this.t('login-form.other.captcha-method-slide-image')))) {
           let params = {
             userName: this.form.userName,
             password: this.form.password,

package/src/login-qr.vue

@@ -58,7 +58,7 @@ export default {
       default: false
     },
     qrType:{
-      type: Object,
+      type: Array,
       default: ['0','1']
     }
   },
@@ -68,7 +68,7 @@ export default {
       ddClientId: '',
       wwLoginInstance: null,
       dingTalkLoginInstance: null,
-      currentLoginType: 'wechat',
+      currentLoginType: '',
       LoginConfig: {},
       wxImg,
       ddImg
@@ -83,6 +83,7 @@ export default {
     }
   },
   mounted() {
+    this.currentLoginType = this.qrType.includes('0') ? 'wechat' : 'dingtalk';
     this.initLoginInstance();
   },
   beforeDestroy() {