Oak-Team
/
oak-general-business
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 38 Wiki Activity

适配了domain2.6.1对Exception的定义

This commit is contained in:
Xu Chang 2023-02-06 21:53:36 +08:00
parent 6fccaa64ee
commit 6ac3fa5e2f
3 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/editor/index.ts
View File

@ -82,7 +82,7 @@ export default OakComponent({
return result;
} catch (error) {
if (
(error as OakException).constructor.name ===
(error as OakException<EntityDict>).constructor.name ===
OakUnloggedInException.name
) {
this.navigateTo({

2
src/pages/userEntityGrant/grant/index.ts
View File

@ -82,7 +82,7 @@ export default OakComponent({
});
} catch (error) {
if (
(<OakException>error).constructor.name ===
(<OakException<EntityDict>>error).constructor.name ===
OakCongruentRowExists.name
) {
// 这里由于编译的问题，用instanceof会不通过检查

47
src/types/Exception.ts
View File

@ -1,13 +1,15 @@
import { OakUserException, makeException as makeException2 } from "oak-domain/lib/types";
import { EntityDict } from '../general-app-domain';
import { EntityDict as BaseEntityDict, SelectOpResult } from 'oak-domain/lib/types/Entity';
export class OakNotEnoughMoneyException extends OakUserException {
export class OakNotEnoughMoneyException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
constructor(message?: string) {
super(message || '您的余额不足');
}
};
export class OakDistinguishUserException extends OakUserException {
export class OakDistinguishUserException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
userId: string;
usingPassword: boolean;
usingIdCard: boolean;
@ -35,7 +37,7 @@ export class OakDistinguishUserException extends OakUserException {
}
};
export class OakChangeLoginWayException extends OakUserException {
export class OakChangeLoginWayException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
userId: string;
usingIdCard: boolean;
usingWechatUser: boolean;
@ -60,61 +62,74 @@ export class OakChangeLoginWayException extends OakUserException {
}
}
export class OakMobileUnsetException extends OakUserException {
export class OakMobileUnsetException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
constructor(message?: string) {
super(message || '您需要先登记手机号');
}
}
export class OakUserInfoUncompletedException extends OakUserException {
export class OakUserInfoUncompletedException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
constructor(message?: string) {
super(message || '您需要先填写完整的用户信息');
}
}
export class OakUserDisabledException extends OakUserException {
export class OakUserDisabledException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
constructor(message?: string) {
super(message || '您的帐户已被禁用，请联系系统管理员');
}
}
export class OakTokenExpiredException extends OakUserException {
export class OakTokenExpiredException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
constructor(message?: string) {
super(message || '当前登录状态已经过期');
}
}
export function makeException(data: {
export function makeException<ED extends EntityDict & BaseEntityDict>(data: {
name: string;
message?: string;
opRecords: SelectOpResult<ED>;
[A: string]: any;
}) {
const exception = makeException2(data);
const exception = makeException2<ED>(data);
if (exception) {
return exception;
}
const { name, message } = data;
const { name, message, opRecords } = data;
switch (name) {
case 'OakNotEnoughMoneyException': {
return new OakNotEnoughMoneyException(message);
const e = new OakNotEnoughMoneyException(message);
e.setOpRecords(opRecords);
return e;
}
case 'OakDistinguishUserException': {
return new OakDistinguishUserException(data.userId, data.usingPassword, data.usingIdCard, data.usingWechatUser, data.usingEmail, message);
const e = new OakDistinguishUserException(data.userId, data.usingPassword, data.usingIdCard, data.usingWechatUser, data.usingEmail, message);
e.setOpRecords(opRecords);
return e;
}
case 'OakUserDisabledException': {
return new OakUserDisabledException(message);
const e = new OakUserDisabledException(message);
e.setOpRecords(opRecords);
return e;
}
case 'OakTokenExpiredException': {
return new OakTokenExpiredException(message);
const e = new OakTokenExpiredException(message);
e.setOpRecords(opRecords);
return e;
}
case 'OakMobileUnsetException': {
return new OakMobileUnsetException(message);
const e = new OakMobileUnsetException(message);
e.setOpRecords(opRecords);
return e;
}
case 'OakUserInfoUncompletedException': {
return new OakUserInfoUncompletedException(message);
const e = new OakUserInfoUncompletedException(message);
e.setOpRecords(opRecords);
return e;
}
default: {
return;