From b3ae7f8c30888c6b31146f0cd4818a1dca44fb10 Mon Sep 17 00:00:00 2001 From: "Xc@centOs" Date: Sun, 18 Feb 2024 12:11:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86context=E7=9A=84=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E6=94=BE=E5=9B=9E=E5=88=B0index?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/components/config/style/platform/index.d.ts | 2 +- es/components/config/upsert/index.d.ts | 2 +- es/components/extraFile/commit/index.d.ts | 6 +++--- es/components/userEntityGrant/claim/ubPicker/index.d.ts | 4 ++-- es/components/userEntityGrant/upsert/index.d.ts | 4 ++-- es/components/wechatLogin/qrCode/index.d.ts | 2 +- es/context/BackendRuntimeContext.d.ts | 2 +- es/context/BackendRuntimeContext.js | 2 +- es/context/FrontendRuntimeContext.d.ts | 2 +- es/context/FrontendRuntimeContext.js | 2 +- es/index.d.ts | 1 + es/index.js | 2 +- es/triggers/toDo.d.ts | 2 +- lib/context/BackendRuntimeContext.d.ts | 2 +- lib/context/BackendRuntimeContext.js | 4 ++-- lib/context/FrontendRuntimeContext.d.ts | 2 +- lib/context/FrontendRuntimeContext.js | 4 ++-- lib/index.d.ts | 1 + lib/index.js | 2 +- lib/triggers/toDo.d.ts | 2 +- src/context/BackendRuntimeContext.ts | 2 +- src/context/FrontendRuntimeContext.ts | 2 +- src/index.ts | 2 +- 23 files changed, 29 insertions(+), 27 deletions(-) diff --git a/es/components/config/style/platform/index.d.ts b/es/components/config/style/platform/index.d.ts index 0017a6f93..bd3579c54 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 26655e31f..6a8e95a3d 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 cce735384..2d1fa1da6 100644 --- a/es/components/extraFile/commit/index.d.ts +++ b/es/components/extraFile/commit/index.d.ts @@ -12,16 +12,16 @@ declare const _default: ) => unknown) | undefined; - type?: "button" | "reset" | "submit" | undefined; + type?: "button" | "submit" | "reset" | undefined; shape?: "default" | "rounded" | "rectangular" | undefined; children?: import("react").ReactNode; } & Pick & import("react").ButtonHTMLAttributes, "id" | "onMouseDown" | "onMouseUp" | "onTouchEnd" | "onTouchStart"> & { diff --git a/es/components/userEntityGrant/claim/ubPicker/index.d.ts b/es/components/userEntityGrant/claim/ubPicker/index.d.ts index b29d102ca..dbb7f06e5 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: "single" | "all" | "free"; - ruleOnRow: "single" | "all" | "free"; + rule: "all" | "single" | "free"; + ruleOnRow: "all" | "single" | "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 960926763..5f8ad2f06 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: "single" | "all" | "free"; - ruleOnRow: "single" | "all" | "free"; + rule: "all" | "single" | "free"; + ruleOnRow: "all" | "single" | "free"; }>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatLogin/qrCode/index.d.ts b/es/components/wechatLogin/qrCode/index.d.ts index 8a45a21cf..69727bd4d 100644 --- a/es/components/wechatLogin/qrCode/index.d.ts +++ b/es/components/wechatLogin/qrCode/index.d.ts @@ -1,6 +1,6 @@ import { EntityDict } from '../../../oak-app-domain'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/context/BackendRuntimeContext.d.ts b/es/context/BackendRuntimeContext.d.ts index 723e50ae5..cff952aa3 100644 --- a/es/context/BackendRuntimeContext.d.ts +++ b/es/context/BackendRuntimeContext.d.ts @@ -2,7 +2,7 @@ import { RuntimeContext } from './RuntimeContext'; import { EntityDict } from '../oak-app-domain'; import { SerializedData } from './FrontendRuntimeContext'; import { EntityDict as BaseEntityDict } from 'oak-domain/lib/types/Entity'; -import { BackendRuntimeContext as BRC } from 'oak-frontend-base/lib/context/BackendRuntimeContext'; +import { BackendRuntimeContext as BRC } from 'oak-frontend-base'; /** * general数据结构要求的后台上下文 */ diff --git a/es/context/BackendRuntimeContext.js b/es/context/BackendRuntimeContext.js index 489cb1a82..18286a4a2 100644 --- a/es/context/BackendRuntimeContext.js +++ b/es/context/BackendRuntimeContext.js @@ -5,7 +5,7 @@ import { ROOT_TOKEN_ID } from '../constants'; import { generateNewIdAsync } from 'oak-domain/lib/utils/uuid'; import { applicationProjection } from '../types/Projection'; import { getMpUnlimitWxaCode } from '../aspects/wechatQrCode'; -import { BackendRuntimeContext as BRC } from 'oak-frontend-base/lib/context/BackendRuntimeContext'; +import { BackendRuntimeContext as BRC } from 'oak-frontend-base'; import { cloneDeep } from 'oak-domain/lib/utils/lodash'; /** * general数据结构要求的后台上下文 diff --git a/es/context/FrontendRuntimeContext.d.ts b/es/context/FrontendRuntimeContext.d.ts index 43e842828..22b178982 100644 --- a/es/context/FrontendRuntimeContext.d.ts +++ b/es/context/FrontendRuntimeContext.d.ts @@ -1,5 +1,5 @@ import { EntityDict as BaseEntityDict } from 'oak-domain/lib/types/Entity'; -import { FrontendRuntimeContext as Frc, SerializedData as Fsd } from 'oak-frontend-base/es/context/FrontendRuntimeContext'; +import { FrontendRuntimeContext as Frc, SerializedData as Fsd } from 'oak-frontend-base'; import { BasicFeatures } from 'oak-frontend-base'; import { EntityDict } from '../oak-app-domain'; import { RuntimeContext } from './RuntimeContext'; diff --git a/es/context/FrontendRuntimeContext.js b/es/context/FrontendRuntimeContext.js index cb1c03763..eef824b71 100644 --- a/es/context/FrontendRuntimeContext.js +++ b/es/context/FrontendRuntimeContext.js @@ -1,5 +1,5 @@ import { assert } from 'oak-domain/lib/utils/assert'; -import { FrontendRuntimeContext as Frc } from 'oak-frontend-base/es/context/FrontendRuntimeContext'; +import { FrontendRuntimeContext as Frc } from 'oak-frontend-base'; import { OakApplicationLoadingException, OakTokenExpiredException, OakUserDisabledException, OakUserInfoLoadingException, } from '../types/Exception'; import { OakUnloggedInException } from 'oak-domain/lib/types'; ; diff --git a/es/index.d.ts b/es/index.d.ts index fc4407422..ff69ba0d8 100644 --- a/es/index.d.ts +++ b/es/index.d.ts @@ -1,5 +1,6 @@ export type { GeneralFeatures } from './features'; export type { GeneralAspectDict } from './aspects/AspectDict'; +export * from './types/Exception'; export * from './types/Page'; export * from './types/Message'; export * from './types/RuntimeCxt'; diff --git a/es/index.js b/es/index.js index 3b2084cac..8ebd17eb3 100644 --- a/es/index.js +++ b/es/index.js @@ -1,6 +1,6 @@ // import { registerMessageNotificationConverters } from './triggers/message'; // import { registerWeChatPublicEventCallback } from './endpoints'; -// export * from './types/Exception'; +export * from './types/Exception'; export * from './types/Page'; export * from './types/Message'; export * from './types/RuntimeCxt'; diff --git a/es/triggers/toDo.d.ts b/es/triggers/toDo.d.ts index 6605371ec..c343874f5 100644 --- a/es/triggers/toDo.d.ts +++ b/es/triggers/toDo.d.ts @@ -14,7 +14,7 @@ export declare function createToDo; +}, userIds?: string[]): Promise<1 | 0>; /** * 完成todo例程，当在entity对象上进行action操作时（操作条件是filter），将对应的todo完成 * 必须在entity的action的后trigger中调用 diff --git a/lib/context/BackendRuntimeContext.d.ts b/lib/context/BackendRuntimeContext.d.ts index 723e50ae5..cff952aa3 100644 --- a/lib/context/BackendRuntimeContext.d.ts +++ b/lib/context/BackendRuntimeContext.d.ts @@ -2,7 +2,7 @@ import { RuntimeContext } from './RuntimeContext'; import { EntityDict } from '../oak-app-domain'; import { SerializedData } from './FrontendRuntimeContext'; import { EntityDict as BaseEntityDict } from 'oak-domain/lib/types/Entity'; -import { BackendRuntimeContext as BRC } from 'oak-frontend-base/lib/context/BackendRuntimeContext'; +import { BackendRuntimeContext as BRC } from 'oak-frontend-base'; /** * general数据结构要求的后台上下文 */ diff --git a/lib/context/BackendRuntimeContext.js b/lib/context/BackendRuntimeContext.js index 720251f4c..b165873a1 100644 --- a/lib/context/BackendRuntimeContext.js +++ b/lib/context/BackendRuntimeContext.js @@ -8,12 +8,12 @@ const constants_1 = require("../constants"); const uuid_1 = require("oak-domain/lib/utils/uuid"); const Projection_1 = require("../types/Projection"); const wechatQrCode_1 = require("../aspects/wechatQrCode"); -const BackendRuntimeContext_1 = require("oak-frontend-base/lib/context/BackendRuntimeContext"); +const oak_frontend_base_1 = require("oak-frontend-base"); const lodash_1 = require("oak-domain/lib/utils/lodash"); /** * general数据结构要求的后台上下文 */ -class BackendRuntimeContext extends BackendRuntimeContext_1.BackendRuntimeContext { +class BackendRuntimeContext extends oak_frontend_base_1.BackendRuntimeContext { application; token; amIRoot; diff --git a/lib/context/FrontendRuntimeContext.d.ts b/lib/context/FrontendRuntimeContext.d.ts index 43e842828..22b178982 100644 --- a/lib/context/FrontendRuntimeContext.d.ts +++ b/lib/context/FrontendRuntimeContext.d.ts @@ -1,5 +1,5 @@ import { EntityDict as BaseEntityDict } from 'oak-domain/lib/types/Entity'; -import { FrontendRuntimeContext as Frc, SerializedData as Fsd } from 'oak-frontend-base/es/context/FrontendRuntimeContext'; +import { FrontendRuntimeContext as Frc, SerializedData as Fsd } from 'oak-frontend-base'; import { BasicFeatures } from 'oak-frontend-base'; import { EntityDict } from '../oak-app-domain'; import { RuntimeContext } from './RuntimeContext'; diff --git a/lib/context/FrontendRuntimeContext.js b/lib/context/FrontendRuntimeContext.js index 1b3a30cee..482699e30 100644 --- a/lib/context/FrontendRuntimeContext.js +++ b/lib/context/FrontendRuntimeContext.js @@ -2,11 +2,11 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.FrontendRuntimeContext = void 0; const assert_1 = require("oak-domain/lib/utils/assert"); -const FrontendRuntimeContext_1 = require("oak-frontend-base/es/context/FrontendRuntimeContext"); +const oak_frontend_base_1 = require("oak-frontend-base"); const Exception_1 = require("../types/Exception"); const types_1 = require("oak-domain/lib/types"); ; -class FrontendRuntimeContext extends FrontendRuntimeContext_1.FrontendRuntimeContext { +class FrontendRuntimeContext extends oak_frontend_base_1.FrontendRuntimeContext { application; token; constructor(store, features) { diff --git a/lib/index.d.ts b/lib/index.d.ts index fc4407422..ff69ba0d8 100644 --- a/lib/index.d.ts +++ b/lib/index.d.ts @@ -1,5 +1,6 @@ export type { GeneralFeatures } from './features'; export type { GeneralAspectDict } from './aspects/AspectDict'; +export * from './types/Exception'; export * from './types/Page'; export * from './types/Message'; export * from './types/RuntimeCxt'; diff --git a/lib/index.js b/lib/index.js index 47b7666b2..e06bbf0c8 100644 --- a/lib/index.js +++ b/lib/index.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.updateFreeDict = exports.authDeduceRelationMap = exports.selectFreeEntities = exports.FrontendRuntimeContext = exports.BackendRuntimeContext = void 0; const tslib_1 = require("tslib"); -// export * from './types/Exception'; +tslib_1.__exportStar(require("./types/Exception"), exports); tslib_1.__exportStar(require("./types/Page"), exports); tslib_1.__exportStar(require("./types/Message"), exports); tslib_1.__exportStar(require("./types/RuntimeCxt"), exports); diff --git a/lib/triggers/toDo.d.ts b/lib/triggers/toDo.d.ts index 6605371ec..c343874f5 100644 --- a/lib/triggers/toDo.d.ts +++ b/lib/triggers/toDo.d.ts @@ -14,7 +14,7 @@ export declare function createToDo; +}, userIds?: string[]): Promise<1 | 0>; /** * 完成todo例程，当在entity对象上进行action操作时（操作条件是filter），将对应的todo完成 * 必须在entity的action的后trigger中调用 diff --git a/src/context/BackendRuntimeContext.ts b/src/context/BackendRuntimeContext.ts index a61ff26ff..e3f4be3a8 100644 --- a/src/context/BackendRuntimeContext.ts +++ b/src/context/BackendRuntimeContext.ts @@ -16,7 +16,7 @@ import { generateNewIdAsync } from 'oak-domain/lib/utils/uuid'; import { SelectOpResult } from 'oak-domain/lib/types'; import { applicationProjection } from '../types/Projection'; import { getMpUnlimitWxaCode } from '../aspects/wechatQrCode'; -import { BackendRuntimeContext as BRC } from 'oak-frontend-base/lib/context/BackendRuntimeContext'; +import { BackendRuntimeContext as BRC } from 'oak-frontend-base'; import { cloneDeep } from 'oak-domain/lib/utils/lodash'; /** * general数据结构要求的后台上下文 diff --git a/src/context/FrontendRuntimeContext.ts b/src/context/FrontendRuntimeContext.ts index 6f6cbba88..d1dfa0777 100644 --- a/src/context/FrontendRuntimeContext.ts +++ b/src/context/FrontendRuntimeContext.ts @@ -1,6 +1,6 @@ import { assert } from 'oak-domain/lib/utils/assert'; import { EntityDict as BaseEntityDict } from 'oak-domain/lib/types/Entity'; -import { FrontendRuntimeContext as Frc, SerializedData as Fsd } from 'oak-frontend-base/es/context/FrontendRuntimeContext'; +import { FrontendRuntimeContext as Frc, SerializedData as Fsd } from 'oak-frontend-base'; import { BasicFeatures } from 'oak-frontend-base' import { EntityDict } from '../oak-app-domain'; diff --git a/src/index.ts b/src/index.ts index e438cd228..c9cb1a8af 100644 --- a/src/index.ts +++ b/src/index.ts @@ -4,7 +4,7 @@ export type { GeneralFeatures } from './features'; export type { GeneralAspectDict } from './aspects/AspectDict'; -// export * from './types/Exception'; +export * from './types/Exception'; export * from './types/Page'; export * from './types/Message'; export * from './types/RuntimeCxt';