mergeConfilct

es/components/amap/location/index.d.ts

@@ -37,5 +37,5 @@ export declare type Poi = {
     email?: string;
     businessArea?: string;
 };
-declare const Location: (props: LocationProps) => import("react/jsx-runtime").JSX.Element;
+declare const Location: (props: LocationProps) => JSX.Element;
 export default Location;

es/components/amap/map/index.d.ts

@@ -29,5 +29,5 @@ export interface AMapProps extends APILoaderProps {
     securityJsCode?: string;
     serviceHost?: string;
 }
-declare const memo: (props: AMapProps) => import("react/jsx-runtime").JSX.Element;
+declare const memo: (props: AMapProps) => JSX.Element;
 export default memo;

es/components/article/cell/web.d.ts

@@ -7,4 +7,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'article', f
     name: string;
     width: string;
     editor: any;
-}, {}>): import("react/jsx-runtime").JSX.Element;
+}, {}>): JSX.Element;

es/components/article/detail/web.d.ts

@@ -8,4 +8,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'article', f
     content?: string;
     html?: string;
     origin?: string;
-}, {}>): import("react/jsx-runtime").JSX.Element;
+}, {}>): JSX.Element;

es/components/article/preview/web.d.ts

@@ -8,4 +8,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'article', f
     content?: string;
     html?: string;
     origin?: string;
-}, {}>): import("react/jsx-runtime").JSX.Element;
+}, {}>): JSX.Element;

es/components/article/treeList/web.pc.d.ts

@@ -19,4 +19,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'articleMenu
     setCurrentArticle: (id: string) => void;
 }, {
     createOne: () => Promise<void>;
-}>): import("react/jsx-runtime").JSX.Element | null;
+}>): JSX.Element | null;

es/components/article/upsert/web.d.ts

@@ -26,4 +26,4 @@ export default function Render(props: WebComponentProps<EntityDict, "article", f
     }>;
     clearContentTip: () => void;
     gotoPreview: (content?: string, title?: string) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/articleMenu/treeCell/web.pc.d.ts

@@ -34,4 +34,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'articleMenu
     createSubArticle: (name: string) => Promise<void>;
     createSubArticleMenu: (name: string) => Promise<void>;
     gotoDoc: (articleMenuId: string) => void;
-}>): import("react/jsx-runtime").JSX.Element | null;
+}>): JSX.Element | null;

es/components/articleMenu/treeList/web.pc.d.ts

@@ -33,4 +33,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'articleMenu
     createOne: (name?: string) => Promise<void>;
     getDefaultArticle: (rows: EntityDict['articleMenu']['OpSchema'][]) => void;
     getSearchArticle: () => Promise<string[]>;
-}>): import("react/jsx-runtime").JSX.Element | null;
+}>): JSX.Element | null;

es/components/articleMenu/treeManager/web.pc.d.ts

@@ -14,4 +14,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'articleMenu
     searchArticle: (searchValue: string) => void;
     getArticleMenuIdByArticle: (articleId: string, type: string) => void;
     gotoSearchArticleAndArticleMenu: (articleMenuId: string, articleId: string) => void;
-}>): import("react/jsx-runtime").JSX.Element | null;
+}>): JSX.Element | null;

es/components/changePassword/byMobile/web.d.ts

@@ -10,4 +10,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'message', f
     setMobile: (value: string) => void;
     sendCaptcha: (mobile: string) => Promise<void>;
     onConfirmByMobile: (mobile: string, captcha: string, newPassword: string) => Promise<void>;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/changePassword/byPassword/web.d.ts

