From ff741272da9444fdb9d2d18fb7206e763847aee4 Mon Sep 17 00:00:00 2001 From: Xc Date: Mon, 16 Sep 2024 18:03:43 +0800 Subject: [PATCH 1/5] 2.5.1-dev --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index eef3e4a8..99bb907c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oak-pay-business", - "version": "2.5.0", + "version": "2.5.1", "description": "", "files": [ "lib/**/*", @@ -29,9 +29,9 @@ "dependencies": { "classnames": "^2.3.1", "dayjs": "^1.11.5", - "oak-domain": "^5.1.1", - "oak-frontend-base": "^5.3.8", - "oak-general-business": "~5.5.0", + "oak-domain": "file:../oak-domain", + "oak-frontend-base": "file:../oak-frontend-base", + "oak-general-business": "file:../oak-general-business", "wechat-pay-nodejs": "^0.2.3" }, "peerDependencies": { From 24ff33eeb6a26b723ce0d13058d1363bf33eb6c2 Mon Sep 17 00:00:00 2001 From: "Xc@centOs" Date: Thu, 19 Sep 2024 19:07:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=80=82=E9=85=8Dlog=E7=9A=84=E6=94=B9?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/aspects/withdraw.d.ts | 24 ++++++++++++------------ es/oak-app-domain/ActionDefDict.d.ts | 4 +--- es/oak-app-domain/Log/Action.d.ts | 8 +------- es/oak-app-domain/Log/Action.js | 11 +---------- es/oak-app-domain/Log/Schema.d.ts | 8 ++++---- es/oak-app-domain/Log/Storage.js | 1 + es/oak-app-domain/Log/Style.js | 6 ------ lib/aspects/withdraw.d.ts | 24 ++++++++++++------------ lib/oak-app-domain/ActionDefDict.d.ts | 4 +--- lib/oak-app-domain/Log/Action.d.ts | 8 +------- lib/oak-app-domain/Log/Action.js | 13 ++----------- lib/oak-app-domain/Log/Schema.d.ts | 8 ++++---- lib/oak-app-domain/Log/Storage.js | 1 + lib/oak-app-domain/Log/Style.js | 6 ------ 14 files changed, 41 insertions(+), 85 deletions(-) diff --git a/es/aspects/withdraw.d.ts b/es/aspects/withdraw.d.ts index 8ad7334d..5d27ce2e 100644 --- a/es/aspects/withdraw.d.ts +++ b/es/aspects/withdraw.d.ts @@ -3,7 +3,7 @@ export declare function getWithdrawCreateData(params: { accountId: string; price: number; withdrawAccountId?: string; -}, context: BRC): Promise<(Partial> & { +}, context: BRC): Promise<(Partial> & { id: string; } & { accountId: string; @@ -12,12 +12,12 @@ export declare function getWithdrawCreateData(params: { creatorId: string; creator?: import("../oak-app-domain/User/Schema").UpdateOperation | undefined; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { accountId: string; @@ -26,12 +26,12 @@ export declare function getWithdrawCreateData(params: { creator?: undefined; creatorId: string; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { account?: undefined; @@ -40,12 +40,12 @@ export declare function getWithdrawCreateData(params: { creatorId: string; creator?: import("../oak-app-domain/User/Schema").UpdateOperation | undefined; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { account?: undefined; @@ -54,8 +54,8 @@ export declare function getWithdrawCreateData(params: { creator?: undefined; creatorId: string; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; diff --git a/es/oak-app-domain/ActionDefDict.d.ts b/es/oak-app-domain/ActionDefDict.d.ts index bfc912cb..3f29beca 100644 --- a/es/oak-app-domain/ActionDefDict.d.ts +++ b/es/oak-app-domain/ActionDefDict.d.ts @@ -1,7 +1,5 @@ export declare const actionDefDict: { - log: { - iState: import("oak-domain/lib/types").ActionDef; - }; + log: {}; modi: { iState: import("oak-domain/lib/types").ActionDef; }; diff --git a/es/oak-app-domain/Log/Action.d.ts b/es/oak-app-domain/Log/Action.d.ts index bd49c47d..47ccb5c5 100644 --- a/es/oak-app-domain/Log/Action.d.ts +++ b/es/oak-app-domain/Log/Action.d.ts @@ -1,12 +1,6 @@ -import { ActionDef } from "oak-domain/lib/types/Action"; import { GenericAction } from "oak-domain/lib/actions/action"; -export type IState = 'normal' | 'rollbacked' | string; -export type State = IState | string; export type IAction = 'undo' | 'redo' | string; export type ParticularAction = IAction; export declare const actions: string[]; -export declare const IActionDef: ActionDef; export type Action = GenericAction | ParticularAction | string; -export declare const actionDefDict: { - iState: ActionDef; -}; +export declare const actionDefDict: {}; diff --git a/es/oak-app-domain/Log/Action.js b/es/oak-app-domain/Log/Action.js index 4756e9be..ea5a3c3a 100644 --- a/es/oak-app-domain/Log/Action.js +++ b/es/oak-app-domain/Log/Action.js @@ -1,11 +1,2 @@ export const actions = ["count", "stat", "download", "select", "aggregate", "create", "remove", "update", "undo", "redo"]; -export const IActionDef = { - stm: { - undo: ['normal', 'rollbacked'], - redo: ['rollbacked', 'normal'], - }, - is: 'normal', -}; -export const actionDefDict = { - iState: IActionDef -}; +export const actionDefDict = {}; diff --git a/es/oak-app-domain/Log/Schema.d.ts b/es/oak-app-domain/Log/Schema.d.ts index 7645b6c3..54a1eead 100644 --- a/es/oak-app-domain/Log/Schema.d.ts +++ b/es/oak-app-domain/Log/Schema.d.ts @@ -1,19 +1,19 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, MakeFilter, ExprOp, ExpressionKey, SubQueryPredicateMetadata } from "oak-domain/lib/types/Demand"; import { OneOf } from "oak-domain/lib/types/Polyfill"; import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, AggregationResult, EntityShape } from "oak-domain/lib/types/Entity"; -import { Action, ParticularAction, IState } from "./Action"; +import { Action, ParticularAction } from "./Action"; import { String } from "oak-domain/lib/types/DataType"; import * as Oper from "../Oper/Schema"; export type OpSchema = EntityShape & { entity: String<32>; entityId: String<64>; - iState?: IState | null; + iState: "normal" | "rollbacked"; }; export type OpAttr = keyof OpSchema; export type Schema = EntityShape & { entity: String<32>; entityId: String<64>; - iState?: IState | null; + iState: "normal" | "rollbacked"; oper$log?: Array; oper$log$$aggr?: AggregationResult; } & { @@ -26,7 +26,7 @@ type AttrFilter = { $$updateAt$$: Q_DateValue; entity: Q_StringValue; entityId: Q_StringValue; - iState: Q_EnumValue; + iState: Q_EnumValue<"normal" | "rollbacked">; oper$log: Oper.Filter & SubQueryPredicateMetadata; }; export type Filter = MakeFilter>; diff --git a/es/oak-app-domain/Log/Storage.js b/es/oak-app-domain/Log/Storage.js index fa3742a3..e7c4a225 100644 --- a/es/oak-app-domain/Log/Storage.js +++ b/es/oak-app-domain/Log/Storage.js @@ -16,6 +16,7 @@ export const desc = { } }, iState: { + notNull: true, type: "enum", enumeration: ["normal", "rollbacked"] } diff --git a/es/oak-app-domain/Log/Style.js b/es/oak-app-domain/Log/Style.js index 2ced3a03..6bfdcb8d 100644 --- a/es/oak-app-domain/Log/Style.js +++ b/es/oak-app-domain/Log/Style.js @@ -3,10 +3,4 @@ export const style = { undo: '', redo: '', }, - color: { - iState: { - normal: '#229954', - rollbacked: '#2C3E50', - }, - }, }; diff --git a/lib/aspects/withdraw.d.ts b/lib/aspects/withdraw.d.ts index 8ad7334d..5d27ce2e 100644 --- a/lib/aspects/withdraw.d.ts +++ b/lib/aspects/withdraw.d.ts @@ -3,7 +3,7 @@ export declare function getWithdrawCreateData(params: { accountId: string; price: number; withdrawAccountId?: string; -}, context: BRC): Promise<(Partial> & { +}, context: BRC): Promise<(Partial> & { id: string; } & { accountId: string; @@ -12,12 +12,12 @@ export declare function getWithdrawCreateData(params: { creatorId: string; creator?: import("../oak-app-domain/User/Schema").UpdateOperation | undefined; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { accountId: string; @@ -26,12 +26,12 @@ export declare function getWithdrawCreateData(params: { creator?: undefined; creatorId: string; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { account?: undefined; @@ -40,12 +40,12 @@ export declare function getWithdrawCreateData(params: { creatorId: string; creator?: import("../oak-app-domain/User/Schema").UpdateOperation | undefined; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { account?: undefined; @@ -54,8 +54,8 @@ export declare function getWithdrawCreateData(params: { creator?: undefined; creatorId: string; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; diff --git a/lib/oak-app-domain/ActionDefDict.d.ts b/lib/oak-app-domain/ActionDefDict.d.ts index bfc912cb..3f29beca 100644 --- a/lib/oak-app-domain/ActionDefDict.d.ts +++ b/lib/oak-app-domain/ActionDefDict.d.ts @@ -1,7 +1,5 @@ export declare const actionDefDict: { - log: { - iState: import("oak-domain/lib/types").ActionDef; - }; + log: {}; modi: { iState: import("oak-domain/lib/types").ActionDef; }; diff --git a/lib/oak-app-domain/Log/Action.d.ts b/lib/oak-app-domain/Log/Action.d.ts index bd49c47d..47ccb5c5 100644 --- a/lib/oak-app-domain/Log/Action.d.ts +++ b/lib/oak-app-domain/Log/Action.d.ts @@ -1,12 +1,6 @@ -import { ActionDef } from "oak-domain/lib/types/Action"; import { GenericAction } from "oak-domain/lib/actions/action"; -export type IState = 'normal' | 'rollbacked' | string; -export type State = IState | string; export type IAction = 'undo' | 'redo' | string; export type ParticularAction = IAction; export declare const actions: string[]; -export declare const IActionDef: ActionDef; export type Action = GenericAction | ParticularAction | string; -export declare const actionDefDict: { - iState: ActionDef; -}; +export declare const actionDefDict: {}; diff --git a/lib/oak-app-domain/Log/Action.js b/lib/oak-app-domain/Log/Action.js index 795b1cd4..0332a26f 100644 --- a/lib/oak-app-domain/Log/Action.js +++ b/lib/oak-app-domain/Log/Action.js @@ -1,14 +1,5 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.actionDefDict = exports.IActionDef = exports.actions = void 0; +exports.actionDefDict = exports.actions = void 0; exports.actions = ["count", "stat", "download", "select", "aggregate", "create", "remove", "update", "undo", "redo"]; -exports.IActionDef = { - stm: { - undo: ['normal', 'rollbacked'], - redo: ['rollbacked', 'normal'], - }, - is: 'normal', -}; -exports.actionDefDict = { - iState: exports.IActionDef -}; +exports.actionDefDict = {}; diff --git a/lib/oak-app-domain/Log/Schema.d.ts b/lib/oak-app-domain/Log/Schema.d.ts index 7645b6c3..54a1eead 100644 --- a/lib/oak-app-domain/Log/Schema.d.ts +++ b/lib/oak-app-domain/Log/Schema.d.ts @@ -1,19 +1,19 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, MakeFilter, ExprOp, ExpressionKey, SubQueryPredicateMetadata } from "oak-domain/lib/types/Demand"; import { OneOf } from "oak-domain/lib/types/Polyfill"; import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, AggregationResult, EntityShape } from "oak-domain/lib/types/Entity"; -import { Action, ParticularAction, IState } from "./Action"; +import { Action, ParticularAction } from "./Action"; import { String } from "oak-domain/lib/types/DataType"; import * as Oper from "../Oper/Schema"; export type OpSchema = EntityShape & { entity: String<32>; entityId: String<64>; - iState?: IState | null; + iState: "normal" | "rollbacked"; }; export type OpAttr = keyof OpSchema; export type Schema = EntityShape & { entity: String<32>; entityId: String<64>; - iState?: IState | null; + iState: "normal" | "rollbacked"; oper$log?: Array; oper$log$$aggr?: AggregationResult; } & { @@ -26,7 +26,7 @@ type AttrFilter = { $$updateAt$$: Q_DateValue; entity: Q_StringValue; entityId: Q_StringValue; - iState: Q_EnumValue; + iState: Q_EnumValue<"normal" | "rollbacked">; oper$log: Oper.Filter & SubQueryPredicateMetadata; }; export type Filter = MakeFilter>; diff --git a/lib/oak-app-domain/Log/Storage.js b/lib/oak-app-domain/Log/Storage.js index dfc1a991..e21f7eff 100644 --- a/lib/oak-app-domain/Log/Storage.js +++ b/lib/oak-app-domain/Log/Storage.js @@ -19,6 +19,7 @@ exports.desc = { } }, iState: { + notNull: true, type: "enum", enumeration: ["normal", "rollbacked"] } diff --git a/lib/oak-app-domain/Log/Style.js b/lib/oak-app-domain/Log/Style.js index 02ac76bd..80eaf818 100644 --- a/lib/oak-app-domain/Log/Style.js +++ b/lib/oak-app-domain/Log/Style.js @@ -6,10 +6,4 @@ exports.style = { undo: '', redo: '', }, - color: { - iState: { - normal: '#229954', - rollbacked: '#2C3E50', - }, - }, }; From 3fcdd62f577ec9f7d77b25d5a22e605c2e6d37fa Mon Sep 17 00:00:00 2001 From: "Xc@centOs" Date: Fri, 20 Sep 2024 11:39:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=80=82=E9=85=8Dgeneral=E7=9A=84=E6=94=B9?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/aspects/withdraw.d.ts | 16 ++++++++-------- es/context/BackendRuntimeContext.d.ts | 2 +- es/oak-app-domain/ArticleMenu/Schema.d.ts | 4 ++-- es/oak-app-domain/ArticleMenu/Storage.js | 1 - es/utils/application.d.ts | 2 +- es/utils/payClazz/WechatPay/index.d.ts | 2 +- lib/aspects/withdraw.d.ts | 8 ++++---- lib/context/BackendRuntimeContext.d.ts | 2 +- lib/oak-app-domain/ArticleMenu/Schema.d.ts | 4 ++-- lib/oak-app-domain/ArticleMenu/Storage.js | 1 - lib/oak-app-domain/User/Storage.js | 3 +++ lib/oak-app-domain/User/locales/zh_CN.json | 2 +- lib/utils/application.d.ts | 2 +- lib/utils/payClazz/WechatPay/index.d.ts | 2 +- 14 files changed, 26 insertions(+), 25 deletions(-) diff --git a/es/aspects/withdraw.d.ts b/es/aspects/withdraw.d.ts index 5d27ce2e..d2a27766 100644 --- a/es/aspects/withdraw.d.ts +++ b/es/aspects/withdraw.d.ts @@ -12,8 +12,8 @@ export declare function getWithdrawCreateData(params: { creatorId: string; creator?: import("../oak-app-domain/User/Schema").UpdateOperation | undefined; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; @@ -26,8 +26,8 @@ export declare function getWithdrawCreateData(params: { creator?: undefined; creatorId: string; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; @@ -40,8 +40,8 @@ export declare function getWithdrawCreateData(params: { creatorId: string; creator?: import("../oak-app-domain/User/Schema").UpdateOperation | undefined; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; @@ -54,8 +54,8 @@ export declare function getWithdrawCreateData(params: { creator?: undefined; creatorId: string; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; diff --git a/es/context/BackendRuntimeContext.d.ts b/es/context/BackendRuntimeContext.d.ts index 309537d6..aefe6ccb 100644 --- a/es/context/BackendRuntimeContext.d.ts +++ b/es/context/BackendRuntimeContext.d.ts @@ -15,7 +15,7 @@ export declare class BackendRuntimeContext | undefined; + config?: number | import("oak-domain/lib/types").JsonProjection | undefined; style?: number | import("oak-domain/lib/types").JsonProjection | undefined; domainId?: number | undefined; domain?: import("../oak-app-domain/Domain/Schema").Projection | undefined; diff --git a/es/oak-app-domain/ArticleMenu/Schema.d.ts b/es/oak-app-domain/ArticleMenu/Schema.d.ts index 2db4d23b..6b447b9b 100644 --- a/es/oak-app-domain/ArticleMenu/Schema.d.ts +++ b/es/oak-app-domain/ArticleMenu/Schema.d.ts @@ -10,7 +10,7 @@ export type OpSchema = EntityShape & { name: String<32>; isArticle: Boolean; parentId?: ForeignKey<"articleMenu"> | null; - isLeaf: Boolean; + isLeaf?: Boolean | null; entity: String<32>; entityId: String<64>; }; @@ -19,7 +19,7 @@ export type Schema = EntityShape & { name: String<32>; isArticle: Boolean; parentId?: ForeignKey<"articleMenu"> | null; - isLeaf: Boolean; + isLeaf?: Boolean | null; entity: String<32>; entityId: String<64>; parent?: Schema | null; diff --git a/es/oak-app-domain/ArticleMenu/Storage.js b/es/oak-app-domain/ArticleMenu/Storage.js index 3fb8bdd9..d327c44c 100644 --- a/es/oak-app-domain/ArticleMenu/Storage.js +++ b/es/oak-app-domain/ArticleMenu/Storage.js @@ -17,7 +17,6 @@ export const desc = { ref: "articleMenu" }, isLeaf: { - notNull: true, type: "boolean" }, entity: { diff --git a/es/utils/application.d.ts b/es/utils/application.d.ts index 4449cd47..c7ec4133 100644 --- a/es/utils/application.d.ts +++ b/es/utils/application.d.ts @@ -14,7 +14,7 @@ export declare const mergedProjection: { type?: number | undefined; systemId?: number | undefined; system?: import("../oak-app-domain/System/Schema").Projection | undefined; - config?: number | import("oak-domain/lib/types").JsonProjection | undefined; + config?: number | import("oak-domain/lib/types").JsonProjection | undefined; style?: number | import("oak-domain/lib/types").JsonProjection | undefined; domainId?: number | undefined; domain?: import("../oak-app-domain/Domain/Schema").Projection | undefined; diff --git a/es/utils/payClazz/WechatPay/index.d.ts b/es/utils/payClazz/WechatPay/index.d.ts index ce1d041a..eeba2b4b 100644 --- a/es/utils/payClazz/WechatPay/index.d.ts +++ b/es/utils/payClazz/WechatPay/index.d.ts @@ -1,4 +1,4 @@ import WechatPay from './WechatPay'; import WechatPayDebug from './WechatPay.debug'; -declare const _default: typeof WechatPay | typeof WechatPayDebug; +declare const _default: typeof WechatPayDebug | typeof WechatPay; export default _default; diff --git a/lib/aspects/withdraw.d.ts b/lib/aspects/withdraw.d.ts index 5d27ce2e..2ea225ee 100644 --- a/lib/aspects/withdraw.d.ts +++ b/lib/aspects/withdraw.d.ts @@ -3,7 +3,7 @@ export declare function getWithdrawCreateData(params: { accountId: string; price: number; withdrawAccountId?: string; -}, context: BRC): Promise<(Partial> & { +}, context: BRC): Promise<(Partial> & { id: string; } & { accountId: string; @@ -17,7 +17,7 @@ export declare function getWithdrawCreateData(params: { modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { accountId: string; @@ -31,7 +31,7 @@ export declare function getWithdrawCreateData(params: { modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { account?: undefined; @@ -45,7 +45,7 @@ export declare function getWithdrawCreateData(params: { modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { account?: undefined; diff --git a/lib/context/BackendRuntimeContext.d.ts b/lib/context/BackendRuntimeContext.d.ts index 309537d6..aefe6ccb 100644 --- a/lib/context/BackendRuntimeContext.d.ts +++ b/lib/context/BackendRuntimeContext.d.ts @@ -15,7 +15,7 @@ export declare class BackendRuntimeContext | undefined; + config?: number | import("oak-domain/lib/types").JsonProjection | undefined; style?: number | import("oak-domain/lib/types").JsonProjection | undefined; domainId?: number | undefined; domain?: import("../oak-app-domain/Domain/Schema").Projection | undefined; diff --git a/lib/oak-app-domain/ArticleMenu/Schema.d.ts b/lib/oak-app-domain/ArticleMenu/Schema.d.ts index 2db4d23b..6b447b9b 100644 --- a/lib/oak-app-domain/ArticleMenu/Schema.d.ts +++ b/lib/oak-app-domain/ArticleMenu/Schema.d.ts @@ -10,7 +10,7 @@ export type OpSchema = EntityShape & { name: String<32>; isArticle: Boolean; parentId?: ForeignKey<"articleMenu"> | null; - isLeaf: Boolean; + isLeaf?: Boolean | null; entity: String<32>; entityId: String<64>; }; @@ -19,7 +19,7 @@ export type Schema = EntityShape & { name: String<32>; isArticle: Boolean; parentId?: ForeignKey<"articleMenu"> | null; - isLeaf: Boolean; + isLeaf?: Boolean | null; entity: String<32>; entityId: String<64>; parent?: Schema | null; diff --git a/lib/oak-app-domain/ArticleMenu/Storage.js b/lib/oak-app-domain/ArticleMenu/Storage.js index 72cd418c..2ef5f1cc 100644 --- a/lib/oak-app-domain/ArticleMenu/Storage.js +++ b/lib/oak-app-domain/ArticleMenu/Storage.js @@ -20,7 +20,6 @@ exports.desc = { ref: "articleMenu" }, isLeaf: { - notNull: true, type: "boolean" }, entity: { diff --git a/lib/oak-app-domain/User/Storage.js b/lib/oak-app-domain/User/Storage.js index 870f7385..751b8d4e 100644 --- a/lib/oak-app-domain/User/Storage.js +++ b/lib/oak-app-domain/User/Storage.js @@ -46,6 +46,9 @@ exports.desc = { isRoot: { type: "boolean" }, + hasPassword: { + type: "boolean" + }, idState: { type: "enum", enumeration: ["unverified", "verified", "verifying"] diff --git a/lib/oak-app-domain/User/locales/zh_CN.json b/lib/oak-app-domain/User/locales/zh_CN.json index a1ffcb46..a9e98868 100644 --- a/lib/oak-app-domain/User/locales/zh_CN.json +++ b/lib/oak-app-domain/User/locales/zh_CN.json @@ -1 +1 @@ -{ "name": "用户", "attr": { "name": "姓名", "nickname": "昵称", "birth": "生日", "password": "密码", "passwordSha1": "sha1加密密码", "gender": "性别", "idCardType": "证件类型", "idNumber": "证件号码", "ref": "指向用户", "files": "相关文件", "userState": "用户状态", "idState": "身份验证状态", "codes": "微信分享二维码", "isRoot": "是否超级用户", "addresses": "收货地址", "accounts": "用户帐户", "withdrawAccounts": "用户提现帐户" }, "action": { "activate": "激活", "accept": "同意", "verify": "验证", "reject": "拒绝", "enable": "启用", "disable": "禁用", "mergeTo": "合并", "mergeFrom": "使合并" }, "v": { "userState": { "shadow": "未激活", "normal": "正常", "disabled": "禁用", "merged": "已被合并" }, "idState": { "unverified": "未验证", "verifying": "验证中", "verified": "已验证" }, "gender": { "male": "男", "female": "女" }, "idCardType": { "ID-Card": "身份证", "passport": "护照", "Mainland-passport": "港澳台通行证" } } } +{ "name": "用户", "attr": { "name": "姓名", "nickname": "昵称", "birth": "生日", "password": "密码", "passwordSha1": "sha1加密密码", "gender": "性别", "idCardType": "证件类型", "idNumber": "证件号码", "ref": "指向用户", "files": "相关文件", "userState": "用户状态", "idState": "身份验证状态", "codes": "微信分享二维码", "isRoot": "是否超级用户", "addresses": "收货地址", "hasPassword": "用户是否存在密码", "accounts": "用户帐户", "withdrawAccounts": "用户提现帐户" }, "action": { "activate": "激活", "accept": "同意", "verify": "验证", "reject": "拒绝", "enable": "启用", "disable": "禁用", "mergeTo": "合并", "mergeFrom": "使合并" }, "v": { "userState": { "shadow": "未激活", "normal": "正常", "disabled": "禁用", "merged": "已被合并" }, "idState": { "unverified": "未验证", "verifying": "验证中", "verified": "已验证" }, "gender": { "male": "男", "female": "女" }, "idCardType": { "ID-Card": "身份证", "passport": "护照", "Mainland-passport": "港澳台通行证" } } } diff --git a/lib/utils/application.d.ts b/lib/utils/application.d.ts index 4449cd47..c7ec4133 100644 --- a/lib/utils/application.d.ts +++ b/lib/utils/application.d.ts @@ -14,7 +14,7 @@ export declare const mergedProjection: { type?: number | undefined; systemId?: number | undefined; system?: import("../oak-app-domain/System/Schema").Projection | undefined; - config?: number | import("oak-domain/lib/types").JsonProjection | undefined; + config?: number | import("oak-domain/lib/types").JsonProjection | undefined; style?: number | import("oak-domain/lib/types").JsonProjection | undefined; domainId?: number | undefined; domain?: import("../oak-app-domain/Domain/Schema").Projection | undefined; diff --git a/lib/utils/payClazz/WechatPay/index.d.ts b/lib/utils/payClazz/WechatPay/index.d.ts index ce1d041a..eeba2b4b 100644 --- a/lib/utils/payClazz/WechatPay/index.d.ts +++ b/lib/utils/payClazz/WechatPay/index.d.ts @@ -1,4 +1,4 @@ import WechatPay from './WechatPay'; import WechatPayDebug from './WechatPay.debug'; -declare const _default: typeof WechatPay | typeof WechatPayDebug; +declare const _default: typeof WechatPayDebug | typeof WechatPay; export default _default; From 804974782fc5038fef1636276dfe3eb5eb6995e5 Mon Sep 17 00:00:00 2001 From: "Xc@centOs" Date: Fri, 20 Sep 2024 23:54:08 +0800 Subject: [PATCH 4/5] build --- es/aspects/withdraw.d.ts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/es/aspects/withdraw.d.ts b/es/aspects/withdraw.d.ts index d2a27766..2ea225ee 100644 --- a/es/aspects/withdraw.d.ts +++ b/es/aspects/withdraw.d.ts @@ -3,7 +3,7 @@ export declare function getWithdrawCreateData(params: { accountId: string; price: number; withdrawAccountId?: string; -}, context: BRC): Promise<(Partial> & { +}, context: BRC): Promise<(Partial> & { id: string; } & { accountId: string; @@ -12,12 +12,12 @@ export declare function getWithdrawCreateData(params: { creatorId: string; creator?: import("../oak-app-domain/User/Schema").UpdateOperation | undefined; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { accountId: string; @@ -26,12 +26,12 @@ export declare function getWithdrawCreateData(params: { creator?: undefined; creatorId: string; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { account?: undefined; @@ -40,12 +40,12 @@ export declare function getWithdrawCreateData(params: { creatorId: string; creator?: import("../oak-app-domain/User/Schema").UpdateOperation | undefined; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { account?: undefined; @@ -54,8 +54,8 @@ export declare function getWithdrawCreateData(params: { creator?: undefined; creatorId: string; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; From f5bfa1c1f41f01185d9bf2f12c0c3579051c683b Mon Sep 17 00:00:00 2001 From: "Xc@centOs" Date: Fri, 20 Sep 2024 23:56:13 +0800 Subject: [PATCH 5/5] 2.5.1-ppppub --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 99bb907c..0f25a5e0 100644 --- a/package.json +++ b/package.json @@ -29,9 +29,9 @@ "dependencies": { "classnames": "^2.3.1", "dayjs": "^1.11.5", - "oak-domain": "file:../oak-domain", - "oak-frontend-base": "file:../oak-frontend-base", - "oak-general-business": "file:../oak-general-business", + "oak-domain": "^5.1.2", + "oak-frontend-base": "^5.3.10", + "oak-general-business": "~5.5.1", "wechat-pay-nodejs": "^0.2.3" }, "peerDependencies": {