@lambo-design/login-form 1.0.0-beta.34 → 1.0.0-beta.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/login-form",
-  "version": "1.0.0-beta.34",
+  "version": "1.0.0-beta.39",
   "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.339"
+    "@lambo-design/shared": "^1.0.0-beta.364",
+    "@lambo-design/core": "^4.7.1-beta.178"
   },
   "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,
@@ -340,6 +377,11 @@ export default {
   mounted() {
     this.getCaptcha();
     this.getLocalStorage();
+    // 新增：初始化时检查 channelDataList
+    if (this.channelDataList && this.channelDataList.length > 0 && !this.selectedLoginMethod) {
+      this.selectedLoginMethod = this.channelDataList[0].channelName;
+      this.$emit('login-method-change', this.selectedLoginMethod);
+    }
   }
 }
 </script>

package/src/login-qr.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="lambo-login-qrcode">
+  <div class="lambo-login-qrcode" :class="wxQrClass">
     <!-- 二维码加载状态 -->
     <div v-if="loading" class="qrcode-loading">
       <Icon type="ios-loading" size="24" spin></Icon>
@@ -60,6 +60,22 @@ export default {
     qrType:{
       type: Array,
       default: ['0','1']
+    },
+    // 企业微信登录模式: 'saas' (SaaS版) 或 'private' (私有化版)
+    wxLoginMode: {
+      type: String,
+      default: 'saas',
+      validator: (value) => ['saas', 'private'].includes(value)
+    },
+    // 私有化版本配置（当 wxLoginMode 为 'private' 时使用）
+    privateWxConfig: {
+      type: Object,
+      default: () => ({
+        appId: '',
+        agentId: '',
+        redirectUri: '',
+        sdkUrl: ''
+      })
     }
   },
   data() {
@@ -80,6 +96,9 @@ export default {
     },
     isDd(){
       return _.some(this.qrType, (item) => item ==='1');
+    },
+    wxQrClass() {
+      return this.wxLoginMode === 'private' ? 'wx-private' : ''
     }
   },
   mounted() {
@@ -93,12 +112,19 @@ export default {
   methods: {
     loadWxWorkSdk() {
       return new Promise((resolve) => {
-        if (typeof ww !== 'undefined') {
+        if (typeof ww !== 'undefined' || typeof WwLogin !== 'undefined') {
           resolve();
           return;
         }
         const script = document.createElement('script');
-        script.src = 'https://wwcdn.weixin.qq.com/node/open/js/wecom-jssdk-2.3.3.js';
+        // 根据登录模式选择不同的SDK
+        if (this.wxLoginMode === 'private') {
+          // 私有化版本SDK，优先使用传入的地址
+          script.src = this.privateWxConfig.sdkUrl;
+        } else {
+          // SaaS版本SDK
+          script.src = 'https://wwcdn.weixin.qq.com/node/open/js/wecom-jssdk-2.3.3.js';
+        }
         script.onload = resolve;
         document.head.appendChild(script);
       });
@@ -126,10 +152,39 @@ export default {
       if (!document.getElementById('ww_login') || this.wwLoginInstance) {
         return;
       }
-      let appId
-      let agentId
-      let res =await ajax.get(config.authServerContext + '/sso/wxcp/getWxInfo')
-      if(res.data.code === 1){
+
+      if (this.wxLoginMode === 'private') {
+        // 私有化版本初始化
+        await this.initPrivateWwLogin();
+      } else {
+        // SaaS版本初始化
+        await this.initSaasWwLogin();
+      }
+    },
+
+    // 私有化版本企业微信登录初始化
+    async initPrivateWwLogin() {
+      try {
+        this.wwLoginInstance = window.WwLogin({
+          "id": "ww_login",
+          "appid": this.privateWxConfig.appId,
+          "agentid": this.privateWxConfig.agentId,
+          "redirect_uri": this.privateWxConfig.redirectUri,
+          "state": 'state_' + Date.now(),
+          "href": ""
+        });
+        console.log('✅ 私有化企业微信登录组件初始化成功');
+      } catch (error) {
+        console.error('❌ 初始化私有化企业微信登录组件失败：', error);
+      }
+    },
+
+    // SaaS版本企业微信登录初始化
+    async initSaasWwLogin() {
+      let appId;
+      let agentId;
+      let res = await ajax.get(config.authServerContext + '/sso/wxcp/getWxInfo');
+      if (res.data.code === 1) {
         appId = res.data.data.appId;
         agentId = res.data.data.agentId;
       }
@@ -150,9 +205,9 @@ export default {
           onLoginSuccess: this.handleLoginSuccess,
           onLoginFail: this.handleLoginFail
         });
-        console.log('✅ 企业微信登录组件初始化成功');
+        console.log('✅ SaaS企业微信登录组件初始化成功');
       } catch (error) {
-        console.error('❌ 初始化企业微信登录组件失败：', error);
+        console.error('❌ 初始化SaaS企业微信登录组件失败：', error);
       }
     },
     handleLoginSuccess({ code }) {
@@ -437,13 +492,50 @@ export default {
 
 
 /* 企业微信登录组件容器 */
-#ww_login {
-  width: 100% !important;
-  max-width: 220px !important;
-  margin: 0 auto !important;
-  display: block !important;
+.wx-saas {
+  #ww_login {
+    width: 100% !important;
+    max-width: 220px !important;
+    margin: 0 auto !important;
+    display: block !important;
+  }
+  .lambo-login-qrcode ::v-deep #ww_login iframe,
+  .qrcode-img-wrapper ::v-deep iframe {
+    position: relative;
+    top: -60px !important;
+    height: 360px !important;
+    border: none !important;
+    width: 100% !important;
+    overflow: hidden !important;
+  }
 }
+.wx-private {
+  #ww_login {
+    width: 100% !important;
+    margin: 0 auto !important;
+    display: block !important;
+  }
+  .lambo-login-qrcode ::v-deep #ww_login iframe,
+  .qrcode-img-wrapper ::v-deep iframe {
+    position: relative;
+    top: 25px !important;
+    height: 400px !important;
+    border: none !important;
+    width: 100% !important;
+    overflow: hidden !important;
+  }
 
+  .qrcode-img-wrapper {
+    height: 400px !important;
+    min-height: 260px !important;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    overflow: hidden;
+    width: 100%;
+    position: relative;
+  }
+}
 /* 钉钉登录组件容器 */
 #dingtalk_login {
   width: 100% !important;
@@ -454,16 +546,6 @@ export default {
   overflow: hidden;
 }
 
-.lambo-login-qrcode ::v-deep #ww_login iframe,
-.qrcode-img-wrapper ::v-deep iframe {
-  position: relative;
-  top: -60px !important;
-  height: 360px !important;
-  border: none !important;
-  width: 100% !important;
-  overflow: hidden !important;
-}
-
 /* 钉钉iframe样式 - 减少上方留白 */
 .lambo-login-qrcode ::v-deep #dingtalk_login iframe,
 .qrcode-img-wrapper ::v-deep iframe {