@@ -5,4 +5,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'message', f
     failTimes: number;
 }, {
     onConfirm: (prevPassword: string, password: string) => Promise<void>;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/changePassword/web.d.ts

@@ -6,4 +6,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'message', f
     oakId: string;
 }, {
     goToMobile: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/common/download/index.d.ts

@@ -7,7 +7,7 @@ declare type IDownloadProps = {
     style?: React.CSSProperties;
     filename?: string;
 };
-declare function Download(props: IDownloadProps): import("react/jsx-runtime").JSX.Element;
+declare function Download(props: IDownloadProps): JSX.Element;
 declare namespace Download {
     var onDownload: (arrayBuffer: ArrayBuffer, filename: string) => void;
     var base64ToBlob: (base64String: string) => Blob;

es/components/common/empty/empty.d.ts

@@ -1,3 +1,3 @@
 import './index.less';
-declare const Empty: () => import("react/jsx-runtime").JSX.Element;
+declare const Empty: () => JSX.Element;
 export default Empty;

es/components/common/empty/simple.d.ts

@@ -1,3 +1,3 @@
 import './index.less';
-declare const Empty: () => import("react/jsx-runtime").JSX.Element;
+declare const Empty: () => JSX.Element;
 export default Empty;

es/components/common/errorPage/web.d.ts

@@ -15,5 +15,5 @@ interface IErrorPageProps {
     children?: React.ReactNode;
     icon?: React.ReactNode;
 }
-declare function ErrorPage(props: IErrorPageProps): import("react/jsx-runtime").JSX.Element;
+declare function ErrorPage(props: IErrorPageProps): JSX.Element;
 export default ErrorPage;

es/components/common/grid/index.d.ts

@@ -15,5 +15,5 @@ declare type GridProps = {
     list: Array<Item>;
     onChange?: (index: number, event?: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
 };
-declare const _default: React.MemoExoticComponent<(props: GridProps) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: React.MemoExoticComponent<(props: GridProps) => JSX.Element>;
 export default _default;

es/components/common/pageHeader/index.d.ts

@@ -17,5 +17,5 @@ declare type PageHeaderProps = {
     children?: React.ReactNode;
     showHeader?: boolean;
 };
-declare const _default: React.MemoExoticComponent<(props: PageHeaderProps) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: React.MemoExoticComponent<(props: PageHeaderProps) => JSX.Element>;
 export default _default;

es/components/common/qrCode/index.d.ts

@@ -14,5 +14,5 @@ declare type IQrCodeProps = {
     successed?: boolean;
     type?: EntityDict['wechatLogin']['Schema']['type'];
 };
-declare function QrCode(props: IQrCodeProps): import("react/jsx-runtime").JSX.Element;
+declare function QrCode(props: IQrCodeProps): JSX.Element;
 export default QrCode;

es/components/common/result/fail/index.d.ts

@@ -5,5 +5,5 @@ declare type Props = {
     description?: string;
     children?: React.ReactNode;
 };
-declare const _default: React.MemoExoticComponent<(props: Props) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: React.MemoExoticComponent<(props: Props) => JSX.Element>;
 export default _default;

es/components/common/result/success/index.d.ts

@@ -5,5 +5,5 @@ declare type Props = {
     description?: string;
     children?: React.ReactNode;
 };
-declare const _default: React.MemoExoticComponent<(props: Props) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: React.MemoExoticComponent<(props: Props) => JSX.Element>;
 export default _default;

es/components/common/weChatLoginGrant/index.d.ts

@@ -14,5 +14,5 @@ interface GrantProps {
     rootStyle?: React.CSSProperties;
     rootClassName?: string;
 }
-declare function Grant(props: GrantProps): import("react/jsx-runtime").JSX.Element;
+declare function Grant(props: GrantProps): JSX.Element;
 export default Grant;

es/components/common/weChatLoginQrCode/index.d.ts

@@ -14,5 +14,5 @@ interface QrCodeProps {
     rootStyle?: React.CSSProperties;
     rootClassName?: string;
 }
-declare function QrCode(props: QrCodeProps): import("react/jsx-runtime").JSX.Element;
+declare function QrCode(props: QrCodeProps): JSX.Element;
 export default QrCode;

es/components/config/application/web.pc.d.ts

@@ -15,5 +15,5 @@ export default function render(props: WebComponentProps<EntityDict, 'user', fals
     setValue: (path: string, value: string) => void;
     removeItem: (path: string, index: number) => void;
     cleanKey: (path: string, key: string) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;
 export {};

es/components/config/application/web/index.d.ts

@@ -4,4 +4,4 @@ export default function Web(props: {
     setValue: (path: string, value: any) => void;
     removeItem: (path: string, index: number) => void;
     cleanKey: (path: string, key: string) => void;
-}): import("react/jsx-runtime").JSX.Element;
+}): JSX.Element;

es/components/config/application/wechatMp/index.d.ts

@@ -4,4 +4,4 @@ export default function WechatMp(props: {
     setValue: (path: string, value: any) => void;
     removeItem: (path: string, index: number) => void;
     cleanKey: (path: string, key: string) => void;
-}): import("react/jsx-runtime").JSX.Element;
+}): JSX.Element;

