From 1200c5dd1321478e620f9fd5e6b04d0fb9c7579b Mon Sep 17 00:00:00 2001 From: Xc Date: Fri, 14 Jun 2024 19:36:50 +0800 Subject: [PATCH] =?UTF-8?q?application=E6=94=B9=E6=88=90=E4=BB=8E=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E4=B8=AD=E5=8F=96=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/components/address/list/index.d.ts | 2 +- es/components/address/upsert/index.d.ts | 2 +- es/components/application/detail/index.d.ts | 2 +- .../application/detailForPlatform/index.d.ts | 2 +- es/components/application/panel/index.d.ts | 2 +- es/components/application/upsert/index.d.ts | 2 +- es/components/article/cell/index.d.ts | 2 +- es/components/article/detail/index.d.ts | 2 +- es/components/article/preview/index.d.ts | 2 +- es/components/article/treeList/index.d.ts | 2 +- es/components/article/upsert/index.d.ts | 2 +- es/components/articleMenu/treeCell/index.d.ts | 2 +- es/components/articleMenu/treeList/index.d.ts | 2 +- .../articleMenu/treeManager/index.d.ts | 2 +- .../changePassword/byMobile/index.d.ts | 2 +- .../changePassword/byPassword/index.d.ts | 2 +- es/components/changePassword/index.d.ts | 2 +- es/components/common/tabBar/index.d.ts | 2 +- es/components/config/application/index.d.ts | 2 +- .../config/style/platform/index.d.ts | 2 +- es/components/config/upsert/index.d.ts | 2 +- es/components/domain/detail/index.d.ts | 2 +- es/components/domain/list/index.d.ts | 2 +- es/components/domain/upsert/index.d.ts | 2 +- es/components/editor/index.d.ts | 2 +- es/components/extraFile/avatar/index.d.ts | 2 +- es/components/extraFile/commit/index.d.ts | 1 - es/components/message/cell/index.d.ts | 2 +- es/components/message/detail/index.d.ts | 2 +- es/components/message/list/index.d.ts | 2 +- es/components/message/simpleList/index.d.ts | 2 +- .../messageTypeSmsTemplate/list/index.d.ts | 2 +- .../messageTypeSmsTemplate/tab/index.d.ts | 2 +- .../messageTypeTemplate/list/index.d.ts | 2 +- es/components/mobile/login/index.d.ts | 2 +- es/components/mobile/manageList/index.d.ts | 2 +- es/components/mobile/me/index.d.ts | 2 +- es/components/my/avatar/index.d.ts | 2 +- es/components/my/info/index.d.ts | 2 +- es/components/my/message/index.d.ts | 2 +- es/components/paper/detail/index.d.ts | 2 +- es/components/paper/list/index.d.ts | 2 +- es/components/paper/preview/index.d.ts | 2 +- es/components/paper/upsert/index.d.ts | 2 +- es/components/parasite/detail/index.d.ts | 2 +- es/components/parasite/excess/index.d.ts | 2 +- es/components/parasite/list/index.d.ts | 2 +- es/components/pickers/area/index.d.ts | 2 +- es/components/platform/detail/index.d.ts | 2 +- es/components/platform/panel/index.d.ts | 2 +- es/components/platform/system/index.d.ts | 2 +- es/components/platform/upsert/index.d.ts | 2 +- es/components/session/cell/index.d.ts | 2 +- es/components/session/forMessage/index.d.ts | 2 +- es/components/session/header/index.d.ts | 2 +- es/components/session/list/index.d.ts | 2 +- .../session/sessionMessage/index.d.ts | 2 +- es/components/sessionMessage/cell/index.d.ts | 2 +- es/components/sessionMessage/list/index.d.ts | 2 +- .../sessionMessage/upsert/index.d.ts | 2 +- .../subscription/config/upsert/index.d.ts | 2 +- es/components/subscription/detail/index.d.ts | 2 +- es/components/subscription/upsert/index.d.ts | 2 +- es/components/subwayLine/list/index.d.ts | 2 +- es/components/subwayLine/picker/index.d.ts | 2 +- .../subwayLine/upsertStation/index.d.ts | 2 +- .../subwayLine/upsertSubway/index.d.ts | 2 +- es/components/system/application/index.d.ts | 2 +- es/components/system/detail/index.d.ts | 2 +- es/components/system/panel/index.d.ts | 2 +- es/components/system/upsert/index.d.ts | 2 +- es/components/token/me/index.d.ts | 2 +- .../user/authentication/idCard/index.d.ts | 2 +- es/components/user/authentication/index.d.ts | 2 +- es/components/user/info/index.d.ts | 2 +- es/components/user/login/index.d.ts | 2 +- es/components/user/manage/detail/index.d.ts | 2 +- es/components/user/manage/index.d.ts | 2 +- es/components/user/manage/upsert/index.d.ts | 2 +- .../userEntityGrant/claim/index.d.ts | 2 +- .../userEntityGrant/claim/ubPicker/index.d.ts | 2 +- es/components/userEntityGrant/list/index.d.ts | 2 +- .../userEntityGrant/share/index.d.ts | 2 +- .../userEntityGrant/upsert/index.d.ts | 2 +- .../userRelation/upsert/onUser/index.d.ts | 2 +- .../upsert/onUser/userRelation/index.d.ts | 2 +- es/components/userRelation/upsert/web.d.ts | 1 - es/components/userRelation/upsert/web.pc.d.ts | 1 - es/components/userWechatPublicTag/index.d.ts | 2 +- .../userWechatPublicTag/list/index.d.ts | 2 +- .../subscribedList/index.d.ts | 2 +- es/components/wechatLogin/confirm/index.d.ts | 2 +- es/components/wechatLogin/qrCode/index.d.ts | 2 +- .../wechatMaterialLibrary/index.d.ts | 2 +- .../wechatMenu/actionPhone/index.d.ts | 2 +- .../wechatMenu/conditionalMenu/index.d.ts | 2 +- es/components/wechatMenu/index.d.ts | 2 +- es/components/wechatMenu/menu/index.d.ts | 2 +- es/components/wechatMenu/menuInfo/index.d.ts | 2 +- es/components/wechatMenu/preview/index.d.ts | 2 +- .../wechatMenu/selectArticle/index.d.ts | 2 +- .../wechatMenu/selectMiniprogram/index.d.ts | 2 +- es/components/wechatMenu/showNews/index.d.ts | 2 +- es/components/wechatMenu/tagList/index.d.ts | 2 +- es/components/wechatMenu/textClick/index.d.ts | 2 +- .../wechatPublicAutoReply/index.d.ts | 2 +- .../wechatPublicAutoReply/preview/index.d.ts | 2 +- .../wechatPublicAutoReply/text/index.d.ts | 2 +- es/components/wechatPublicTag/list/index.d.ts | 2 +- .../wechatPublicTag/upsert/index.d.ts | 2 +- es/components/wechatQrCode/scan/index.d.ts | 2 +- es/components/wechatQrCode/share/index.d.ts | 2 +- .../wechatUser/bindingList/index.d.ts | 2 +- es/components/wechatUser/login/index.d.ts | 2 +- es/components/wechatUser/unbindBtn/index.d.ts | 2 +- es/context/FrontendRuntimeContext.d.ts | 2 +- es/features/application.d.ts | 3 +- es/features/application.js | 27 +++++++++++++++- es/triggers/toDo.d.ts | 2 +- lib/context/FrontendRuntimeContext.d.ts | 2 +- lib/features/application.d.ts | 3 +- lib/features/application.js | 27 +++++++++++++++- lib/triggers/toDo.d.ts | 2 +- src/features/application.ts | 31 ++++++++++++++++++- 124 files changed, 202 insertions(+), 124 deletions(-) diff --git a/es/components/address/list/index.d.ts b/es/components/address/list/index.d.ts index eb7c9c471..3a8805399 100644 --- a/es/components/address/list/index.d.ts +++ b/es/components/address/list/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/address/upsert/index.d.ts b/es/components/address/upsert/index.d.ts index 543b66d91..81555dcf4 100644 --- a/es/components/address/upsert/index.d.ts +++ b/es/components/address/upsert/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/application/detail/index.d.ts b/es/components/application/detail/index.d.ts index f1528b757..950310deb 100644 --- a/es/components/application/detail/index.d.ts +++ b/es/components/application/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/application/detailForPlatform/index.d.ts b/es/components/application/detailForPlatform/index.d.ts index f1528b757..950310deb 100644 --- a/es/components/application/detailForPlatform/index.d.ts +++ b/es/components/application/detailForPlatform/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/application/panel/index.d.ts b/es/components/application/panel/index.d.ts index f1528b757..950310deb 100644 --- a/es/components/application/panel/index.d.ts +++ b/es/components/application/panel/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/application/upsert/index.d.ts b/es/components/application/upsert/index.d.ts index f0ad771b5..4bd827e96 100644 --- a/es/components/application/upsert/index.d.ts +++ b/es/components/application/upsert/index.d.ts @@ -1,4 +1,4 @@ /// import { EntityDict } from '../../../oak-app-domain'; -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/article/cell/index.d.ts b/es/components/article/cell/index.d.ts index 7e54e8a64..11cbecb5d 100644 --- a/es/components/article/cell/index.d.ts +++ b/es/components/article/cell/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/article/detail/index.d.ts b/es/components/article/detail/index.d.ts index 7e54e8a64..11cbecb5d 100644 --- a/es/components/article/detail/index.d.ts +++ b/es/components/article/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/article/preview/index.d.ts b/es/components/article/preview/index.d.ts index 7e54e8a64..11cbecb5d 100644 --- a/es/components/article/preview/index.d.ts +++ b/es/components/article/preview/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/article/treeList/index.d.ts b/es/components/article/treeList/index.d.ts index 2499768af..791c71079 100644 --- a/es/components/article/treeList/index.d.ts +++ b/es/components/article/treeList/index.d.ts @@ -15,5 +15,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< articleId: string; currentArticle: string; setCurrentArticle: (id: string) => void; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/article/upsert/index.d.ts b/es/components/article/upsert/index.d.ts index 2e9d9680b..d40a637bb 100644 --- a/es/components/article/upsert/index.d.ts +++ b/es/components/article/upsert/index.d.ts @@ -2,5 +2,5 @@ import { EntityDict } from '../../../oak-app-domain'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps void; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/articleMenu/treeCell/index.d.ts b/es/components/articleMenu/treeCell/index.d.ts index a118fce4d..0d9fea429 100644 --- a/es/components/articleMenu/treeCell/index.d.ts +++ b/es/components/articleMenu/treeCell/index.d.ts @@ -22,5 +22,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< }) => void; currentArticle: string; setCurrentArticle: (id: string) => void; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/articleMenu/treeList/index.d.ts b/es/components/articleMenu/treeList/index.d.ts index b2daa7d12..0c49cd336 100644 --- a/es/components/articleMenu/treeList/index.d.ts +++ b/es/components/articleMenu/treeList/index.d.ts @@ -29,5 +29,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< }) => void; currentArticle: string; setCurrentArticle: (id: string) => void; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/articleMenu/treeManager/index.d.ts b/es/components/articleMenu/treeManager/index.d.ts index 28eeb71d6..dc310e62e 100644 --- a/es/components/articleMenu/treeManager/index.d.ts +++ b/es/components/articleMenu/treeManager/index.d.ts @@ -4,5 +4,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< show: string; articleMenuId: string; articleId: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/changePassword/byMobile/index.d.ts b/es/components/changePassword/byMobile/index.d.ts index 9e6eb4aca..a156771c1 100644 --- a/es/components/changePassword/byMobile/index.d.ts +++ b/es/components/changePassword/byMobile/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/changePassword/byPassword/index.d.ts b/es/components/changePassword/byPassword/index.d.ts index 9e6eb4aca..a156771c1 100644 --- a/es/components/changePassword/byPassword/index.d.ts +++ b/es/components/changePassword/byPassword/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/changePassword/index.d.ts b/es/components/changePassword/index.d.ts index 8dde0b6bd..720962b50 100644 --- a/es/components/changePassword/index.d.ts +++ b/es/components/changePassword/index.d.ts @@ -1,4 +1,4 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/common/tabBar/index.d.ts b/es/components/common/tabBar/index.d.ts index 97fd2535a..c56abc303 100644 --- a/es/components/common/tabBar/index.d.ts +++ b/es/components/common/tabBar/index.d.ts @@ -17,5 +17,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< border: boolean; selectedIconPath: string; iconPath: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/config/application/index.d.ts b/es/components/config/application/index.d.ts index 5bf5d66e3..14aff74fd 100644 --- a/es/components/config/application/index.d.ts +++ b/es/components/config/application/index.d.ts @@ -8,5 +8,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< entityId: string; type: string; isService: boolean; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/config/style/platform/index.d.ts b/es/components/config/style/platform/index.d.ts index d8601ae9e..0017a6f93 100644 --- a/es/components/config/style/platform/index.d.ts +++ b/es/components/config/style/platform/index.d.ts @@ -4,5 +4,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< entity: "application" | "platform" | "system"; entityId: string; name: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/config/upsert/index.d.ts b/es/components/config/upsert/index.d.ts index 9bf014f88..26655e31f 100644 --- a/es/components/config/upsert/index.d.ts +++ b/es/components/config/upsert/index.d.ts @@ -4,5 +4,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< entity: "platform" | "system"; name: string; entityId: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/domain/detail/index.d.ts b/es/components/domain/detail/index.d.ts index a7112bd2e..1d9217ba1 100644 --- a/es/components/domain/detail/index.d.ts +++ b/es/components/domain/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/domain/list/index.d.ts b/es/components/domain/list/index.d.ts index 95639f0bc..9210d251f 100644 --- a/es/components/domain/list/index.d.ts +++ b/es/components/domain/list/index.d.ts @@ -1,4 +1,4 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/domain/upsert/index.d.ts b/es/components/domain/upsert/index.d.ts index a7112bd2e..1d9217ba1 100644 --- a/es/components/domain/upsert/index.d.ts +++ b/es/components/domain/upsert/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/editor/index.d.ts b/es/components/editor/index.d.ts index 6424a23b3..6a8638c06 100644 --- a/es/components/editor/index.d.ts +++ b/es/components/editor/index.d.ts @@ -12,5 +12,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< entityId: string; tag1: string; tag2: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/extraFile/avatar/index.d.ts b/es/components/extraFile/avatar/index.d.ts index 4e84fe12c..4caacd42b 100644 --- a/es/components/extraFile/avatar/index.d.ts +++ b/es/components/extraFile/avatar/index.d.ts @@ -4,5 +4,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< entity: keyof EntityDict; entityId: string; autoUpload: boolean; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/extraFile/commit/index.d.ts b/es/components/extraFile/commit/index.d.ts index d5d6f1990..2407a9fad 100644 --- a/es/components/extraFile/commit/index.d.ts +++ b/es/components/extraFile/commit/index.d.ts @@ -1,4 +1,3 @@ -/// import { EntityDict } from '../../../oak-app-domain'; import { EntityDict as BaseEntityDict } from 'oak-domain/lib/types/Entity'; import { ReactComponentProps } from 'oak-frontend-base/lib/types/Page'; diff --git a/es/components/message/cell/index.d.ts b/es/components/message/cell/index.d.ts index 4243aadc6..97cf95bf1 100644 --- a/es/components/message/cell/index.d.ts +++ b/es/components/message/cell/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/message/detail/index.d.ts b/es/components/message/detail/index.d.ts index b6a428c8d..1010f95bb 100644 --- a/es/components/message/detail/index.d.ts +++ b/es/components/message/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/message/list/index.d.ts b/es/components/message/list/index.d.ts index 7d50f35ad..cf6ec7609 100644 --- a/es/components/message/list/index.d.ts +++ b/es/components/message/list/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/message/simpleList/index.d.ts b/es/components/message/simpleList/index.d.ts index abd90f921..ddcb9dc96 100644 --- a/es/components/message/simpleList/index.d.ts +++ b/es/components/message/simpleList/index.d.ts @@ -1,4 +1,4 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps void) | undefined; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/messageTypeSmsTemplate/list/index.d.ts b/es/components/messageTypeSmsTemplate/list/index.d.ts index 04dad4e71..04bc0cc22 100644 --- a/es/components/messageTypeSmsTemplate/list/index.d.ts +++ b/es/components/messageTypeSmsTemplate/list/index.d.ts @@ -2,5 +2,5 @@ import { EntityDict } from '../../../oak-app-domain'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/messageTypeSmsTemplate/tab/index.d.ts b/es/components/messageTypeSmsTemplate/tab/index.d.ts index dfbf38926..0151e0c36 100644 --- a/es/components/messageTypeSmsTemplate/tab/index.d.ts +++ b/es/components/messageTypeSmsTemplate/tab/index.d.ts @@ -1,5 +1,5 @@ import { EntityDict } from '../../../oak-app-domain'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/messageTypeTemplate/list/index.d.ts b/es/components/messageTypeTemplate/list/index.d.ts index 905b83c1c..fa7ff81d2 100644 --- a/es/components/messageTypeTemplate/list/index.d.ts +++ b/es/components/messageTypeTemplate/list/index.d.ts @@ -1,5 +1,5 @@ import { EntityDict } from '../../../oak-app-domain'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/mobile/login/index.d.ts b/es/components/mobile/login/index.d.ts index c5b493c7e..74eb451be 100644 --- a/es/components/mobile/login/index.d.ts +++ b/es/components/mobile/login/index.d.ts @@ -3,5 +3,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< onlyPassword: boolean; eventLoggedIn: string; callback: (() => void) | undefined; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/mobile/manageList/index.d.ts b/es/components/mobile/manageList/index.d.ts index 1423e77bb..c541ac9fe 100644 --- a/es/components/mobile/manageList/index.d.ts +++ b/es/components/mobile/manageList/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/mobile/me/index.d.ts b/es/components/mobile/me/index.d.ts index 6ec844c9a..91d2b55d6 100644 --- a/es/components/mobile/me/index.d.ts +++ b/es/components/mobile/me/index.d.ts @@ -1,5 +1,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps void) | undefined; bindNum: number; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/my/avatar/index.d.ts b/es/components/my/avatar/index.d.ts index cecab0c89..6634a4b02 100644 --- a/es/components/my/avatar/index.d.ts +++ b/es/components/my/avatar/index.d.ts @@ -3,5 +3,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< size: string | number; iconColor: string; iconName: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/my/info/index.d.ts b/es/components/my/info/index.d.ts index 778d1fe68..c7093295b 100644 --- a/es/components/my/info/index.d.ts +++ b/es/components/my/info/index.d.ts @@ -1,4 +1,4 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/my/message/index.d.ts b/es/components/my/message/index.d.ts index 4007eded7..a16fbf16b 100644 --- a/es/components/my/message/index.d.ts +++ b/es/components/my/message/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/paper/detail/index.d.ts b/es/components/paper/detail/index.d.ts index 7e54e8a64..11cbecb5d 100644 --- a/es/components/paper/detail/index.d.ts +++ b/es/components/paper/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/paper/list/index.d.ts b/es/components/paper/list/index.d.ts index b1c5dddb3..45ab91503 100644 --- a/es/components/paper/list/index.d.ts +++ b/es/components/paper/list/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/paper/preview/index.d.ts b/es/components/paper/preview/index.d.ts index 4007eded7..a16fbf16b 100644 --- a/es/components/paper/preview/index.d.ts +++ b/es/components/paper/preview/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/paper/upsert/index.d.ts b/es/components/paper/upsert/index.d.ts index 9a45cf4c3..cad71f4a4 100644 --- a/es/components/paper/upsert/index.d.ts +++ b/es/components/paper/upsert/index.d.ts @@ -1,4 +1,4 @@ /// import { EntityDict } from '../../../oak-app-domain'; -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/parasite/detail/index.d.ts b/es/components/parasite/detail/index.d.ts index 22328f43f..6d21c42a8 100644 --- a/es/components/parasite/detail/index.d.ts +++ b/es/components/parasite/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/parasite/excess/index.d.ts b/es/components/parasite/excess/index.d.ts index aeab4e2c1..34faa92b3 100644 --- a/es/components/parasite/excess/index.d.ts +++ b/es/components/parasite/excess/index.d.ts @@ -1,4 +1,4 @@ /// import { EntityDict } from '../../../oak-app-domain'; -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/parasite/list/index.d.ts b/es/components/parasite/list/index.d.ts index e129300e0..e722590cc 100644 --- a/es/components/parasite/list/index.d.ts +++ b/es/components/parasite/list/index.d.ts @@ -2,5 +2,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< entity: string; entityId: string; nameLabel: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/pickers/area/index.d.ts b/es/components/pickers/area/index.d.ts index 5dbd35e65..6df7e5cdb 100644 --- a/es/components/pickers/area/index.d.ts +++ b/es/components/pickers/area/index.d.ts @@ -1,5 +1,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps void; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/platform/detail/index.d.ts b/es/components/platform/detail/index.d.ts index 2f4ee4714..06b00557b 100644 --- a/es/components/platform/detail/index.d.ts +++ b/es/components/platform/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/platform/panel/index.d.ts b/es/components/platform/panel/index.d.ts index 2f4ee4714..06b00557b 100644 --- a/es/components/platform/panel/index.d.ts +++ b/es/components/platform/panel/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/platform/system/index.d.ts b/es/components/platform/system/index.d.ts index 1cd59e4cf..77784982e 100644 --- a/es/components/platform/system/index.d.ts +++ b/es/components/platform/system/index.d.ts @@ -1,4 +1,4 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/platform/upsert/index.d.ts b/es/components/platform/upsert/index.d.ts index 2f4ee4714..06b00557b 100644 --- a/es/components/platform/upsert/index.d.ts +++ b/es/components/platform/upsert/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/session/cell/index.d.ts b/es/components/session/cell/index.d.ts index ff3040392..39344dfcf 100644 --- a/es/components/session/cell/index.d.ts +++ b/es/components/session/cell/index.d.ts @@ -3,5 +3,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< onSelect: (id: string) => void; isEntity: boolean; name: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/session/forMessage/index.d.ts b/es/components/session/forMessage/index.d.ts index 3040df8a6..dba8fea20 100644 --- a/es/components/session/forMessage/index.d.ts +++ b/es/components/session/forMessage/index.d.ts @@ -3,5 +3,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< isEntity: boolean; entityDisplay: (data: any) => any[]; entityProjection: any; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/session/header/index.d.ts b/es/components/session/header/index.d.ts index 4007eded7..a16fbf16b 100644 --- a/es/components/session/header/index.d.ts +++ b/es/components/session/header/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/session/list/index.d.ts b/es/components/session/list/index.d.ts index bf432d40c..34abdc829 100644 --- a/es/components/session/list/index.d.ts +++ b/es/components/session/list/index.d.ts @@ -9,5 +9,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< sessionId: string; dialog: boolean; onItemClick: ((sessionId: string) => {}) | null | undefined; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/session/sessionMessage/index.d.ts b/es/components/session/sessionMessage/index.d.ts index f312bc5f4..e7e0b3993 100644 --- a/es/components/session/sessionMessage/index.d.ts +++ b/es/components/session/sessionMessage/index.d.ts @@ -2,5 +2,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< sessionId: string; entity: string; entityId: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/sessionMessage/cell/index.d.ts b/es/components/sessionMessage/cell/index.d.ts index 2945b7e2c..183a85740 100644 --- a/es/components/sessionMessage/cell/index.d.ts +++ b/es/components/sessionMessage/cell/index.d.ts @@ -1,4 +1,4 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/sessionMessage/list/index.d.ts b/es/components/sessionMessage/list/index.d.ts index ab50d269f..2305165fb 100644 --- a/es/components/sessionMessage/list/index.d.ts +++ b/es/components/sessionMessage/list/index.d.ts @@ -8,5 +8,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< entityId: string; entityDisplay: (data: EntityDict['session']['Schema'][] | RowWithActions[]) => any[]; entityProjection: any; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/sessionMessage/upsert/index.d.ts b/es/components/sessionMessage/upsert/index.d.ts index f47a2acd2..e18e9c4e5 100644 --- a/es/components/sessionMessage/upsert/index.d.ts +++ b/es/components/sessionMessage/upsert/index.d.ts @@ -5,5 +5,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< customUpload: (file: UploadFile) => void; send: () => void; setText: (text: string) => void; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/subscription/config/upsert/index.d.ts b/es/components/subscription/config/upsert/index.d.ts index e5f2d178d..6bc7838f5 100644 --- a/es/components/subscription/config/upsert/index.d.ts +++ b/es/components/subscription/config/upsert/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/subscription/detail/index.d.ts b/es/components/subscription/detail/index.d.ts index 66d28049e..53e78bbe6 100644 --- a/es/components/subscription/detail/index.d.ts +++ b/es/components/subscription/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/subscription/upsert/index.d.ts b/es/components/subscription/upsert/index.d.ts index b3034692b..74d4d6ba0 100644 --- a/es/components/subscription/upsert/index.d.ts +++ b/es/components/subscription/upsert/index.d.ts @@ -2,5 +2,5 @@ import { EntityDict } from '../../../oak-app-domain/EntityDict'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/subwayLine/list/index.d.ts b/es/components/subwayLine/list/index.d.ts index 6165fcd44..9a110d1e1 100644 --- a/es/components/subwayLine/list/index.d.ts +++ b/es/components/subwayLine/list/index.d.ts @@ -1,3 +1,3 @@ import { EntityDict } from '../../../oak-app-domain'; -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/subwayLine/picker/index.d.ts b/es/components/subwayLine/picker/index.d.ts index 12eb7190d..d786b329a 100644 --- a/es/components/subwayLine/picker/index.d.ts +++ b/es/components/subwayLine/picker/index.d.ts @@ -3,5 +3,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< onCancel: (() => void) | undefined; onConfirm: ((stationIds: string[]) => void) | undefined; selectIds: string[] | undefined; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/subwayLine/upsertStation/index.d.ts b/es/components/subwayLine/upsertStation/index.d.ts index 7b55194ff..1d3ff4628 100644 --- a/es/components/subwayLine/upsertStation/index.d.ts +++ b/es/components/subwayLine/upsertStation/index.d.ts @@ -3,5 +3,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< openStation: boolean; onClose: () => void; subwayId: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/subwayLine/upsertSubway/index.d.ts b/es/components/subwayLine/upsertSubway/index.d.ts index 68bb8f50d..4309667a7 100644 --- a/es/components/subwayLine/upsertSubway/index.d.ts +++ b/es/components/subwayLine/upsertSubway/index.d.ts @@ -2,5 +2,5 @@ import { EntityDict } from '../../../oak-app-domain'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps void; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/system/application/index.d.ts b/es/components/system/application/index.d.ts index 43ddd9f13..a45836817 100644 --- a/es/components/system/application/index.d.ts +++ b/es/components/system/application/index.d.ts @@ -1,4 +1,4 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/system/detail/index.d.ts b/es/components/system/detail/index.d.ts index 8bf853bbb..e352440b7 100644 --- a/es/components/system/detail/index.d.ts +++ b/es/components/system/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/system/panel/index.d.ts b/es/components/system/panel/index.d.ts index 8bf853bbb..e352440b7 100644 --- a/es/components/system/panel/index.d.ts +++ b/es/components/system/panel/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/system/upsert/index.d.ts b/es/components/system/upsert/index.d.ts index 8bf853bbb..e352440b7 100644 --- a/es/components/system/upsert/index.d.ts +++ b/es/components/system/upsert/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/token/me/index.d.ts b/es/components/token/me/index.d.ts index a044d565d..abae43b01 100644 --- a/es/components/token/me/index.d.ts +++ b/es/components/token/me/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/user/authentication/idCard/index.d.ts b/es/components/user/authentication/idCard/index.d.ts index 6556411bf..b1b8ae8b7 100644 --- a/es/components/user/authentication/idCard/index.d.ts +++ b/es/components/user/authentication/idCard/index.d.ts @@ -6,5 +6,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< entity: string; autoUpload: boolean; disabled: boolean; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/user/authentication/index.d.ts b/es/components/user/authentication/index.d.ts index c9449def6..944f7e987 100644 --- a/es/components/user/authentication/index.d.ts +++ b/es/components/user/authentication/index.d.ts @@ -4,5 +4,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< autoUpload: boolean; onFinish: (() => void) | undefined; needUploadPhotos: boolean; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/user/info/index.d.ts b/es/components/user/info/index.d.ts index 9e6eb4aca..a156771c1 100644 --- a/es/components/user/info/index.d.ts +++ b/es/components/user/info/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/user/login/index.d.ts b/es/components/user/login/index.d.ts index 4b205fc98..dffbc6270 100644 --- a/es/components/user/login/index.d.ts +++ b/es/components/user/login/index.d.ts @@ -5,5 +5,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< redirectUri: string; url: string; callback: (() => void) | undefined; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/user/manage/detail/index.d.ts b/es/components/user/manage/detail/index.d.ts index 2e7a3635e..076512a32 100644 --- a/es/components/user/manage/detail/index.d.ts +++ b/es/components/user/manage/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/user/manage/index.d.ts b/es/components/user/manage/index.d.ts index d33500b73..53c36f819 100644 --- a/es/components/user/manage/index.d.ts +++ b/es/components/user/manage/index.d.ts @@ -1,4 +1,4 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/user/manage/upsert/index.d.ts b/es/components/user/manage/upsert/index.d.ts index 88ed45721..be08db540 100644 --- a/es/components/user/manage/upsert/index.d.ts +++ b/es/components/user/manage/upsert/index.d.ts @@ -1,4 +1,4 @@ /// import { EntityDict } from "../../../../oak-app-domain"; -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/userEntityGrant/claim/index.d.ts b/es/components/userEntityGrant/claim/index.d.ts index dd836cbe0..d17d81093 100644 --- a/es/components/userEntityGrant/claim/index.d.ts +++ b/es/components/userEntityGrant/claim/index.d.ts @@ -16,5 +16,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< hideInfo: boolean; hideTip: boolean; afterClaim: ((ueg: EntityDict['userEntityGrant']['OpSchema']) => void) | undefined; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/userEntityGrant/claim/ubPicker/index.d.ts b/es/components/userEntityGrant/claim/ubPicker/index.d.ts index 3ff190b84..b29d102ca 100644 --- a/es/components/userEntityGrant/claim/ubPicker/index.d.ts +++ b/es/components/userEntityGrant/claim/ubPicker/index.d.ts @@ -10,5 +10,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< onPickRows: (ids: string[]) => void; pickedRowIds: string[] | undefined; pickedRelationIds: string[] | undefined; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/userEntityGrant/list/index.d.ts b/es/components/userEntityGrant/list/index.d.ts index d5a513a61..173b46388 100644 --- a/es/components/userEntityGrant/list/index.d.ts +++ b/es/components/userEntityGrant/list/index.d.ts @@ -3,5 +3,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< entityId: string; relationEntity: string; relationEntityFilter: {}; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/userEntityGrant/share/index.d.ts b/es/components/userEntityGrant/share/index.d.ts index e04f8057f..b7bbd6ff7 100644 --- a/es/components/userEntityGrant/share/index.d.ts +++ b/es/components/userEntityGrant/share/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/userEntityGrant/upsert/index.d.ts b/es/components/userEntityGrant/upsert/index.d.ts index 5a575ac50..960926763 100644 --- a/es/components/userEntityGrant/upsert/index.d.ts +++ b/es/components/userEntityGrant/upsert/index.d.ts @@ -13,5 +13,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< multiple: boolean; rule: "single" | "all" | "free"; ruleOnRow: "single" | "all" | "free"; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/userRelation/upsert/onUser/index.d.ts b/es/components/userRelation/upsert/onUser/index.d.ts index 7f421cd1b..ff878210b 100644 --- a/es/components/userRelation/upsert/onUser/index.d.ts +++ b/es/components/userRelation/upsert/onUser/index.d.ts @@ -9,5 +9,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< allowUpdateName: boolean; allowUpdateNickname: boolean; isNew: boolean; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/userRelation/upsert/onUser/userRelation/index.d.ts b/es/components/userRelation/upsert/onUser/userRelation/index.d.ts index 8a88eb02e..7030510f7 100644 --- a/es/components/userRelation/upsert/onUser/userRelation/index.d.ts +++ b/es/components/userRelation/upsert/onUser/userRelation/index.d.ts @@ -3,5 +3,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< entity: keyof EntityDict; entityId: string; relations: import("../../../../../oak-app-domain/Relation/Schema").OpSchema[]; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/userRelation/upsert/web.d.ts b/es/components/userRelation/upsert/web.d.ts index 9a693f5e4..59df5f4b7 100644 --- a/es/components/userRelation/upsert/web.d.ts +++ b/es/components/userRelation/upsert/web.d.ts @@ -1,4 +1,3 @@ -/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../oak-app-domain'; import { QrCodeType } from '../../../types/Config'; diff --git a/es/components/userRelation/upsert/web.pc.d.ts b/es/components/userRelation/upsert/web.pc.d.ts index 45795c977..ac1d06326 100644 --- a/es/components/userRelation/upsert/web.pc.d.ts +++ b/es/components/userRelation/upsert/web.pc.d.ts @@ -1,4 +1,3 @@ -/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../oak-app-domain'; import { QrCodeType } from '../../../types/Config'; diff --git a/es/components/userWechatPublicTag/index.d.ts b/es/components/userWechatPublicTag/index.d.ts index 61894f44c..4d39ecf8f 100644 --- a/es/components/userWechatPublicTag/index.d.ts +++ b/es/components/userWechatPublicTag/index.d.ts @@ -1,4 +1,4 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/userWechatPublicTag/list/index.d.ts b/es/components/userWechatPublicTag/list/index.d.ts index 4a745109d..f1c9a3614 100644 --- a/es/components/userWechatPublicTag/list/index.d.ts +++ b/es/components/userWechatPublicTag/list/index.d.ts @@ -1,5 +1,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/userWechatPublicTag/subscribedList/index.d.ts b/es/components/userWechatPublicTag/subscribedList/index.d.ts index 78c814bb6..7a0670531 100644 --- a/es/components/userWechatPublicTag/subscribedList/index.d.ts +++ b/es/components/userWechatPublicTag/subscribedList/index.d.ts @@ -1,4 +1,4 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatLogin/confirm/index.d.ts b/es/components/wechatLogin/confirm/index.d.ts index 7e6f4d539..11d2f3f62 100644 --- a/es/components/wechatLogin/confirm/index.d.ts +++ b/es/components/wechatLogin/confirm/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => 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 3b3d78760..69727bd4d 100644 --- a/es/components/wechatLogin/qrCode/index.d.ts +++ b/es/components/wechatLogin/qrCode/index.d.ts @@ -2,5 +2,5 @@ import { EntityDict } from '../../../oak-app-domain'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatMaterialLibrary/index.d.ts b/es/components/wechatMaterialLibrary/index.d.ts index 333c8caf1..f07e65ee4 100644 --- a/es/components/wechatMaterialLibrary/index.d.ts +++ b/es/components/wechatMaterialLibrary/index.d.ts @@ -3,5 +3,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< type: MaterialType; getMenuContent: (menuContent: any) => void; applicationId: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatMenu/actionPhone/index.d.ts b/es/components/wechatMenu/actionPhone/index.d.ts index 8e80303bf..f41a49dad 100644 --- a/es/components/wechatMenu/actionPhone/index.d.ts +++ b/es/components/wechatMenu/actionPhone/index.d.ts @@ -11,5 +11,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< isPreview: boolean; open: boolean; tabKey: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatMenu/conditionalMenu/index.d.ts b/es/components/wechatMenu/conditionalMenu/index.d.ts index e0873726d..cc184c883 100644 --- a/es/components/wechatMenu/conditionalMenu/index.d.ts +++ b/es/components/wechatMenu/conditionalMenu/index.d.ts @@ -4,5 +4,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< wechatId: string; menuType: string; tabKey: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatMenu/index.d.ts b/es/components/wechatMenu/index.d.ts index c2a38e510..2fa342661 100644 --- a/es/components/wechatMenu/index.d.ts +++ b/es/components/wechatMenu/index.d.ts @@ -2,5 +2,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< applicationId: string; isPlatform: boolean; tabKey: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatMenu/menu/index.d.ts b/es/components/wechatMenu/menu/index.d.ts index 9911a9a61..57b2e6ca2 100644 --- a/es/components/wechatMenu/menu/index.d.ts +++ b/es/components/wechatMenu/menu/index.d.ts @@ -3,5 +3,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< menuId: string; menuType: string; tabKey: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatMenu/menuInfo/index.d.ts b/es/components/wechatMenu/menuInfo/index.d.ts index f7b3a780b..d17740e46 100644 --- a/es/components/wechatMenu/menuInfo/index.d.ts +++ b/es/components/wechatMenu/menuInfo/index.d.ts @@ -19,5 +19,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< actions: string[]; wechatId: string; iState: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatMenu/preview/index.d.ts b/es/components/wechatMenu/preview/index.d.ts index a7c9dd34d..7f6e29809 100644 --- a/es/components/wechatMenu/preview/index.d.ts +++ b/es/components/wechatMenu/preview/index.d.ts @@ -2,5 +2,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< button: any[]; news: any[]; applicationId: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatMenu/selectArticle/index.d.ts b/es/components/wechatMenu/selectArticle/index.d.ts index 3b94218e6..1f5701d44 100644 --- a/es/components/wechatMenu/selectArticle/index.d.ts +++ b/es/components/wechatMenu/selectArticle/index.d.ts @@ -2,5 +2,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< getUrl: (url: string) => void; changeOpen: (open: boolean) => void; applicationId: string; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatMenu/selectMiniprogram/index.d.ts b/es/components/wechatMenu/selectMiniprogram/index.d.ts index b3ba152eb..34f5a1ee8 100644 --- a/es/components/wechatMenu/selectMiniprogram/index.d.ts +++ b/es/components/wechatMenu/selectMiniprogram/index.d.ts @@ -1,5 +1,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps void; changeOpen: (open: boolean) => void; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatMenu/showNews/index.d.ts b/es/components/wechatMenu/showNews/index.d.ts index 528a9f359..a76aa8442 100644 --- a/es/components/wechatMenu/showNews/index.d.ts +++ b/es/components/wechatMenu/showNews/index.d.ts @@ -1,4 +1,4 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatMenu/tagList/index.d.ts b/es/components/wechatMenu/tagList/index.d.ts index 3933a080b..c8823ae2b 100644 --- a/es/components/wechatMenu/tagList/index.d.ts +++ b/es/components/wechatMenu/tagList/index.d.ts @@ -6,5 +6,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< name: string; wechatId: string; }) => void; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatMenu/textClick/index.d.ts b/es/components/wechatMenu/textClick/index.d.ts index a0e6be8d3..5cfc90a07 100644 --- a/es/components/wechatMenu/textClick/index.d.ts +++ b/es/components/wechatMenu/textClick/index.d.ts @@ -1,5 +1,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps void; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatPublicAutoReply/index.d.ts b/es/components/wechatPublicAutoReply/index.d.ts index 2fafe318c..5afaff8f9 100644 --- a/es/components/wechatPublicAutoReply/index.d.ts +++ b/es/components/wechatPublicAutoReply/index.d.ts @@ -1,5 +1,5 @@ import { EntityDict } from '../../oak-app-domain'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatPublicAutoReply/preview/index.d.ts b/es/components/wechatPublicAutoReply/preview/index.d.ts index 3a000f956..de1d5f00d 100644 --- a/es/components/wechatPublicAutoReply/preview/index.d.ts +++ b/es/components/wechatPublicAutoReply/preview/index.d.ts @@ -7,5 +7,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< video: string; voice: string; }; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatPublicAutoReply/text/index.d.ts b/es/components/wechatPublicAutoReply/text/index.d.ts index dd3519d90..3e93c18a5 100644 --- a/es/components/wechatPublicAutoReply/text/index.d.ts +++ b/es/components/wechatPublicAutoReply/text/index.d.ts @@ -1,5 +1,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps void; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatPublicTag/list/index.d.ts b/es/components/wechatPublicTag/list/index.d.ts index be53cb08c..eea49a877 100644 --- a/es/components/wechatPublicTag/list/index.d.ts +++ b/es/components/wechatPublicTag/list/index.d.ts @@ -1,4 +1,4 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatPublicTag/upsert/index.d.ts b/es/components/wechatPublicTag/upsert/index.d.ts index 501e73530..2aa8c6dd0 100644 --- a/es/components/wechatPublicTag/upsert/index.d.ts +++ b/es/components/wechatPublicTag/upsert/index.d.ts @@ -7,5 +7,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< editTag: () => void; addTag: () => void; changeText: (text: string) => void; -}>) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatQrCode/scan/index.d.ts b/es/components/wechatQrCode/scan/index.d.ts index 81a2c248e..c322195a6 100644 --- a/es/components/wechatQrCode/scan/index.d.ts +++ b/es/components/wechatQrCode/scan/index.d.ts @@ -1,5 +1,5 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +}>) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatQrCode/share/index.d.ts b/es/components/wechatQrCode/share/index.d.ts index 14f3713ef..0ee7d6c0c 100644 --- a/es/components/wechatQrCode/share/index.d.ts +++ b/es/components/wechatQrCode/share/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatUser/bindingList/index.d.ts b/es/components/wechatUser/bindingList/index.d.ts index ab29006fe..9394adf2c 100644 --- a/es/components/wechatUser/bindingList/index.d.ts +++ b/es/components/wechatUser/bindingList/index.d.ts @@ -1,4 +1,4 @@ /// import { EntityDict } from '../../../oak-app-domain'; -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatUser/login/index.d.ts b/es/components/wechatUser/login/index.d.ts index 4007eded7..a16fbf16b 100644 --- a/es/components/wechatUser/login/index.d.ts +++ b/es/components/wechatUser/login/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/components/wechatUser/unbindBtn/index.d.ts b/es/components/wechatUser/unbindBtn/index.d.ts index 611b25119..841d0c766 100644 --- a/es/components/wechatUser/unbindBtn/index.d.ts +++ b/es/components/wechatUser/unbindBtn/index.d.ts @@ -1,4 +1,4 @@ /// import { EntityDict } from '../../../oak-app-domain'; -declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/es/context/FrontendRuntimeContext.d.ts b/es/context/FrontendRuntimeContext.d.ts index ffcffc84e..dccd17346 100644 --- a/es/context/FrontendRuntimeContext.d.ts +++ b/es/context/FrontendRuntimeContext.d.ts @@ -18,7 +18,7 @@ export declare abstract class FrontendRuntimeContext; getApplicationId(): string | undefined; getSystemId(): ED["application"]["Schema"]["systemId"] | undefined; - getApplication(): Partial | undefined; + getApplication(): Partial; getTokenValue(): string | undefined; getToken(allowUnloggedIn?: boolean): Partial | undefined; getCurrentUserId(allowUnloggedIn?: boolean): string | undefined; diff --git a/es/features/application.d.ts b/es/features/application.d.ts index 8c6ec42ca..6de31b7a3 100644 --- a/es/features/application.d.ts +++ b/es/features/application.d.ts @@ -9,11 +9,12 @@ export declare class Application extends Feature { private cache; private storage; private projection; + private sensativeEntities; constructor(cache: Cache, storage: LocalStorage); private getApplicationFromCache; private loadApplicationInfo; initialize(domain: string, appId?: string | null, projection?: EntityDict['application']['Selection']['data']): Promise; - getApplication(): Partial | undefined; + getApplication(): Partial; getApplicationId(allowUnInitialized?: boolean): string | undefined; uploadWechatMedia(params: { applicationId: string; diff --git a/es/features/application.js b/es/features/application.js index fc1927a14..297896c40 100644 --- a/es/features/application.js +++ b/es/features/application.js @@ -1,6 +1,7 @@ import { Feature } from 'oak-frontend-base/es/types/Feature'; import { assert } from 'oak-domain/lib/utils/assert'; import { cloneDeep, merge } from 'oak-domain/lib/utils/lodash'; +import { traverseProjection } from 'oak-domain/lib/utils/projection'; import { applicationProjection } from '../types/Projection'; import { OakApplicationLoadingException, } from '../types/Exception'; export class Application extends Feature { @@ -9,13 +10,36 @@ export class Application extends Feature { cache; storage; projection; + sensativeEntities = []; constructor(cache, storage) { super(); this.cache = cache; this.storage = storage; this.projection = cloneDeep(applicationProjection); + // this.application做一层缓存,有时候更新了一些相关的属性还是要更新的 + traverseProjection('application', this.cache.getSchema(), this.projection, (entity) => this.sensativeEntities.push(entity)); + this.cache.bindOnSync((opRecords) => { + for (const record of opRecords) { + if (record.a !== 's') { + if (this.sensativeEntities.includes(record.e)) { + this.application = undefined; + } + else { + const { d } = record; + for (const e2 in d) { + if (this.sensativeEntities.includes(e2)) { + this.application = undefined; + } + } + } + } + } + }); } getApplicationFromCache() { + if (this.application) { + return this.application; + } const data = this.cache.get('application', { data: this.projection, filter: { @@ -24,6 +48,7 @@ export class Application extends Feature { }); assert(data.length === 1, `cache:applicationId${this.applicationId}没有取到有效数据`); this.application = data[0]; + return this.application; } async loadApplicationInfo(domain) { let applicationId; @@ -69,7 +94,7 @@ export class Application extends Feature { if (this.applicationId === undefined) { throw new OakApplicationLoadingException(); } - return this.application; + return this.getApplicationFromCache(); } getApplicationId(allowUnInitialized) { if (this.applicationId === undefined) { 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/lib/context/FrontendRuntimeContext.d.ts b/lib/context/FrontendRuntimeContext.d.ts index ffcffc84e..dccd17346 100644 --- a/lib/context/FrontendRuntimeContext.d.ts +++ b/lib/context/FrontendRuntimeContext.d.ts @@ -18,7 +18,7 @@ export declare abstract class FrontendRuntimeContext; getApplicationId(): string | undefined; getSystemId(): ED["application"]["Schema"]["systemId"] | undefined; - getApplication(): Partial | undefined; + getApplication(): Partial; getTokenValue(): string | undefined; getToken(allowUnloggedIn?: boolean): Partial | undefined; getCurrentUserId(allowUnloggedIn?: boolean): string | undefined; diff --git a/lib/features/application.d.ts b/lib/features/application.d.ts index 8c6ec42ca..6de31b7a3 100644 --- a/lib/features/application.d.ts +++ b/lib/features/application.d.ts @@ -9,11 +9,12 @@ export declare class Application extends Feature { private cache; private storage; private projection; + private sensativeEntities; constructor(cache: Cache, storage: LocalStorage); private getApplicationFromCache; private loadApplicationInfo; initialize(domain: string, appId?: string | null, projection?: EntityDict['application']['Selection']['data']): Promise; - getApplication(): Partial | undefined; + getApplication(): Partial; getApplicationId(allowUnInitialized?: boolean): string | undefined; uploadWechatMedia(params: { applicationId: string; diff --git a/lib/features/application.js b/lib/features/application.js index 9b1fed56e..e785c5748 100644 --- a/lib/features/application.js +++ b/lib/features/application.js @@ -4,6 +4,7 @@ exports.Application = void 0; const Feature_1 = require("oak-frontend-base/es/types/Feature"); const assert_1 = require("oak-domain/lib/utils/assert"); const lodash_1 = require("oak-domain/lib/utils/lodash"); +const projection_1 = require("oak-domain/lib/utils/projection"); const Projection_1 = require("../types/Projection"); const Exception_1 = require("../types/Exception"); class Application extends Feature_1.Feature { @@ -12,13 +13,36 @@ class Application extends Feature_1.Feature { cache; storage; projection; + sensativeEntities = []; constructor(cache, storage) { super(); this.cache = cache; this.storage = storage; this.projection = (0, lodash_1.cloneDeep)(Projection_1.applicationProjection); + // this.application做一层缓存,有时候更新了一些相关的属性还是要更新的 + (0, projection_1.traverseProjection)('application', this.cache.getSchema(), this.projection, (entity) => this.sensativeEntities.push(entity)); + this.cache.bindOnSync((opRecords) => { + for (const record of opRecords) { + if (record.a !== 's') { + if (this.sensativeEntities.includes(record.e)) { + this.application = undefined; + } + else { + const { d } = record; + for (const e2 in d) { + if (this.sensativeEntities.includes(e2)) { + this.application = undefined; + } + } + } + } + } + }); } getApplicationFromCache() { + if (this.application) { + return this.application; + } const data = this.cache.get('application', { data: this.projection, filter: { @@ -27,6 +51,7 @@ class Application extends Feature_1.Feature { }); (0, assert_1.assert)(data.length === 1, `cache:applicationId${this.applicationId}没有取到有效数据`); this.application = data[0]; + return this.application; } async loadApplicationInfo(domain) { let applicationId; @@ -72,7 +97,7 @@ class Application extends Feature_1.Feature { if (this.applicationId === undefined) { throw new Exception_1.OakApplicationLoadingException(); } - return this.application; + return this.getApplicationFromCache(); } getApplicationId(allowUnInitialized) { if (this.applicationId === undefined) { 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/src/features/application.ts b/src/features/application.ts index 51b5d7cb9..1b3c052b1 100644 --- a/src/features/application.ts +++ b/src/features/application.ts @@ -3,6 +3,7 @@ import { Cache } from 'oak-frontend-base/es/features/cache'; import { Feature } from 'oak-frontend-base/es/types/Feature'; import { assert } from 'oak-domain/lib/utils/assert'; import { cloneDeep, merge } from 'oak-domain/lib/utils/lodash'; +import { traverseProjection } from 'oak-domain/lib/utils/projection'; import { EntityDict } from '../oak-app-domain'; import { AppType } from '../oak-app-domain/Application/Schema'; @@ -12,6 +13,7 @@ import { MediaType, MediaVideoDescription } from '../types/WeChat'; import { OakApplicationLoadingException, } from '../types/Exception'; +import { CreateOpResult, SelectOpResult } from 'oak-domain/lib/types'; export class Application extends Feature { private applicationId?: string; @@ -19,6 +21,7 @@ export class Application extends Feature { private cache: Cache; private storage: LocalStorage; private projection: ED['application']['Selection']['data']; + private sensativeEntities: (keyof ED)[] = []; constructor( cache: Cache, @@ -28,9 +31,34 @@ export class Application extends Feature { this.cache = cache; this.storage = storage; this.projection = cloneDeep(applicationProjection); + + // this.application做一层缓存,有时候更新了一些相关的属性还是要更新的 + traverseProjection('application', this.cache.getSchema(), this.projection, (entity) => this.sensativeEntities.push(entity)); + this.cache.bindOnSync( + (opRecords) => { + for (const record of opRecords) { + if (record.a !== 's') { + if (this.sensativeEntities.includes((>record).e)) { + this.application = undefined; + } + else { + const { d } = record as SelectOpResult; + for (const e2 in d) { + if (this.sensativeEntities.includes(e2)) { + this.application = undefined; + } + } + } + } + } + } + ) } private getApplicationFromCache() { + if (this.application) { + return this.application; + } const data = this.cache.get('application', { data: this.projection, filter: { @@ -42,6 +70,7 @@ export class Application extends Feature { `cache:applicationId${this.applicationId}没有取到有效数据` ); this.application = data[0]; + return this.application; } private async loadApplicationInfo(domain: string) { @@ -96,7 +125,7 @@ export class Application extends Feature { if (this.applicationId === undefined) { throw new OakApplicationLoadingException(); } - return this.application; + return this.getApplicationFromCache(); } getApplicationId(allowUnInitialized?: boolean) {