From 0d10785905c58c845430da1db3c04837e15e7f25 Mon Sep 17 00:00:00 2001 From: Xc Date: Thu, 18 Apr 2024 10:21:00 +0800 Subject: [PATCH 1/2] 5.0.0-publish --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 6178cfc94..7d8149e18 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oak-general-business", - "version": "4.4.1", + "version": "5.0.0", "description": "oak框架中公共业务逻辑的实现", "author": { "name": "XuChang" @@ -20,11 +20,11 @@ "copy-to-clipboard": "^3.3.3", "csstype": "^3.1.3", "dayjs": "^1.11.9", - "oak-common-aspect": "file:../oak-common-aspect", - "oak-domain": "file:../oak-domain", - "oak-external-sdk": "file:../oak-external-sdk", - "oak-frontend-base": "file:../oak-frontend-base", - "oak-memory-tree-store": "file:../oak-memory-tree-store", + "oak-common-aspect": "^3.0.0", + "oak-domain": "^5.0.0", + "oak-external-sdk": "^2.3.0", + "oak-frontend-base": "^5.0.0", + "oak-memory-tree-store": "^3.3.0", "qrcode.react": "^3.1.0", "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", From 85248ac5ffd4e445130dd60438f3095b113be014 Mon Sep 17 00:00:00 2001 From: Xc Date: Thu, 18 Apr 2024 23:41:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BA=86=E5=8E=9F?= =?UTF-8?q?=E6=9D=A5=E8=AE=BE=E8=AE=A1=E4=B8=AD=E6=B3=A8=E5=85=A5appId?= =?UTF-8?q?=E7=9A=84=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/checkers/index.d.ts | 2 +- es/components/extraFile/commit/index.d.ts | 8 ++++---- es/features/index.js | 5 +---- es/triggers/index.d.ts | 2 +- es/triggers/toDo.d.ts | 2 +- lib/checkers/index.d.ts | 2 +- lib/features/index.js | 5 +---- lib/triggers/index.d.ts | 2 +- lib/triggers/toDo.d.ts | 2 +- src/features/index.ts | 6 +----- 10 files changed, 13 insertions(+), 23 deletions(-) diff --git a/es/checkers/index.d.ts b/es/checkers/index.d.ts index f8eec4200..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/extraFile/commit/index.d.ts b/es/components/extraFile/commit/index.d.ts index 07dd5cebf..2407a9fad 100644 --- a/es/components/extraFile/commit/index.d.ts +++ b/es/components/extraFile/commit/index.d.ts @@ -12,19 +12,19 @@ declare const _default: ) => unknown) | undefined; - type?: "button" | "submit" | "reset" | undefined; + type?: "reset" | "submit" | "button" | undefined; shape?: "default" | "rounded" | "rectangular" | undefined; children?: import("react").ReactNode; - } & Pick & import("react").ButtonHTMLAttributes, "id" | "onMouseDown" | "onMouseUp" | "onTouchEnd" | "onTouchStart"> & { + } & Pick & import("react").ButtonHTMLAttributes, "id" | "onMouseUp" | "onMouseDown" | "onTouchStart" | "onTouchEnd"> & { className?: string | undefined; style?: (import("react").CSSProperties & Partial>) | undefined; tabIndex?: number | undefined; diff --git a/es/features/index.js b/es/features/index.js index 23eae6f08..549c32412 100644 --- a/es/features/index.js +++ b/es/features/index.js @@ -33,10 +33,7 @@ export function create(basicFeatures) { }; } export async function initialize(features, access, config, clazzes) { - const location = features.navigator.getLocation(); - const searchParams = new URLSearchParams(location.search); - const appId = searchParams.get('appId'); - await features.application.initialize(access.http.hostname, appId, config?.applicationExtraProjection); + await features.application.initialize(access.http.hostname, undefined, config?.applicationExtraProjection); if (process.env.OAK_PLATFORM === 'web') { features.wechatSdk.setLandingUrl(window.location.href); } diff --git a/es/triggers/index.d.ts b/es/triggers/index.d.ts index 5f162712a..4536d0d1b 100644 --- a/es/triggers/index.d.ts +++ b/es/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/es/triggers/toDo.d.ts b/es/triggers/toDo.d.ts index 945523f77..36cbfbff9 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/checkers/index.d.ts b/lib/checkers/index.d.ts index f8eec4200..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/features/index.js b/lib/features/index.js index 8298d3a30..5b6f082db 100644 --- a/lib/features/index.js +++ b/lib/features/index.js @@ -38,10 +38,7 @@ function create(basicFeatures) { } exports.create = create; async function initialize(features, access, config, clazzes) { - const location = features.navigator.getLocation(); - const searchParams = new URLSearchParams(location.search); - const appId = searchParams.get('appId'); - await features.application.initialize(access.http.hostname, appId, config?.applicationExtraProjection); + await features.application.initialize(access.http.hostname, undefined, config?.applicationExtraProjection); if (process.env.OAK_PLATFORM === 'web') { features.wechatSdk.setLandingUrl(window.location.href); } diff --git a/lib/triggers/index.d.ts b/lib/triggers/index.d.ts index a4a453da6..4536d0d1b 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 945523f77..36cbfbff9 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/features/index.ts b/src/features/index.ts index 87fe44aff..8b9815a01 100644 --- a/src/features/index.ts +++ b/src/features/index.ts @@ -92,11 +92,7 @@ export async function initialize( }, clazzes?: Array Cos>, ) { - const location = features.navigator.getLocation(); - const searchParams = new URLSearchParams(location.search); - const appId = searchParams.get('appId'); - await features.application.initialize(access.http.hostname, appId, config?.applicationExtraProjection); - + await features.application.initialize(access.http.hostname, undefined, config?.applicationExtraProjection); if (process.env.OAK_PLATFORM === 'web') { features.wechatSdk.setLandingUrl(window.location.href); }