es/components/config/application/wechatPublic/index.d.ts

@@ -5,4 +5,4 @@ export default function WechatPublic(props: {
     setValue: (path: string, value: any) => void;
     removeItem: (path: string, index: number) => void;
     cleanKey: (path: string, key: string) => void;
-}): import("react/jsx-runtime").JSX.Element;
+}): JSX.Element;

es/components/config/style/index.d.ts

@@ -3,5 +3,5 @@ declare type StyleProps = {
     value?: StyleType | null;
     onChange: (value: StyleType) => void;
 };
-export default function Render(props: StyleProps): import("react/jsx-runtime").JSX.Element;
+export default function Render(props: StyleProps): JSX.Element;
 export {};

es/components/config/upsert/account/index.d.ts

@@ -3,4 +3,4 @@ export default function Account(props: {
     account: Required<Config>['Account'];
     setValue: (path: string, value: any) => void;
     removeItem: (path: string, index: number) => void;
-}): import("react/jsx-runtime").JSX.Element;
+}): JSX.Element;

es/components/config/upsert/cos/index.d.ts

@@ -2,4 +2,4 @@ import { Config } from '../../../../types/Config';
 export default function Cos(props: {
     cos: Required<Config>['Cos'];
     setValue: (path: string, value: any) => void;
-}): import("react/jsx-runtime").JSX.Element;
+}): JSX.Element;

es/components/config/upsert/live/index.d.ts

@@ -2,4 +2,4 @@ import { Config } from '../../../../types/Config';
 export default function Cos(props: {
     live: Required<Config>['Live'];
     setValue: (path: string, value: any) => void;
-}): import("react/jsx-runtime").JSX.Element;
+}): JSX.Element;

es/components/config/upsert/map/index.d.ts

@@ -2,4 +2,4 @@ import { Config } from '../../../../types/Config';
 export default function Cos(props: {
     map: Required<Config>['Map'];
     setValue: (path: string, value: any) => void;
-}): import("react/jsx-runtime").JSX.Element;
+}): JSX.Element;

es/components/config/upsert/sms/index.d.ts

@@ -4,4 +4,4 @@ export default function Sms(props: {
     setValue: (path: string, value: any) => void;
     removeItem: (path: string, index: number) => void;
     cleanKey: (path: string, key: string) => void;
-}): import("react/jsx-runtime").JSX.Element;
+}): JSX.Element;

es/components/config/upsert/web.pc.d.ts

@@ -12,4 +12,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'user', fals
     setValue: (path: string, value: string) => void;
     removeItem: (path: string, index: number) => void;
     cleanKey: (path: string, key: string) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/extraFile/avatar/web.d.ts

@@ -6,4 +6,4 @@ export default function render(props: WebComponentProps<EntityDict, 'extraFile',
     avatarUrl?: string;
 }, {
     onPickByWeb: (files: File[]) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/extraFile/display/web.d.ts

@@ -1 +1 @@
-export default function render(): import("react/jsx-runtime").JSX.Element;
+export default function render(): JSX.Element;

es/components/extraFile/forUrl/web.d.ts

@@ -19,5 +19,5 @@ export default function render(props: WebComponentProps<EntityDict, "extraFile",
     closeModal: () => void;
     onModal1Confirm: (value: number) => void;
     setSelectedId: (id: number) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;
 export {};

es/components/extraFile/gallery/web.d.ts

@@ -33,5 +33,5 @@ export default function render(props: WebComponentProps<EntityDict, "extraFile",
     getUrl: (extraFile: EntityDict['extraFile']['OpSchema']) => string;
     getFileName: (extraFile: EntityDict['extraFile']['OpSchema']) => string;
     eFFormatBytes: (value: number) => string;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;
 export {};

es/components/func/actionPanel/web.d.ts

@@ -10,4 +10,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'user', fals
     }>;
 }, {
     onClick: (action: string) => void;
-}>): import("react/jsx-runtime").JSX.Element | null;
+}>): JSX.Element | null;

