diff --git a/es/aspects/AspectService.d.ts b/es/aspects/AspectService.d.ts index cbd45209..51c652dc 100644 --- a/es/aspects/AspectService.d.ts +++ b/es/aspects/AspectService.d.ts @@ -8,5 +8,5 @@ type TransformAspectDict, ED extends BaseEntityDic [K in keyof T]: T[K] extends (params: infer P, context: BCT) => infer R ? R extends Promise ? (params: P, callback?: (result: R, opRecords?: OpRecord[]) => void, dontPublish?: true, ignoreContext?: true) => R : never : never; }; export type AspectDictTrans, BCT extends AsyncContext> = TransformAspectDict, ED, BCT>; -export declare const createService: >(cache: BasicFeatures["cache"]) => TransformAspectDict, ED, any>; +export declare const createService: >(cache: BasicFeatures["cache"]) => AspectDictTrans; export {}; diff --git a/es/components/actionBtn/index.d.ts b/es/components/actionBtn/index.d.ts index e17837fa..fe7a5113 100644 --- a/es/components/actionBtn/index.d.ts +++ b/es/components/actionBtn/index.d.ts @@ -1,18 +1,10 @@ -/// import { ED, OakExtraActionProps } from '../../types/AbstractComponent'; import { ActionDef } from '../../types/Page'; declare const _default: (props: import("../../types/Page").ReactComponentProps[]; - cascadeActions: { - [x: string]: ActionDef[] | undefined; - id?: ActionDef[] | undefined; - $$seq$$?: ActionDef[] | undefined; - $$createAt$$?: ActionDef[] | undefined; - $$updateAt$$?: ActionDef[] | undefined; - $$deleteAt$$?: ActionDef[] | undefined; - }; + actions: ActionDef[]; + cascadeActions: { [K in keyof ED[keyof ED]["Schema"]]?: ActionDef[]; }; onAction: Function; -}>) => import("react").ReactElement>; +}>) => React.ReactElement; export default _default; diff --git a/es/components/actionBtnPanel/index.d.ts b/es/components/actionBtnPanel/index.d.ts index 7ba46721..6085643b 100644 --- a/es/components/actionBtnPanel/index.d.ts +++ b/es/components/actionBtnPanel/index.d.ts @@ -1,10 +1,10 @@ -/// +import { ED } from "../../types/AbstractComponent"; import { Item } from './types'; declare const _default: (props: import("../..").ReactComponentProps) => import("react").ReactElement>; +}>) => React.ReactElement; export default _default; diff --git a/es/components/actionBtnPanel/types.d.ts b/es/components/actionBtnPanel/types.d.ts index 6e6eb576..a84c0119 100644 --- a/es/components/actionBtnPanel/types.d.ts +++ b/es/components/actionBtnPanel/types.d.ts @@ -1,4 +1,3 @@ -/// import { ButtonProps } from 'antd'; export type Item = { icon?: string | React.ReactNode; diff --git a/es/components/actionTabPanel/index.d.ts b/es/components/actionTabPanel/index.d.ts index 191641c4..418b0317 100644 --- a/es/components/actionTabPanel/index.d.ts +++ b/es/components/actionTabPanel/index.d.ts @@ -1,10 +1,10 @@ -/// +import { ED } from "../../types/AbstractComponent"; import { IMode, Item } from "./type"; declare const _default: (props: import("../..").ReactComponentProps) => import("react").ReactElement>; +}>) => React.ReactElement; export default _default; diff --git a/es/components/actionTabPanel/type.d.ts b/es/components/actionTabPanel/type.d.ts index 75dc1b1b..a6ba219c 100644 --- a/es/components/actionTabPanel/type.d.ts +++ b/es/components/actionTabPanel/type.d.ts @@ -1,4 +1,3 @@ -/// import { ButtonProps } from 'antd'; export type Item = { icon?: string; diff --git a/es/components/checklist/index.d.ts b/es/components/checklist/index.d.ts index fdb06c1f..c9308bde 100644 --- a/es/components/checklist/index.d.ts +++ b/es/components/checklist/index.d.ts @@ -1,11 +1,10 @@ -/// declare const _default: (props: import("../..").ReactComponentProps; + option: Array<{ label: string; value: string | number; - }[]; + }>; onSelect: (v: Array) => void; disabled: boolean; -}>) => import("react").ReactElement>; +}>) => React.ReactElement; export default _default; diff --git a/es/components/demo/icon/index.d.ts b/es/components/demo/icon/index.d.ts index 2d3ab6ea..3062f8b5 100644 --- a/es/components/demo/icon/index.d.ts +++ b/es/components/demo/icon/index.d.ts @@ -1,4 +1,2 @@ -/// -/// -declare const _default: (props: import("../../..").ReactComponentProps) => import("react").ReactElement>; +declare const _default: (props: import("../../..").ReactComponentProps) => React.ReactElement; export default _default; diff --git a/es/components/detail/index.d.ts b/es/components/detail/index.d.ts index 633eebb3..27cab86a 100644 --- a/es/components/detail/index.d.ts +++ b/es/components/detail/index.d.ts @@ -5,9 +5,9 @@ declare const _default: (props: ReactCompo column?: number | Record; entity: T2; attributes: OakAbsAttrDef[]; - data: Partial; + data: Partial; title?: string; bordered?: boolean; - layout?: 'horizontal' | 'vertical'; + layout?: "horizontal" | "vertical"; }>) => React.ReactElement; export default _default; diff --git a/es/components/entity/graph/index.d.ts b/es/components/entity/graph/index.d.ts index f0ab5725..9d8d2ca5 100644 --- a/es/components/entity/graph/index.d.ts +++ b/es/components/entity/graph/index.d.ts @@ -1,5 +1,4 @@ -/// declare const _default: (props: import("../../..").ReactComponentProps void; -}>) => import("react").ReactElement>; +}>) => React.ReactElement; export default _default; diff --git a/es/components/filter/index.d.ts b/es/components/filter/index.d.ts index 1ebe2dcd..b9d09c1f 100644 --- a/es/components/filter/index.d.ts +++ b/es/components/filter/index.d.ts @@ -1,8 +1,7 @@ -/// import { ED } from '../../types/AbstractComponent'; import { ColumnProps } from '../../types/Filter'; declare const _default: (props: import("../..").ReactComponentProps; -}>) => import("react").ReactElement>; + entity: keyof ED; + column: ColumnProps; +}>) => React.ReactElement; export default _default; diff --git a/es/components/func/actionPanel/index.d.ts b/es/components/func/actionPanel/index.d.ts index 12a4345e..8381d45f 100644 --- a/es/components/func/actionPanel/index.d.ts +++ b/es/components/func/actionPanel/index.d.ts @@ -1,9 +1,8 @@ -/// declare const _default: (props: import("../../..").ReactComponentProps void; actions: string[]; actionDescriptions: any; iconSize: string; rowNum: number; -}>) => import("react").ReactElement>; +}>) => React.ReactElement; export default _default; diff --git a/es/components/func/debugPanel/index.d.ts b/es/components/func/debugPanel/index.d.ts index ffeec765..e4486d89 100644 --- a/es/components/func/debugPanel/index.d.ts +++ b/es/components/func/debugPanel/index.d.ts @@ -1,4 +1,2 @@ -/// -/// -declare const _default: (props: import("../../..").ReactComponentProps) => import("react").ReactElement>; +declare const _default: (props: import("../../..").ReactComponentProps) => React.ReactElement; export default _default; diff --git a/es/components/i18n/list/index.d.ts b/es/components/i18n/list/index.d.ts index 164a1411..b9be6a8e 100644 --- a/es/components/i18n/list/index.d.ts +++ b/es/components/i18n/list/index.d.ts @@ -1,4 +1,2 @@ -/// -/// -declare const _default: (props: import("../../..").ReactComponentProps) => import("react").ReactElement>; +declare const _default: (props: import("../../..").ReactComponentProps) => React.ReactElement; export default _default; diff --git a/es/components/i18n/upsert/index.d.ts b/es/components/i18n/upsert/index.d.ts index 8f975b44..e91256d0 100644 --- a/es/components/i18n/upsert/index.d.ts +++ b/es/components/i18n/upsert/index.d.ts @@ -1,4 +1,2 @@ -/// -/// -declare const _default: (props: import("../../..").ReactComponentProps) => import("react").ReactElement>; +declare const _default: (props: import("../../..").ReactComponentProps) => React.ReactElement; export default _default; diff --git a/es/components/icon/index.d.ts b/es/components/icon/index.d.ts index fb913b70..6cbef16a 100644 --- a/es/components/icon/index.d.ts +++ b/es/components/icon/index.d.ts @@ -1,8 +1,7 @@ -/// declare const _default: (props: import("../..").ReactComponentProps) => import("react").ReactElement>; +}>) => React.ReactElement; export default _default; diff --git a/es/components/list/index.d.ts b/es/components/list/index.d.ts index fee0097c..7ff5d86e 100644 --- a/es/components/list/index.d.ts +++ b/es/components/list/index.d.ts @@ -10,11 +10,11 @@ declare const _default: (props: ReactCompo data: RowWithActions[]; loading: boolean; tablePagination?: React.ReactNode | false; - rowSelection?: TableProps>['rowSelection']; + rowSelection?: TableProps>["rowSelection"]; hideHeader?: boolean; disableSerialNumber?: boolean; - size?: 'large' | 'middle' | 'small'; - scroll?: TableProps>['scroll']; + size?: "large" | "middle" | "small"; + scroll?: TableProps>["scroll"]; empty?: React.ReactNode; opWidth?: number; ellipsis?: boolean; diff --git a/es/components/list/renderCell/index.d.ts b/es/components/list/renderCell/index.d.ts index daabb19b..1c24e5e7 100644 --- a/es/components/list/renderCell/index.d.ts +++ b/es/components/list/renderCell/index.d.ts @@ -2,7 +2,7 @@ import { ED, OakAbsDerivedAttrDef } from '../../../types/AbstractComponent'; import { ReactComponentProps } from '../../../types/Page'; declare const _default: (props: ReactComponentProps) => React.ReactElement; diff --git a/es/components/message/index.d.ts b/es/components/message/index.d.ts index daacbce1..f52dccff 100644 --- a/es/components/message/index.d.ts +++ b/es/components/message/index.d.ts @@ -1,5 +1,4 @@ -/// declare const _default: (props: import("../..").ReactComponentProps) => import("react").ReactElement>; +}>) => React.ReactElement; export default _default; diff --git a/es/components/pagination/index.d.ts b/es/components/pagination/index.d.ts index 7e393cff..91927d1d 100644 --- a/es/components/pagination/index.d.ts +++ b/es/components/pagination/index.d.ts @@ -5,7 +5,7 @@ declare const _default: (props: ReactCompo style?: React.CSSProperties; className?: string; showQuickJumper?: boolean; - size?: 'default' | 'small'; + size?: "default" | "small"; showSizeChanger?: boolean; showTotal?: (total: number, range: [number, number]) => React.ReactNode; }>) => React.ReactElement; diff --git a/es/components/picker/index.d.ts b/es/components/picker/index.d.ts index 9632f574..a3b47231 100644 --- a/es/components/picker/index.d.ts +++ b/es/components/picker/index.d.ts @@ -1,23 +1,15 @@ -/// import { ED } from '../../types/AbstractComponent'; import { RowWithActions } from '../..'; declare const _default: (props: import("../..").ReactComponentProps void; title: (row: RowWithActions) => string; titleLabel: string; - filter: { - [K: string]: any; - }; - sorter: { - $attr: { - [K: string]: any; - }; - $direction?: "asc" | "desc" | undefined; - }[]; + filter: ED[keyof ED]["Filter"]; + sorter: ED[keyof ED]["Sorter"]; projection: {}; -}>) => import("react").ReactElement>; +}>) => React.ReactElement; export default _default; diff --git a/es/components/refAttr/index.d.ts b/es/components/refAttr/index.d.ts index 1d1240b5..3268062f 100644 --- a/es/components/refAttr/index.d.ts +++ b/es/components/refAttr/index.d.ts @@ -1,11 +1,10 @@ -/// import { ED, OakAbsRefAttrPickerRender } from '../../types/AbstractComponent'; declare const _default: (props: import("../..").ReactComponentProps; + pickerRender: OakAbsRefAttrPickerRender; onChange: (value: string[]) => void; -}>) => import("react").ReactElement>; +}>) => React.ReactElement; export default _default; diff --git a/es/components/relation/actionAuth/index.d.ts b/es/components/relation/actionAuth/index.d.ts index 13a87624..e1474ab1 100644 --- a/es/components/relation/actionAuth/index.d.ts +++ b/es/components/relation/actionAuth/index.d.ts @@ -1,4 +1,3 @@ -/// declare const _default: (props: import("../../..").ReactComponentProps) => import("react").ReactElement>; +}>) => React.ReactElement; export default _default; diff --git a/es/components/relation/path/detail/index.d.ts b/es/components/relation/path/detail/index.d.ts index aaaff78a..36100a0b 100644 --- a/es/components/relation/path/detail/index.d.ts +++ b/es/components/relation/path/detail/index.d.ts @@ -1,5 +1,4 @@ -/// declare const _default: (props: import("../../../..").ReactComponentProps) => import("react").ReactElement>; +}>) => React.ReactElement; export default _default; diff --git a/es/components/relation/path/list/index.d.ts b/es/components/relation/path/list/index.d.ts index 8cbe5719..adcf6041 100644 --- a/es/components/relation/path/list/index.d.ts +++ b/es/components/relation/path/list/index.d.ts @@ -1,6 +1,5 @@ -/// import { EntityDict } from 'oak-domain/lib/base-app-domain'; declare const _default: (props: import("../../../..").ReactComponentProps) => import("react").ReactElement>; +}>) => React.ReactElement; export default _default; diff --git a/es/components/relation/path/upsert/index.d.ts b/es/components/relation/path/upsert/index.d.ts index 4c86275f..94559929 100644 --- a/es/components/relation/path/upsert/index.d.ts +++ b/es/components/relation/path/upsert/index.d.ts @@ -1,7 +1,6 @@ -/// import { EntityDict } from 'oak-domain/lib/base-app-domain'; declare const _default: (props: import("../../../..").ReactComponentProps void; entity: string; -}>) => import("react").ReactElement>; +}>) => React.ReactElement; export default _default; diff --git a/es/components/relation/relationAuth/index.d.ts b/es/components/relation/relationAuth/index.d.ts index a3c27912..0cf6ec46 100644 --- a/es/components/relation/relationAuth/index.d.ts +++ b/es/components/relation/relationAuth/index.d.ts @@ -1,4 +1,3 @@ -/// declare const _default: (props: import("../../..").ReactComponentProps) => import("react").ReactElement>; +}>) => React.ReactElement; export default _default; diff --git a/es/components/search/index.d.ts b/es/components/search/index.d.ts index 6e8eba74..4dc08906 100644 --- a/es/components/search/index.d.ts +++ b/es/components/search/index.d.ts @@ -1,7 +1,7 @@ -/// +import { ED } from '../../types/AbstractComponent'; declare const _default: (props: import("../..").ReactComponentProps) => import("react").ReactElement>; +}>) => React.ReactElement; export default _default; diff --git a/es/components/upsert/index.d.ts b/es/components/upsert/index.d.ts index b81a5408..8fa8fb4d 100644 --- a/es/components/upsert/index.d.ts +++ b/es/components/upsert/index.d.ts @@ -1,11 +1,11 @@ import { ED, OakAbsAttrUpsertDef } from '../../types/AbstractComponent'; import { ReactComponentProps } from '../../types/Page'; -declare const _default: (props: ReactComponentProps(props: ReactComponentProps; entity: T2; attributes: OakAbsAttrUpsertDef[]; - data: ED2[T2]['Schema']; - layout: 'horizontal' | 'vertical'; - mode: 'default' | 'card'; + data: ED2[T2]["Schema"]; + layout: "horizontal" | "vertical"; + mode: "default" | "card"; }>) => React.ReactElement; export default _default; diff --git a/es/context/BackendRuntimeContext.d.ts b/es/context/BackendRuntimeContext.d.ts index 1b43f64f..cd448b9f 100644 --- a/es/context/BackendRuntimeContext.d.ts +++ b/es/context/BackendRuntimeContext.d.ts @@ -10,7 +10,7 @@ export declare abstract class BackendRuntimeContext; getNavigatorState(): { pathname: string; - oakFrom?: string | undefined; + oakFrom?: string; } | undefined; getSubscriberId(): string | undefined; getBriefEnvironment(): BriefEnv | undefined; diff --git a/es/features/console.d.ts b/es/features/console.d.ts index 2cec6f3d..0223e9e6 100644 --- a/es/features/console.d.ts +++ b/es/features/console.d.ts @@ -43,7 +43,7 @@ export default abstract class Console | undefined; getAvailMenus(): (OMenu & { - sourceEntity?: keyof ED | undefined; + sourceEntity?: keyof ED; available: boolean | null; })[]; /** diff --git a/es/features/navigator.common.d.ts b/es/features/navigator.common.d.ts index 0ab95842..7ee5ab70 100644 --- a/es/features/navigator.common.d.ts +++ b/es/features/navigator.common.d.ts @@ -1,4 +1,3 @@ -/// import { Feature } from '../types/Feature'; export declare class Navigator extends Feature { namespace: string; diff --git a/es/features/navigator.mp.d.ts b/es/features/navigator.mp.d.ts index d1e73c6b..a4c60041 100644 --- a/es/features/navigator.mp.d.ts +++ b/es/features/navigator.mp.d.ts @@ -1,4 +1,3 @@ -/// import { OakNavigateToParameters } from '../types/Page'; import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain'; import { EntityDict } from 'oak-domain/lib/types'; diff --git a/es/features/navigator.web.d.ts b/es/features/navigator.web.d.ts index 2657ea2b..19ca65a3 100644 --- a/es/features/navigator.web.d.ts +++ b/es/features/navigator.web.d.ts @@ -15,10 +15,10 @@ export declare class Navigator extends CommonNavigator { namespace: string; url: string; state: unknown; - key: string; - pathname: string; - search: string; - hash: string; + key: import("history").Key; + pathname: import("history").Pathname; + search: import("history").Search; + hash: import("history").Hash; }; getState(): { pathname: string; diff --git a/es/features/runningTree.d.ts b/es/features/runningTree.d.ts index e73f8fc9..21851e9b 100644 --- a/es/features/runningTree.d.ts +++ b/es/features/runningTree.d.ts @@ -119,20 +119,20 @@ declare class ListNode; getNamedFilters(): (NamedFilterItem & { - applied?: boolean | undefined; + applied?: boolean; })[]; getNamedFilterByName(name: string): (NamedFilterItem & { - applied?: boolean | undefined; + applied?: boolean; }) | undefined; setNamedFilters(filters: NamedFilterItem[], refresh?: boolean): void; addNamedFilter(filter: NamedFilterItem, refresh?: boolean): void; removeNamedFilter(filter: NamedFilterItem, refresh?: boolean): void; removeNamedFilterByName(name: string, refresh?: boolean): void; getNamedSorters(): (NamedSorterItem & { - applied?: boolean | undefined; + applied?: boolean; })[]; getNamedSorterByName(name: string): (NamedSorterItem & { - applied?: boolean | undefined; + applied?: boolean; }) | undefined; setNamedSorters(sorters: NamedSorterItem[], refresh?: boolean): void; addNamedSorter(sorter: NamedSorterItem, refresh?: boolean): void; @@ -327,20 +327,20 @@ export declare class RunningTree extends setPageSize(path: string, pageSize: number): void; setCurrentPage(path: string, currentPage: number): void; getNamedFilters(path: string): (NamedFilterItem & { - applied?: boolean | undefined; + applied?: boolean; })[]; getNamedFilterByName(path: string, name: string): (NamedFilterItem & { - applied?: boolean | undefined; + applied?: boolean; }) | undefined; setNamedFilters(path: string, filters: NamedFilterItem[], refresh?: boolean): void; addNamedFilter(path: string, filter: NamedFilterItem, refresh?: boolean): void; removeNamedFilter(path: string, filter: NamedFilterItem, refresh?: boolean): void; removeNamedFilterByName(path: string, name: string, refresh?: boolean): void; getNamedSorters(path: string): (NamedSorterItem & { - applied?: boolean | undefined; + applied?: boolean; })[]; getNamedSorterByName(path: string, name: string): (NamedSorterItem & { - applied?: boolean | undefined; + applied?: boolean; }) | undefined; setNamedSorters(path: string, sorters: NamedSorterItem[], refresh?: boolean): void; addNamedSorter(path: string, sorter: NamedSorterItem, refresh?: boolean): void; diff --git a/es/page.mp.d.ts b/es/page.mp.d.ts index 0616d051..927e69d8 100644 --- a/es/page.mp.d.ts +++ b/es/page.mp.d.ts @@ -1,4 +1,3 @@ -/// import { Aspect, EntityDict } from 'oak-domain/lib/types'; import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain'; import { BasicFeatures } from './features'; diff --git a/es/page.react.d.ts b/es/page.react.d.ts index 1f2d2781..98a2b9a4 100644 --- a/es/page.react.d.ts +++ b/es/page.react.d.ts @@ -25,84 +25,84 @@ export declare function createComponent, prevState: Record): Promise; render(): React.ReactNode; oakFullpath: string; - featuresSubscribed: { + featuresSubscribed: Array<{ name: string; callback: (args?: any) => void; - unsubHandler?: (() => void) | undefined; - }[]; + unsubHandler?: () => void; + }>; addFeatureSub(name: string, callback: (args?: any) => void): void; removeFeatureSub(name: string, callback: (args?: any) => void): void; unsubscribeAll(): void; subscribeAll(): void; save(key: string, item: any): Promise; load(key: string): Promise; - clear(key?: string | undefined): Promise; + clear(key?: string): Promise; setNotification(data: NotificationProps): void; consumeNotification(): NotificationProps | undefined; setMessage(data: MessageProps): Promise; consumeMessage(): MessageProps | undefined; - reRender(extra?: Record | undefined): void; + reRender(extra?: Record): void; navigateTo(options: { url: string; - } & OakNavigateToParameters, state?: Record | undefined, disableNamespace?: boolean | undefined): Promise; - navigateBack(delta?: number | undefined): Promise; - redirectTo(options: { + } & OakNavigateToParameters, state?: Record, disableNamespace?: boolean): Promise; + navigateBack(delta?: number): Promise; + redirectTo(options: { url: string; - } & OakNavigateToParameters, state?: Record | undefined, disableNamespace?: boolean | undefined): Promise; + } & OakNavigateToParameters, state?: Record, disableNamespace?: boolean): Promise; addItem(data: Omit & { - id?: string | undefined; - }, path?: string | undefined): string; - addItems(data: (Omit & { - id?: string | undefined; - })[], path?: string | undefined): string[]; - removeItem(id: string, path?: string | undefined): void; - removeItems(ids: string[], path?: string | undefined): void; - updateItem(data: ED[T_3]["Update"]["data"], id: string, action?: ED[T_3]["Action"] | undefined, path?: string | undefined): void; - updateItems(data: ED[T_4]["Update"]["data"], ids: string[], action?: ED[T_4]["Action"] | undefined, path?: string | undefined): void; - recoverItem(id: string, path?: string | undefined): void; - recoverItems(ids: string[], path?: string | undefined): void; - resetItem(id: string, path?: string | undefined): void; - update(data: ED[T_5]["Update"]["data"], action?: ED[T_5]["Action"] | undefined, path?: string | undefined): void; - create(data: Omit, path?: string | undefined): void; - remove(path?: string | undefined): void; - isCreation(path?: string | undefined): boolean; - clean(lsn?: number | undefined, dontPublish?: true | undefined, path?: string | undefined): void; + id?: string; + }, path?: string): string; + addItems(data: (Omit & { + id?: string; + })[], path?: string): string[]; + removeItem(id: string, path?: string): void; + removeItems(ids: string[], path?: string): void; + updateItem(data: ED[T_1]["Update"]["data"], id: string, action?: ED[T_1]["Action"] | undefined, path?: string): void; + updateItems(data: ED[T_1]["Update"]["data"], ids: string[], action?: ED[T_1]["Action"] | undefined, path?: string): void; + recoverItem(id: string, path?: string): void; + recoverItems(ids: string[], path?: string): void; + resetItem(id: string, path?: string): void; + update(data: ED[T_1]["Update"]["data"], action?: ED[T_1]["Action"] | undefined, path?: string): void; + create(data: Omit, path?: string): void; + remove(path?: string): void; + isCreation(path?: string): boolean; + clean(lsn?: number, dontPublish?: true, path?: string): void; savePoint(): number; - t(key: string, params?: object | undefined): string; - execute(action?: ED[T]["Action"] | undefined, messageProps?: boolean | MessageProps | undefined, path?: string | undefined, opers?: { + t(key: string, params?: object): string; + execute(action?: ED[T]["Action"] | undefined, messageProps?: boolean | MessageProps, path?: string, opers?: { entity: T; operation: ED[T]["Operation"]; }[] | undefined): Promise; - isDirty(path?: string | undefined): boolean; - getFreshValue(path?: string | undefined): Partial | Partial[] | undefined; - select(entity: T2_2, selection: ED[T2_2]["Selection"]): Partial[]; - checkOperation(entity: T2_3, operation: Omit, checkerTypes?: CheckerType[] | undefined, cacheInsensative?: true | undefined): boolean | { [A in ED[T2_3]["Action"]]: boolean | import("oak-domain/lib/types").OakUserException; }[ED[T2_3]["Action"]]; - tryExecute(path?: string | undefined, action?: string | undefined): boolean | { [A_1 in ED[keyof ED]["Action"]]: boolean | import("oak-domain/lib/types").OakUserException; }[ED[keyof ED]["Action"]]; - getOperations(path?: string | undefined): { + isDirty(path?: string): boolean; + getFreshValue(path?: string): Partial | Partial[] | undefined; + select(entity: T2, selection: ED[T2]["Selection"]): Partial[]; + checkOperation(entity: T2, operation: Omit, checkerTypes?: CheckerType[], cacheInsensative?: true): boolean | { [A in ED[T2]["Action"]]: boolean | import("oak-domain/lib/types").OakUserException; }[ED[T2]["Action"]]; + tryExecute(path?: string, action?: string): boolean | { [A in ED[keyof ED]["Action"]]: boolean | import("oak-domain/lib/types").OakUserException; }[ED[keyof ED]["Action"]]; + getOperations(path?: string): { entity: keyof ED; operation: ED[keyof ED]["Operation"]; }[] | undefined; - refresh(pageNumber?: number | undefined, resetTotal?: boolean | undefined): Promise; + refresh(pageNumber?: number, resetTotal?: boolean): Promise; loadMore(): Promise; - setId(id: string, path?: string | undefined): void; + setId(id: string, path?: string): void; unsetId(): void; - getId(path?: string | undefined): string | undefined; - setFilters(filters: NamedFilterItem[], path?: string | undefined): void; - setNamedFilters(filters: NamedFilterItem[], refresh?: boolean | undefined, path?: string | undefined): void; - getFilters(path?: string | undefined): any[] | undefined; - getFilterByName(name: string, path?: string | undefined): any; - addNamedFilter(namedFilter: NamedFilterItem, refresh?: boolean | undefined, path?: string | undefined): void; - removeNamedFilter(namedFilter: NamedFilterItem, refresh?: boolean | undefined, path?: string | undefined): void; - removeNamedFilterByName(name: string, refresh?: boolean | undefined, path?: string | undefined): void; - setNamedSorters(namedSorters: NamedSorterItem[], refresh?: boolean | undefined, path?: string | undefined): void; - getSorters(path?: string | undefined): ED[T]["Sorter"][] | undefined; - getSorterByName(name: string, path?: string | undefined): any; - addNamedSorter(namedSorter: NamedSorterItem, refresh?: boolean | undefined, path?: string | undefined): void; - removeNamedSorter(namedSorter: NamedSorterItem, refresh?: boolean | undefined, path?: string | undefined): void; - removeNamedSorterByName(name: string, refresh?: boolean | undefined, path?: string | undefined): void; - getPagination(path?: string | undefined): import(".").Pagination | undefined; - setPageSize(pageSize: number, path?: string | undefined): void; - setCurrentPage(currentPage: number, path?: string | undefined): void; + getId(path?: string): string | undefined; + setFilters(filters: NamedFilterItem[], path?: string): void; + setNamedFilters(filters: NamedFilterItem[], refresh?: boolean, path?: string): void; + getFilters(path?: string): any[] | undefined; + getFilterByName(name: string, path?: string): any; + addNamedFilter(namedFilter: NamedFilterItem, refresh?: boolean, path?: string): void; + removeNamedFilter(namedFilter: NamedFilterItem, refresh?: boolean, path?: string): void; + removeNamedFilterByName(name: string, refresh?: boolean, path?: string): void; + setNamedSorters(namedSorters: NamedSorterItem[], refresh?: boolean, path?: string): void; + getSorters(path?: string): ED[T]["Sorter"][] | undefined; + getSorterByName(name: string, path?: string): any; + addNamedSorter(namedSorter: NamedSorterItem, refresh?: boolean, path?: string): void; + removeNamedSorter(namedSorter: NamedSorterItem, refresh?: boolean, path?: string): void; + removeNamedSorterByName(name: string, refresh?: boolean, path?: string): void; + getPagination(path?: string): import(".").Pagination | undefined; + setPageSize(pageSize: number, path?: string): void; + setCurrentPage(currentPage: number, path?: string): void; subDataEvents(events: string[], callback: (event: string, opRecords: OpRecord[]) => void): Promise<() => void>; context: unknown; setState>(state: ComponentData | ((prevState: Readonly>, props: Readonly>) => ComponentData | Pick, K> | null) | Pick, K> | null, callback?: (() => void) | undefined): void; diff --git a/es/platforms/web/responsive/ResponsiveProvider.d.ts b/es/platforms/web/responsive/ResponsiveProvider.d.ts index ed51c074..48f37edd 100644 --- a/es/platforms/web/responsive/ResponsiveProvider.d.ts +++ b/es/platforms/web/responsive/ResponsiveProvider.d.ts @@ -1,9 +1,8 @@ -/// import { Breakpoints } from './context'; export interface ResponsiveProviderProps { children?: React.ReactNode; breakpoints?: Breakpoints; } export declare function ResponsiveProvider(props: ResponsiveProviderProps): import("react").FunctionComponentElement>; diff --git a/es/platforms/web/responsive/context.d.ts b/es/platforms/web/responsive/context.d.ts index 08e5d73e..db94e6c7 100644 --- a/es/platforms/web/responsive/context.d.ts +++ b/es/platforms/web/responsive/context.d.ts @@ -17,5 +17,5 @@ export declare const keys: Keys; export declare const values: Values; export declare const defaultBreakpoints: Breakpoints; export declare const ResponsiveContext: React.Context<{ - breakpoints?: Breakpoints | undefined; + breakpoints?: Breakpoints; }>; diff --git a/es/platforms/web/router/types.d.ts b/es/platforms/web/router/types.d.ts index 86e1ea4b..e2e2c761 100644 --- a/es/platforms/web/router/types.d.ts +++ b/es/platforms/web/router/types.d.ts @@ -1,4 +1,3 @@ -/// import { BrowserRouterProps } from 'react-router-dom'; export interface IBrowserRouterProps extends BrowserRouterProps { namespace: string; diff --git a/es/types/AbstractComponent.d.ts b/es/types/AbstractComponent.d.ts index 66a167db..fdd6160c 100644 --- a/es/types/AbstractComponent.d.ts +++ b/es/types/AbstractComponent.d.ts @@ -1,4 +1,3 @@ -/// import { EntityDict } from 'oak-domain/lib/types/Entity'; import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain'; import { DataType, DataTypeParams } from 'oak-domain/lib/types/schema/DataTypes'; diff --git a/es/types/Filter.d.ts b/es/types/Filter.d.ts index d75e8400..b3189517 100644 --- a/es/types/Filter.d.ts +++ b/es/types/Filter.d.ts @@ -1,4 +1,3 @@ -/// import { Dayjs } from 'dayjs'; import { OakAbsRefAttrPickerDef, ColSpanType, ED } from './AbstractComponent'; export type ViewType = 'Input' | 'Select' | 'DatePicker' | 'DatePicker.RangePicker' | 'RefAttr'; diff --git a/es/types/Map.d.ts b/es/types/Map.d.ts index a430bdc0..ff0eb969 100644 --- a/es/types/Map.d.ts +++ b/es/types/Map.d.ts @@ -1,4 +1,3 @@ -/// export type MapComponent = (props: { id?: string; center?: [number, number]; diff --git a/es/types/Page.d.ts b/es/types/Page.d.ts index d4ea7ee9..df4dec33 100644 --- a/es/types/Page.d.ts +++ b/es/types/Page.d.ts @@ -1,5 +1,3 @@ -/// -/// import { Aspect, EntityDict, CheckerType, AggregationResult, OpRecord, OakUserException } from "oak-domain/lib/types"; import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain'; import { Feature } from './Feature'; diff --git a/es/types/Wx.d.ts b/es/types/Wx.d.ts index 53a1ee38..b22e1c16 100644 --- a/es/types/Wx.d.ts +++ b/es/types/Wx.d.ts @@ -1,3 +1,2 @@ -/// export type PromisifyOption> = Omit; export type PromisifyResult = Promise>[0]>; diff --git a/es/utils/bluetooth/bluetooth.mp.d.ts b/es/utils/bluetooth/bluetooth.mp.d.ts index 9dcff5bf..2dabd622 100644 --- a/es/utils/bluetooth/bluetooth.mp.d.ts +++ b/es/utils/bluetooth/bluetooth.mp.d.ts @@ -1,4 +1,3 @@ -/// import { PromisifyOption } from '../../types/Wx'; export declare class Bluetooth { private serverDict; diff --git a/es/utils/upload.web.d.ts b/es/utils/upload.web.d.ts index 13c6fd4d..7cadbbd5 100644 --- a/es/utils/upload.web.d.ts +++ b/es/utils/upload.web.d.ts @@ -1,3 +1,3 @@ export declare class Upload { - uploadFile(file: File | string, name: string, uploadUrl: string, formData: Record, autoInform?: boolean, getPercent?: Function): Promise; + uploadFile(file: File | string, name: string, uploadUrl: string, formData: Record, autoInform?: boolean, getPercent?: Function, method?: "POST" | "PUT" | "PATCH"): Promise; } diff --git a/es/utils/upload.web.js b/es/utils/upload.web.js index 57d0cc5b..20fe825a 100644 --- a/es/utils/upload.web.js +++ b/es/utils/upload.web.js @@ -1,34 +1,12 @@ export class Upload { - // async uploadFile( - // file: File | string, - // name: string, - // uploadUrl: string, - // formData: Record, - // autoInform?: boolean - // ): Promise { - // const formData2 = new FormData(); - // for (const key of Object.keys(formData)) { - // formData2.append(key, formData[key]); - // } - // formData2.append(name || 'file', file as File); - // const options = { - // body: formData2, - // method: 'POST', - // }; - // const result = await fetch(uploadUrl, options); - // return result; - // } - async uploadFile(file, name, uploadUrl, formData, autoInform, getPercent) { + async uploadFile(file, name, uploadUrl, formData, autoInform, getPercent, method = "POST") { + const isPut = method === "PUT"; + // 进度监听模式 if (getPercent) { - const formData2 = new FormData(); - Object.entries(formData).forEach(([key, value]) => { - formData2.append(key, value); - }); - formData2.append(name || 'file', file); return new Promise((resolve, reject) => { const xhr = new XMLHttpRequest(); let percent = 0; - xhr.upload.addEventListener('progress', (event) => { + xhr.upload.addEventListener("progress", (event) => { if (event.lengthComputable) { percent = Math.round((event.loaded / event.total) * 100); getPercent(percent); @@ -37,14 +15,14 @@ export class Upload { xhr.onload = () => { if (xhr.status >= 200 && xhr.status < 300) { if (xhr.status === 204) { - resolve({ status: 204 }); // 正确返回状态码 + resolve({ status: 204 }); } else { try { const data = JSON.parse(xhr.responseText); resolve(data); } - catch (e) { + catch { resolve({ status: xhr.status, raw: xhr.responseText }); } } @@ -53,22 +31,51 @@ export class Upload { reject(new Error(`HTTP Error: ${xhr.status}`)); } }; - xhr.onerror = () => reject(new Error('Network Error')); - xhr.open('POST', uploadUrl); - xhr.send(formData2); + xhr.onerror = () => reject(new Error("Network Error")); + xhr.open(method, uploadUrl); + if (isPut) { + // PUT 模式:直接上传文件 + if (file instanceof File) { + xhr.setRequestHeader("Content-Type", file.type || "application/octet-stream"); + } + xhr.send(file); + } + else { + // POST / PATCH 模式:构建表单 + const formData2 = new FormData(); + Object.entries(formData).forEach(([key, value]) => { + formData2.append(key, value); + }); + formData2.append(name || "file", file); + xhr.send(formData2); + } }); } + // 无进度监听模式(直接 fetch) + if (isPut) { + // S3 预签名上传 + const headers = {}; + if (file instanceof File) { + headers["Content-Type"] = file.type || "application/octet-stream"; + } + const result = await fetch(uploadUrl, { + method: "PUT", + headers, + body: file, + }); + return result; + } else { + // 表单上传 const formData2 = new FormData(); for (const key of Object.keys(formData)) { formData2.append(key, formData[key]); } - formData2.append(name || 'file', file); - const options = { + formData2.append(name || "file", file); + const result = await fetch(uploadUrl, { + method, body: formData2, - method: 'POST', - }; - const result = await fetch(uploadUrl, options); + }); return result; } } diff --git a/lib/aspects/AspectService.d.ts b/lib/aspects/AspectService.d.ts index cbd45209..51c652dc 100644 --- a/lib/aspects/AspectService.d.ts +++ b/lib/aspects/AspectService.d.ts @@ -8,5 +8,5 @@ type TransformAspectDict, ED extends BaseEntityDic [K in keyof T]: T[K] extends (params: infer P, context: BCT) => infer R ? R extends Promise ? (params: P, callback?: (result: R, opRecords?: OpRecord[]) => void, dontPublish?: true, ignoreContext?: true) => R : never : never; }; export type AspectDictTrans, BCT extends AsyncContext> = TransformAspectDict, ED, BCT>; -export declare const createService: >(cache: BasicFeatures["cache"]) => TransformAspectDict, ED, any>; +export declare const createService: >(cache: BasicFeatures["cache"]) => AspectDictTrans; export {}; diff --git a/lib/context/BackendRuntimeContext.d.ts b/lib/context/BackendRuntimeContext.d.ts index 1b43f64f..cd448b9f 100644 --- a/lib/context/BackendRuntimeContext.d.ts +++ b/lib/context/BackendRuntimeContext.d.ts @@ -10,7 +10,7 @@ export declare abstract class BackendRuntimeContext; getNavigatorState(): { pathname: string; - oakFrom?: string | undefined; + oakFrom?: string; } | undefined; getSubscriberId(): string | undefined; getBriefEnvironment(): BriefEnv | undefined; diff --git a/lib/debugStore/index.js b/lib/debugStore/index.js index 31180044..a49871e5 100644 --- a/lib/debugStore/index.js +++ b/lib/debugStore/index.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.createDebugStore = void 0; +exports.createDebugStore = createDebugStore; const node_schedule_1 = require("node-schedule"); const constant_1 = require("../constant/constant"); const DebugStore_1 = require("./DebugStore"); @@ -223,4 +223,3 @@ function createDebugStore(storageSchema, contextBuilder, triggers, checkers, wat } return store; } -exports.createDebugStore = createDebugStore; diff --git a/lib/features/console.d.ts b/lib/features/console.d.ts index 2cec6f3d..0223e9e6 100644 --- a/lib/features/console.d.ts +++ b/lib/features/console.d.ts @@ -43,7 +43,7 @@ export default abstract class Console | undefined; getAvailMenus(): (OMenu & { - sourceEntity?: keyof ED | undefined; + sourceEntity?: keyof ED; available: boolean | null; })[]; /** diff --git a/lib/features/index.js b/lib/features/index.js index a818fde6..483ad541 100644 --- a/lib/features/index.js +++ b/lib/features/index.js @@ -1,6 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.initializeStep1 = exports.initializeStep2 = void 0; +exports.initializeStep2 = initializeStep2; +exports.initializeStep1 = initializeStep1; const tslib_1 = require("tslib"); const cache_1 = require("./cache"); const location_1 = require("./location"); @@ -43,7 +44,6 @@ function initializeStep2(features, connector, storageSchema, frontendContextBuil subscriber, }; } -exports.initializeStep2 = initializeStep2; function initializeStep1() { const location = new location_1.Location(); const environment = new environment_1.Environment(); @@ -60,4 +60,3 @@ function initializeStep1() { navigator, }; } -exports.initializeStep1 = initializeStep1; diff --git a/lib/features/navigator.common.d.ts b/lib/features/navigator.common.d.ts index 0ab95842..7ee5ab70 100644 --- a/lib/features/navigator.common.d.ts +++ b/lib/features/navigator.common.d.ts @@ -1,4 +1,3 @@ -/// import { Feature } from '../types/Feature'; export declare class Navigator extends Feature { namespace: string; diff --git a/lib/features/navigator.mp.d.ts b/lib/features/navigator.mp.d.ts index d1e73c6b..a4c60041 100644 --- a/lib/features/navigator.mp.d.ts +++ b/lib/features/navigator.mp.d.ts @@ -1,4 +1,3 @@ -/// import { OakNavigateToParameters } from '../types/Page'; import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain'; import { EntityDict } from 'oak-domain/lib/types'; diff --git a/lib/features/navigator.web.d.ts b/lib/features/navigator.web.d.ts index 2657ea2b..19ca65a3 100644 --- a/lib/features/navigator.web.d.ts +++ b/lib/features/navigator.web.d.ts @@ -15,10 +15,10 @@ export declare class Navigator extends CommonNavigator { namespace: string; url: string; state: unknown; - key: string; - pathname: string; - search: string; - hash: string; + key: import("history").Key; + pathname: import("history").Pathname; + search: import("history").Search; + hash: import("history").Hash; }; getState(): { pathname: string; diff --git a/lib/features/runningTree.d.ts b/lib/features/runningTree.d.ts index e73f8fc9..21851e9b 100644 --- a/lib/features/runningTree.d.ts +++ b/lib/features/runningTree.d.ts @@ -119,20 +119,20 @@ declare class ListNode; getNamedFilters(): (NamedFilterItem & { - applied?: boolean | undefined; + applied?: boolean; })[]; getNamedFilterByName(name: string): (NamedFilterItem & { - applied?: boolean | undefined; + applied?: boolean; }) | undefined; setNamedFilters(filters: NamedFilterItem[], refresh?: boolean): void; addNamedFilter(filter: NamedFilterItem, refresh?: boolean): void; removeNamedFilter(filter: NamedFilterItem, refresh?: boolean): void; removeNamedFilterByName(name: string, refresh?: boolean): void; getNamedSorters(): (NamedSorterItem & { - applied?: boolean | undefined; + applied?: boolean; })[]; getNamedSorterByName(name: string): (NamedSorterItem & { - applied?: boolean | undefined; + applied?: boolean; }) | undefined; setNamedSorters(sorters: NamedSorterItem[], refresh?: boolean): void; addNamedSorter(sorter: NamedSorterItem, refresh?: boolean): void; @@ -327,20 +327,20 @@ export declare class RunningTree extends setPageSize(path: string, pageSize: number): void; setCurrentPage(path: string, currentPage: number): void; getNamedFilters(path: string): (NamedFilterItem & { - applied?: boolean | undefined; + applied?: boolean; })[]; getNamedFilterByName(path: string, name: string): (NamedFilterItem & { - applied?: boolean | undefined; + applied?: boolean; }) | undefined; setNamedFilters(path: string, filters: NamedFilterItem[], refresh?: boolean): void; addNamedFilter(path: string, filter: NamedFilterItem, refresh?: boolean): void; removeNamedFilter(path: string, filter: NamedFilterItem, refresh?: boolean): void; removeNamedFilterByName(path: string, name: string, refresh?: boolean): void; getNamedSorters(path: string): (NamedSorterItem & { - applied?: boolean | undefined; + applied?: boolean; })[]; getNamedSorterByName(path: string, name: string): (NamedSorterItem & { - applied?: boolean | undefined; + applied?: boolean; }) | undefined; setNamedSorters(path: string, sorters: NamedSorterItem[], refresh?: boolean): void; addNamedSorter(path: string, sorter: NamedSorterItem, refresh?: boolean): void; diff --git a/lib/initialize.js b/lib/initialize.js index e6f10f3e..7fa179a7 100644 --- a/lib/initialize.js +++ b/lib/initialize.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.initialize = void 0; +exports.initialize = initialize; const features_1 = require("./features"); const IntrinsicCheckers_1 = require("oak-domain/lib/store/IntrinsicCheckers"); /** @@ -27,4 +27,3 @@ function initialize(storageSchema, frontendContextBuilder, connector, checkers, features, }; } -exports.initialize = initialize; diff --git a/lib/page.common.js b/lib/page.common.js index 6a4b31a5..16c37214 100644 --- a/lib/page.common.js +++ b/lib/page.common.js @@ -1,6 +1,13 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.select = exports.getFreshValue = exports.destroyNode = exports.execute = exports.loadMore = exports.refresh = exports.reRender = exports.onPathSet = void 0; +exports.onPathSet = onPathSet; +exports.reRender = reRender; +exports.refresh = refresh; +exports.loadMore = loadMore; +exports.execute = execute; +exports.destroyNode = destroyNode; +exports.getFreshValue = getFreshValue; +exports.select = select; const assert_1 = require("oak-domain/lib/utils/assert"); const lodash_1 = require("oak-domain/lib/utils/lodash"); const relation_1 = require("oak-domain/lib/store/relation"); @@ -144,7 +151,6 @@ function onPathSet(option, isPage) { }; } } -exports.onPathSet = onPathSet; function checkActionAttrsIfNecessary(cache, entity, action, id) { if (typeof action === 'string') { return action; @@ -547,13 +553,11 @@ function reRender(option, extra) { this.setState(data); } } -exports.reRender = reRender; async function refresh(pageNumber, resetTotal) { if (this.state.oakFullpath) { await this.features.runningTree.refresh(this.state.oakFullpath, pageNumber, resetTotal); } } -exports.refresh = refresh; async function loadMore() { if (this.state.oakEntity && this.state.oakFullpath) { try { @@ -567,7 +571,6 @@ async function loadMore() { } } } -exports.loadMore = loadMore; async function execute(action, path, messageProps, //默认true opers) { if (this.state.oakExecuting) { @@ -589,12 +592,10 @@ opers) { this.setMessage(messageData); } } -exports.execute = execute; function destroyNode(isPage, path) { this.features.runningTree.destroyNode(path, isPage); (0, lodash_1.unset)(this.state, ['oakFullpath', 'oakEntity']); } -exports.destroyNode = destroyNode; function join(path1, path2) { if (path2 === '..') { const array = path1.split('.'); @@ -621,7 +622,6 @@ function getFreshValue(path) { (0, assert_1.assert)(false); } } -exports.getFreshValue = getFreshValue; function select(entity, selection) { const rollback = this.features.runningTree.begin(); try { @@ -638,4 +638,3 @@ function select(entity, selection) { (0, assert_1.assert)(false); } } -exports.select = select; diff --git a/lib/page.mp.d.ts b/lib/page.mp.d.ts index 0616d051..927e69d8 100644 --- a/lib/page.mp.d.ts +++ b/lib/page.mp.d.ts @@ -1,4 +1,3 @@ -/// import { Aspect, EntityDict } from 'oak-domain/lib/types'; import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain'; import { BasicFeatures } from './features'; diff --git a/lib/page.mp.js b/lib/page.mp.js index de2adc3a..faf80f4a 100644 --- a/lib/page.mp.js +++ b/lib/page.mp.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.createComponent = void 0; +exports.createComponent = createComponent; /// const assert_1 = require("oak-domain/lib/utils/assert"); const types_1 = require("oak-domain/lib/types"); @@ -879,4 +879,3 @@ function createComponent(option, features) { }, }); } -exports.createComponent = createComponent; diff --git a/lib/page.native.js b/lib/page.native.js index e52d119e..503f35fa 100644 --- a/lib/page.native.js +++ b/lib/page.native.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.createComponent = void 0; +exports.createComponent = createComponent; const tslib_1 = require("tslib"); const react_native_1 = require("react-native"); const page_react_1 = require("./page.react"); @@ -41,4 +41,3 @@ function createComponent(option, features) { } return (0, withRouter_1.default)(Component, option); } -exports.createComponent = createComponent; diff --git a/lib/page.react.d.ts b/lib/page.react.d.ts index 1f2d2781..98a2b9a4 100644 --- a/lib/page.react.d.ts +++ b/lib/page.react.d.ts @@ -25,84 +25,84 @@ export declare function createComponent, prevState: Record): Promise; render(): React.ReactNode; oakFullpath: string; - featuresSubscribed: { + featuresSubscribed: Array<{ name: string; callback: (args?: any) => void; - unsubHandler?: (() => void) | undefined; - }[]; + unsubHandler?: () => void; + }>; addFeatureSub(name: string, callback: (args?: any) => void): void; removeFeatureSub(name: string, callback: (args?: any) => void): void; unsubscribeAll(): void; subscribeAll(): void; save(key: string, item: any): Promise; load(key: string): Promise; - clear(key?: string | undefined): Promise; + clear(key?: string): Promise; setNotification(data: NotificationProps): void; consumeNotification(): NotificationProps | undefined; setMessage(data: MessageProps): Promise; consumeMessage(): MessageProps | undefined; - reRender(extra?: Record | undefined): void; + reRender(extra?: Record): void; navigateTo(options: { url: string; - } & OakNavigateToParameters, state?: Record | undefined, disableNamespace?: boolean | undefined): Promise; - navigateBack(delta?: number | undefined): Promise; - redirectTo(options: { + } & OakNavigateToParameters, state?: Record, disableNamespace?: boolean): Promise; + navigateBack(delta?: number): Promise; + redirectTo(options: { url: string; - } & OakNavigateToParameters, state?: Record | undefined, disableNamespace?: boolean | undefined): Promise; + } & OakNavigateToParameters, state?: Record, disableNamespace?: boolean): Promise; addItem(data: Omit & { - id?: string | undefined; - }, path?: string | undefined): string; - addItems(data: (Omit & { - id?: string | undefined; - })[], path?: string | undefined): string[]; - removeItem(id: string, path?: string | undefined): void; - removeItems(ids: string[], path?: string | undefined): void; - updateItem(data: ED[T_3]["Update"]["data"], id: string, action?: ED[T_3]["Action"] | undefined, path?: string | undefined): void; - updateItems(data: ED[T_4]["Update"]["data"], ids: string[], action?: ED[T_4]["Action"] | undefined, path?: string | undefined): void; - recoverItem(id: string, path?: string | undefined): void; - recoverItems(ids: string[], path?: string | undefined): void; - resetItem(id: string, path?: string | undefined): void; - update(data: ED[T_5]["Update"]["data"], action?: ED[T_5]["Action"] | undefined, path?: string | undefined): void; - create(data: Omit, path?: string | undefined): void; - remove(path?: string | undefined): void; - isCreation(path?: string | undefined): boolean; - clean(lsn?: number | undefined, dontPublish?: true | undefined, path?: string | undefined): void; + id?: string; + }, path?: string): string; + addItems(data: (Omit & { + id?: string; + })[], path?: string): string[]; + removeItem(id: string, path?: string): void; + removeItems(ids: string[], path?: string): void; + updateItem(data: ED[T_1]["Update"]["data"], id: string, action?: ED[T_1]["Action"] | undefined, path?: string): void; + updateItems(data: ED[T_1]["Update"]["data"], ids: string[], action?: ED[T_1]["Action"] | undefined, path?: string): void; + recoverItem(id: string, path?: string): void; + recoverItems(ids: string[], path?: string): void; + resetItem(id: string, path?: string): void; + update(data: ED[T_1]["Update"]["data"], action?: ED[T_1]["Action"] | undefined, path?: string): void; + create(data: Omit, path?: string): void; + remove(path?: string): void; + isCreation(path?: string): boolean; + clean(lsn?: number, dontPublish?: true, path?: string): void; savePoint(): number; - t(key: string, params?: object | undefined): string; - execute(action?: ED[T]["Action"] | undefined, messageProps?: boolean | MessageProps | undefined, path?: string | undefined, opers?: { + t(key: string, params?: object): string; + execute(action?: ED[T]["Action"] | undefined, messageProps?: boolean | MessageProps, path?: string, opers?: { entity: T; operation: ED[T]["Operation"]; }[] | undefined): Promise; - isDirty(path?: string | undefined): boolean; - getFreshValue(path?: string | undefined): Partial | Partial[] | undefined; - select(entity: T2_2, selection: ED[T2_2]["Selection"]): Partial[]; - checkOperation(entity: T2_3, operation: Omit, checkerTypes?: CheckerType[] | undefined, cacheInsensative?: true | undefined): boolean | { [A in ED[T2_3]["Action"]]: boolean | import("oak-domain/lib/types").OakUserException; }[ED[T2_3]["Action"]]; - tryExecute(path?: string | undefined, action?: string | undefined): boolean | { [A_1 in ED[keyof ED]["Action"]]: boolean | import("oak-domain/lib/types").OakUserException; }[ED[keyof ED]["Action"]]; - getOperations(path?: string | undefined): { + isDirty(path?: string): boolean; + getFreshValue(path?: string): Partial | Partial[] | undefined; + select(entity: T2, selection: ED[T2]["Selection"]): Partial[]; + checkOperation(entity: T2, operation: Omit, checkerTypes?: CheckerType[], cacheInsensative?: true): boolean | { [A in ED[T2]["Action"]]: boolean | import("oak-domain/lib/types").OakUserException; }[ED[T2]["Action"]]; + tryExecute(path?: string, action?: string): boolean | { [A in ED[keyof ED]["Action"]]: boolean | import("oak-domain/lib/types").OakUserException; }[ED[keyof ED]["Action"]]; + getOperations(path?: string): { entity: keyof ED; operation: ED[keyof ED]["Operation"]; }[] | undefined; - refresh(pageNumber?: number | undefined, resetTotal?: boolean | undefined): Promise; + refresh(pageNumber?: number, resetTotal?: boolean): Promise; loadMore(): Promise; - setId(id: string, path?: string | undefined): void; + setId(id: string, path?: string): void; unsetId(): void; - getId(path?: string | undefined): string | undefined; - setFilters(filters: NamedFilterItem[], path?: string | undefined): void; - setNamedFilters(filters: NamedFilterItem[], refresh?: boolean | undefined, path?: string | undefined): void; - getFilters(path?: string | undefined): any[] | undefined; - getFilterByName(name: string, path?: string | undefined): any; - addNamedFilter(namedFilter: NamedFilterItem, refresh?: boolean | undefined, path?: string | undefined): void; - removeNamedFilter(namedFilter: NamedFilterItem, refresh?: boolean | undefined, path?: string | undefined): void; - removeNamedFilterByName(name: string, refresh?: boolean | undefined, path?: string | undefined): void; - setNamedSorters(namedSorters: NamedSorterItem[], refresh?: boolean | undefined, path?: string | undefined): void; - getSorters(path?: string | undefined): ED[T]["Sorter"][] | undefined; - getSorterByName(name: string, path?: string | undefined): any; - addNamedSorter(namedSorter: NamedSorterItem, refresh?: boolean | undefined, path?: string | undefined): void; - removeNamedSorter(namedSorter: NamedSorterItem, refresh?: boolean | undefined, path?: string | undefined): void; - removeNamedSorterByName(name: string, refresh?: boolean | undefined, path?: string | undefined): void; - getPagination(path?: string | undefined): import(".").Pagination | undefined; - setPageSize(pageSize: number, path?: string | undefined): void; - setCurrentPage(currentPage: number, path?: string | undefined): void; + getId(path?: string): string | undefined; + setFilters(filters: NamedFilterItem[], path?: string): void; + setNamedFilters(filters: NamedFilterItem[], refresh?: boolean, path?: string): void; + getFilters(path?: string): any[] | undefined; + getFilterByName(name: string, path?: string): any; + addNamedFilter(namedFilter: NamedFilterItem, refresh?: boolean, path?: string): void; + removeNamedFilter(namedFilter: NamedFilterItem, refresh?: boolean, path?: string): void; + removeNamedFilterByName(name: string, refresh?: boolean, path?: string): void; + setNamedSorters(namedSorters: NamedSorterItem[], refresh?: boolean, path?: string): void; + getSorters(path?: string): ED[T]["Sorter"][] | undefined; + getSorterByName(name: string, path?: string): any; + addNamedSorter(namedSorter: NamedSorterItem, refresh?: boolean, path?: string): void; + removeNamedSorter(namedSorter: NamedSorterItem, refresh?: boolean, path?: string): void; + removeNamedSorterByName(name: string, refresh?: boolean, path?: string): void; + getPagination(path?: string): import(".").Pagination | undefined; + setPageSize(pageSize: number, path?: string): void; + setCurrentPage(currentPage: number, path?: string): void; subDataEvents(events: string[], callback: (event: string, opRecords: OpRecord[]) => void): Promise<() => void>; context: unknown; setState>(state: ComponentData | ((prevState: Readonly>, props: Readonly>) => ComponentData | Pick, K> | null) | Pick, K> | null, callback?: (() => void) | undefined): void; diff --git a/lib/page.react.js b/lib/page.react.js index 8b8c5344..d90d252d 100644 --- a/lib/page.react.js +++ b/lib/page.react.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.createComponent = void 0; +exports.createComponent = createComponent; const tslib_1 = require("tslib"); const jsx_runtime_1 = require("react/jsx-runtime"); const assert_1 = require("oak-domain/lib/utils/assert"); @@ -744,4 +744,3 @@ function createComponent(option, features) { ; return OakComponentWrapper; } -exports.createComponent = createComponent; diff --git a/lib/page.web.js b/lib/page.web.js index ca1bd151..900e9fc5 100644 --- a/lib/page.web.js +++ b/lib/page.web.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.createComponent = void 0; +exports.createComponent = createComponent; const tslib_1 = require("tslib"); const jsx_runtime_1 = require("react/jsx-runtime"); const withRouter_1 = tslib_1.__importDefault(require("./platforms/web/router/withRouter")); @@ -105,4 +105,3 @@ function createComponent(option, features) { } return (0, withRouter_1.default)(Component, option); } -exports.createComponent = createComponent; diff --git a/lib/platforms/web/initialize/index.js b/lib/platforms/web/initialize/index.js index 146744e9..2290e70a 100644 --- a/lib/platforms/web/initialize/index.js +++ b/lib/platforms/web/initialize/index.js @@ -1,5 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = initialize; const tslib_1 = require("tslib"); const jsx_runtime_1 = require("react/jsx-runtime"); const client_1 = tslib_1.__importDefault(require("react-dom/client")); @@ -39,4 +40,3 @@ function initialize(features, appName, routers, locales, error, format) { root.render(Main); } } -exports.default = initialize; diff --git a/lib/platforms/web/responsive/ResponsiveProvider.d.ts b/lib/platforms/web/responsive/ResponsiveProvider.d.ts index ed51c074..48f37edd 100644 --- a/lib/platforms/web/responsive/ResponsiveProvider.d.ts +++ b/lib/platforms/web/responsive/ResponsiveProvider.d.ts @@ -1,9 +1,8 @@ -/// import { Breakpoints } from './context'; export interface ResponsiveProviderProps { children?: React.ReactNode; breakpoints?: Breakpoints; } export declare function ResponsiveProvider(props: ResponsiveProviderProps): import("react").FunctionComponentElement>; diff --git a/lib/platforms/web/responsive/ResponsiveProvider.js b/lib/platforms/web/responsive/ResponsiveProvider.js index fd94e38e..f23f3dac 100644 --- a/lib/platforms/web/responsive/ResponsiveProvider.js +++ b/lib/platforms/web/responsive/ResponsiveProvider.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.ResponsiveProvider = void 0; +exports.ResponsiveProvider = ResponsiveProvider; const react_1 = require("react"); const context_1 = require("./context"); function ResponsiveProvider(props) { @@ -12,4 +12,3 @@ function ResponsiveProvider(props) { value, }, children); } -exports.ResponsiveProvider = ResponsiveProvider; diff --git a/lib/platforms/web/responsive/context.d.ts b/lib/platforms/web/responsive/context.d.ts index 08e5d73e..db94e6c7 100644 --- a/lib/platforms/web/responsive/context.d.ts +++ b/lib/platforms/web/responsive/context.d.ts @@ -17,5 +17,5 @@ export declare const keys: Keys; export declare const values: Values; export declare const defaultBreakpoints: Breakpoints; export declare const ResponsiveContext: React.Context<{ - breakpoints?: Breakpoints | undefined; + breakpoints?: Breakpoints; }>; diff --git a/lib/platforms/web/responsive/useWidth.js b/lib/platforms/web/responsive/useWidth.js index 3854edc7..4debd149 100644 --- a/lib/platforms/web/responsive/useWidth.js +++ b/lib/platforms/web/responsive/useWidth.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.useWidth = void 0; +exports.useWidth = useWidth; const react_1 = require("react"); const react_responsive_1 = require("react-responsive"); const context_1 = require("./context"); @@ -46,4 +46,3 @@ function useWidth(props) { } return 'xs'; } -exports.useWidth = useWidth; diff --git a/lib/platforms/web/router/types.d.ts b/lib/platforms/web/router/types.d.ts index 86e1ea4b..e2e2c761 100644 --- a/lib/platforms/web/router/types.d.ts +++ b/lib/platforms/web/router/types.d.ts @@ -1,4 +1,3 @@ -/// import { BrowserRouterProps } from 'react-router-dom'; export interface IBrowserRouterProps extends BrowserRouterProps { namespace: string; diff --git a/lib/platforms/web/utils/width.js b/lib/platforms/web/utils/width.js index e27214c4..ed3134fe 100644 --- a/lib/platforms/web/utils/width.js +++ b/lib/platforms/web/utils/width.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getBrowserWidth = void 0; +exports.getBrowserWidth = getBrowserWidth; const context_1 = require("../responsive/context"); // const canUseDocument = !!( // typeof window !== 'undefined' && @@ -40,4 +40,3 @@ function getBrowserWidth() { } return size; } -exports.getBrowserWidth = getBrowserWidth; diff --git a/lib/platforms/wechatMp/i18n/common.js b/lib/platforms/wechatMp/i18n/common.js index 751dbc79..89d1d570 100644 --- a/lib/platforms/wechatMp/i18n/common.js +++ b/lib/platforms/wechatMp/i18n/common.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.lookUpAST = void 0; +exports.lookUpAST = lookUpAST; /** * Common runtime logic between js and wxs */ @@ -54,4 +54,3 @@ function lookUpAST(key, translations, locale, fallbackLocale) { } return translation; } -exports.lookUpAST = lookUpAST; diff --git a/lib/platforms/wechatMp/i18n/compile/translation-parser.js b/lib/platforms/wechatMp/i18n/compile/translation-parser.js index 3b6e0346..cf806314 100644 --- a/lib/platforms/wechatMp/i18n/compile/translation-parser.js +++ b/lib/platforms/wechatMp/i18n/compile/translation-parser.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.parseTranslations = void 0; +exports.parseTranslations = parseTranslations; const tslib_1 = require("tslib"); const format_message_parse_1 = tslib_1.__importDefault(require("format-message-parse")); function parseTranslations(object) { @@ -16,4 +16,3 @@ function parseTranslations(object) { } return object; } -exports.parseTranslations = parseTranslations; diff --git a/lib/platforms/wechatMp/i18n/index.js b/lib/platforms/wechatMp/i18n/index.js index 19dd0922..d9b249f8 100644 --- a/lib/platforms/wechatMp/i18n/index.js +++ b/lib/platforms/wechatMp/i18n/index.js @@ -1,6 +1,9 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getI18next = exports.CURRENT_LOCALE_DATA = exports.LOCALE_CHANGE_HANDLER_NAME = exports.CURRENT_LOCALE_KEY = exports.getI18nInstanceWechatMp = exports.initI18nWechatMp = exports.I18nWechatMpRuntimeBase = void 0; +exports.CURRENT_LOCALE_DATA = exports.LOCALE_CHANGE_HANDLER_NAME = exports.CURRENT_LOCALE_KEY = exports.I18nWechatMpRuntimeBase = void 0; +exports.initI18nWechatMp = initI18nWechatMp; +exports.getI18nInstanceWechatMp = getI18nInstanceWechatMp; +exports.getI18next = getI18next; const interpreter_1 = require("./interpreter"); const common_1 = require("./common"); const translation_parser_1 = require("./compile/translation-parser"); @@ -83,11 +86,9 @@ function initI18nWechatMp(options) { }); return i18nInstance; } -exports.initI18nWechatMp = initI18nWechatMp; function getI18nInstanceWechatMp() { return OakI18n?.i18nInstance; } -exports.getI18nInstanceWechatMp = getI18nInstanceWechatMp; exports.CURRENT_LOCALE_KEY = '$_locale'; exports.LOCALE_CHANGE_HANDLER_NAME = '$_localeChange'; exports.CURRENT_LOCALE_DATA = '$_translations'; @@ -102,7 +103,6 @@ function getI18next(options) { }); return i18n; } -exports.getI18next = getI18next; // type Func = (...args: any[]) => any; // export const I18nWechatMp = Behavior( // (() => { diff --git a/lib/platforms/wechatMp/i18n/interpreter/index.js b/lib/platforms/wechatMp/i18n/interpreter/index.js index 062427b1..e0e5ca9e 100644 --- a/lib/platforms/wechatMp/i18n/interpreter/index.js +++ b/lib/platforms/wechatMp/i18n/interpreter/index.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.interpret = void 0; +exports.interpret = interpret; const EMPTY = ''; function interpret(message, params) { if (!message) @@ -13,7 +13,6 @@ function interpret(message, params) { }, []) .join(''); } -exports.interpret = interpret; function _eval(element, params) { params = params || {}; if (typeof element === 'string') { diff --git a/lib/platforms/wechatMp/i18n/wxs.js b/lib/platforms/wechatMp/i18n/wxs.js index 47119645..14fd0523 100644 --- a/lib/platforms/wechatMp/i18n/wxs.js +++ b/lib/platforms/wechatMp/i18n/wxs.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.t = void 0; +exports.t = t; /** * 在wxs环境下实现部分i18n-js内的逻辑 * 参见i18n-js/src/i18n.ts中的translate逻辑 @@ -132,7 +132,6 @@ function t(key, p1, p2, p3, p4, p5, p6) { } return fullKey.split('.').pop(); } -exports.t = t; function propObserver(locales, oldValue, instance) { Instance = instance; } diff --git a/lib/platforms/wechatMp/i18n/wxs/index.js b/lib/platforms/wechatMp/i18n/wxs/index.js index a70a26f4..02c979f5 100644 --- a/lib/platforms/wechatMp/i18n/wxs/index.js +++ b/lib/platforms/wechatMp/i18n/wxs/index.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getMessageInterpreter = void 0; +exports.getMessageInterpreter = getMessageInterpreter; const interpreter_1 = require("../interpreter"); const common_1 = require("../common"); function getMessageInterpreter() { @@ -25,4 +25,3 @@ function getMessageInterpreter() { return ''; }; } -exports.getMessageInterpreter = getMessageInterpreter; diff --git a/lib/types/AbstractComponent.d.ts b/lib/types/AbstractComponent.d.ts index 66a167db..fdd6160c 100644 --- a/lib/types/AbstractComponent.d.ts +++ b/lib/types/AbstractComponent.d.ts @@ -1,4 +1,3 @@ -/// import { EntityDict } from 'oak-domain/lib/types/Entity'; import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain'; import { DataType, DataTypeParams } from 'oak-domain/lib/types/schema/DataTypes'; diff --git a/lib/types/Filter.d.ts b/lib/types/Filter.d.ts index d75e8400..b3189517 100644 --- a/lib/types/Filter.d.ts +++ b/lib/types/Filter.d.ts @@ -1,4 +1,3 @@ -/// import { Dayjs } from 'dayjs'; import { OakAbsRefAttrPickerDef, ColSpanType, ED } from './AbstractComponent'; export type ViewType = 'Input' | 'Select' | 'DatePicker' | 'DatePicker.RangePicker' | 'RefAttr'; diff --git a/lib/types/Map.d.ts b/lib/types/Map.d.ts index a430bdc0..ff0eb969 100644 --- a/lib/types/Map.d.ts +++ b/lib/types/Map.d.ts @@ -1,4 +1,3 @@ -/// export type MapComponent = (props: { id?: string; center?: [number, number]; diff --git a/lib/types/Page.d.ts b/lib/types/Page.d.ts index d4ea7ee9..df4dec33 100644 --- a/lib/types/Page.d.ts +++ b/lib/types/Page.d.ts @@ -1,5 +1,3 @@ -/// -/// import { Aspect, EntityDict, CheckerType, AggregationResult, OpRecord, OakUserException } from "oak-domain/lib/types"; import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain'; import { Feature } from './Feature'; diff --git a/lib/types/Wx.d.ts b/lib/types/Wx.d.ts index 53a1ee38..b22e1c16 100644 --- a/lib/types/Wx.d.ts +++ b/lib/types/Wx.d.ts @@ -1,3 +1,2 @@ -/// export type PromisifyOption> = Omit; export type PromisifyResult = Promise>[0]>; diff --git a/lib/utils/bluetooth/bluetooth.mp.d.ts b/lib/utils/bluetooth/bluetooth.mp.d.ts index 9dcff5bf..2dabd622 100644 --- a/lib/utils/bluetooth/bluetooth.mp.d.ts +++ b/lib/utils/bluetooth/bluetooth.mp.d.ts @@ -1,4 +1,3 @@ -/// import { PromisifyOption } from '../../types/Wx'; export declare class Bluetooth { private serverDict; diff --git a/lib/utils/env/env.mp.js b/lib/utils/env/env.mp.js index c6dabba3..47ae4b5b 100644 --- a/lib/utils/env/env.mp.js +++ b/lib/utils/env/env.mp.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getEnv = void 0; +exports.getEnv = getEnv; async function getEnv() { const env = await wx.getSystemInfo(); const fullEnv = Object.assign(env, { @@ -19,4 +19,3 @@ async function getEnv() { briefEnv, }; } -exports.getEnv = getEnv; diff --git a/lib/utils/env/env.native.js b/lib/utils/env/env.native.js index b3192442..fe32a8aa 100644 --- a/lib/utils/env/env.native.js +++ b/lib/utils/env/env.native.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getEnv = void 0; +exports.getEnv = getEnv; const react_native_1 = require("react-native"); const react_native_localize_1 = require("react-native-localize"); const react_native_device_info_1 = require("react-native-device-info"); @@ -31,4 +31,3 @@ async function getEnv() { briefEnv, }; } -exports.getEnv = getEnv; diff --git a/lib/utils/env/env.web.js b/lib/utils/env/env.web.js index f54b96e0..fefa1323 100644 --- a/lib/utils/env/env.web.js +++ b/lib/utils/env/env.web.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getEnv = void 0; +exports.getEnv = getEnv; const tslib_1 = require("tslib"); const fingerprintjs_1 = tslib_1.__importDefault(require("@fingerprintjs/fingerprintjs")); const lodash_1 = require("oak-domain/lib/utils/lodash"); @@ -33,4 +33,3 @@ async function getEnv() { briefEnv, }; } -exports.getEnv = getEnv; diff --git a/lib/utils/i18n.js b/lib/utils/i18n.js index 3cea2116..9922ab51 100644 --- a/lib/utils/i18n.js +++ b/lib/utils/i18n.js @@ -1,11 +1,11 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.t = exports.registerMissCallback = void 0; +exports.registerMissCallback = registerMissCallback; +exports.t = t; let MissCallback = () => undefined; function registerMissCallback(callback) { MissCallback = callback; } -exports.registerMissCallback = registerMissCallback; function get(object, path) { // 沿着路径寻找到对应的值,未找到则返回默认值 defaultValue return (_basePath(path).reduce((o, k) => { @@ -25,4 +25,3 @@ function t(key, locales, lng, fallbackLng, params) { } return ''; } -exports.t = t; diff --git a/lib/utils/locate.js b/lib/utils/locate.js index 594b01a2..485bdf9a 100644 --- a/lib/utils/locate.js +++ b/lib/utils/locate.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.locate = void 0; +exports.locate = locate; const utils_1 = require("./utils"); async function locateWechat() { return wx.getLocation({}); @@ -38,4 +38,3 @@ async function locate() { return result2; } } -exports.locate = locate; diff --git a/lib/utils/mockId.js b/lib/utils/mockId.js index af089737..b96d7607 100644 --- a/lib/utils/mockId.js +++ b/lib/utils/mockId.js @@ -1,11 +1,10 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.isMockId = exports.generateMockId = void 0; +exports.generateMockId = generateMockId; +exports.isMockId = isMockId; function generateMockId() { return `__mock-${Math.ceil(Math.random() * 100000000000)}`; } -exports.generateMockId = generateMockId; function isMockId(id) { return id.startsWith('__mock-'); } -exports.isMockId = isMockId; diff --git a/lib/utils/promisify.js b/lib/utils/promisify.js index d21a92c3..0d8af38d 100644 --- a/lib/utils/promisify.js +++ b/lib/utils/promisify.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.promisify = void 0; +exports.promisify = promisify; /** * 将小程序的API封装成支持Promise的API, 小程序部分api不支持promise * @params fn {Function} 小程序原始API,如wx.login @@ -22,4 +22,3 @@ function promisify(fn) { }); }; } -exports.promisify = promisify; diff --git a/lib/utils/upload.web.d.ts b/lib/utils/upload.web.d.ts index 13c6fd4d..7cadbbd5 100644 --- a/lib/utils/upload.web.d.ts +++ b/lib/utils/upload.web.d.ts @@ -1,3 +1,3 @@ export declare class Upload { - uploadFile(file: File | string, name: string, uploadUrl: string, formData: Record, autoInform?: boolean, getPercent?: Function): Promise; + uploadFile(file: File | string, name: string, uploadUrl: string, formData: Record, autoInform?: boolean, getPercent?: Function, method?: "POST" | "PUT" | "PATCH"): Promise; } diff --git a/lib/utils/upload.web.js b/lib/utils/upload.web.js index 16d725bb..ecc65dce 100644 --- a/lib/utils/upload.web.js +++ b/lib/utils/upload.web.js @@ -2,36 +2,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.Upload = void 0; class Upload { - // async uploadFile( - // file: File | string, - // name: string, - // uploadUrl: string, - // formData: Record, - // autoInform?: boolean - // ): Promise { - // const formData2 = new FormData(); - // for (const key of Object.keys(formData)) { - // formData2.append(key, formData[key]); - // } - // formData2.append(name || 'file', file as File); - // const options = { - // body: formData2, - // method: 'POST', - // }; - // const result = await fetch(uploadUrl, options); - // return result; - // } - async uploadFile(file, name, uploadUrl, formData, autoInform, getPercent) { + async uploadFile(file, name, uploadUrl, formData, autoInform, getPercent, method = "POST") { + const isPut = method === "PUT"; + // 进度监听模式 if (getPercent) { - const formData2 = new FormData(); - Object.entries(formData).forEach(([key, value]) => { - formData2.append(key, value); - }); - formData2.append(name || 'file', file); return new Promise((resolve, reject) => { const xhr = new XMLHttpRequest(); let percent = 0; - xhr.upload.addEventListener('progress', (event) => { + xhr.upload.addEventListener("progress", (event) => { if (event.lengthComputable) { percent = Math.round((event.loaded / event.total) * 100); getPercent(percent); @@ -40,14 +18,14 @@ class Upload { xhr.onload = () => { if (xhr.status >= 200 && xhr.status < 300) { if (xhr.status === 204) { - resolve({ status: 204 }); // 正确返回状态码 + resolve({ status: 204 }); } else { try { const data = JSON.parse(xhr.responseText); resolve(data); } - catch (e) { + catch { resolve({ status: xhr.status, raw: xhr.responseText }); } } @@ -56,22 +34,51 @@ class Upload { reject(new Error(`HTTP Error: ${xhr.status}`)); } }; - xhr.onerror = () => reject(new Error('Network Error')); - xhr.open('POST', uploadUrl); - xhr.send(formData2); + xhr.onerror = () => reject(new Error("Network Error")); + xhr.open(method, uploadUrl); + if (isPut) { + // PUT 模式:直接上传文件 + if (file instanceof File) { + xhr.setRequestHeader("Content-Type", file.type || "application/octet-stream"); + } + xhr.send(file); + } + else { + // POST / PATCH 模式:构建表单 + const formData2 = new FormData(); + Object.entries(formData).forEach(([key, value]) => { + formData2.append(key, value); + }); + formData2.append(name || "file", file); + xhr.send(formData2); + } }); } + // 无进度监听模式(直接 fetch) + if (isPut) { + // S3 预签名上传 + const headers = {}; + if (file instanceof File) { + headers["Content-Type"] = file.type || "application/octet-stream"; + } + const result = await fetch(uploadUrl, { + method: "PUT", + headers, + body: file, + }); + return result; + } else { + // 表单上传 const formData2 = new FormData(); for (const key of Object.keys(formData)) { formData2.append(key, formData[key]); } - formData2.append(name || 'file', file); - const options = { + formData2.append(name || "file", file); + const result = await fetch(uploadUrl, { + method, body: formData2, - method: 'POST', - }; - const result = await fetch(uploadUrl, options); + }); return result; } } diff --git a/lib/utils/usefulFn.js b/lib/utils/usefulFn.js index 6bf57ea3..c6fa3237 100644 --- a/lib/utils/usefulFn.js +++ b/lib/utils/usefulFn.js @@ -1,6 +1,20 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.analyzeAttrMobileForCard = exports.translateAttributes = exports.analyzeDataUpsertTransformer = exports.makeDataTransformer = exports.getType = exports.getFixed = exports.getAlign = exports.getValue = exports.getWidth = exports.getLabel = exports.getPath = exports.getLinkUrl = exports.isAttributeType = exports.resolvePath = exports.getAttributes = void 0; +exports.getAttributes = getAttributes; +exports.resolvePath = resolvePath; +exports.isAttributeType = isAttributeType; +exports.getLinkUrl = getLinkUrl; +exports.getPath = getPath; +exports.getLabel = getLabel; +exports.getWidth = getWidth; +exports.getValue = getValue; +exports.getAlign = getAlign; +exports.getFixed = getFixed; +exports.getType = getType; +exports.makeDataTransformer = makeDataTransformer; +exports.analyzeDataUpsertTransformer = analyzeDataUpsertTransformer; +exports.translateAttributes = translateAttributes; +exports.analyzeAttrMobileForCard = analyzeAttrMobileForCard; const tslib_1 = require("tslib"); const assert_1 = require("oak-domain/lib/utils/assert"); const relation_1 = require("oak-domain/lib/store/relation"); @@ -35,7 +49,6 @@ function getAttributes(attributes) { }, }); } -exports.getAttributes = getAttributes; function resolvePath(dataSchema, entity, path) { (0, assert_1.assert)(!path.includes('['), '数组索引不需要携带[],请使用arr.0.value'); const attrs = path.split('.'); @@ -86,12 +99,10 @@ function resolvePath(dataSchema, entity, path) { attribute, }; } -exports.resolvePath = resolvePath; // 强制类型 function isAttributeType(attribute) { return attribute; } -exports.isAttributeType = isAttributeType; function getLinkUrl(attribute, props) { if (typeof attribute === 'string') { return ''; @@ -107,7 +118,6 @@ function getLinkUrl(attribute, props) { href += searchParams.join('&'); return href; } -exports.getLinkUrl = getLinkUrl; // 以下几个get方法只需要两个参数attribute和一个解析path对象,只是后者类型还没定义 function getPath(attribute) { if (typeof attribute === 'string') { @@ -115,7 +125,6 @@ function getPath(attribute) { } return attribute.path; } -exports.getPath = getPath; function getLabel(attribute, entity, attr, t) { if (isAttributeType(attribute).label) { return isAttributeType(attribute).label; @@ -133,7 +142,6 @@ function getLabel(attribute, entity, attr, t) { } return t(`${entity}:attr.${attr}`, {}); } -exports.getLabel = getLabel; // 目前width属性可以是undefined,只有特殊type或用户自定义才有值,这样其余attr属性可以自适应 function getWidth(attribute, attrType) { let width; @@ -149,7 +157,6 @@ function getWidth(attribute, attrType) { } return width; } -exports.getWidth = getWidth; function getValue(data, path, entity, attr, attrType, t) { let value = (0, lodash_1.get)(data, path); // 枚举类型还要通过i18转一下中文 @@ -173,15 +180,12 @@ function getValue(data, path, entity, attr, attrType, t) { } return value; } -exports.getValue = getValue; function getAlign(attribute) { return isAttributeType(attribute).align || 'left'; } -exports.getAlign = getAlign; function getFixed(attribute) { return isAttributeType(attribute).fixed; } -exports.getFixed = getFixed; function getType(attribute, attrType) { let type = attrType; if (isAttributeType(attribute).type) { @@ -189,7 +193,6 @@ function getType(attribute, attrType) { } return type; } -exports.getType = getType; function getLabelI18(dataSchema, entity, path, t) { const { attr, entity: entityI8n } = resolvePath(dataSchema, entity, path); return t(`${entityI8n}:attr.${attr}`, {}); @@ -227,7 +230,6 @@ function makeDataTransformer(dataSchema, entity, attrDefs, t) { }; }); } -exports.makeDataTransformer = makeDataTransformer; function analyzeDataUpsertTransformer(dataSchema, entity, attrUpsertDefs) { let geoDef = undefined; const makeNativeFixedPart = (attr, def) => { @@ -306,7 +308,6 @@ function analyzeDataUpsertTransformer(dataSchema, entity, attrUpsertDefs) { }; }); } -exports.analyzeDataUpsertTransformer = analyzeDataUpsertTransformer; function translateAttributes(dataSchema, entity, attributes) { const judgeAttributes = attributes.map((ele) => { const path = getPath(ele); @@ -322,7 +323,6 @@ function translateAttributes(dataSchema, entity, attributes) { }); return judgeAttributes; } -exports.translateAttributes = translateAttributes; function analyzeAttrMobileForCard(dataSchema, entity, t, attributes) { return (data) => { // 遍历用户传入的数据源 @@ -347,4 +347,3 @@ function analyzeAttrMobileForCard(dataSchema, entity, t, attributes) { return coverData; }; } -exports.analyzeAttrMobileForCard = analyzeAttrMobileForCard;