Merge branch 'dev' into release
This commit is contained in:
commit
adef08d3f5
|
|
@ -282,7 +282,7 @@ export class Cache extends Feature {
|
|||
catch (err) {
|
||||
this.rollback();
|
||||
// 现在如果cache中属性缺失会报OakRowUnexistedException,待进一步细化
|
||||
if (!(err instanceof OakUserException) || !(err instanceof OakRowUnexistedException)) {
|
||||
if (!(err instanceof OakUserException) && !(err instanceof OakRowUnexistedException)) {
|
||||
throw err;
|
||||
}
|
||||
return err;
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ class Cache extends Feature_1.Feature {
|
|||
catch (err) {
|
||||
this.rollback();
|
||||
// 现在如果cache中属性缺失会报OakRowUnexistedException,待进一步细化
|
||||
if (!(err instanceof Exception_1.OakUserException) || !(err instanceof Exception_1.OakRowUnexistedException)) {
|
||||
if (!(err instanceof Exception_1.OakUserException) && !(err instanceof Exception_1.OakRowUnexistedException)) {
|
||||
throw err;
|
||||
}
|
||||
return err;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "oak-frontend-base",
|
||||
"version": "4.2.5",
|
||||
"version": "4.2.6",
|
||||
"description": "oak框架中前端与业务逻辑无关的平台部分",
|
||||
"author": {
|
||||
"name": "XuChang"
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
},
|
||||
"peerDependencies": {
|
||||
"@ant-design/icons": ">=5.2.6",
|
||||
"antd": ">=5.11.0",
|
||||
"antd": ">=5.13.0",
|
||||
"antd-mobile": ">=5.33.0",
|
||||
"antd-mobile-icons": ">=0.3.0",
|
||||
"react": ">=18.2.0",
|
||||
|
|
@ -63,7 +63,7 @@
|
|||
"@types/react-native": "^0.72.8",
|
||||
"@types/uuid": "^9.0.6",
|
||||
"@types/wechat-miniprogram": "^3.4.5",
|
||||
"antd": "5.11.0",
|
||||
"antd": "^5.13.3",
|
||||
"antd-mobile": "5.33.0",
|
||||
"antd-mobile-icons": "0.3.0",
|
||||
"assert": "^2.0.0",
|
||||
|
|
|
|||
|
|
@ -401,7 +401,7 @@ export class Cache<
|
|||
} catch (err) {
|
||||
this.rollback();
|
||||
// 现在如果cache中属性缺失会报OakRowUnexistedException,待进一步细化
|
||||
if (!(err instanceof OakUserException) || !(err instanceof OakRowUnexistedException)) {
|
||||
if (!(err instanceof OakUserException) && !(err instanceof OakRowUnexistedException)) {
|
||||
throw err;
|
||||
}
|
||||
return err as Error;
|
||||
|
|
|
|||
Loading…
Reference in New Issue