es/components/func/debugPanel/web.d.ts

@@ -10,4 +10,4 @@ export default function render(props: WebComponentProps<EntityDict, 'address', t
     resetInitialData: () => void;
     downloadEnv: () => void;
     resetEnv: (data: Record<string, any>) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/icon/web.d.ts

@@ -8,4 +8,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'user', fals
     size?: string;
     className?: string;
     style?: React.CSSProperties;
-}, {}>): import("react/jsx-runtime").JSX.Element;
+}, {}>): JSX.Element;

es/components/message/cell/web.d.ts

@@ -11,4 +11,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'message', f
     router: EntityDict['message']['Schema']['router'];
     visitState: EntityDict['message']['Schema']['visitState'];
     id: string;
-}, {}>): import("react/jsx-runtime").JSX.Element;
+}, {}>): JSX.Element;

es/components/message/detail/web.d.ts

@@ -10,4 +10,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'message', f
     router: EntityDict['message']['Schema']['router'];
 }, {
     goPage: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/message/detail/web.pc.d.ts

@@ -10,4 +10,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'message', f
     router: EntityDict['message']['Schema']['router'];
 }, {
     goPage: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/message/list/web.d.ts

@@ -4,4 +4,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'message', t
     messages: EntityDict['message']['Schema'][];
 }, {
     goDetailById: (id: string) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/message/list/web.pc.d.ts

@@ -4,4 +4,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'message', t
     messages: RowWithActions<EntityDict, 'message'>[];
 }, {
     goDetailById: (id: string) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/message/web.d.ts

@@ -3,4 +3,4 @@ export default function render(props: {
     data: {
         data: MessageProps;
     };
-}): import("react/jsx-runtime").JSX.Element;
+}): JSX.Element;

es/components/messageTypeTemplateId/list/web.pc.d.ts

@@ -5,4 +5,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'messageType
     dirtyIds: string[];
     messageTypes: string[];
     applicationId: string;
-}, {}>): import("react/jsx-runtime").JSX.Element;
+}, {}>): JSX.Element;

es/components/my/avatar/web.d.ts

@@ -9,4 +9,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'token', fal
     iconName?: string;
     iconLarger?: string;
     onClick?: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/my/info/web.d.ts

@@ -13,4 +13,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'token', fal
 }, {
     logout: () => void;
     updateAttribute: (attr: string, value: any) => Promise<void>;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/my/info/web.pc.d.ts

@@ -13,4 +13,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'token', fal
 }, {
     logout: () => void;
     updateAttribute: (attr: string, value: any) => Promise<void>;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/my/message/web.d.ts

@@ -8,4 +8,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'user', fals
     style?: React.CSSProperties;
 }, {
     goMessageList: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/my/message/web.pc.d.ts

@@ -10,4 +10,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'user', fals
     buttonClassName?: string;
 }, {
     goMessageList: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/parasite/detail/web.d.ts

@@ -6,4 +6,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'userEntityG
     url: string;
     expiresAt: number;
     title?: string;
-}, {}>): import("react/jsx-runtime").JSX.Element;
+}, {}>): JSX.Element;

es/components/parasite/excess/web.d.ts

@@ -4,4 +4,4 @@ export default function render(props: WebComponentProps<EntityDict, 'parasite',
     loading: boolean;
     illegal: boolean;
     expired: boolean;
-}, {}>): import("react/jsx-runtime").JSX.Element;
+}, {}>): JSX.Element;

es/components/parasite/list/web.d.ts

