From 3a2b1dd8454445311fbde91187f9d7333d197ad3 Mon Sep 17 00:00:00 2001 From: wkj <278599135@.com> Date: Fri, 9 May 2025 15:08:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E4=BA=9B=E5=8D=95?= =?UTF-8?q?=E8=AF=8D=E5=86=99=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/aspects/token.js | 6 +++--- es/components/article/detail/index.d.ts | 2 +- es/components/article/preview/index.d.ts | 2 +- es/components/article/upsert/index.d.ts | 2 +- es/components/articleMenu/treeManager/index.d.ts | 2 +- es/components/extraFile/commit/index.d.ts | 6 +++--- es/components/wechatLogin/qrCode/index.d.ts | 2 +- lib/aspects/token.js | 6 +++--- src/aspects/token.ts | 6 +++--- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/es/aspects/token.js b/es/aspects/token.js index b61e7699e..75b25cd61 100644 --- a/es/aspects/token.js +++ b/es/aspects/token.js @@ -537,7 +537,7 @@ export async function verifyPassword(params, context) { } }, {}); if (!user) { - throw new OakUserException('error::user.passwordUnmath'); + throw new OakUserException('error::user.passwordUnmatch'); } await context.operate('user', { id: await generateNewIdAsync(), @@ -693,7 +693,7 @@ export async function loginByAccount(params, context) { return await setupEmail(account, env, context); } else { - throw new OakUserException('error::user.emaiUnexists'); + throw new OakUserException('error::user.emailUnexists'); } } else { @@ -701,7 +701,7 @@ export async function loginByAccount(params, context) { } } default: { - throw new OakUserException('不error::user.loginWayDisabled'); + throw new OakUserException('error::user.loginWayDisabled'); } } } diff --git a/es/components/article/detail/index.d.ts b/es/components/article/detail/index.d.ts index 67561a438..efadbb3ab 100644 --- a/es/components/article/detail/index.d.ts +++ b/es/components/article/detail/index.d.ts @@ -1,7 +1,7 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps void; - tocPosition: "left" | "right" | "none"; + tocPosition: "none" | "left" | "right"; highlightBgColor: string; onArticlePreview: (content?: string, title?: string) => void; origin: string; diff --git a/es/components/articleMenu/treeManager/index.d.ts b/es/components/articleMenu/treeManager/index.d.ts index d1595302b..a1da850fc 100644 --- a/es/components/articleMenu/treeManager/index.d.ts +++ b/es/components/articleMenu/treeManager/index.d.ts @@ -4,7 +4,7 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< show: "preview" | "edit" | "doc"; articleMenuId: string; articleId: string; - tocPosition: "left" | "right" | "none"; + tocPosition: "none" | "left" | "right"; highlightBgColor: string; onMenuView: () => void; onMenuViewById: (articleMenuId: string) => void; diff --git a/es/components/extraFile/commit/index.d.ts b/es/components/extraFile/commit/index.d.ts index f44d9d2a0..7cacf7e9e 100644 --- a/es/components/extraFile/commit/index.d.ts +++ b/es/components/extraFile/commit/index.d.ts @@ -15,7 +15,7 @@ declare const _default: ) => unknown) | undefined; - type?: "button" | "reset" | "submit" | undefined; + type?: "button" | "submit" | "reset" | undefined; shape?: "default" | "rounded" | "rectangular" | undefined; children?: import("react").ReactNode; - } & Pick & import("react").ButtonHTMLAttributes, "id" | "onMouseDown" | "onMouseUp" | "onTouchStart" | "onTouchEnd"> & { + } & Pick & import("react").ButtonHTMLAttributes, "id" | "onMouseDown" | "onMouseUp" | "onTouchEnd" | "onTouchStart"> & { className?: string | undefined; style?: (import("react").CSSProperties & Partial>) | undefined; tabIndex?: number | undefined; diff --git a/es/components/wechatLogin/qrCode/index.d.ts b/es/components/wechatLogin/qrCode/index.d.ts index 21f928111..db7fcdc9b 100644 --- a/es/components/wechatLogin/qrCode/index.d.ts +++ b/es/components/wechatLogin/qrCode/index.d.ts @@ -1,6 +1,6 @@ import { EntityDict } from '../../../oak-app-domain'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; diff --git a/lib/aspects/token.js b/lib/aspects/token.js index 0b9326726..35d0d7c4f 100644 --- a/lib/aspects/token.js +++ b/lib/aspects/token.js @@ -542,7 +542,7 @@ async function verifyPassword(params, context) { } }, {}); if (!user) { - throw new types_1.OakUserException('error::user.passwordUnmath'); + throw new types_1.OakUserException('error::user.passwordUnmatch'); } await context.operate('user', { id: await (0, uuid_1.generateNewIdAsync)(), @@ -699,7 +699,7 @@ async function loginByAccount(params, context) { return await setupEmail(account, env, context); } else { - throw new types_1.OakUserException('error::user.emaiUnexists'); + throw new types_1.OakUserException('error::user.emailUnexists'); } } else { @@ -707,7 +707,7 @@ async function loginByAccount(params, context) { } } default: { - throw new types_1.OakUserException('不error::user.loginWayDisabled'); + throw new types_1.OakUserException('error::user.loginWayDisabled'); } } } diff --git a/src/aspects/token.ts b/src/aspects/token.ts index 84c25c09d..cbb4bff39 100644 --- a/src/aspects/token.ts +++ b/src/aspects/token.ts @@ -729,7 +729,7 @@ export async function verifyPassword( }, { }); if (!user) { - throw new OakUserException('error::user.passwordUnmath'); + throw new OakUserException('error::user.passwordUnmatch'); } await context.operate('user', { @@ -910,14 +910,14 @@ export async function loginByAccount( } return await setupEmail(account, env, context); } else { - throw new OakUserException('error::user.emaiUnexists'); + throw new OakUserException('error::user.emailUnexists'); } } else { throw new OakUserException('error::user.loginWayDisabled'); } } default: { - throw new OakUserException('不error::user.loginWayDisabled'); + throw new OakUserException('error::user.loginWayDisabled'); } } } else if (accountType === 'mobile') {