From 6d6ac55aa6c60721e4169da1358d8eab8a19a64d Mon Sep 17 00:00:00 2001 From: Xc Date: Tue, 20 Aug 2024 22:00:29 +0800 Subject: [PATCH] =?UTF-8?q?order=E4=B8=AD=E9=87=8D=E5=A4=8D=E7=9A=84?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/components/AbstractComponents.d.ts | 4 ++-- es/components/AbstractComponents.js | 4 ---- es/entities/Order.d.ts | 2 +- es/oak-app-domain/ExtraFile/Schema.d.ts | 4 ++-- es/oak-app-domain/ExtraFile/Storage.js | 2 +- es/oak-app-domain/Order/Action.d.ts | 2 +- es/oak-app-domain/Order/Storage.js | 2 +- es/triggers/withdraw.d.ts | 2 +- es/utils/payClazz/WechatPay/index.d.ts | 2 +- lib/aspects/withdraw.d.ts | 8 ++++---- lib/context/BackendRuntimeContext.d.ts | 2 +- lib/entities/Order.d.ts | 2 +- lib/oak-app-domain/ExtraFile/Schema.d.ts | 4 ++-- lib/oak-app-domain/ExtraFile/Storage.js | 2 +- lib/oak-app-domain/Order/Action.d.ts | 2 +- lib/oak-app-domain/Order/Storage.js | 2 +- lib/utils/application.d.ts | 2 +- lib/utils/payClazz/WechatPay/index.d.ts | 2 +- src/components/AbstractComponents.ts | 1 - src/entities/Order.ts | 2 +- 20 files changed, 24 insertions(+), 29 deletions(-) diff --git a/es/components/AbstractComponents.d.ts b/es/components/AbstractComponents.d.ts index 18b3c16d..9251d752 100644 --- a/es/components/AbstractComponents.d.ts +++ b/es/components/AbstractComponents.d.ts @@ -21,7 +21,7 @@ declare const List: (props: ReactComponentProps(props: { tablePagination?: any; rowSelection?: any; disableSerialNumber?: boolean | undefined; - size?: "small" | "middle" | "large" | undefined; + size?: "large" | "middle" | "small" | undefined; scroll?: any; empty?: any; opWidth?: number | undefined; diff --git a/es/components/AbstractComponents.js b/es/components/AbstractComponents.js index 45f55231..38db9750 100644 --- a/es/components/AbstractComponents.js +++ b/es/components/AbstractComponents.js @@ -1,7 +1,3 @@ -/** - * 抽象组件在业务层根据EntityDict的重新声明 - * by Xc 20230807 - */ import AbsFilterPanel from 'oak-frontend-base/es/components/filterPanel'; import AbsList from 'oak-frontend-base/es/components/list'; import AbsListPro from 'oak-frontend-base/es/components/listPro'; diff --git a/es/entities/Order.d.ts b/es/entities/Order.d.ts index 8cc7cf70..808bf0b9 100644 --- a/es/entities/Order.d.ts +++ b/es/entities/Order.d.ts @@ -20,7 +20,7 @@ export interface Schema extends EntityShape { opers: AccountOper[]; } export type IAction = 'startPaying' | 'payAll' | 'payPartially' | 'payNone' | 'timeout' | 'cancel' | 'startRefunding' | 'refundAll' | 'refundPartially' | 'refundNone'; -export type IState = 'paid' | 'unpaid' | 'timeout' | 'cancelled' | 'paying' | 'partiallyPaid' | 'paid' | 'refunding' | 'partiallyRefunded' | 'refunded'; +export type IState = 'unpaid' | 'timeout' | 'cancelled' | 'paying' | 'partiallyPaid' | 'paid' | 'refunding' | 'partiallyRefunded' | 'refunded'; export declare const IActionDef: ActionDef; export type Action = IAction | 'settle'; export declare const entityDesc: EntityDesc | null; - size?: Int<4> | null; + size?: Int<8> | null; sort?: Float<22, 10> | null; fileType?: String<128> | null; isBridge?: Boolean | null; @@ -46,7 +46,7 @@ export type Schema = EntityShape & { extra1?: Text | null; extra2?: Object | null; extension?: String<16> | null; - size?: Int<4> | null; + size?: Int<8> | null; sort?: Float<22, 10> | null; fileType?: String<128> | null; isBridge?: Boolean | null; diff --git a/es/oak-app-domain/ExtraFile/Storage.js b/es/oak-app-domain/ExtraFile/Storage.js index 6ea1f326..fac85b41 100644 --- a/es/oak-app-domain/ExtraFile/Storage.js +++ b/es/oak-app-domain/ExtraFile/Storage.js @@ -75,7 +75,7 @@ export const desc = { size: { type: "int", params: { - width: 4, + width: 8, signed: true } }, diff --git a/es/oak-app-domain/Order/Action.d.ts b/es/oak-app-domain/Order/Action.d.ts index 516023a4..db93ec9b 100644 --- a/es/oak-app-domain/Order/Action.d.ts +++ b/es/oak-app-domain/Order/Action.d.ts @@ -1,7 +1,7 @@ import { ActionDef } from "oak-domain/lib/types/Action"; import { GenericAction } from "oak-domain/lib/actions/action"; export type IAction = 'startPaying' | 'payAll' | 'payPartially' | 'payNone' | 'timeout' | 'cancel' | 'startRefunding' | 'refundAll' | 'refundPartially' | 'refundNone' | string; -export type IState = 'paid' | 'unpaid' | 'timeout' | 'cancelled' | 'paying' | 'partiallyPaid' | 'paid' | 'refunding' | 'partiallyRefunded' | 'refunded' | string; +export type IState = 'unpaid' | 'timeout' | 'cancelled' | 'paying' | 'partiallyPaid' | 'paid' | 'refunding' | 'partiallyRefunded' | 'refunded' | string; export declare const IActionDef: ActionDef; export type ParticularAction = IAction | 'settle'; export declare const actions: string[]; diff --git a/es/oak-app-domain/Order/Storage.js b/es/oak-app-domain/Order/Storage.js index f3ca6a3c..7231f9fe 100644 --- a/es/oak-app-domain/Order/Storage.js +++ b/es/oak-app-domain/Order/Storage.js @@ -60,7 +60,7 @@ export const desc = { }, iState: { type: "enum", - enumeration: ["paid", "unpaid", "timeout", "cancelled", "paying", "partiallyPaid", "paid", "refunding", "partiallyRefunded", "refunded"] + enumeration: ["unpaid", "timeout", "cancelled", "paying", "partiallyPaid", "paid", "refunding", "partiallyRefunded", "refunded"] } }, actionType: "crud", diff --git a/es/triggers/withdraw.d.ts b/es/triggers/withdraw.d.ts index 979a44c8..e69f8d6e 100644 --- a/es/triggers/withdraw.d.ts +++ b/es/triggers/withdraw.d.ts @@ -6,6 +6,6 @@ import { BRC } from '../types/RuntimeCxt'; * @param context * @param refunds */ -export declare function updateWithdrawState(context: BRC, id: string): Promise<1 | 0>; +export declare function updateWithdrawState(context: BRC, id: string): Promise<0 | 1>; declare const triggers: Trigger[]; export default triggers; 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 11c2072c..e8536354 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/entities/Order.d.ts b/lib/entities/Order.d.ts index 8cc7cf70..808bf0b9 100644 --- a/lib/entities/Order.d.ts +++ b/lib/entities/Order.d.ts @@ -20,7 +20,7 @@ export interface Schema extends EntityShape { opers: AccountOper[]; } export type IAction = 'startPaying' | 'payAll' | 'payPartially' | 'payNone' | 'timeout' | 'cancel' | 'startRefunding' | 'refundAll' | 'refundPartially' | 'refundNone'; -export type IState = 'paid' | 'unpaid' | 'timeout' | 'cancelled' | 'paying' | 'partiallyPaid' | 'paid' | 'refunding' | 'partiallyRefunded' | 'refunded'; +export type IState = 'unpaid' | 'timeout' | 'cancelled' | 'paying' | 'partiallyPaid' | 'paid' | 'refunding' | 'partiallyRefunded' | 'refunded'; export declare const IActionDef: ActionDef; export type Action = IAction | 'settle'; export declare const entityDesc: EntityDesc | null; - size?: Int<4> | null; + size?: Int<8> | null; sort?: Float<22, 10> | null; fileType?: String<128> | null; isBridge?: Boolean | null; @@ -46,7 +46,7 @@ export type Schema = EntityShape & { extra1?: Text | null; extra2?: Object | null; extension?: String<16> | null; - size?: Int<4> | null; + size?: Int<8> | null; sort?: Float<22, 10> | null; fileType?: String<128> | null; isBridge?: Boolean | null; diff --git a/lib/oak-app-domain/ExtraFile/Storage.js b/lib/oak-app-domain/ExtraFile/Storage.js index 97edb473..368be5d9 100644 --- a/lib/oak-app-domain/ExtraFile/Storage.js +++ b/lib/oak-app-domain/ExtraFile/Storage.js @@ -78,7 +78,7 @@ exports.desc = { size: { type: "int", params: { - width: 4, + width: 8, signed: true } }, diff --git a/lib/oak-app-domain/Order/Action.d.ts b/lib/oak-app-domain/Order/Action.d.ts index 516023a4..db93ec9b 100644 --- a/lib/oak-app-domain/Order/Action.d.ts +++ b/lib/oak-app-domain/Order/Action.d.ts @@ -1,7 +1,7 @@ import { ActionDef } from "oak-domain/lib/types/Action"; import { GenericAction } from "oak-domain/lib/actions/action"; export type IAction = 'startPaying' | 'payAll' | 'payPartially' | 'payNone' | 'timeout' | 'cancel' | 'startRefunding' | 'refundAll' | 'refundPartially' | 'refundNone' | string; -export type IState = 'paid' | 'unpaid' | 'timeout' | 'cancelled' | 'paying' | 'partiallyPaid' | 'paid' | 'refunding' | 'partiallyRefunded' | 'refunded' | string; +export type IState = 'unpaid' | 'timeout' | 'cancelled' | 'paying' | 'partiallyPaid' | 'paid' | 'refunding' | 'partiallyRefunded' | 'refunded' | string; export declare const IActionDef: ActionDef; export type ParticularAction = IAction | 'settle'; export declare const actions: string[]; diff --git a/lib/oak-app-domain/Order/Storage.js b/lib/oak-app-domain/Order/Storage.js index 4a0d24bd..fd5dbb5d 100644 --- a/lib/oak-app-domain/Order/Storage.js +++ b/lib/oak-app-domain/Order/Storage.js @@ -63,7 +63,7 @@ exports.desc = { }, iState: { type: "enum", - enumeration: ["paid", "unpaid", "timeout", "cancelled", "paying", "partiallyPaid", "paid", "refunding", "partiallyRefunded", "refunded"] + enumeration: ["unpaid", "timeout", "cancelled", "paying", "partiallyPaid", "paid", "refunding", "partiallyRefunded", "refunded"] } }, actionType: "crud", diff --git a/lib/utils/application.d.ts b/lib/utils/application.d.ts index e7c4620e..260f0950 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; diff --git a/src/components/AbstractComponents.ts b/src/components/AbstractComponents.ts index 4d1d18a8..8f5a1a45 100644 --- a/src/components/AbstractComponents.ts +++ b/src/components/AbstractComponents.ts @@ -2,7 +2,6 @@ * 抽象组件在业务层根据EntityDict的重新声明 * by Xc 20230807 */ - // @ts-nocheck import React from 'react'; import { EntityDict } from '../oak-app-domain'; diff --git a/src/entities/Order.ts b/src/entities/Order.ts index d419e067..ab58d443 100644 --- a/src/entities/Order.ts +++ b/src/entities/Order.ts @@ -28,7 +28,7 @@ export interface Schema extends EntityShape { }; export type IAction = 'startPaying' | 'payAll' | 'payPartially' | 'payNone' | 'timeout' | 'cancel' | 'startRefunding' | 'refundAll' | 'refundPartially' | 'refundNone'; -export type IState = 'paid' | 'unpaid' | 'timeout' | 'cancelled' | 'paying' | 'partiallyPaid' | 'paid' | 'refunding' | 'partiallyRefunded' | 'refunded'; +export type IState = 'unpaid' | 'timeout' | 'cancelled' | 'paying' | 'partiallyPaid' | 'paid' | 'refunding' | 'partiallyRefunded' | 'refunded'; export const IActionDef: ActionDef = { stm: {