@@ -7,4 +7,4 @@ export default function render(props: WebComponentProps<EntityDict, 'parasite',
 }, {
     cancel: () => void;
     getQrCode: () => Promise<void>;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/parasite/upsert/web.d.ts

@@ -19,4 +19,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'parasite',
     onSearch: (value: string) => void;
     onSelect: (value: string) => void;
     setSearchValue: (value: string) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/subwayLine/list/web.d.ts

@@ -16,4 +16,4 @@ export default function render(props: WebComponentProps<EntityDict, 'area', true
     setCheckedList: (station: string, flag: boolean) => void;
     cancel: () => void;
     confirm: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/theme/setting/RadioColor.d.ts

@@ -3,5 +3,5 @@ interface IProps {
     defaultValue?: number | string;
     onChange: (color: string) => void;
 }
-declare const _default: React.MemoExoticComponent<(props: IProps) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: React.MemoExoticComponent<(props: IProps) => JSX.Element>;
 export default _default;

es/components/theme/setting/RadioRect.d.ts

@@ -9,5 +9,5 @@ interface IProps {
     onChange: (value?: any) => void;
     options: IOption[];
 }
-declare const _default: React.MemoExoticComponent<(props: IProps) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: React.MemoExoticComponent<(props: IProps) => JSX.Element>;
 export default _default;

es/components/theme/setting/index.d.ts

@@ -1 +1 @@
-export default function Render(this: any): import("react/jsx-runtime").JSX.Element;
+export default function Render(this: any): JSX.Element;

es/components/user/login/web.d.ts

@@ -19,4 +19,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'token', fal
     sendCaptcha: (mobile: string) => Promise<void>;
     loginByMobile: (mobile: string, password?: string, captcha?: string) => Promise<void>;
     setLoginMode: (value: number) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/userRelation/list/web.d.ts

@@ -17,4 +17,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'user', true
     goUpsert: () => void;
     confirmDelete: (id: string) => Promise<void>;
     goUpdate: (id: string) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/userRelation/list/web.pc.d.ts

@@ -11,4 +11,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'user', true
     goUpsert: () => void;
     goUpdate: (id: string) => void;
     confirmDelete: (id: string) => Promise<void>;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/userRelation/onEntity/web.d.ts

@@ -1 +1 @@
-export default function render(this: any): import("react/jsx-runtime").JSX.Element;
+export default function render(this: any): JSX.Element;

es/components/userRelation/upsert/byMobile/web.d.ts

@@ -11,4 +11,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'mobile', fa
     onMobileChange: (value: string) => Promise<void>;
     onConfirm: () => Promise<void>;
     onReset: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/userRelation/upsert/byMobile/web.pc.d.ts

@@ -13,4 +13,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'mobile', fa
     onMobileChange: (value: string) => Promise<void>;
     onConfirm: () => Promise<void>;
     onReset: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/userRelation/upsert/byUser/web.d.ts

@@ -8,4 +8,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'user', fals
 }, {
     onConfirm: () => Promise<void>;
     onReset: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/userRelation/upsert/byUser/web.pc.d.ts

@@ -8,4 +8,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'user', fals
 }, {
     onConfirm: () => Promise<void>;
     onReset: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/userRelation/upsert/byUserEntityGrant/web.d.ts

@@ -14,5 +14,5 @@ export default function render(props: WebComponentProps<EntityDict, 'userEntityG
     setInit: () => void;
     setPeriod: (p: number) => void;
     setUnit: (u: Unit) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;
 export {};

es/components/userRelation/upsert/byUserEntityGrant/web.pc.d.ts

@@ -18,5 +18,5 @@ export default function render(props: WebComponentProps<EntityDict, 'userEntityG
     setInit: () => void;
     setPeriod: (p: number) => void;
     setUnit: (u: Unit) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;
 export {};

es/components/userRelation/upsert/onUser/userRelation/web.d.ts

@@ -8,4 +8,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'user', fals
     }[];
 }, {
     onRelationChange: (relation: EntityDict['relation']['OpSchema'], checked: boolean) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/userRelation/upsert/onUser/userRelation/web.pc.d.ts

@@ -8,4 +8,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'user', fals
     }[];
 }, {
     onRelationChange: (relation: EntityDict['relation']['OpSchema'], checked: boolean) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/userRelation/upsert/onUser/web.d.ts

@@ -15,4 +15,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'user', fals
     onMobileChange: (value: string) => Promise<void>;
     onConfirm: () => Promise<void>;
     onReset: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/userRelation/upsert/onUser/web.pc.d.ts

@@ -16,4 +16,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'user', fals
     onMobileChange: (value: string) => Promise<void>;
     onConfirm: () => Promise<void>;
     onReset: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/components/userRelation/upsert/web.pc.d.ts

@@ -11,4 +11,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'relation',
     entityId: string;
     relations: EntityDict['relation']['OpSchema'][];
     qrCodeType?: QrCodeType;
-}, {}>): import("react/jsx-runtime").JSX.Element;
+}, {}>): JSX.Element;

