From 2d2a5174498c686edf4711a7fc64c8d38e62e533 Mon Sep 17 00:00:00 2001 From: Xc Date: Wed, 10 Apr 2024 19:01:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86composeFileUrl?= =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/checkers/index.d.ts | 2 +- es/components/config/style/platform/index.d.ts | 2 +- es/components/config/upsert/index.d.ts | 2 +- es/components/extraFile/commit/index.d.ts | 2 +- es/triggers/index.d.ts | 2 +- es/triggers/toDo.d.ts | 2 +- es/types/Cos.d.ts | 2 +- es/utils/cos/ctyun.d.ts | 2 +- es/utils/cos/index.d.ts | 2 +- es/utils/cos/qiniu.d.ts | 2 +- es/utils/cos/wechat.d.ts | 2 +- es/utils/cos/wechat.js | 3 ++- es/utils/getContextConfig.d.ts | 2 +- lib/checkers/index.d.ts | 2 +- lib/triggers/index.d.ts | 2 +- lib/triggers/toDo.d.ts | 2 +- lib/types/Cos.d.ts | 2 +- lib/utils/cos/ctyun.d.ts | 2 +- lib/utils/cos/index.d.ts | 2 +- lib/utils/cos/qiniu.d.ts | 2 +- lib/utils/cos/wechat.d.ts | 2 +- lib/utils/cos/wechat.js | 3 ++- lib/utils/getContextConfig.d.ts | 2 +- src/types/Cos.ts | 2 +- src/utils/cos/ctyun.ts | 2 +- src/utils/cos/index.ts | 2 +- src/utils/cos/qiniu.ts | 2 +- src/utils/cos/wechat.ts | 5 +++-- src/utils/getContextConfig.ts | 2 +- 29 files changed, 33 insertions(+), 30 deletions(-) diff --git a/es/checkers/index.d.ts b/es/checkers/index.d.ts index 188968f7b..6fc7e4075 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>)[]; +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>)[]; export default checkers; diff --git a/es/components/config/style/platform/index.d.ts b/es/components/config/style/platform/index.d.ts index bd3579c54..0017a6f93 100644 --- a/es/components/config/style/platform/index.d.ts +++ b/es/components/config/style/platform/index.d.ts @@ -1,7 +1,7 @@ import { Style } from '../../../../types/Style'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; diff --git a/es/components/config/upsert/index.d.ts b/es/components/config/upsert/index.d.ts index 6a8e95a3d..26655e31f 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) => import("react").ReactElement>; diff --git a/es/components/extraFile/commit/index.d.ts b/es/components/extraFile/commit/index.d.ts index cbeb7a0c0..2315c1303 100644 --- a/es/components/extraFile/commit/index.d.ts +++ b/es/components/extraFile/commit/index.d.ts @@ -12,7 +12,7 @@ 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>)[]; +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>)[]; export default _default; diff --git a/es/triggers/toDo.d.ts b/es/triggers/toDo.d.ts index 36cbfbff9..945523f77 100644 --- a/es/triggers/toDo.d.ts +++ b/es/triggers/toDo.d.ts @@ -14,7 +14,7 @@ export declare function createToDo; +}, userIds?: string[]): Promise<0 | 1>; /** * 完成todo例程，当在entity对象上进行action操作时（操作条件是filter），将对应的todo完成 * 必须在entity的action的后trigger中调用 diff --git a/es/types/Cos.d.ts b/es/types/Cos.d.ts index 51f39e46b..376ff80e4 100644 --- a/es/types/Cos.d.ts +++ b/es/types/Cos.d.ts @@ -34,7 +34,7 @@ export default interface Cos { /** * 构建出访问图片的url，注意这个url应当和objectId一对一映射，这样才可以实现多个extraFile之间共享cos上的路径 */ - composeFileUrl: (extraFile: ED['extraFile']['OpSchema'], application: ED['application']['Schema'], style?: string) => string; + composeFileUrl: (extraFile: ED['extraFile']['OpSchema'], application: Partial, style?: string) => string; /** * 后台对upload是否成功不确定的文件，向OSS发起主动确认 * @param extraFile diff --git a/es/utils/cos/ctyun.d.ts b/es/utils/cos/ctyun.d.ts index d6637d926..74ed1c900 100644 --- a/es/utils/cos/ctyun.d.ts +++ b/es/utils/cos/ctyun.d.ts @@ -11,7 +11,7 @@ export default class CTYun implements Cos { uploadUrl: string, // 上传的url formData: Record, // 上传的其它part参数 autoInform?: boolean) => Promise, file: string | File): Promise; - composeFileUrl(extraFile: EntityDict['extraFile']['OpSchema'], application: EntityDict['application']['Schema'], style?: string): string; + composeFileUrl(extraFile: EntityDict['extraFile']['OpSchema'], application: Partial, style?: string): string; checkWhetherSuccess(extraFile: OpSchema, context: BRC): Promise; removeFile(extraFile: OpSchema, context: BRC): Promise; } diff --git a/es/utils/cos/index.d.ts b/es/utils/cos/index.d.ts index a1e2b0a23..3bc331311 100644 --- a/es/utils/cos/index.d.ts +++ b/es/utils/cos/index.d.ts @@ -6,4 +6,4 @@ import Cos from '../../types/Cos'; */ export declare function registerCos(clazz: new () => Cos): void; export declare function getCos(origin: string): Cos; -export declare function composeFileUrl(extraFile: ED['extraFile']['OpSchema'], application: ED['application']['Schema'], style?: string): string; +export declare function composeFileUrl(extraFile: ED['extraFile']['OpSchema'], application: Partial, style?: string): string; diff --git a/es/utils/cos/qiniu.d.ts b/es/utils/cos/qiniu.d.ts index bafa30476..97379f339 100644 --- a/es/utils/cos/qiniu.d.ts +++ b/es/utils/cos/qiniu.d.ts @@ -11,7 +11,7 @@ export default class Qiniu implements Cos { uploadUrl: string, // 上传的url formData: Record, // 上传的其它part参数 autoInform?: boolean) => Promise, file: string | File): Promise; - composeFileUrl(extraFile: EntityDict['extraFile']['OpSchema'], application: EntityDict['application']['Schema'], style?: string): string; + composeFileUrl(extraFile: EntityDict['extraFile']['OpSchema'], application: Partial, style?: string): string; checkWhetherSuccess(extraFile: OpSchema, context: BRC): Promise; removeFile(extraFile: OpSchema, context: BRC): Promise; } diff --git a/es/utils/cos/wechat.d.ts b/es/utils/cos/wechat.d.ts index 4252e087f..5d1d7b400 100644 --- a/es/utils/cos/wechat.d.ts +++ b/es/utils/cos/wechat.d.ts @@ -14,7 +14,7 @@ export default class Wechat implements Cos { aspectName: string, // 上传的aspect名 formData: Record, // 上传的其它part参数 autoInform?: boolean) => Promise): Promise; - composeFileUrl(extraFile: EntityDict['extraFile']['OpSchema'], application: EntityDict['application']['Schema'], style?: string): string; + composeFileUrl(extraFile: EntityDict['extraFile']['OpSchema'], application: Partial, style?: string): string; checkWhetherSuccess(extraFile: OpSchema, context: BRC): Promise; removeFile(extraFile: OpSchema, context: BRC): Promise; } diff --git a/es/utils/cos/wechat.js b/es/utils/cos/wechat.js index 274e924c0..1a59e3a82 100644 --- a/es/utils/cos/wechat.js +++ b/es/utils/cos/wechat.js @@ -43,7 +43,8 @@ export default class Wechat { composeFileUrl(extraFile, application, style) { // 微信获取素材链接 还需要处理下 const { applicationId, extra1: mediaId, extra2, type } = extraFile; - const { system: { domain$system } } = application; + const { system } = application; + const { domain$system } = system; assert(domain$system); const [domain] = domain$system; if (domain && mediaId) { diff --git a/es/utils/getContextConfig.d.ts b/es/utils/getContextConfig.d.ts index 94e026a1a..3d26af639 100644 --- a/es/utils/getContextConfig.d.ts +++ b/es/utils/getContextConfig.d.ts @@ -7,7 +7,7 @@ import { EntityDict } from '../oak-app-domain'; * @param origin * @returns */ -export declare function getConfig(application: ED['application']['Schema'], service: Service, origin: Origin): { +export declare function getConfig(application: Partial, service: Service, origin: Origin): { instance: import("oak-external-sdk").QiniuCloudInstance; config: any; } | { diff --git a/lib/checkers/index.d.ts b/lib/checkers/index.d.ts index 188968f7b..6fc7e4075 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>)[]; +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>)[]; export default checkers; diff --git a/lib/triggers/index.d.ts b/lib/triggers/index.d.ts index 890a0484f..8de3cba7b 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>)[]; +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>)[]; export default _default; diff --git a/lib/triggers/toDo.d.ts b/lib/triggers/toDo.d.ts index 36cbfbff9..945523f77 100644 --- a/lib/triggers/toDo.d.ts +++ b/lib/triggers/toDo.d.ts @@ -14,7 +14,7 @@ export declare function createToDo; +}, userIds?: string[]): Promise<0 | 1>; /** * 完成todo例程，当在entity对象上进行action操作时（操作条件是filter），将对应的todo完成 * 必须在entity的action的后trigger中调用 diff --git a/lib/types/Cos.d.ts b/lib/types/Cos.d.ts index 51f39e46b..376ff80e4 100644 --- a/lib/types/Cos.d.ts +++ b/lib/types/Cos.d.ts @@ -34,7 +34,7 @@ export default interface Cos { /** * 构建出访问图片的url，注意这个url应当和objectId一对一映射，这样才可以实现多个extraFile之间共享cos上的路径 */ - composeFileUrl: (extraFile: ED['extraFile']['OpSchema'], application: ED['application']['Schema'], style?: string) => string; + composeFileUrl: (extraFile: ED['extraFile']['OpSchema'], application: Partial, style?: string) => string; /** * 后台对upload是否成功不确定的文件，向OSS发起主动确认 * @param extraFile diff --git a/lib/utils/cos/ctyun.d.ts b/lib/utils/cos/ctyun.d.ts index d6637d926..74ed1c900 100644 --- a/lib/utils/cos/ctyun.d.ts +++ b/lib/utils/cos/ctyun.d.ts @@ -11,7 +11,7 @@ export default class CTYun implements Cos { uploadUrl: string, // 上传的url formData: Record, // 上传的其它part参数 autoInform?: boolean) => Promise, file: string | File): Promise; - composeFileUrl(extraFile: EntityDict['extraFile']['OpSchema'], application: EntityDict['application']['Schema'], style?: string): string; + composeFileUrl(extraFile: EntityDict['extraFile']['OpSchema'], application: Partial, style?: string): string; checkWhetherSuccess(extraFile: OpSchema, context: BRC): Promise; removeFile(extraFile: OpSchema, context: BRC): Promise; } diff --git a/lib/utils/cos/index.d.ts b/lib/utils/cos/index.d.ts index a1e2b0a23..3bc331311 100644 --- a/lib/utils/cos/index.d.ts +++ b/lib/utils/cos/index.d.ts @@ -6,4 +6,4 @@ import Cos from '../../types/Cos'; */ export declare function registerCos(clazz: new () => Cos): void; export declare function getCos(origin: string): Cos; -export declare function composeFileUrl(extraFile: ED['extraFile']['OpSchema'], application: ED['application']['Schema'], style?: string): string; +export declare function composeFileUrl(extraFile: ED['extraFile']['OpSchema'], application: Partial, style?: string): string; diff --git a/lib/utils/cos/qiniu.d.ts b/lib/utils/cos/qiniu.d.ts index bafa30476..97379f339 100644 --- a/lib/utils/cos/qiniu.d.ts +++ b/lib/utils/cos/qiniu.d.ts @@ -11,7 +11,7 @@ export default class Qiniu implements Cos { uploadUrl: string, // 上传的url formData: Record, // 上传的其它part参数 autoInform?: boolean) => Promise, file: string | File): Promise; - composeFileUrl(extraFile: EntityDict['extraFile']['OpSchema'], application: EntityDict['application']['Schema'], style?: string): string; + composeFileUrl(extraFile: EntityDict['extraFile']['OpSchema'], application: Partial, style?: string): string; checkWhetherSuccess(extraFile: OpSchema, context: BRC): Promise; removeFile(extraFile: OpSchema, context: BRC): Promise; } diff --git a/lib/utils/cos/wechat.d.ts b/lib/utils/cos/wechat.d.ts index 4252e087f..5d1d7b400 100644 --- a/lib/utils/cos/wechat.d.ts +++ b/lib/utils/cos/wechat.d.ts @@ -14,7 +14,7 @@ export default class Wechat implements Cos { aspectName: string, // 上传的aspect名 formData: Record, // 上传的其它part参数 autoInform?: boolean) => Promise): Promise; - composeFileUrl(extraFile: EntityDict['extraFile']['OpSchema'], application: EntityDict['application']['Schema'], style?: string): string; + composeFileUrl(extraFile: EntityDict['extraFile']['OpSchema'], application: Partial, style?: string): string; checkWhetherSuccess(extraFile: OpSchema, context: BRC): Promise; removeFile(extraFile: OpSchema, context: BRC): Promise; } diff --git a/lib/utils/cos/wechat.js b/lib/utils/cos/wechat.js index 7422f7695..0010b40ba 100644 --- a/lib/utils/cos/wechat.js +++ b/lib/utils/cos/wechat.js @@ -46,7 +46,8 @@ class Wechat { composeFileUrl(extraFile, application, style) { // 微信获取素材链接 还需要处理下 const { applicationId, extra1: mediaId, extra2, type } = extraFile; - const { system: { domain$system } } = application; + const { system } = application; + const { domain$system } = system; (0, assert_1.assert)(domain$system); const [domain] = domain$system; if (domain && mediaId) { diff --git a/lib/utils/getContextConfig.d.ts b/lib/utils/getContextConfig.d.ts index 94e026a1a..3d26af639 100644 --- a/lib/utils/getContextConfig.d.ts +++ b/lib/utils/getContextConfig.d.ts @@ -7,7 +7,7 @@ import { EntityDict } from '../oak-app-domain'; * @param origin * @returns */ -export declare function getConfig(application: ED['application']['Schema'], service: Service, origin: Origin): { +export declare function getConfig(application: Partial, service: Service, origin: Origin): { instance: import("oak-external-sdk").QiniuCloudInstance; config: any; } | { diff --git a/src/types/Cos.ts b/src/types/Cos.ts index 40add5477..fbc41f5b8 100644 --- a/src/types/Cos.ts +++ b/src/types/Cos.ts @@ -54,7 +54,7 @@ export default interface Cos { */ composeFileUrl: ( extraFile: ED['extraFile']['OpSchema'], - application: ED['application']['Schema'], + application: Partial, style?: string, ) => string; diff --git a/src/utils/cos/ctyun.ts b/src/utils/cos/ctyun.ts index 028936013..c0645abde 100644 --- a/src/utils/cos/ctyun.ts +++ b/src/utils/cos/ctyun.ts @@ -105,7 +105,7 @@ export default class CTYun implements Cos { composeFileUrl( extraFile: EntityDict['extraFile']['OpSchema'], - application: EntityDict['application']['Schema'], + application: Partial, style?: string, ) { if (!application) { diff --git a/src/utils/cos/index.ts b/src/utils/cos/index.ts index a7eaa930d..3ade44359 100644 --- a/src/utils/cos/index.ts +++ b/src/utils/cos/index.ts @@ -33,7 +33,7 @@ export function getCos(origin: string) { export function composeFileUrl( extraFile: ED['extraFile']['OpSchema'], - application: ED['application']['Schema'], + application: Partial, style?: string ) { const { origin } = extraFile; diff --git a/src/utils/cos/qiniu.ts b/src/utils/cos/qiniu.ts index 95e8fe72d..a69ed0e41 100644 --- a/src/utils/cos/qiniu.ts +++ b/src/utils/cos/qiniu.ts @@ -103,7 +103,7 @@ export default class Qiniu implements Cos { composeFileUrl( extraFile: EntityDict['extraFile']['OpSchema'], - application: EntityDict['application']['Schema'], + application: Partial, style?: string ) { const { config } = getConfig(application, 'Cos', 'qiniu'); diff --git a/src/utils/cos/wechat.ts b/src/utils/cos/wechat.ts index 657c42f20..93972fcfc 100644 --- a/src/utils/cos/wechat.ts +++ b/src/utils/cos/wechat.ts @@ -84,12 +84,13 @@ export default class Wechat implements Cos { composeFileUrl( extraFile: EntityDict['extraFile']['OpSchema'], - application: EntityDict['application']['Schema'], + application: Partial, style?: string ) { // 微信获取素材链接 还需要处理下 const { applicationId, extra1: mediaId, extra2, type } = extraFile; - const { system: { domain$system }} = application; + const { system } = application!; + const { domain$system } = system!; assert(domain$system); const [domain] = domain$system; diff --git a/src/utils/getContextConfig.ts b/src/utils/getContextConfig.ts index 6fedfed8e..5b7034eec 100644 --- a/src/utils/getContextConfig.ts +++ b/src/utils/getContextConfig.ts @@ -19,7 +19,7 @@ import { EntityDict } from '../oak-app-domain'; * @param origin * @returns */ -export function getConfig(application: ED['application']['Schema'], service: Service, origin: Origin) { +export function getConfig(application: Partial, service: Service, origin: Origin) { const { system } = application; const { config: systemConfig, platform } =