fix

lib/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;

lib/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;

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

@@ -9,4 +9,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'article', f
     gotoArticleEdit: (articleId: string) => void;
     onRemoveArticle: () => void;
     gotoPreview: (content: string, name: string, articleId: string) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

lib/components/article/detail2/web.d.ts

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

lib/components/article/detail3/web.d.ts

@@ -10,4 +10,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'article', f
     gotoArticleEdit: (articleId: string) => void;
     onRemoveArticle: (id: string) => void;
     copy: (id: string) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

lib/components/articleMenu/cell/web.d.ts

@@ -13,4 +13,4 @@ export default function render(props: WebComponentProps<EntityDict, 'articleMenu
     gotoEditByParentId: (parentId: string) => void;
     gotoArticleEditByArticleMenuId: (articleMenuId: string) => void;
     onRemoveArticleMenu: (id: string) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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 {};

lib/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;

lib/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;

lib/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;

lib/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 {};

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

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

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

lib/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 {};

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

@@ -27,5 +27,5 @@ export default function render(props: WebComponentProps<EntityDict, "extraFile",
 }, {
     onPickByWeb: (files: UploadFile[], callback?: (file: any, status: string) => void) => void;
     onDeleteByWeb: (file: UploadFile) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;
 export {};

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

lib/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;

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

@@ -2,4 +2,4 @@ import { EntityDict } from '../../../general-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;

lib/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;

lib/entities/Article.d.ts

@@ -1,7 +1,7 @@
 import { String, Text } from 'oak-domain/lib/types/DataType';
 import { EntityShape } from 'oak-domain/lib/types/Entity';
-import { Schema as ArticleMenu } from './ArticleMenu';
 import { Schema as ExtraFile } from './ExtraFile';
+import { Schema as ArticleMenu } from './ArticleMenu';
 export interface Schema extends EntityShape {
     name: String<32>;
     content: Text;

lib/entities/Article.js

@@ -1,40 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var IActionDef = {
-    stm: {
-        online: ['offline', 'online'],
-        offline: ['online', 'offline'],
-        disabled: [['online', 'offline'], 'disabled'],
-    },
-    is: 'offline',
-};
 var entityDesc = {
     locales: {
         zh_CN: {
             name: '文章',
             attr: {
-                title: '标题',
-                author: '作者',
-                abstract: '简介',
-                content: '正文',
-                files: '封面图',
-                iState: '状态',
-                url: '外部链接',
-                entity: '关联对象',
-                entityId: '关联对象id',
-                sign: '唯一标志',
-            },
-            action: {
-                online: '上架',
-                offline: '下架',
-                disabled: '禁用',
-            },
-            v: {
-                iState: {
-                    online: '已上架',
-                    offline: '已下架',
-                    disabled: '已禁用',
-                },
+                name: '文章标题',
+                content: '请输入正文内容',
+                articleMenu: '文章菜单',
+                files: '文件'
             },
         },
     },

lib/entities/WechatLogin.js

@@ -13,34 +13,49 @@ var indexes = [
         ],
     },
 ];
-var locale = {
-    zh_CN: {
-        name: '绑定微信号',
-        attr: {
-            user: '用户',
-            type: '类型',
-            successed: '是否成功',
-            remark: '备注',
-            codes: '微信码',
-            expired: '是否过期',
-            expiresAt: '过期时间',
-            qrCodeType: '二维码类型',
+var entityDesc = {
+    indexes: [
+        {
+            name: 'index_uuid',
+            attributes: [
+                {
+                    name: 'expired',
+                },
+                {
+                    name: 'expiresAt',
+                }
+            ],
         },
-        action: {
-            success: '成功',
-        },
-        v: {
-            type: {
-                bind: '绑定',
-                login: '登录',
+    ],
+    locales: {
+        zh_CN: {
+            name: '绑定微信号',
+            attr: {
+                user: '用户',
+                type: '类型',
+                successed: '是否成功',
+                remark: '备注',
+                codes: '微信码',
+                expired: '是否过期',
+                expiresAt: '过期时间',
+                qrCodeType: '二维码类型',
             },
-            qrCodeType: {
-                webForWechatPublic: '网站引流到公众号',
-                wechatMpDomainUrl: '小程序url码',
-                wechatMpWxaCode: '小程序码',
-                wechatPublic: '公众号关注码',
-                wechatPublicForMp: '公众号跳转小程序码',
+            action: {
+                success: '成功',
+            },
+            v: {
+                type: {
+                    bind: '绑定',
+                    login: '登录',
+                },
+                qrCodeType: {
+                    webForWechatPublic: '网站引流到公众号',
+                    wechatMpDomainUrl: '小程序url码',
+                    wechatMpWxaCode: '小程序码',
+                    wechatPublic: '公众号关注码',
+                    wechatPublicForMp: '公众号跳转小程序码',
+                },
             },
         },
-    },
+    }
 };

lib/general-app-domain/ArticleMenu/locales/zh_CN.json

@@ -1 +1 @@
-{ "name": "文章分类", "attr": { "name": "分类标题", "isArticle": "是否存在文章", "parent": "所属分类", "entity": "对象", "entityId": "对象Id", "isLeaf": "是否为叶结点", "files": "图片" } }
+{ "name": "文章分类", "attr": { "name": "分类标题", "isArticle": "是否存在文章", "parent": "所属分类", "entity": "对象", "entityId": "对象Id", "isLeaf": "结点下是否存在叶子结点", "files": "图片" } }

lib/general-app-domain/Storage.js

@@ -15,32 +15,6 @@ var Storage_11 = require("./Address/Storage");
 var Storage_12 = require("./Application/Storage");
 var Storage_13 = require("./Area/Storage");
 var Storage_14 = require("./Article/Storage");
-<<<<<<< HEAD
-var Storage_15 = require("./Captcha/Storage");
-var Storage_16 = require("./Domain/Storage");
-var Storage_17 = require("./Email/Storage");
-var Storage_18 = require("./ExtraFile/Storage");
-var Storage_19 = require("./Livestream/Storage");
-var Storage_20 = require("./Message/Storage");
-var Storage_21 = require("./MessageSystem/Storage");
-var Storage_22 = require("./MessageType/Storage");
-var Storage_23 = require("./MessageTypeTemplateId/Storage");
-var Storage_24 = require("./Mobile/Storage");
-var Storage_25 = require("./Notification/Storage");
-var Storage_26 = require("./Platform/Storage");
-var Storage_27 = require("./Station/Storage");
-var Storage_28 = require("./Subscription/Storage");
-var Storage_29 = require("./Subway/Storage");
-var Storage_30 = require("./SubwayStation/Storage");
-var Storage_31 = require("./System/Storage");
-var Storage_32 = require("./Token/Storage");
-var Storage_33 = require("./UserSystem/Storage");
-var Storage_34 = require("./UserWechatPublicTag/Storage");
-var Storage_35 = require("./WechatLogin/Storage");
-var Storage_36 = require("./WechatPublicTag/Storage");
-var Storage_37 = require("./WechatQrCode/Storage");
-var Storage_38 = require("./WechatUser/Storage");
-=======
 var Storage_15 = require("./ArticleMenu/Storage");
 var Storage_16 = require("./Captcha/Storage");
 var Storage_17 = require("./Domain/Storage");
@@ -54,21 +28,18 @@ var Storage_24 = require("./MessageTypeTemplateId/Storage");
 var Storage_25 = require("./Mobile/Storage");
 var Storage_26 = require("./Notification/Storage");
 var Storage_27 = require("./Platform/Storage");
-var Storage_28 = require("./UserRole/Storage");
-var Storage_29 = require("./Role/Storage");
-var Storage_30 = require("./Station/Storage");
-var Storage_31 = require("./Subscription/Storage");
-var Storage_32 = require("./Subway/Storage");
-var Storage_33 = require("./SubwayStation/Storage");
-var Storage_34 = require("./System/Storage");
-var Storage_35 = require("./Token/Storage");
-var Storage_36 = require("./UserSystem/Storage");
-var Storage_37 = require("./UserWechatPublicTag/Storage");
-var Storage_38 = require("./WechatLogin/Storage");
-var Storage_39 = require("./WechatPublicTag/Storage");
-var Storage_40 = require("./WechatQrCode/Storage");
-var Storage_41 = require("./WechatUser/Storage");
->>>>>>> dev
+var Storage_28 = require("./Station/Storage");
+var Storage_29 = require("./Subscription/Storage");
+var Storage_30 = require("./Subway/Storage");
+var Storage_31 = require("./SubwayStation/Storage");
+var Storage_32 = require("./System/Storage");
+var Storage_33 = require("./Token/Storage");
+var Storage_34 = require("./UserSystem/Storage");
+var Storage_35 = require("./UserWechatPublicTag/Storage");
+var Storage_36 = require("./WechatLogin/Storage");
+var Storage_37 = require("./WechatPublicTag/Storage");
+var Storage_38 = require("./WechatQrCode/Storage");
+var Storage_39 = require("./WechatUser/Storage");
 exports.storageSchema = {
     actionAuth: Storage_1.desc,
     modi: Storage_2.desc,
@@ -84,32 +55,6 @@ exports.storageSchema = {
     application: Storage_12.desc,
     area: Storage_13.desc,
     article: Storage_14.desc,
-<<<<<<< HEAD
-    captcha: Storage_15.desc,
-    domain: Storage_16.desc,
-    email: Storage_17.desc,
-    extraFile: Storage_18.desc,
-    livestream: Storage_19.desc,
-    message: Storage_20.desc,
-    messageSystem: Storage_21.desc,
-    messageType: Storage_22.desc,
-    messageTypeTemplateId: Storage_23.desc,
-    mobile: Storage_24.desc,
-    notification: Storage_25.desc,
-    platform: Storage_26.desc,
-    station: Storage_27.desc,
-    subscription: Storage_28.desc,
-    subway: Storage_29.desc,
-    subwayStation: Storage_30.desc,
-    system: Storage_31.desc,
-    token: Storage_32.desc,
-    userSystem: Storage_33.desc,
-    userWechatPublicTag: Storage_34.desc,
-    wechatLogin: Storage_35.desc,
-    wechatPublicTag: Storage_36.desc,
-    wechatQrCode: Storage_37.desc,
-    wechatUser: Storage_38.desc
-=======
     articleMenu: Storage_15.desc,
     captcha: Storage_16.desc,
     domain: Storage_17.desc,
@@ -123,19 +68,16 @@ exports.storageSchema = {
     mobile: Storage_25.desc,
     notification: Storage_26.desc,
     platform: Storage_27.desc,
-    userRole: Storage_28.desc,
-    role: Storage_29.desc,
-    station: Storage_30.desc,
-    subscription: Storage_31.desc,
-    subway: Storage_32.desc,
-    subwayStation: Storage_33.desc,
-    system: Storage_34.desc,
-    token: Storage_35.desc,
-    userSystem: Storage_36.desc,
-    userWechatPublicTag: Storage_37.desc,
-    wechatLogin: Storage_38.desc,
-    wechatPublicTag: Storage_39.desc,
-    wechatQrCode: Storage_40.desc,
-    wechatUser: Storage_41.desc
->>>>>>> dev
+    station: Storage_28.desc,
+    subscription: Storage_29.desc,
+    subway: Storage_30.desc,
+    subwayStation: Storage_31.desc,
+    system: Storage_32.desc,
+    token: Storage_33.desc,
+    userSystem: Storage_34.desc,
+    userWechatPublicTag: Storage_35.desc,
+    wechatLogin: Storage_36.desc,
+    wechatPublicTag: Storage_37.desc,
+    wechatQrCode: Storage_38.desc,
+    wechatUser: Storage_39.desc
 };

lib/general-app-domain/_SubQuery.d.ts

@@ -184,6 +184,8 @@ export declare type ArticleMenuIdSubQuery = {
         entity: "article";
     }) | (ArticleMenu.ArticleMenuIdSubQuery & {
         entity: "articleMenu";
+    }) | (ExtraFile.ArticleMenuIdSubQuery & {
+        entity: "extraFile";
     }) | (ArticleMenu.ArticleMenuIdSubQuery & {
         entity: "articleMenu";
     }) | any;

lib/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;

lib/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;

lib/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 {};

lib/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 {};

lib/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;

lib/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;

lib/pages/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;

lib/pages/article/doc/web.d.ts

@@ -27,5 +27,5 @@ export default function render(props: WebComponentProps<EntityDict, "articleMenu
         isArticle?: boolean;
         children?: DataNode[];
     };
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;
 export {};

lib/pages/article/list/web.d.ts

@@ -26,5 +26,5 @@ export default function render(props: WebComponentProps<EntityDict, "articleMenu
         isArticle?: boolean;
         children?: DataNode[];
     };
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;
 export {};

lib/pages/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;

lib/pages/article/upsert/web.d.ts

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

lib/pages/articleMenu/list/web.d.ts

@@ -18,5 +18,5 @@ export default function render(props: WebComponentProps<EntityDict, 'articleMenu
     gotoArticleUpsert: (articleId: string) => void;
     gotoEdit: (id?: string) => void;
     loadArticles: (articleMenuId: string) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;
 export {};

lib/pages/articleMenu/upsert/web.d.ts

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

lib/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;

lib/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;

lib/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;

lib/pages/icon/web.d.ts

@@ -1,3 +1,3 @@
 import { EntityDict } from '../../general-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;

lib/pages/login/web.d.ts

@@ -12,4 +12,4 @@ export default function render(props: WebComponentProps<EntityDict, 'token', fal
     sendCaptcha: (mobile: string) => Promise<void>;
     loginByMobileWeb: (mobile: string, loginAgreed: boolean, password?: string, captcha?: string, loginMode?: number) => Promise<void>;
     goPage: (destination: string) => Promise<void>;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

lib/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;

lib/pages/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;

lib/pages/message/drawerList/web.d.ts

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

lib/pages/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;

lib/pages/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;

lib/pages/mobile/login/web.d.ts

@@ -17,4 +17,4 @@ export default function render(props: WebComponentProps<EntityDict, 'token', fal
     setMobile: (mobile: string) => void;
     sendCaptcha: () => Promise<void>;
     loginByMobile: () => Promise<void>;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

lib/pages/mobile/login/web.pc.d.ts

@@ -16,4 +16,4 @@ export default function render(props: WebComponentProps<EntityDict, 'token', fal
     setMobile: (mobile: string) => void;
     sendCaptcha: () => Promise<void>;
     loginByMobile: () => Promise<void>;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

lib/pages/mobile/me/web.d.ts

@@ -5,4 +5,4 @@ export default function render(props: WebComponentProps<EntityDict, 'mobile', tr
     allowRemove: boolean;
 }, {
     goAddMobile: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

lib/pages/mobile/me/web.pc.d.ts

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

lib/pages/paper/detail/web.d.ts

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

lib/pages/paper/list/web.d.ts

@@ -13,4 +13,4 @@ export default function render(props: WebComponentProps<EntityDict, 'article', t
     searchValueChange: (v: string) => Promise<void>;
     searchConfirm: () => Promise<void>;
     onRemove: (id: string) => Promise<void>;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

lib/pages/paper/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;

lib/pages/paper/upsert/web.d.ts

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

lib/pages/personal/web.d.ts

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

lib/pages/personal/web.pc.d.ts

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

lib/pages/pickers/area/web.d.ts

@@ -4,4 +4,4 @@ export default function render(props: WebComponentProps<EntityDict, 'area', true
     areas?: EntityDict['area']['OpSchema'][];
 }, {
     onItemClicked: (area: EntityDict['area']['OpSchema']) => Promise<void>;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

lib/pages/platform/config/upsert/web.pc.d.ts

@@ -6,4 +6,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'platform',
     description: string;
     oakId: string;
     config: Config;
-}, {}>): import("react/jsx-runtime").JSX.Element;
+}, {}>): JSX.Element;

lib/pages/platform/detail/web.d.ts

@@ -9,4 +9,4 @@ export default function Render(props: WebComponentProps<EntityDict, 'platform',
     tabValue: 'detail' | 'system_list';
 }, {
     onTabClick: (key: string) => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

lib/pages/platform/list/web.pc.d.ts

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

lib/pages/platform/upsert/web.pc.d.ts

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

lib/pages/setting/web.d.ts

@@ -9,4 +9,4 @@ export default function render(props: WebComponentProps<EntityDict, 'user', fals
 }, {
     logout: () => void;
     setVisible: () => void;
-}>): import("react/jsx-runtime").JSX.Element;
+}>): JSX.Element;

lib/pages/setting/web.pc.d.ts

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

lib/pages/subscription/config/upsert/web.pc.d.ts

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

lib/pages/subscription/detail/web.d.ts

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

lib/pages/subscription/list/web.pc.d.ts

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

lib/pages/subscription/upsert/web.pc.d.ts

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