es/components/wechatLogin/qrCode/web.d.ts

@@ -6,4 +6,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'wechatLogin
     loading: boolean;
     successed: boolean;
     type: EntityDict['wechatLogin']['Schema']['type'];
-}, {}>): import("react/jsx-runtime").JSX.Element;
+}, {}>): JSX.Element;

es/components/wechatUser/bindingList/web.d.ts

@@ -2,4 +2,4 @@ import { EntityDict } from '../../../oak-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
 export default function Render(props: WebComponentProps<EntityDict, 'wechatUser', true, {
     wechatUsers: EntityDict['wechatUser']['Schema'][];
-}, {}>): import("react/jsx-runtime").JSX.Element;
+}, {}>): JSX.Element;

es/components/wechatUser/unbindBtn/web.d.ts

@@ -4,4 +4,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'wechatUser'
     wechatLoginId: string;
     qrCodeUrl: string;
     loading: boolean;
-}, {}>): import("react/jsx-runtime").JSX.Element;
+}, {}>): JSX.Element;

es/entities/ExtraFile.d.ts

@@ -17,4 +17,6 @@ export interface Schema extends EntityShape {
     sort?: Float<22, 10>;
     fileType?: String<128>;
     isBridge?: Boolean;
+    uploaded: Boolean;
+    uploadMeta?: Object;
 }

es/entities/ExtraFile.js

@@ -20,6 +20,8 @@ const entityDesc = {
                 sort: '排序',
                 fileType: '文件类型',
                 isBridge: '是否桥接访问',
+                uploaded: '是否上传成功',
+                uploadMeta: '上传需要的metadata',
             },
             v: {
                 origin: {

es/index.d.ts

@@ -13,3 +13,4 @@ export { BackendRuntimeContext } from './context/BackendRuntimeContext';
 export { FrontendRuntimeContext, SerializedData, } from './context/FrontendRuntimeContext';
 export { RuntimeContext } from './context/RuntimeContext';
 export { registerWechatPublicTags } from './config/constants';
+export { registerUploader } from './utils/uploader';

es/index.js

@@ -11,3 +11,4 @@ export { getLivestream, getPlayBackUrl, getStreamObj } from './utils/livestream'
 export { BackendRuntimeContext } from './context/BackendRuntimeContext';
 export { FrontendRuntimeContext, } from './context/FrontendRuntimeContext';
 export { registerWechatPublicTags } from './config/constants';
+export { registerUploader } from './utils/uploader';

es/oak-app-domain/ExtraFile/Schema.d.ts

@@ -25,6 +25,7 @@ export declare type OpSchema = EntityShape & {
     sort?: Float<22, 10> | null;
     fileType?: String<128> | null;
     isBridge?: Boolean | null;
+    uploadMeta?: Object | null;
 };
 export declare type OpAttr = keyof OpSchema;
 export declare type Schema = EntityShape & {
@@ -44,6 +45,7 @@ export declare type Schema = EntityShape & {
     sort?: Float<22, 10> | null;
     fileType?: String<128> | null;
     isBridge?: Boolean | null;
+    uploadMeta?: Object | null;
     article?: Article.Schema;
     articleMenu?: ArticleMenu.Schema;
     user?: User.Schema;
@@ -71,6 +73,7 @@ declare type AttrFilter = {
     sort: Q_NumberValue;
     fileType: Q_StringValue;
     isBridge: Q_BooleanValue;
+    uploadMeta: Object;
     article: Article.Filter;
     articleMenu: ArticleMenu.Filter;
     user: User.Filter;
@@ -99,6 +102,7 @@ export declare type Projection = {
     sort?: number;
     fileType?: number;
     isBridge?: number;
+    uploadMeta?: number | Object;
     article?: Article.Projection;
     articleMenu?: ArticleMenu.Projection;
     user?: User.Projection;

es/oak-app-domain/ExtraFile/Storage.js

@@ -93,6 +93,9 @@ export const desc = {
         },
         isBridge: {
             type: "boolean"
+        },
+        uploadMeta: {
+            type: "object"
         }
     },
     actionType: "crud",

es/oak-app-domain/ExtraFile/locales/zh_CN.json

@@ -1 +1 @@
-{ "name": "文件", "attr": { "origin": "源", "type": "类型", "bucket": "桶", "objectId": "对象编号", "tag1": "标签一", "tag2": "标签二", "filename": "文件名", "md5": "md5", "entity": "关联对象", "entityId": "关联对象id", "extra1": "额外信息", "extension": "后缀名", "size": "文件大小", "sort": "排序", "fileType": "文件类型", "isBridge": "是否桥接访问" }, "v": { "origin": { "qiniu": "七牛云", "unknown": "未知" }, "type": { "image": "图像", "video": "视频", "audio": "音频", "file": "文件" } } }
+{ "name": "文件", "attr": { "origin": "源", "type": "类型", "bucket": "桶", "objectId": "对象编号", "tag1": "标签一", "tag2": "标签二", "filename": "文件名", "md5": "md5", "entity": "关联对象", "entityId": "关联对象id", "extra1": "额外信息", "extension": "后缀名", "size": "文件大小", "sort": "排序", "fileType": "文件类型", "isBridge": "是否桥接访问", "uploadMeta": "上传需要的metadata" }, "v": { "origin": { "qiniu": "七牛云", "unknown": "未知" }, "type": { "image": "图像", "video": "视频", "audio": "音频", "file": "文件" } } }

es/pages/address/list/web.d.ts

@@ -5,4 +5,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'address', t
 }, {
     gotoUpsert: (id: string) => void;
     goNewAddress: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/pages/address/upsert/web.d.ts

@@ -9,4 +9,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'address', f
 }, {
     callAreaPicker: () => void;
     confirm: () => Promise<void>;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/pages/application/config/upsert/web.pc.d.ts

@@ -8,5 +8,5 @@ export default function render(props: WebComponentProps<EntityDict, 'application
     oakId: string;
     config: Config;
     type: AppType;
-}, {}>): import("react/jsx-runtime").JSX.Element;
+}, {}>): JSX.Element;
 export {};

es/pages/application/detail/web.d.ts

@@ -14,5 +14,5 @@ export default function Render(props: WebComponentProps<EntityDict, 'application
 }, {
     onTabClick: (key: string) => void;
     goWechatPublicTagList: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;
 export {};

es/pages/application/list/web.pc.d.ts

@@ -12,4 +12,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'application
     goSetConfig: (id: string) => void;
     goUpdate: (id: string) => void;
     removeApplication: (id: string) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/pages/application/upsert/web.pc.d.ts

@@ -15,4 +15,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'application
     style: EntityDict['system']['Schema']['style'];
 }, {
     confirm: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/pages/changePassword/web.d.ts

@@ -4,4 +4,4 @@ export default function render(props: WebComponentProps<EntityDict, 'mobile', tr
     showBack: boolean;
     userId: string;
     currentUserId: string;
-}, {}>): import("react/jsx-runtime").JSX.Element;
+}, {}>): JSX.Element;

