增加 PC 企业微信扫码登录(07-30-pc-wecom-qr-login)
ci-e2e / e2e (push) Canceled after 0s
ci-minimal / check-minimal (push) Canceled after 0s

这个提交包含在:
2026-07-30 17:16:22 +08:00
父节点 45dc206a4c
当前提交 fb164eb690
共修改 21 个文件,包含 959 行新增和 22 行删除
+26 -4
查看文件
@@ -89,6 +89,9 @@ export function LoginPage() {
const wecomConfig = wecomConfigQuery.data;
const wecomEntry = wecomConfig?.entryEnabled && wecomConfig.loginUrl ? wecomConfig : null;
const pcWecomEntry = !isWecomContext && wecomConfig?.pcWebLoginEnabled && wecomConfig.pcLoginUrl
? wecomConfig
: null;
const wecomNotice = useMemo(
() => resolveWecomBindNotice(searchParams.get("wecomBind")) ?? resolveWecomLoginNotice(searchParams.get("wecom")),
[searchParams],
@@ -96,7 +99,7 @@ export function LoginPage() {
const showWecomPrimary = isWecomContext;
const showPasswordPanel = !showWecomPrimary || Boolean(wecomNotice) || passwordFallbackOpen || (showWecomPrimary && wecomConfig && !wecomEntry);
const showBrowserWecomNotice = !showWecomPrimary && Boolean(wecomEntry);
const showBrowserWecomNotice = !showWecomPrimary && Boolean(wecomEntry) && !pcWecomEntry;
useEffect(() => {
if (emailCodeCooldown <= 0) {
@@ -142,6 +145,13 @@ export function LoginPage() {
window.location.assign(buildWecomLoginUrl(wecomEntry.loginUrl, redirectTo, getDeviceFingerprint()));
}
function handlePcWecomLogin() {
if (!pcWecomEntry?.pcLoginUrl) {
return;
}
window.location.assign(buildWecomLoginUrl(pcWecomEntry.pcLoginUrl, redirectTo, getDeviceFingerprint()));
}
async function handleRequestEmailCode(event: React.FormEvent<HTMLFormElement>) {
event.preventDefault();
setEmailCodeError("");
@@ -370,7 +380,9 @@ export function LoginPage() {
<div className="space-y-4">
{!showWecomPrimary ? (
<div className="ux-command-note">
员工日常建议用企业邮箱验证码;固定办公电脑可使用账号密码。企业微信免登需要从企业微信工作台打开。
{pcWecomEntry
? "可使用企业微信扫码登录;企业邮箱验证码和账号密码作为备用方式。"
: "员工日常建议用企业邮箱验证码;固定办公电脑可使用账号密码。企业微信免登需要从企业微信工作台打开。"}
</div>
) : null}
@@ -432,7 +444,7 @@ export function LoginPage() {
: renderPasswordPanel(showWecomPrimary ? "login-password-secondary-panel" : "login-password-primary-panel")
: null}
{!showWecomPrimary && (showBrowserWecomNotice || oidcProvider) ? (
{!showWecomPrimary && (pcWecomEntry || showBrowserWecomNotice || oidcProvider) ? (
<div className="space-y-3">
<div className="flex items-center gap-3 text-xs text-slate-400">
<span className="h-px flex-1 bg-slate-100" />
@@ -440,7 +452,17 @@ export function LoginPage() {
<span className="h-px flex-1 bg-slate-100" />
</div>
{showBrowserWecomNotice ? (
{pcWecomEntry ? (
<Button
className="w-full"
data-testid="wecom-entry-pc"
type="button"
variant="secondary"
onClick={handlePcWecomLogin}
>
企业微信扫码登录
</Button>
) : showBrowserWecomNotice ? (
<div
className="auth-side-entry flex gap-3 text-slate-600"
data-testid="wecom-entry-browser-notice"