From 630b27632b9662db16c3a5e622d20f135d6e074b Mon Sep 17 00:00:00 2001 From: Xc Date: Tue, 21 Jan 2025 15:35:21 +0800 Subject: [PATCH] =?UTF-8?q?exception=E4=B8=AD=E7=9A=84=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E5=AD=97=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/checkers/index.d.ts | 2 +- es/components/article/treeList/index.d.ts | 2 +- es/components/articleMenu/treeCell/index.d.ts | 2 +- es/components/articleMenu/treeList/index.d.ts | 2 +- .../articleMenu/treeManager/index.d.ts | 2 +- .../config/style/platform/index.d.ts | 2 +- es/components/config/upsert/index.d.ts | 2 +- es/components/extraFile/commit/index.d.ts | 6 +- es/components/wechatLogin/qrCode/index.d.ts | 2 +- es/triggers/index.d.ts | 2 +- es/types/Exception.d.ts | 30 +++---- es/types/Exception.js | 80 +++++++++--------- lib/checkers/index.d.ts | 2 +- lib/triggers/index.d.ts | 2 +- lib/types/Exception.d.ts | 30 +++---- lib/types/Exception.js | 80 +++++++++--------- src/types/Exception.ts | 82 +++++++++---------- 17 files changed, 165 insertions(+), 165 deletions(-) diff --git a/es/checkers/index.d.ts b/es/checkers/index.d.ts index 4a38c8a8d..4758a9aeb 100644 --- a/es/checkers/index.d.ts +++ b/es/checkers/index.d.ts @@ -1,2 +1,2 @@ -declare const checkers: (import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker>)[]; +declare const checkers: (import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker>)[]; export default checkers; diff --git a/es/components/article/treeList/index.d.ts b/es/components/article/treeList/index.d.ts index 531bb39b4..b82c03103 100644 --- a/es/components/article/treeList/index.d.ts +++ b/es/components/article/treeList/index.d.ts @@ -1,7 +1,7 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps void; - show: "edit" | "doc" | "preview"; + show: "preview" | "edit" | "doc"; getBreadcrumbItemsByParent: (breadcrumbItems: string[]) => void; breadcrumbItems: string[]; drawerOpen: boolean; diff --git a/es/components/articleMenu/treeCell/index.d.ts b/es/components/articleMenu/treeCell/index.d.ts index be5317bd8..e6a2629a8 100644 --- a/es/components/articleMenu/treeCell/index.d.ts +++ b/es/components/articleMenu/treeCell/index.d.ts @@ -2,7 +2,7 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< onRemove: () => void; onUpdateName: (name: string) => Promise; onChildEditArticleChange: (data: string) => void; - show: "edit" | "doc" | "preview"; + show: "preview" | "edit" | "doc"; getBreadcrumbItemsByParent: (breadcrumbItems: string[]) => void; breadItems: string[]; drawerOpen: boolean; diff --git a/es/components/articleMenu/treeList/index.d.ts b/es/components/articleMenu/treeList/index.d.ts index 79d6726d3..6ccbe30a4 100644 --- a/es/components/articleMenu/treeList/index.d.ts +++ b/es/components/articleMenu/treeList/index.d.ts @@ -4,7 +4,7 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< entityId: string; parentId: string | undefined; onGrandChildEditArticleChange: (data: string) => void; - show: "edit" | "doc" | "preview"; + show: "preview" | "edit" | "doc"; articleMenuId: string; articleId: string; getBreadcrumbItems: (breadcrumbItems: string[]) => void; diff --git a/es/components/articleMenu/treeManager/index.d.ts b/es/components/articleMenu/treeManager/index.d.ts index 99059a531..a1da850fc 100644 --- a/es/components/articleMenu/treeManager/index.d.ts +++ b/es/components/articleMenu/treeManager/index.d.ts @@ -1,7 +1,7 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; diff --git a/es/components/config/upsert/index.d.ts b/es/components/config/upsert/index.d.ts index 9bf014f88..a4b61c5c2 100644 --- a/es/components/config/upsert/index.d.ts +++ b/es/components/config/upsert/index.d.ts @@ -1,7 +1,7 @@ import { Config } from '../../../types/Config'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; diff --git a/es/components/extraFile/commit/index.d.ts b/es/components/extraFile/commit/index.d.ts index da8166521..bd0bce7d8 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?: "reset" | "submit" | "button" | undefined; + type?: "button" | "reset" | "submit" | undefined; shape?: "default" | "rounded" | "rectangular" | undefined; children?: import("react").ReactNode; - } & Pick & import("react").ButtonHTMLAttributes, "id" | "onMouseUp" | "onMouseDown" | "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 db7fcdc9b..21f928111 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/es/triggers/index.d.ts b/es/triggers/index.d.ts index fc7f50979..82bb80dc0 100644 --- a/es/triggers/index.d.ts +++ b/es/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; +declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; export default _default; diff --git a/es/types/Exception.d.ts b/es/types/Exception.d.ts index 3d8c1f66a..ad7b002d9 100644 --- a/es/types/Exception.d.ts +++ b/es/types/Exception.d.ts @@ -8,7 +8,7 @@ export declare class OakDistinguishUserException); + constructor(userId: string, usePassword: boolean, useIdCard: boolean, useWechatUser: boolean, useEmail: boolean, useMobile: boolean, message?: string, _module?: string, params?: Record); toString(): string; } export declare class OakChangeLoginWayException extends OakUserException { @@ -17,57 +17,57 @@ export declare class OakChangeLoginWayException); + constructor(userId: string, useIdCard: boolean, useWechatUser: boolean, useEmail: boolean, useMobile: boolean, message?: string, _module?: string, params?: Record); toString(): string; } export declare class OakMobileUnsetException extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakAuthenticationException extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakUserInfoUncompletedException extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakUserDisabledException extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakTokenExpiredException extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakMpHaveToSubscribeMessage extends OakUserException { rejectedMessageType: string[]; - constructor(rejectedMessageType: string[], message?: string, module?: string, params?: Record); + constructor(rejectedMessageType: string[], message?: string, _module?: string, params?: Record); } /** * 前端用户信息还没加载完整 */ export declare class OakUserInfoLoadingException extends OakException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } /** * 前端application信息还没加载完整 */ export declare class OakApplicationLoadingException extends OakException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakUploadException extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakPasswordUnset extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakHasToVerifyPassword extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakCantChangeVerifiedUser extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare function makeException(data: { name: string; message?: string; opRecords: OpRecord[]; - module?: string; + _module?: string; params?: Record; [A: string]: any; }): OakException | undefined; diff --git a/es/types/Exception.js b/es/types/Exception.js index 18456bfe5..a0a4c305b 100644 --- a/es/types/Exception.js +++ b/es/types/Exception.js @@ -6,8 +6,8 @@ export class OakDistinguishUserException extends OakUserException { useWechatUser; useEmail; useMobile; - constructor(userId, usePassword, useIdCard, useWechatUser, useEmail, useMobile, message, module, params) { - super(message || 'error::distinguishUser', module || 'oak-general-business', params); + constructor(userId, usePassword, useIdCard, useWechatUser, useEmail, useMobile, message, _module, params) { + super(message || 'error::distinguishUser', _module || 'oak-general-business', params); this.userId = userId; this.useIdCard = useIdCard; this.usePassword = usePassword; @@ -35,8 +35,8 @@ export class OakChangeLoginWayException extends OakUserException { useWechatUser; useEmail; useMobile; - constructor(userId, useIdCard, useWechatUser, useEmail, useMobile, message, module, params) { - super(message || 'error::changeLoginWay', module || 'oak-general-business', params); + constructor(userId, useIdCard, useWechatUser, useEmail, useMobile, message, _module, params) { + super(message || 'error::changeLoginWay', _module || 'oak-general-business', params); this.userId = userId; this.useIdCard = useIdCard; this.useMobile = useMobile; @@ -56,34 +56,34 @@ export class OakChangeLoginWayException extends OakUserException { } } export class OakMobileUnsetException extends OakUserException { - constructor(message, module, params) { - super(message || 'error::mobileUnset', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::mobileUnset', _module || 'oak-general-business', params); } } export class OakAuthenticationException extends OakUserException { - constructor(message, module, params) { - super(message || 'error::needAuthentication', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::needAuthentication', _module || 'oak-general-business', params); } } export class OakUserInfoUncompletedException extends OakUserException { - constructor(message, module, params) { - super(message || 'error::userInfoUncompleted', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::userInfoUncompleted', _module || 'oak-general-business', params); } } export class OakUserDisabledException extends OakUserException { - constructor(message, module, params) { - super(message || 'error::userDisabled', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::userDisabled', _module || 'oak-general-business', params); } } export class OakTokenExpiredException extends OakUserException { - constructor(message, module, params) { - super(message || 'error::tokenExpired', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::tokenExpired', _module || 'oak-general-business', params); } } export class OakMpHaveToSubscribeMessage extends OakUserException { rejectedMessageType; - constructor(rejectedMessageType, message, module, params) { - super(message || 'error::mpHaveToSubscribe', module || 'oak-general-business', params); + constructor(rejectedMessageType, message, _module, params) { + super(message || 'error::mpHaveToSubscribe', _module || 'oak-general-business', params); this.rejectedMessageType = rejectedMessageType; } } @@ -91,8 +91,8 @@ export class OakMpHaveToSubscribeMessage extends OakUserException { * 前端用户信息还没加载完整 */ export class OakUserInfoLoadingException extends OakException { - constructor(message, module, params) { - super(message || 'error::userInfoLoading', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::userInfoLoading', _module || 'oak-general-business', params); } } ; @@ -100,81 +100,81 @@ export class OakUserInfoLoadingException extends OakException { * 前端application信息还没加载完整 */ export class OakApplicationLoadingException extends OakException { - constructor(message, module, params) { - super(message || 'error::applicationLoading', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::applicationLoading', _module || 'oak-general-business', params); } } ; export class OakUploadException extends OakUserException { - constructor(message, module, params) { - super(message || 'error::uploadFailed', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::uploadFailed', _module || 'oak-general-business', params); } } ; export class OakPasswordUnset extends OakUserException { - constructor(message, module, params) { - super(message || 'error::user.hasToSetPassword', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::user.hasToSetPassword', _module || 'oak-general-business', params); } } ; export class OakHasToVerifyPassword extends OakUserException { - constructor(message, module, params) { - super(message || 'error::user.hasToVerifyPassword', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::user.hasToVerifyPassword', _module || 'oak-general-business', params); } } ; export class OakCantChangeVerifiedUser extends OakUserException { - constructor(message, module, params) { - super(message || 'error::user.cantChangeVerifiedUser', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::user.cantChangeVerifiedUser', _module || 'oak-general-business', params); } } ; export function makeException(data) { - const { name, message, opRecords, module, params } = data; + const { name, message, opRecords, _module, params } = data; let e; switch (name) { case 'OakDistinguishUserException': { - e = new OakDistinguishUserException(data.userId, data.usePassword, data.useIdCard, data.useWechatUser, data.useEmail, data.useMobile, message, module, params); + e = new OakDistinguishUserException(data.userId, data.usePassword, data.useIdCard, data.useWechatUser, data.useEmail, data.useMobile, message, _module, params); break; } case 'OakChangeLoginWayException': { - e = new OakChangeLoginWayException(data.userId, data.useIdCard, data.useWechatUser, data.useEmail, data.useMobile, message, module, params); + e = new OakChangeLoginWayException(data.userId, data.useIdCard, data.useWechatUser, data.useEmail, data.useMobile, message, _module, params); break; } case 'OakUserDisabledException': { - e = new OakUserDisabledException(message, module, params); + e = new OakUserDisabledException(message, _module, params); break; } case 'OakTokenExpiredException': { - e = new OakTokenExpiredException(message, module, params); + e = new OakTokenExpiredException(message, _module, params); break; } case 'OakMobileUnsetException': { - e = new OakMobileUnsetException(message, module, params); + e = new OakMobileUnsetException(message, _module, params); break; } case 'OakAuthenticationException': { - e = new OakAuthenticationException(message, module, params); + e = new OakAuthenticationException(message, _module, params); break; } case 'OakUserInfoUncompletedException': { - e = new OakUserInfoUncompletedException(message, module, params); + e = new OakUserInfoUncompletedException(message, _module, params); break; } case 'OakUploadException': { - e = new OakUploadException(message, module, params); + e = new OakUploadException(message, _module, params); break; } case 'OakPasswordUnset': { - e = new OakPasswordUnset(message, module, params); + e = new OakPasswordUnset(message, _module, params); break; } case 'OakHasToVerifyPassword': { - e = new OakHasToVerifyPassword(message, module, params); + e = new OakHasToVerifyPassword(message, _module, params); break; } case 'OakCantChangeVerifiedUser': { - e = new OakCantChangeVerifiedUser(message, module, params); + e = new OakCantChangeVerifiedUser(message, _module, params); break; } default: { diff --git a/lib/checkers/index.d.ts b/lib/checkers/index.d.ts index 4a38c8a8d..4758a9aeb 100644 --- a/lib/checkers/index.d.ts +++ b/lib/checkers/index.d.ts @@ -1,2 +1,2 @@ -declare const checkers: (import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker>)[]; +declare const checkers: (import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker>)[]; export default checkers; diff --git a/lib/triggers/index.d.ts b/lib/triggers/index.d.ts index 65f165186..82bb80dc0 100644 --- a/lib/triggers/index.d.ts +++ b/lib/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; +declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; export default _default; diff --git a/lib/types/Exception.d.ts b/lib/types/Exception.d.ts index 3d8c1f66a..ad7b002d9 100644 --- a/lib/types/Exception.d.ts +++ b/lib/types/Exception.d.ts @@ -8,7 +8,7 @@ export declare class OakDistinguishUserException); + constructor(userId: string, usePassword: boolean, useIdCard: boolean, useWechatUser: boolean, useEmail: boolean, useMobile: boolean, message?: string, _module?: string, params?: Record); toString(): string; } export declare class OakChangeLoginWayException extends OakUserException { @@ -17,57 +17,57 @@ export declare class OakChangeLoginWayException); + constructor(userId: string, useIdCard: boolean, useWechatUser: boolean, useEmail: boolean, useMobile: boolean, message?: string, _module?: string, params?: Record); toString(): string; } export declare class OakMobileUnsetException extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakAuthenticationException extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakUserInfoUncompletedException extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakUserDisabledException extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakTokenExpiredException extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakMpHaveToSubscribeMessage extends OakUserException { rejectedMessageType: string[]; - constructor(rejectedMessageType: string[], message?: string, module?: string, params?: Record); + constructor(rejectedMessageType: string[], message?: string, _module?: string, params?: Record); } /** * 前端用户信息还没加载完整 */ export declare class OakUserInfoLoadingException extends OakException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } /** * 前端application信息还没加载完整 */ export declare class OakApplicationLoadingException extends OakException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakUploadException extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakPasswordUnset extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakHasToVerifyPassword extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare class OakCantChangeVerifiedUser extends OakUserException { - constructor(message?: string, module?: string, params?: Record); + constructor(message?: string, _module?: string, params?: Record); } export declare function makeException(data: { name: string; message?: string; opRecords: OpRecord[]; - module?: string; + _module?: string; params?: Record; [A: string]: any; }): OakException | undefined; diff --git a/lib/types/Exception.js b/lib/types/Exception.js index 8fa368d14..99656df07 100644 --- a/lib/types/Exception.js +++ b/lib/types/Exception.js @@ -9,8 +9,8 @@ class OakDistinguishUserException extends types_1.OakUserException { useWechatUser; useEmail; useMobile; - constructor(userId, usePassword, useIdCard, useWechatUser, useEmail, useMobile, message, module, params) { - super(message || 'error::distinguishUser', module || 'oak-general-business', params); + constructor(userId, usePassword, useIdCard, useWechatUser, useEmail, useMobile, message, _module, params) { + super(message || 'error::distinguishUser', _module || 'oak-general-business', params); this.userId = userId; this.useIdCard = useIdCard; this.usePassword = usePassword; @@ -39,8 +39,8 @@ class OakChangeLoginWayException extends types_1.OakUserException { useWechatUser; useEmail; useMobile; - constructor(userId, useIdCard, useWechatUser, useEmail, useMobile, message, module, params) { - super(message || 'error::changeLoginWay', module || 'oak-general-business', params); + constructor(userId, useIdCard, useWechatUser, useEmail, useMobile, message, _module, params) { + super(message || 'error::changeLoginWay', _module || 'oak-general-business', params); this.userId = userId; this.useIdCard = useIdCard; this.useMobile = useMobile; @@ -61,39 +61,39 @@ class OakChangeLoginWayException extends types_1.OakUserException { } exports.OakChangeLoginWayException = OakChangeLoginWayException; class OakMobileUnsetException extends types_1.OakUserException { - constructor(message, module, params) { - super(message || 'error::mobileUnset', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::mobileUnset', _module || 'oak-general-business', params); } } exports.OakMobileUnsetException = OakMobileUnsetException; class OakAuthenticationException extends types_1.OakUserException { - constructor(message, module, params) { - super(message || 'error::needAuthentication', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::needAuthentication', _module || 'oak-general-business', params); } } exports.OakAuthenticationException = OakAuthenticationException; class OakUserInfoUncompletedException extends types_1.OakUserException { - constructor(message, module, params) { - super(message || 'error::userInfoUncompleted', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::userInfoUncompleted', _module || 'oak-general-business', params); } } exports.OakUserInfoUncompletedException = OakUserInfoUncompletedException; class OakUserDisabledException extends types_1.OakUserException { - constructor(message, module, params) { - super(message || 'error::userDisabled', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::userDisabled', _module || 'oak-general-business', params); } } exports.OakUserDisabledException = OakUserDisabledException; class OakTokenExpiredException extends types_1.OakUserException { - constructor(message, module, params) { - super(message || 'error::tokenExpired', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::tokenExpired', _module || 'oak-general-business', params); } } exports.OakTokenExpiredException = OakTokenExpiredException; class OakMpHaveToSubscribeMessage extends types_1.OakUserException { rejectedMessageType; - constructor(rejectedMessageType, message, module, params) { - super(message || 'error::mpHaveToSubscribe', module || 'oak-general-business', params); + constructor(rejectedMessageType, message, _module, params) { + super(message || 'error::mpHaveToSubscribe', _module || 'oak-general-business', params); this.rejectedMessageType = rejectedMessageType; } } @@ -102,8 +102,8 @@ exports.OakMpHaveToSubscribeMessage = OakMpHaveToSubscribeMessage; * 前端用户信息还没加载完整 */ class OakUserInfoLoadingException extends types_1.OakException { - constructor(message, module, params) { - super(message || 'error::userInfoLoading', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::userInfoLoading', _module || 'oak-general-business', params); } } exports.OakUserInfoLoadingException = OakUserInfoLoadingException; @@ -112,86 +112,86 @@ exports.OakUserInfoLoadingException = OakUserInfoLoadingException; * 前端application信息还没加载完整 */ class OakApplicationLoadingException extends types_1.OakException { - constructor(message, module, params) { - super(message || 'error::applicationLoading', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::applicationLoading', _module || 'oak-general-business', params); } } exports.OakApplicationLoadingException = OakApplicationLoadingException; ; class OakUploadException extends types_1.OakUserException { - constructor(message, module, params) { - super(message || 'error::uploadFailed', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::uploadFailed', _module || 'oak-general-business', params); } } exports.OakUploadException = OakUploadException; ; class OakPasswordUnset extends types_1.OakUserException { - constructor(message, module, params) { - super(message || 'error::user.hasToSetPassword', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::user.hasToSetPassword', _module || 'oak-general-business', params); } } exports.OakPasswordUnset = OakPasswordUnset; ; class OakHasToVerifyPassword extends types_1.OakUserException { - constructor(message, module, params) { - super(message || 'error::user.hasToVerifyPassword', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::user.hasToVerifyPassword', _module || 'oak-general-business', params); } } exports.OakHasToVerifyPassword = OakHasToVerifyPassword; ; class OakCantChangeVerifiedUser extends types_1.OakUserException { - constructor(message, module, params) { - super(message || 'error::user.cantChangeVerifiedUser', module || 'oak-general-business', params); + constructor(message, _module, params) { + super(message || 'error::user.cantChangeVerifiedUser', _module || 'oak-general-business', params); } } exports.OakCantChangeVerifiedUser = OakCantChangeVerifiedUser; ; function makeException(data) { - const { name, message, opRecords, module, params } = data; + const { name, message, opRecords, _module, params } = data; let e; switch (name) { case 'OakDistinguishUserException': { - e = new OakDistinguishUserException(data.userId, data.usePassword, data.useIdCard, data.useWechatUser, data.useEmail, data.useMobile, message, module, params); + e = new OakDistinguishUserException(data.userId, data.usePassword, data.useIdCard, data.useWechatUser, data.useEmail, data.useMobile, message, _module, params); break; } case 'OakChangeLoginWayException': { - e = new OakChangeLoginWayException(data.userId, data.useIdCard, data.useWechatUser, data.useEmail, data.useMobile, message, module, params); + e = new OakChangeLoginWayException(data.userId, data.useIdCard, data.useWechatUser, data.useEmail, data.useMobile, message, _module, params); break; } case 'OakUserDisabledException': { - e = new OakUserDisabledException(message, module, params); + e = new OakUserDisabledException(message, _module, params); break; } case 'OakTokenExpiredException': { - e = new OakTokenExpiredException(message, module, params); + e = new OakTokenExpiredException(message, _module, params); break; } case 'OakMobileUnsetException': { - e = new OakMobileUnsetException(message, module, params); + e = new OakMobileUnsetException(message, _module, params); break; } case 'OakAuthenticationException': { - e = new OakAuthenticationException(message, module, params); + e = new OakAuthenticationException(message, _module, params); break; } case 'OakUserInfoUncompletedException': { - e = new OakUserInfoUncompletedException(message, module, params); + e = new OakUserInfoUncompletedException(message, _module, params); break; } case 'OakUploadException': { - e = new OakUploadException(message, module, params); + e = new OakUploadException(message, _module, params); break; } case 'OakPasswordUnset': { - e = new OakPasswordUnset(message, module, params); + e = new OakPasswordUnset(message, _module, params); break; } case 'OakHasToVerifyPassword': { - e = new OakHasToVerifyPassword(message, module, params); + e = new OakHasToVerifyPassword(message, _module, params); break; } case 'OakCantChangeVerifiedUser': { - e = new OakCantChangeVerifiedUser(message, module, params); + e = new OakCantChangeVerifiedUser(message, _module, params); break; } default: { diff --git a/src/types/Exception.ts b/src/types/Exception.ts index 23b7b62c3..261375f0c 100644 --- a/src/types/Exception.ts +++ b/src/types/Exception.ts @@ -17,9 +17,9 @@ export class OakDistinguishUserException useEmail: boolean, useMobile: boolean, message?: string, - module?: string, + _module?: string, params?: Record) { - super(message || 'error::distinguishUser', module || 'oak-general-business', params); + super(message || 'error::distinguishUser', _module || 'oak-general-business', params); this.userId = userId; this.useIdCard = useIdCard; this.usePassword = usePassword; @@ -55,9 +55,9 @@ export class OakChangeLoginWayException useEmail: boolean, useMobile: boolean, message?: string, - module?: string, + _module?: string, params?: Record) { - super(message || 'error::changeLoginWay', module || 'oak-general-business', params); + super(message || 'error::changeLoginWay', _module || 'oak-general-business', params); this.userId = userId; this.useIdCard = useIdCard; this.useMobile = useMobile; @@ -79,40 +79,40 @@ export class OakChangeLoginWayException } export class OakMobileUnsetException extends OakUserException { - constructor(message?: string, module?: string, params?: Record) { - super(message || 'error::mobileUnset', module || 'oak-general-business', params); + constructor(message?: string, _module?: string, params?: Record) { + super(message || 'error::mobileUnset', _module || 'oak-general-business', params); } } export class OakAuthenticationException extends OakUserException { - constructor(message?: string, module?: string, params?: Record) { - super(message || 'error::needAuthentication', module || 'oak-general-business', params); + constructor(message?: string, _module?: string, params?: Record) { + super(message || 'error::needAuthentication', _module || 'oak-general-business', params); } } export class OakUserInfoUncompletedException extends OakUserException { - constructor(message?: string, module?: string, params?: Record) { - super(message || 'error::userInfoUncompleted', module || 'oak-general-business', params); + constructor(message?: string, _module?: string, params?: Record) { + super(message || 'error::userInfoUncompleted', _module || 'oak-general-business', params); } } export class OakUserDisabledException extends OakUserException { - constructor(message?: string, module?: string, params?: Record) { - super(message || 'error::userDisabled', module || 'oak-general-business', params); + constructor(message?: string, _module?: string, params?: Record) { + super(message || 'error::userDisabled', _module || 'oak-general-business', params); } } export class OakTokenExpiredException extends OakUserException { - constructor(message?: string, module?: string, params?: Record) { - super(message || 'error::tokenExpired', module || 'oak-general-business', params); + constructor(message?: string, _module?: string, params?: Record) { + super(message || 'error::tokenExpired', _module || 'oak-general-business', params); } } export class OakMpHaveToSubscribeMessage extends OakUserException { rejectedMessageType: string[]; - constructor(rejectedMessageType: string[], message?: string, module?: string, params?: Record) { - super(message || 'error::mpHaveToSubscribe', module || 'oak-general-business', params); + constructor(rejectedMessageType: string[], message?: string, _module?: string, params?: Record) { + super(message || 'error::mpHaveToSubscribe', _module || 'oak-general-business', params); this.rejectedMessageType = rejectedMessageType; } } @@ -121,8 +121,8 @@ export class OakMpHaveToSubscribeMessage * 前端用户信息还没加载完整 */ export class OakUserInfoLoadingException extends OakException { - constructor(message?: string, module?: string, params?: Record) { - super(message || 'error::userInfoLoading', module || 'oak-general-business', params); + constructor(message?: string, _module?: string, params?: Record) { + super(message || 'error::userInfoLoading', _module || 'oak-general-business', params); } }; @@ -130,32 +130,32 @@ export class OakUserInfoLoadingException * 前端application信息还没加载完整 */ export class OakApplicationLoadingException extends OakException { - constructor(message?: string, module?: string, params?: Record) { - super(message || 'error::applicationLoading', module || 'oak-general-business', params); + constructor(message?: string, _module?: string, params?: Record) { + super(message || 'error::applicationLoading', _module || 'oak-general-business', params); } }; export class OakUploadException extends OakUserException { - constructor(message?: string, module?: string, params?: Record) { - super(message || 'error::uploadFailed', module || 'oak-general-business', params); + constructor(message?: string, _module?: string, params?: Record) { + super(message || 'error::uploadFailed', _module || 'oak-general-business', params); } }; export class OakPasswordUnset extends OakUserException { - constructor(message?: string, module?: string, params?: Record) { - super(message || 'error::user.hasToSetPassword', module || 'oak-general-business', params); + constructor(message?: string, _module?: string, params?: Record) { + super(message || 'error::user.hasToSetPassword', _module || 'oak-general-business', params); } }; export class OakHasToVerifyPassword extends OakUserException { - constructor(message?: string, module?: string, params?: Record) { - super(message || 'error::user.hasToVerifyPassword', module || 'oak-general-business', params); + constructor(message?: string, _module?: string, params?: Record) { + super(message || 'error::user.hasToVerifyPassword', _module || 'oak-general-business', params); } }; export class OakCantChangeVerifiedUser extends OakUserException { - constructor(message?: string, module?: string, params?: Record) { - super(message || 'error::user.cantChangeVerifiedUser', module || 'oak-general-business', params); + constructor(message?: string, _module?: string, params?: Record) { + super(message || 'error::user.cantChangeVerifiedUser', _module || 'oak-general-business', params); } }; @@ -163,11 +163,11 @@ export function makeException(data: { name: string; message?: string; opRecords: OpRecord[]; - module?: string; + _module?: string; params?: Record; [A: string]: any; }) { - const { name, message, opRecords, module, params } = data; + const { name, message, opRecords, _module, params } = data; let e: OakException | undefined; switch (name) { case 'OakDistinguishUserException': { @@ -179,7 +179,7 @@ export function makeException(data: { data.useEmail, data.useMobile, message, - module, + _module, params, ); break; @@ -192,45 +192,45 @@ export function makeException(data: { data.useEmail, data.useMobile, message, - module, + _module, params, ); break; } case 'OakUserDisabledException': { - e = new OakUserDisabledException(message, module, params); + e = new OakUserDisabledException(message, _module, params); break; } case 'OakTokenExpiredException': { - e = new OakTokenExpiredException(message, module, params); + e = new OakTokenExpiredException(message, _module, params); break; } case 'OakMobileUnsetException': { - e = new OakMobileUnsetException(message, module, params); + e = new OakMobileUnsetException(message, _module, params); break; } case 'OakAuthenticationException': { - e = new OakAuthenticationException(message, module, params); + e = new OakAuthenticationException(message, _module, params); break; } case 'OakUserInfoUncompletedException': { - e = new OakUserInfoUncompletedException(message, module, params); + e = new OakUserInfoUncompletedException(message, _module, params); break; } case 'OakUploadException': { - e = new OakUploadException(message, module, params); + e = new OakUploadException(message, _module, params); break; } case 'OakPasswordUnset': { - e = new OakPasswordUnset(message, module, params); + e = new OakPasswordUnset(message, _module, params); break; } case 'OakHasToVerifyPassword': { - e = new OakHasToVerifyPassword(message, module, params); + e = new OakHasToVerifyPassword(message, _module, params); break; } case 'OakCantChangeVerifiedUser': { - e = new OakCantChangeVerifiedUser(message, module, params); + e = new OakCantChangeVerifiedUser(message, _module, params); break; } default: {