es/pages/changePassword/web.pc.d.ts

@@ -4,4 +4,4 @@ export default function render(props: WebComponentProps<EntityDict, 'mobile', tr
     showBack: boolean;
     userId: string;
     currentUserId: string;
-}, {}>): import("react/jsx-runtime").JSX.Element;
+}, {}>): JSX.Element;

es/pages/domain/detail/web.d.ts

@@ -11,4 +11,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'domain', fa
     system: EntityDict['system']['Schema'];
 }, {
     onTabClick: (key: string) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/pages/domain/list/web.pc.d.ts

@@ -10,4 +10,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'domain', tr
     goDetail: (id: string) => void;
     goCreate: () => void;
     goUpdate: (id: string) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/pages/domain/upsert/web.pc.d.ts

@@ -11,4 +11,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'domain', fa
     showBack: boolean;
 }, {
     confirm: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

es/pages/icon/web.d.ts

@@ -1,3 +1,3 @@
 import { EntityDict } from '../../oak-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
-export default function Render(props: WebComponentProps<EntityDict, 'token', true, {}, {}>): import("react/jsx-runtime").JSX.Element;
+export default function Render(props: WebComponentProps<EntityDict, 'token', true, {}, {}>): JSX.Element;

es/pages/message/detail/web.d.ts

@@ -10,4 +10,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'message', f
     router: EntityDict['message']['Schema']['router'];
 }, {
     goPage: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;