From 5b9dee27682a2720c85a430a255ec9e1b485a116 Mon Sep 17 00:00:00 2001 From: wkj <278599135@qq.com> Date: Mon, 11 Sep 2023 14:01:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20src=E4=B8=8B=20exceptionHa?= =?UTF-8?q?ndlers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/exceptionHandlers.d.ts | 0 es/exceptionHandlers.js | 34 ---------------------------------- es/index.js | 1 - es/initialize.dev.d.ts | 2 +- es/initialize.dev.js | 2 +- es/initialize.prod.js | 2 +- es/types/actionBtnPanel.d.ts | 29 ----------------------------- es/types/actionBtnPanel.js | 1 - lib/exceptionHandlers.d.ts | 0 lib/exceptionHandlers.js | 34 ---------------------------------- lib/index.js | 1 - lib/initialize.dev.d.ts | 2 +- lib/initialize.dev.js | 2 +- lib/initialize.prod.js | 2 +- src/exceptionHandlers.ts | 35 ----------------------------------- src/hooks/useMyInfo.ts | 3 +-- src/index.ts | 1 - src/initialize.dev.ts | 20 ++++++++++++++++---- src/initialize.prod.ts | 9 +++++++-- 19 files changed, 30 insertions(+), 150 deletions(-) delete mode 100644 es/exceptionHandlers.d.ts delete mode 100644 es/exceptionHandlers.js delete mode 100644 es/types/actionBtnPanel.d.ts delete mode 100644 es/types/actionBtnPanel.js delete mode 100644 lib/exceptionHandlers.d.ts delete mode 100644 lib/exceptionHandlers.js delete mode 100644 src/exceptionHandlers.ts diff --git a/es/exceptionHandlers.d.ts b/es/exceptionHandlers.d.ts deleted file mode 100644 index e69de29bb..000000000 diff --git a/es/exceptionHandlers.js b/es/exceptionHandlers.js deleted file mode 100644 index 1b1cfe9d9..000000000 --- a/es/exceptionHandlers.js +++ /dev/null @@ -1,34 +0,0 @@ -"use strict"; -// import { ExceptionHandlerDict } from "oak-frontend-base/es/types/ExceptionHandler"; -// import { OakUnloggedInException } from "oak-domain/lib/types/Exception"; -// import { EntityDict } from './oak-app-domain'; -// import { GeneralFeatures } from './features/index'; -// import { OakTokenExpiredException } from "./types/Exception"; -// import { BRC, FRC, FrcAspectDict } from './types/RuntimeCxt'; -// export const handlerDict: ExceptionHandlerDict< -// EntityDict, -// BRC, -// FRC, -// FrcAspectDict, -// GeneralFeatures> = { -// [OakUnloggedInException.name]: async (features) => { -// await features.token.logout(); -// features.navigator.navigateTo( -// { -// url: '/mobile/login', -// }, -// undefined, -// true -// ); -// }, -// [OakTokenExpiredException.name]: async (features) => { -// await features.token.logout(); -// features.navigator.navigateTo( -// { -// url: '/mobile/login', -// }, -// undefined, -// true -// ); -// } -// } diff --git a/es/index.js b/es/index.js index df3934084..7871ec9d1 100644 --- a/es/index.js +++ b/es/index.js @@ -1,4 +1,3 @@ -// export * from './exceptionHandlers'; import { registerMessageNotificationConverters } from './triggers/message'; import { registerWeChatPublicEventCallback } from './endpoints'; export { registerMessageNotificationConverters, registerWeChatPublicEventCallback, }; diff --git a/es/initialize.dev.d.ts b/es/initialize.dev.d.ts index c373a8603..62ff7d231 100644 --- a/es/initialize.dev.d.ts +++ b/es/initialize.dev.d.ts @@ -6,7 +6,7 @@ import { AsyncRowStore } from 'oak-domain/lib/store/AsyncRowStore'; import { BackendRuntimeContext } from './context/BackendRuntimeContext'; import { FrontendRuntimeContext } from './context/FrontendRuntimeContext'; import { GAD, GFD } from './types/Page'; -import GeneralAspectDict from './aspects/AspectDict'; +import type GeneralAspectDict from './aspects/AspectDict'; import { AppType } from './oak-app-domain/Application/Schema'; import { InitializeOptions } from 'oak-frontend-base'; export declare function initialize, AD extends Record>, FrontCxt extends FrontendRuntimeContext>>(type: AppType, domain: string, storageSchema: StorageSchema, frontendContextBuilder: () => (store: CacheStore) => FrontCxt, backendContextBuilder: (contextStr?: string) => (store: AsyncRowStore) => Promise, aspectDict: AD, triggers: Array>, checkers: Array>, watchers: Array>, timers: Array>, startRoutines: Array>, initialData: { diff --git a/es/initialize.dev.js b/es/initialize.dev.js index 746a53163..cb3a48020 100644 --- a/es/initialize.dev.js +++ b/es/initialize.dev.js @@ -1,6 +1,6 @@ import { ActionDefDict as generalActionDefDict } from './oak-app-domain'; -import { intersection } from 'oak-domain/lib/utils/lodash'; import { initialize as initDev } from 'oak-frontend-base/es/initialize-dev'; +import { intersection } from 'oak-domain/lib/utils/lodash'; import generalWatchers from './watchers'; import generalCheckers from './checkers'; import generalTriggers from './triggers'; diff --git a/es/initialize.prod.js b/es/initialize.prod.js index 6bb05bbc3..c7954e282 100644 --- a/es/initialize.prod.js +++ b/es/initialize.prod.js @@ -1,6 +1,6 @@ +import { initialize as initProd } from 'oak-frontend-base/es/initialize-prod'; import { ActionDefDict as generalActionDefDict } from './oak-app-domain'; import { intersection } from 'oak-domain/lib/utils/lodash'; -import { initialize as initProd } from 'oak-frontend-base/es/initialize-prod'; import generalCheckers from './checkers'; import { initialize as initGeneralFeatures } from './features'; import { rewriteSelection, rewriteOperation } from './utils/selectionRewriter'; diff --git a/es/types/actionBtnPanel.d.ts b/es/types/actionBtnPanel.d.ts deleted file mode 100644 index e4d069864..000000000 --- a/es/types/actionBtnPanel.d.ts +++ /dev/null @@ -1,29 +0,0 @@ -/// -import { ButtonProps, SpaceProps } from 'antd'; -declare type Item = { - icon?: string | React.ReactNode; - label?: string; - action?: string; - auth: boolean; - type?: 'a' | 'button'; - index?: number; - alerted?: boolean; - alertTitle?: string; - alertContent?: string; - confirmText?: string; - cancelText?: string; - render?: React.ReactNode; - beforeAction?: (item: Item) => boolean | Promise; - afterAction?: (item: Item) => void; - onClick?: (item: Item) => void | Promise; - buttonProps?: Omit; - filter?: () => boolean; -}; -export declare type ActionBtnPanelProps = { - entity: string; - items: Item[]; - spaceProps?: SpaceProps; - mode?: 'cell' | 'table-cell'; - column?: 3; -}; -export {}; diff --git a/es/types/actionBtnPanel.js b/es/types/actionBtnPanel.js deleted file mode 100644 index cb0ff5c3b..000000000 --- a/es/types/actionBtnPanel.js +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/lib/exceptionHandlers.d.ts b/lib/exceptionHandlers.d.ts deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/exceptionHandlers.js b/lib/exceptionHandlers.js deleted file mode 100644 index 1b1cfe9d9..000000000 --- a/lib/exceptionHandlers.js +++ /dev/null @@ -1,34 +0,0 @@ -"use strict"; -// import { ExceptionHandlerDict } from "oak-frontend-base/es/types/ExceptionHandler"; -// import { OakUnloggedInException } from "oak-domain/lib/types/Exception"; -// import { EntityDict } from './oak-app-domain'; -// import { GeneralFeatures } from './features/index'; -// import { OakTokenExpiredException } from "./types/Exception"; -// import { BRC, FRC, FrcAspectDict } from './types/RuntimeCxt'; -// export const handlerDict: ExceptionHandlerDict< -// EntityDict, -// BRC, -// FRC, -// FrcAspectDict, -// GeneralFeatures> = { -// [OakUnloggedInException.name]: async (features) => { -// await features.token.logout(); -// features.navigator.navigateTo( -// { -// url: '/mobile/login', -// }, -// undefined, -// true -// ); -// }, -// [OakTokenExpiredException.name]: async (features) => { -// await features.token.logout(); -// features.navigator.navigateTo( -// { -// url: '/mobile/login', -// }, -// undefined, -// true -// ); -// } -// } diff --git a/lib/index.js b/lib/index.js index bd4191ac7..a14cdace7 100644 --- a/lib/index.js +++ b/lib/index.js @@ -2,7 +2,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.registerUploader = exports.registerWechatPublicTags = exports.FrontendRuntimeContext = exports.BackendRuntimeContext = exports.getStreamObj = exports.getPlayBackUrl = exports.getLivestream = exports.decomposeFileUrl = exports.composeFileUrl = exports.registerWeChatPublicEventCallback = exports.registerMessageNotificationConverters = void 0; var tslib_1 = require("tslib"); -// export * from './exceptionHandlers'; var message_1 = require("./triggers/message"); Object.defineProperty(exports, "registerMessageNotificationConverters", { enumerable: true, get: function () { return message_1.registerMessageNotificationConverters; } }); var endpoints_1 = require("./endpoints"); diff --git a/lib/initialize.dev.d.ts b/lib/initialize.dev.d.ts index c373a8603..62ff7d231 100644 --- a/lib/initialize.dev.d.ts +++ b/lib/initialize.dev.d.ts @@ -6,7 +6,7 @@ import { AsyncRowStore } from 'oak-domain/lib/store/AsyncRowStore'; import { BackendRuntimeContext } from './context/BackendRuntimeContext'; import { FrontendRuntimeContext } from './context/FrontendRuntimeContext'; import { GAD, GFD } from './types/Page'; -import GeneralAspectDict from './aspects/AspectDict'; +import type GeneralAspectDict from './aspects/AspectDict'; import { AppType } from './oak-app-domain/Application/Schema'; import { InitializeOptions } from 'oak-frontend-base'; export declare function initialize, AD extends Record>, FrontCxt extends FrontendRuntimeContext>>(type: AppType, domain: string, storageSchema: StorageSchema, frontendContextBuilder: () => (store: CacheStore) => FrontCxt, backendContextBuilder: (contextStr?: string) => (store: AsyncRowStore) => Promise, aspectDict: AD, triggers: Array>, checkers: Array>, watchers: Array>, timers: Array>, startRoutines: Array>, initialData: { diff --git a/lib/initialize.dev.js b/lib/initialize.dev.js index 25cd58eac..43d6863ad 100644 --- a/lib/initialize.dev.js +++ b/lib/initialize.dev.js @@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.initialize = void 0; var tslib_1 = require("tslib"); var oak_app_domain_1 = require("./oak-app-domain"); -var lodash_1 = require("oak-domain/lib/utils/lodash"); var initialize_dev_1 = require("oak-frontend-base/es/initialize-dev"); +var lodash_1 = require("oak-domain/lib/utils/lodash"); var watchers_1 = tslib_1.__importDefault(require("./watchers")); var checkers_1 = tslib_1.__importDefault(require("./checkers")); var triggers_1 = tslib_1.__importDefault(require("./triggers")); diff --git a/lib/initialize.prod.js b/lib/initialize.prod.js index 04e5ec298..6adddc294 100644 --- a/lib/initialize.prod.js +++ b/lib/initialize.prod.js @@ -2,9 +2,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.initialize = void 0; var tslib_1 = require("tslib"); +var initialize_prod_1 = require("oak-frontend-base/es/initialize-prod"); var oak_app_domain_1 = require("./oak-app-domain"); var lodash_1 = require("oak-domain/lib/utils/lodash"); -var initialize_prod_1 = require("oak-frontend-base/es/initialize-prod"); var checkers_1 = tslib_1.__importDefault(require("./checkers")); var features_1 = require("./features"); var selectionRewriter_1 = require("./utils/selectionRewriter"); diff --git a/src/exceptionHandlers.ts b/src/exceptionHandlers.ts deleted file mode 100644 index 548cfec97..000000000 --- a/src/exceptionHandlers.ts +++ /dev/null @@ -1,35 +0,0 @@ -// import { ExceptionHandlerDict } from "oak-frontend-base/es/types/ExceptionHandler"; -// import { OakUnloggedInException } from "oak-domain/lib/types/Exception"; -// import { EntityDict } from './oak-app-domain'; -// import { GeneralFeatures } from './features/index'; -// import { OakTokenExpiredException } from "./types/Exception"; -// import { BRC, FRC, FrcAspectDict } from './types/RuntimeCxt'; - - -// export const handlerDict: ExceptionHandlerDict< -// EntityDict, -// BRC, -// FRC, -// FrcAspectDict, -// GeneralFeatures> = { -// [OakUnloggedInException.name]: async (features) => { -// await features.token.logout(); -// features.navigator.navigateTo( -// { -// url: '/mobile/login', -// }, -// undefined, -// true -// ); -// }, -// [OakTokenExpiredException.name]: async (features) => { -// await features.token.logout(); -// features.navigator.navigateTo( -// { -// url: '/mobile/login', -// }, -// undefined, -// true -// ); -// } -// } \ No newline at end of file diff --git a/src/hooks/useMyInfo.ts b/src/hooks/useMyInfo.ts index 1d4496b51..0cc750aca 100644 --- a/src/hooks/useMyInfo.ts +++ b/src/hooks/useMyInfo.ts @@ -1,6 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { OpSchema as ExtraFile } from '../oak-app-domain/ExtraFile/Schema'; import useFeatures from './useFeatures'; export default function useMyInfo() { @@ -12,7 +11,7 @@ export default function useMyInfo() { userInfo?.mobile$user && userInfo?.mobile$user[0]?.mobile || ''; const extraFile = userInfo?.extraFile$entity?.find( - (ele: ExtraFile) => ele.tag1 === 'avatar' + (ele) => ele.tag1 === 'avatar' ); const avatarUrl = features.extraFile.getUrl(extraFile); diff --git a/src/index.ts b/src/index.ts index 187a16e78..668b0ca42 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +1,4 @@ -// export * from './exceptionHandlers'; import { registerMessageNotificationConverters } from './triggers/message'; import { registerWeChatPublicEventCallback } from './endpoints'; diff --git a/src/initialize.dev.ts b/src/initialize.dev.ts index d51627839..3c6fa41eb 100644 --- a/src/initialize.dev.ts +++ b/src/initialize.dev.ts @@ -1,19 +1,31 @@ import { AuthCascadePath, EntityDict as BaseEntityDict } from 'oak-domain/lib/types/Entity'; -import { ColorDict } from 'oak-domain/lib/types/Style'; -import { ActionDictOfEntityDict, Aspect, AuthDefDict, CascadeRemoveDefDict, Checker, Exportation, Importation, Routine, StorageSchema, Timer, Trigger, Watcher } from 'oak-domain/lib/types'; +import { + ActionDictOfEntityDict, + Aspect, + AuthDefDict, + CascadeRemoveDefDict, + Checker, + Exportation, + Importation, + Routine, + StorageSchema, + Timer, + Trigger, + Watcher, +} from 'oak-domain/lib/types'; import { EntityDict, ActionDefDict as generalActionDefDict } from './oak-app-domain'; import { CacheStore } from 'oak-frontend-base'; +import { initialize as initDev } from 'oak-frontend-base/es/initialize-dev'; import { AsyncRowStore } from 'oak-domain/lib/store/AsyncRowStore'; import { intersection } from 'oak-domain/lib/utils/lodash'; import { BackendRuntimeContext } from './context/BackendRuntimeContext'; import { FrontendRuntimeContext } from './context/FrontendRuntimeContext'; import { GAD, GFD } from './types/Page'; -import { initialize as initDev } from 'oak-frontend-base/es/initialize-dev'; import generalWatchers from './watchers'; import generalCheckers from './checkers'; import generalTriggers from './triggers'; import generalAspectDict from './aspects'; -import GeneralAspectDict from './aspects/AspectDict'; +import type GeneralAspectDict from './aspects/AspectDict'; import generalStartRoutines from './routines/start'; import generalData from './data'; import { initialize as initGeneralFeatures } from './features'; diff --git a/src/initialize.prod.ts b/src/initialize.prod.ts index 3222f43bc..9765a0c47 100644 --- a/src/initialize.prod.ts +++ b/src/initialize.prod.ts @@ -1,13 +1,18 @@ import { EntityDict as BaseEntityDict } from 'oak-domain/lib/types/Entity'; import { InitializeOptions } from 'oak-frontend-base'; -import { ActionDictOfEntityDict, Aspect, AuthDefDict, CascadeRemoveDefDict, Checker, Connector, StorageSchema } from 'oak-domain/lib/types'; +import { initialize as initProd } from 'oak-frontend-base/es/initialize-prod'; +import { + Aspect, + Checker, + Connector, + StorageSchema, +} from 'oak-domain/lib/types'; import { EntityDict, ActionDefDict as generalActionDefDict } from './oak-app-domain'; import { CacheStore } from 'oak-frontend-base'; import { intersection } from 'oak-domain/lib/utils/lodash'; import { BackendRuntimeContext } from './context/BackendRuntimeContext'; import { FrontendRuntimeContext } from './context/FrontendRuntimeContext'; import { GAD, GFD } from './types/Page'; -import { initialize as initProd } from 'oak-frontend-base/es/initialize-prod'; import generalCheckers from './checkers'; import { initialize as initGeneralFeatures } from './features'; import { AppType } from './oak-app-domain/Application/Schema';