From c7c202702747372dd6ef4dda92520ba372f634ad Mon Sep 17 00:00:00 2001 From: wenjiarui Date: Mon, 19 Feb 2024 15:07:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9externalsdk=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/components/extraFile/commit/index.d.ts | 8 ++++---- .../userEntityGrant/claim/ubPicker/index.d.ts | 4 ++-- es/components/userEntityGrant/upsert/index.d.ts | 4 ++-- es/utils/getContextConfig.d.ts | 6 +++--- es/utils/getContextConfig.js | 4 +--- lib/utils/getContextConfig.d.ts | 6 +++--- lib/utils/getContextConfig.js | 15 ++++++--------- src/utils/cos/ctyun.ts | 2 +- src/utils/cos/qiniu.ts | 2 +- src/utils/getContextConfig.ts | 4 +--- 10 files changed, 24 insertions(+), 31 deletions(-) diff --git a/es/components/extraFile/commit/index.d.ts b/es/components/extraFile/commit/index.d.ts index 2d1fa1da6..6ae0fa0ba 100644 --- a/es/components/extraFile/commit/index.d.ts +++ b/es/components/extraFile/commit/index.d.ts @@ -12,7 +12,7 @@ declare const _default: ) => unknown) | undefined; - type?: "button" | "submit" | "reset" | undefined; + type?: "button" | "reset" | "submit" | undefined; shape?: "default" | "rounded" | "rectangular" | undefined; children?: import("react").ReactNode; - } & Pick & import("react").ButtonHTMLAttributes, "id" | "onMouseDown" | "onMouseUp" | "onTouchEnd" | "onTouchStart"> & { + } & Pick & import("react").ButtonHTMLAttributes, "id" | "onMouseDown" | "onMouseUp" | "onTouchStart" | "onTouchEnd"> & { className?: string | undefined; - style?: (import("react").CSSProperties & Partial>) | undefined; + style?: (import("react").CSSProperties & Partial>) | undefined; tabIndex?: number | undefined; } & import("react").AriaAttributes) | undefined; afterCommit?: AfterCommit; diff --git a/es/components/userEntityGrant/claim/ubPicker/index.d.ts b/es/components/userEntityGrant/claim/ubPicker/index.d.ts index dbb7f06e5..b29d102ca 100644 --- a/es/components/userEntityGrant/claim/ubPicker/index.d.ts +++ b/es/components/userEntityGrant/claim/ubPicker/index.d.ts @@ -4,8 +4,8 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< entity: keyof EntityDict; entityFilter: any; relationIds: string[]; - rule: "all" | "single" | "free"; - ruleOnRow: "all" | "single" | "free"; + rule: "single" | "all" | "free"; + ruleOnRow: "single" | "all" | "free"; onPickRelations: (ids: string[]) => void; onPickRows: (ids: string[]) => void; pickedRowIds: string[] | undefined; diff --git a/es/components/userEntityGrant/upsert/index.d.ts b/es/components/userEntityGrant/upsert/index.d.ts index 5f8ad2f06..960926763 100644 --- a/es/components/userEntityGrant/upsert/index.d.ts +++ b/es/components/userEntityGrant/upsert/index.d.ts @@ -11,7 +11,7 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< claimUrl: string; qrCodeType: QrCodeType; multiple: boolean; - rule: "all" | "single" | "free"; - ruleOnRow: "all" | "single" | "free"; + rule: "single" | "all" | "free"; + ruleOnRow: "single" | "all" | "free"; }>) => import("react").ReactElement>; export default _default; diff --git a/es/utils/getContextConfig.d.ts b/es/utils/getContextConfig.d.ts index dff2480e5..ccac987f2 100644 --- a/es/utils/getContextConfig.d.ts +++ b/es/utils/getContextConfig.d.ts @@ -10,12 +10,12 @@ import { ED as EntityDict } from '../types/RuntimeCxt'; * @returns */ export declare function getConfig, FrontCxt extends FrontendRuntimeContext>>(context: Cxt | FrontCxt, service: Service, origin: Origin): { - instance: import("oak-external-sdk/es/QiniuSDK").QiniuCloudInstance; + instance: import("oak-external-sdk").QiniuCloudInstance; config: any; } | { - instance: import("oak-external-sdk/es/CTYunSDK").CTYunInstance; + instance: import("oak-external-sdk").CTYunInstance; config: any; } | { - instance: import("oak-external-sdk/es/service/amap/Amap").AmapInstance; + instance: import("oak-external-sdk").AmapInstance; config: any; }; diff --git a/es/utils/getContextConfig.js b/es/utils/getContextConfig.js index a49e66df9..126ec0d6f 100644 --- a/es/utils/getContextConfig.js +++ b/es/utils/getContextConfig.js @@ -1,8 +1,6 @@ import { assert } from 'oak-domain/lib/utils/assert'; import { OakDataException } from 'oak-domain/lib/types/Exception'; -import AmapSDK from 'oak-external-sdk/es/AmapSDK'; -import QiniuSDK from 'oak-external-sdk/es/QiniuSDK'; -import CTYunSDk from 'oak-external-sdk/es/CTYunSDK'; +import { AmapSDK, QiniuSDK, CTYunSDk } from 'oak-external-sdk'; /** * 目前虽然数据结构上config也可能在platform上，但是实际中暂时还没有 * @param context diff --git a/lib/utils/getContextConfig.d.ts b/lib/utils/getContextConfig.d.ts index dff2480e5..ccac987f2 100644 --- a/lib/utils/getContextConfig.d.ts +++ b/lib/utils/getContextConfig.d.ts @@ -10,12 +10,12 @@ import { ED as EntityDict } from '../types/RuntimeCxt'; * @returns */ export declare function getConfig, FrontCxt extends FrontendRuntimeContext>>(context: Cxt | FrontCxt, service: Service, origin: Origin): { - instance: import("oak-external-sdk/es/QiniuSDK").QiniuCloudInstance; + instance: import("oak-external-sdk").QiniuCloudInstance; config: any; } | { - instance: import("oak-external-sdk/es/CTYunSDK").CTYunInstance; + instance: import("oak-external-sdk").CTYunInstance; config: any; } | { - instance: import("oak-external-sdk/es/service/amap/Amap").AmapInstance; + instance: import("oak-external-sdk").AmapInstance; config: any; }; diff --git a/lib/utils/getContextConfig.js b/lib/utils/getContextConfig.js index ce4cadb25..d57ac79b1 100644 --- a/lib/utils/getContextConfig.js +++ b/lib/utils/getContextConfig.js @@ -1,12 +1,9 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.getConfig = void 0; -const tslib_1 = require("tslib"); const assert_1 = require("oak-domain/lib/utils/assert"); const Exception_1 = require("oak-domain/lib/types/Exception"); -const AmapSDK_1 = tslib_1.__importDefault(require("oak-external-sdk/lib/AmapSDK")); -const QiniuSDK_1 = tslib_1.__importDefault(require("oak-external-sdk/lib/QiniuSDK")); -const CTYunSDK_1 = tslib_1.__importDefault(require("oak-external-sdk/lib/CTYunSDK")); +const oak_external_sdk_1 = require("oak-external-sdk"); /** * 目前虽然数据结构上config也可能在platform上，但是实际中暂时还没有 * @param context @@ -25,8 +22,8 @@ function getConfig(context, service, origin) { platformConfig[service] && platformConfig[service][origin]; originCloudAccounts = originConfig && - platformConfig.Account && - platformConfig.Account[origin]; + platformConfig.Account && + platformConfig.Account[origin]; } if (!originConfig) { throw new Exception_1.OakDataException(`调用的服务${service}源${origin}找不到相应的配置，请联系管理员`); @@ -45,7 +42,7 @@ function getConfig(context, service, origin) { case 'qiniu': { const qiniuAccount = originCloudAccounts.find((ele) => ele.accessKey === originConfig.accessKey); (0, assert_1.assert)(qiniuAccount, `调用的服务${service}源${origin}找不到相应的云平台帐号，请联系管理员`); - const qiniuInstance = QiniuSDK_1.default.getInstance(qiniuAccount.accessKey, qiniuAccount.secretKey); + const qiniuInstance = oak_external_sdk_1.QiniuSDK.getInstance(qiniuAccount.accessKey, qiniuAccount.secretKey); return { instance: qiniuInstance, config: originConfig, @@ -54,7 +51,7 @@ function getConfig(context, service, origin) { case 'ctyun': { const ctyunAccount = originCloudAccounts.find((ele) => ele.accessKey === originConfig.accessKey); (0, assert_1.assert)(ctyunAccount, `调用的服务${service}源${origin}找不到相应的云平台帐号，请联系管理员`); - const ctyunInstance = CTYunSDK_1.default.getInstance(ctyunAccount.accessKey, ctyunAccount.securityKey); + const ctyunInstance = oak_external_sdk_1.CTYunSDk.getInstance(ctyunAccount.accessKey, ctyunAccount.securityKey); return { instance: ctyunInstance, config: originConfig, @@ -64,7 +61,7 @@ function getConfig(context, service, origin) { (0, assert_1.assert)(origin === 'amap'); const amapAccount = originCloudAccounts.find((ele) => ele.webApiKey === originConfig.webApiKey); (0, assert_1.assert)(amapAccount, `调用的服务${service}源${origin}找不到相应的云平台帐号，请联系管理员`); - const amapInstance = AmapSDK_1.default.getInstance(amapAccount.webApiKey); + const amapInstance = oak_external_sdk_1.AmapSDK.getInstance(amapAccount.webApiKey); return { instance: amapInstance, config: originConfig, diff --git a/src/utils/cos/ctyun.ts b/src/utils/cos/ctyun.ts index f8da7d53b..cd34c7a3e 100644 --- a/src/utils/cos/ctyun.ts +++ b/src/utils/cos/ctyun.ts @@ -6,7 +6,7 @@ import { OpSchema } from '../../oak-app-domain/ExtraFile/Schema'; import { CTYunUploadInfo } from '../../types/Upload'; import { getConfig } from '../getContextConfig'; import { CTYunCosConfig } from '../../types/Config'; -import { CTYunInstance } from 'oak-external-sdk/es/service/ctyun/CTYun'; +import { CTYunInstance } from 'oak-external-sdk'; import { urlSafeBase64Encode } from '../sign'; import { OakUploadException } from '../../types/Exception'; import { OakExternalException, OakNetworkException } from 'oak-domain/lib/types/Exception'; diff --git a/src/utils/cos/qiniu.ts b/src/utils/cos/qiniu.ts index 60d791aef..8b5af56ae 100644 --- a/src/utils/cos/qiniu.ts +++ b/src/utils/cos/qiniu.ts @@ -6,7 +6,7 @@ import { OpSchema } from '../../oak-app-domain/ExtraFile/Schema'; import { QiniuUploadInfo } from '../../types/Upload'; import { getConfig } from '../getContextConfig'; import { QiniuCosConfig } from '../../types/Config'; -import { QiniuCloudInstance } from 'oak-external-sdk/es/service/qiniu/QiniuCloud'; +import { QiniuCloudInstance } from 'oak-external-sdk'; import { urlSafeBase64Encode } from '../sign'; import { OakUploadException } from '../../types/Exception'; import { OakExternalException, OakNetworkException } from 'oak-domain/lib/types/Exception'; diff --git a/src/utils/getContextConfig.ts b/src/utils/getContextConfig.ts index 2ad1527b4..5b71bd156 100644 --- a/src/utils/getContextConfig.ts +++ b/src/utils/getContextConfig.ts @@ -1,8 +1,6 @@ import { assert } from 'oak-domain/lib/utils/assert'; import { OakDataException } from 'oak-domain/lib/types/Exception'; -import AmapSDK from 'oak-external-sdk/lib/AmapSDK'; -import QiniuSDK from 'oak-external-sdk/lib/QiniuSDK'; -import CTYunSDk from 'oak-external-sdk/lib/CTYunSDK'; +import { AmapSDK, QiniuSDK, CTYunSDk } from 'oak-external-sdk'; import { AliCloudConfig, AmapCloudConfig,