From db6b0a35cc74465df1c8f7067d7b5e0037b6fd6c Mon Sep 17 00:00:00 2001 From: wangcheng <1607978730@qq.com> Date: Sun, 23 Apr 2023 16:38:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=B0=E9=93=81=E7=BA=BF?= =?UTF-8?q?=E5=8F=8A=E7=AB=99=E7=82=B9entities?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/components/common/empty/empty.d.ts | 1 + lib/components/common/empty/simple.d.ts | 1 + lib/components/config/application/web.pc.d.ts | 1 + .../config/application/web/index.d.ts | 1 + .../config/application/wechatMp/index.d.ts | 1 + .../application/wechatPublic/index.d.ts | 1 + lib/components/config/style/index.d.ts | 1 + .../config/upsert/account/index.d.ts | 1 + lib/components/config/upsert/cos/index.d.ts | 1 + lib/components/config/upsert/live/index.d.ts | 1 + lib/components/config/upsert/map/index.d.ts | 1 + lib/components/config/upsert/sms/index.d.ts | 1 + lib/components/config/upsert/web.pc.d.ts | 1 + lib/components/extraFile/avatar/web.d.ts | 1 + lib/components/extraFile/display/web.d.ts | 1 + lib/components/extraFile/gallery/web.d.ts | 1 + lib/components/func/actionPanel/web.d.ts | 1 + lib/components/func/debugPanel/web.d.ts | 1 + lib/components/icon-font-awesome/web.d.ts | 1 + lib/components/message/cell/web.d.ts | 1 + lib/components/message/cellButton/web.d.ts | 1 + lib/components/message/web.d.ts | 1 + .../messageTypeTemplateId/list/web.pc.d.ts | 1 + lib/components/my/avatar/web.d.ts | 1 + lib/components/my/info/web.d.ts | 1 + lib/components/my/info/web.pc.d.ts | 1 + .../userEntityGrant/cellButton/web.d.ts | 1 + lib/entities/Station.d.ts | 7 + lib/entities/Station.js | 11 ++ lib/entities/Subway.d.ts | 7 + lib/entities/Subway.js | 11 ++ lib/entities/SubwayStation.d.ts | 7 + lib/entities/SubwayStation.js | 11 ++ lib/general-app-domain/Area/Schema.d.ts | 22 +++ lib/general-app-domain/EntityDict.d.ts | 14 ++ lib/general-app-domain/Station/Schema.d.ts | 115 +++++++++++++ lib/general-app-domain/Station/Schema.js | 2 + lib/general-app-domain/Station/Storage.d.ts | 3 + lib/general-app-domain/Station/Storage.js | 22 +++ .../Station/locales/zh_CN.json | 1 + lib/general-app-domain/Storage.js | 142 ++++++++-------- lib/general-app-domain/Subway/Schema.d.ts | 115 +++++++++++++ lib/general-app-domain/Subway/Schema.js | 2 + lib/general-app-domain/Subway/Storage.d.ts | 3 + lib/general-app-domain/Subway/Storage.js | 22 +++ .../Subway/locales/zh_CN.json | 1 + .../SubwayStation/Schema.d.ts | 152 ++++++++++++++++++ .../SubwayStation/Schema.js | 2 + .../SubwayStation/Storage.d.ts | 3 + .../SubwayStation/Storage.js | 20 +++ .../SubwayStation/locales/zh_CN.json | 1 + lib/general-app-domain/User/Schema.d.ts | 11 ++ lib/general-app-domain/_SubQuery.d.ts | 58 +++++++ lib/pages/address/list/web.d.ts | 1 + lib/pages/address/upsert/web.d.ts | 1 + .../application/config/upsert/web.pc.d.ts | 1 + lib/pages/application/detail/web.d.ts | 1 + lib/pages/application/list/web.pc.d.ts | 1 + lib/pages/application/upsert/web.pc.d.ts | 1 + lib/pages/article/detail/web.d.ts | 1 + lib/pages/article/list/web.d.ts | 1 + lib/pages/article/preview/web.d.ts | 1 + lib/pages/article/upsert/web.d.ts | 1 + lib/pages/domain/detail/web.d.ts | 1 + lib/pages/domain/list/web.pc.d.ts | 1 + lib/pages/domain/upsert/web.pc.d.ts | 1 + lib/pages/icon/web.d.ts | 1 + lib/pages/login/web.d.ts | 1 + lib/pages/message/detail/web.d.ts | 1 + lib/pages/message/detail/web.pc.d.ts | 1 + lib/pages/message/drawerList/web.d.ts | 1 + lib/pages/message/list/web.d.ts | 1 + lib/pages/message/list/web.pc.d.ts | 1 + lib/pages/mobile/login/web.d.ts | 1 + lib/pages/mobile/login/web.pc.d.ts | 1 + lib/pages/mobile/me/web.d.ts | 1 + lib/pages/mobile/me/web.pc.d.ts | 1 + lib/pages/personal/web.d.ts | 1 + lib/pages/personal/web.pc.d.ts | 1 + lib/pages/pickers/area/web.d.ts | 1 + lib/pages/platform/config/upsert/web.pc.d.ts | 1 + lib/pages/platform/detail/web.d.ts | 1 + lib/pages/platform/list/web.pc.d.ts | 1 + lib/pages/platform/upsert/web.pc.d.ts | 1 + lib/pages/setting/web.d.ts | 1 + lib/pages/setting/web.pc.d.ts | 1 + .../subscription/config/upsert/web.pc.d.ts | 1 + lib/pages/subscription/detail/web.d.ts | 1 + lib/pages/subscription/list/web.pc.d.ts | 1 + lib/pages/subscription/upsert/web.pc.d.ts | 1 + lib/pages/system/config/upsert/web.pc.d.ts | 1 + lib/pages/system/detail/web.d.ts | 1 + lib/pages/system/list/web.pc.d.ts | 1 + lib/pages/system/upsert/web.pc.d.ts | 1 + lib/pages/token/me/web.d.ts | 1 + lib/pages/user/info/web.d.ts | 1 + lib/pages/user/info/web.pc.d.ts | 1 + lib/pages/user/manage/detail/web.d.ts | 1 + lib/pages/user/manage/upsert/web.d.ts | 1 + lib/pages/user/manage/web.d.ts | 1 + lib/pages/user/manage/web.pc.d.ts | 1 + lib/pages/user/search/web.d.ts | 1 + lib/pages/userEntityGrant/confirm/web.d.ts | 1 + lib/pages/userEntityGrant/detail/web.d.ts | 1 + lib/pages/userEntityGrant/detail/web.pc.d.ts | 1 + lib/pages/userEntityGrant/grant/web.d.ts | 1 + lib/pages/userEntityGrant/list/web.d.ts | 1 + lib/pages/userRelation/list/web.d.ts | 1 + lib/pages/userRelation/list/web.pc.d.ts | 1 + lib/pages/userRelation/manage/web.d.ts | 1 + lib/pages/userRelation/onEntity/web.d.ts | 1 + .../userRelation/upsert/byMobile/web.pc.d.ts | 1 + .../userRelation/upsert/byUser/web.pc.d.ts | 1 + .../upsert/byUserEntityGrant/web.d.ts | 1 + .../upsert/byUserEntityGrant/web.pc.d.ts | 1 + .../upsert/onUser/userRelation/web.pc.d.ts | 1 + lib/pages/userRelation/upsert/onUser/web.d.ts | 1 + .../userRelation/upsert/onUser/web.pc.d.ts | 1 + lib/pages/userRelation/upsert/web.d.ts | 1 + lib/pages/userRelation/upsert/web.pc.d.ts | 1 + lib/pages/wechatPublic/tag/list/web.pc.d.ts | 1 + lib/pages/wechatPublic/tag/upsert/web.d.ts | 1 + lib/pages/wechatQrCode/scan/web.d.ts | 1 + lib/pages/wechatUser/login/web.d.ts | 1 + src/entities/Station.ts | 19 +++ src/entities/Subway.ts | 19 +++ src/entities/SubwayStation.ts | 20 +++ 127 files changed, 857 insertions(+), 64 deletions(-) create mode 100644 lib/entities/Station.d.ts create mode 100644 lib/entities/Station.js create mode 100644 lib/entities/Subway.d.ts create mode 100644 lib/entities/Subway.js create mode 100644 lib/entities/SubwayStation.d.ts create mode 100644 lib/entities/SubwayStation.js create mode 100644 lib/general-app-domain/Station/Schema.d.ts create mode 100644 lib/general-app-domain/Station/Schema.js create mode 100644 lib/general-app-domain/Station/Storage.d.ts create mode 100644 lib/general-app-domain/Station/Storage.js create mode 100644 lib/general-app-domain/Station/locales/zh_CN.json create mode 100644 lib/general-app-domain/Subway/Schema.d.ts create mode 100644 lib/general-app-domain/Subway/Schema.js create mode 100644 lib/general-app-domain/Subway/Storage.d.ts create mode 100644 lib/general-app-domain/Subway/Storage.js create mode 100644 lib/general-app-domain/Subway/locales/zh_CN.json create mode 100644 lib/general-app-domain/SubwayStation/Schema.d.ts create mode 100644 lib/general-app-domain/SubwayStation/Schema.js create mode 100644 lib/general-app-domain/SubwayStation/Storage.d.ts create mode 100644 lib/general-app-domain/SubwayStation/Storage.js create mode 100644 lib/general-app-domain/SubwayStation/locales/zh_CN.json create mode 100644 src/entities/Station.ts create mode 100644 src/entities/Subway.ts create mode 100644 src/entities/SubwayStation.ts diff --git a/lib/components/common/empty/empty.d.ts b/lib/components/common/empty/empty.d.ts index 5ad33b8bc..a67bcf109 100644 --- a/lib/components/common/empty/empty.d.ts +++ b/lib/components/common/empty/empty.d.ts @@ -1,3 +1,4 @@ +/// import './index.less'; declare const Empty: () => JSX.Element; export default Empty; diff --git a/lib/components/common/empty/simple.d.ts b/lib/components/common/empty/simple.d.ts index 5ad33b8bc..a67bcf109 100644 --- a/lib/components/common/empty/simple.d.ts +++ b/lib/components/common/empty/simple.d.ts @@ -1,3 +1,4 @@ +/// import './index.less'; declare const Empty: () => JSX.Element; export default Empty; diff --git a/lib/components/config/application/web.pc.d.ts b/lib/components/config/application/web.pc.d.ts index caa53b0c0..0f8b76b9d 100644 --- a/lib/components/config/application/web.pc.d.ts +++ b/lib/components/config/application/web.pc.d.ts @@ -1,3 +1,4 @@ +/// import { AppType, WebConfig, WechatPublicConfig, WechatMpConfig } from '../../../general-app-domain/Application/Schema'; import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/components/config/application/web/index.d.ts b/lib/components/config/application/web/index.d.ts index b7f7da3d0..90b02d1c5 100644 --- a/lib/components/config/application/web/index.d.ts +++ b/lib/components/config/application/web/index.d.ts @@ -1,3 +1,4 @@ +/// import { WebConfig } from '../../../../general-app-domain/Application/Schema'; export default function Web(props: { config: WebConfig; diff --git a/lib/components/config/application/wechatMp/index.d.ts b/lib/components/config/application/wechatMp/index.d.ts index cad38df4f..e70206643 100644 --- a/lib/components/config/application/wechatMp/index.d.ts +++ b/lib/components/config/application/wechatMp/index.d.ts @@ -1,3 +1,4 @@ +/// import { WechatMpConfig } from '../../../../general-app-domain/Application/Schema'; export default function WechatMp(props: { config: WechatMpConfig; diff --git a/lib/components/config/application/wechatPublic/index.d.ts b/lib/components/config/application/wechatPublic/index.d.ts index 10f5a622e..9b75714ca 100644 --- a/lib/components/config/application/wechatPublic/index.d.ts +++ b/lib/components/config/application/wechatPublic/index.d.ts @@ -1,3 +1,4 @@ +/// import { WechatPublicConfig } from '../../../../general-app-domain/Application/Schema'; export default function WechatPublic(props: { isService?: boolean; diff --git a/lib/components/config/style/index.d.ts b/lib/components/config/style/index.d.ts index 2469d4262..e94804fd5 100644 --- a/lib/components/config/style/index.d.ts +++ b/lib/components/config/style/index.d.ts @@ -1,3 +1,4 @@ +/// import { Style as StyleType } from '../../../types/Style'; declare type StyleProps = { value?: StyleType | null; diff --git a/lib/components/config/upsert/account/index.d.ts b/lib/components/config/upsert/account/index.d.ts index d12966ca5..ed8ae19c5 100644 --- a/lib/components/config/upsert/account/index.d.ts +++ b/lib/components/config/upsert/account/index.d.ts @@ -1,3 +1,4 @@ +/// import { Config } from '../../../../types/Config'; export default function Account(props: { account: Required['Account']; diff --git a/lib/components/config/upsert/cos/index.d.ts b/lib/components/config/upsert/cos/index.d.ts index e597fb133..1be008bf7 100644 --- a/lib/components/config/upsert/cos/index.d.ts +++ b/lib/components/config/upsert/cos/index.d.ts @@ -1,3 +1,4 @@ +/// import { Config } from '../../../../types/Config'; export default function Cos(props: { cos: Required['Cos']; diff --git a/lib/components/config/upsert/live/index.d.ts b/lib/components/config/upsert/live/index.d.ts index e6e06424f..35e0ce993 100644 --- a/lib/components/config/upsert/live/index.d.ts +++ b/lib/components/config/upsert/live/index.d.ts @@ -1,3 +1,4 @@ +/// import { Config } from '../../../../types/Config'; export default function Cos(props: { live: Required['Live']; diff --git a/lib/components/config/upsert/map/index.d.ts b/lib/components/config/upsert/map/index.d.ts index 84db02c1b..7b865bc39 100644 --- a/lib/components/config/upsert/map/index.d.ts +++ b/lib/components/config/upsert/map/index.d.ts @@ -1,3 +1,4 @@ +/// import { Config } from '../../../../types/Config'; export default function Cos(props: { map: Required['Map']; diff --git a/lib/components/config/upsert/sms/index.d.ts b/lib/components/config/upsert/sms/index.d.ts index 56f0dd17c..2aaa74d6e 100644 --- a/lib/components/config/upsert/sms/index.d.ts +++ b/lib/components/config/upsert/sms/index.d.ts @@ -1,3 +1,4 @@ +/// import { Config } from '../../../../types/Config'; export default function Sms(props: { sms: Required['Sms']; diff --git a/lib/components/config/upsert/web.pc.d.ts b/lib/components/config/upsert/web.pc.d.ts index f99cb9476..197ed9171 100644 --- a/lib/components/config/upsert/web.pc.d.ts +++ b/lib/components/config/upsert/web.pc.d.ts @@ -1,3 +1,4 @@ +/// import { Config } from '../../../types/Config'; import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/components/extraFile/avatar/web.d.ts b/lib/components/extraFile/avatar/web.d.ts index ca5e1fe55..d49017b39 100644 --- a/lib/components/extraFile/avatar/web.d.ts +++ b/lib/components/extraFile/avatar/web.d.ts @@ -1,3 +1,4 @@ +/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function render(props: WebComponentProps export default function render(): JSX.Element; diff --git a/lib/components/extraFile/gallery/web.d.ts b/lib/components/extraFile/gallery/web.d.ts index 42bf82c1a..f4898ce78 100644 --- a/lib/components/extraFile/gallery/web.d.ts +++ b/lib/components/extraFile/gallery/web.d.ts @@ -1,3 +1,4 @@ +/// import { UploadFile } from 'antd'; import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; diff --git a/lib/components/func/actionPanel/web.d.ts b/lib/components/func/actionPanel/web.d.ts index 2ae338d31..bdf44b412 100644 --- a/lib/components/func/actionPanel/web.d.ts +++ b/lib/components/func/actionPanel/web.d.ts @@ -1,3 +1,4 @@ +/// import { WebComponentProps } from "oak-frontend-base"; import { EntityDict } from "../../../general-app-domain"; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../general-app-domain'; import './web.less'; diff --git a/lib/components/message/cell/web.d.ts b/lib/components/message/cell/web.d.ts index c68480d63..d1b04a151 100644 --- a/lib/components/message/cell/web.d.ts +++ b/lib/components/message/cell/web.d.ts @@ -1,3 +1,4 @@ +/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { MessageProps } from 'oak-frontend-base/lib/types/Message'; export default function render(props: { data: { diff --git a/lib/components/messageTypeTemplateId/list/web.pc.d.ts b/lib/components/messageTypeTemplateId/list/web.pc.d.ts index c7178a149..4befd5137 100644 --- a/lib/components/messageTypeTemplateId/list/web.pc.d.ts +++ b/lib/components/messageTypeTemplateId/list/web.pc.d.ts @@ -1,3 +1,4 @@ +/// import { WebComponentProps } from "oak-frontend-base"; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; import { AvatarSize } from 'antd/es/avatar/SizeContext'; diff --git a/lib/components/my/info/web.d.ts b/lib/components/my/info/web.d.ts index 3c17f3482..2f8cdb25f 100644 --- a/lib/components/my/info/web.d.ts +++ b/lib/components/my/info/web.d.ts @@ -1,3 +1,4 @@ +/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps; + area: Area; +} diff --git a/lib/entities/Station.js b/lib/entities/Station.js new file mode 100644 index 000000000..60673bf64 --- /dev/null +++ b/lib/entities/Station.js @@ -0,0 +1,11 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var locale = { + zh_CN: { + name: "站点", + attr: { + name: "站点名", + area: "城市", + }, + }, +}; diff --git a/lib/entities/Subway.d.ts b/lib/entities/Subway.d.ts new file mode 100644 index 000000000..34b407757 --- /dev/null +++ b/lib/entities/Subway.d.ts @@ -0,0 +1,7 @@ +import { String } from "oak-domain/lib/types/DataType"; +import { EntityShape } from "oak-domain/lib/types/Entity"; +import { Schema as Area } from "./Area"; +export interface Schema extends EntityShape { + name: String<32>; + area: Area; +} diff --git a/lib/entities/Subway.js b/lib/entities/Subway.js new file mode 100644 index 000000000..240a10fda --- /dev/null +++ b/lib/entities/Subway.js @@ -0,0 +1,11 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var locale = { + zh_CN: { + name: "地铁", + attr: { + name: "线路", + area: "城市", + }, + }, +}; diff --git a/lib/entities/SubwayStation.d.ts b/lib/entities/SubwayStation.d.ts new file mode 100644 index 000000000..dda8fe689 --- /dev/null +++ b/lib/entities/SubwayStation.d.ts @@ -0,0 +1,7 @@ +import { EntityShape } from "oak-domain/lib/types/Entity"; +import { Schema as Subway } from "./Subway"; +import { Schema as Station } from "./Station"; +export interface Schema extends EntityShape { + station: Station; + subway: Subway; +} diff --git a/lib/entities/SubwayStation.js b/lib/entities/SubwayStation.js new file mode 100644 index 000000000..1fc98b40a --- /dev/null +++ b/lib/entities/SubwayStation.js @@ -0,0 +1,11 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var locale = { + zh_CN: { + name: "地铁站点连接表", + attr: { + station: "站点", + subway: "地铁线", + }, + }, +}; diff --git a/lib/general-app-domain/Area/Schema.d.ts b/lib/general-app-domain/Area/Schema.d.ts index 85d52e5a0..65cd9d841 100644 --- a/lib/general-app-domain/Area/Schema.d.ts +++ b/lib/general-app-domain/Area/Schema.d.ts @@ -5,6 +5,8 @@ import * as SubQuery from "../_SubQuery"; import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, EntityShape, AggregationResult } from "oak-domain/lib/types/Entity"; import { ReadOnlyAction } from "oak-domain/lib/actions/action"; import * as Address from "../Address/Schema"; +import * as Station from "../Station/Schema"; +import * as Subway from "../Subway/Schema"; export declare type OpSchema = EntityShape & { name: String<32>; level: 'province' | 'city' | 'district' | 'street' | 'country'; @@ -26,6 +28,10 @@ export declare type Schema = EntityShape & { address$area$$aggr?: AggregationResult; area$parent?: Array; area$parent$$aggr?: AggregationResult; + station$area?: Array; + station$area$$aggr?: AggregationResult; + subway$area?: Array; + subway$area$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; }; @@ -68,6 +74,18 @@ export declare type Projection = { area$parent$$aggr?: Aggregation & { $entity: "area"; }; + station$area?: Station.Selection & { + $entity: "station"; + }; + station$area$$aggr?: Station.Aggregation & { + $entity: "station"; + }; + subway$area?: Subway.Selection & { + $entity: "subway"; + }; + subway$area$$aggr?: Subway.Aggregation & { + $entity: "subway"; + }; } & Partial>; declare type AreaIdProjection = OneOf<{ id: number; @@ -110,6 +128,8 @@ export declare type CreateOperationData = FormCreateData; }) & { address$area?: OakOperation, Address.Filter> | OakOperation<"create", Omit[]> | Array> | OakOperation, Address.Filter>>; + station$area?: OakOperation, Station.Filter> | OakOperation<"create", Omit[]> | Array> | OakOperation, Station.Filter>>; + subway$area?: OakOperation, Subway.Filter> | OakOperation<"create", Omit[]> | Array> | OakOperation, Subway.Filter>>; }; export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>; export declare type CreateMultipleOperation = OakOperation<"create", Array>; @@ -120,6 +140,8 @@ export declare type UpdateOperationData = FormUpdateData[]> | Array> | Address.UpdateOperation | Address.RemoveOperation>; + station$area?: Station.UpdateOperation | Station.RemoveOperation | OakOperation<"create", Omit[]> | Array> | Station.UpdateOperation | Station.RemoveOperation>; + subway$area?: Subway.UpdateOperation | Subway.RemoveOperation | OakOperation<"create", Omit[]> | Array> | Subway.UpdateOperation | Subway.RemoveOperation>; }; export declare type UpdateOperation = OakOperation<"update" | string, UpdateOperationData, Filter, Sorter>; export declare type RemoveOperationData = {}; diff --git a/lib/general-app-domain/EntityDict.d.ts b/lib/general-app-domain/EntityDict.d.ts index 46b074533..dee81d825 100644 --- a/lib/general-app-domain/EntityDict.d.ts +++ b/lib/general-app-domain/EntityDict.d.ts @@ -1,9 +1,13 @@ +import { EntityDef as ActionAuth } from "./ActionAuth/Schema"; import { EntityDef as Modi } from "./Modi/Schema"; import { EntityDef as ModiEntity } from "./ModiEntity/Schema"; import { EntityDef as Oper } from "./Oper/Schema"; import { EntityDef as OperEntity } from "./OperEntity/Schema"; +import { EntityDef as Relation } from "./Relation/Schema"; +import { EntityDef as RelationAuth } from "./RelationAuth/Schema"; import { EntityDef as User } from "./User/Schema"; import { EntityDef as UserEntityGrant } from "./UserEntityGrant/Schema"; +import { EntityDef as UserRelation } from "./UserRelation/Schema"; import { EntityDef as Address } from "./Address/Schema"; import { EntityDef as Application } from "./Application/Schema"; import { EntityDef as Area } from "./Area/Schema"; @@ -22,7 +26,10 @@ import { EntityDef as Notification } from "./Notification/Schema"; import { EntityDef as Platform } from "./Platform/Schema"; import { EntityDef as UserRole } from "./UserRole/Schema"; import { EntityDef as Role } from "./Role/Schema"; +import { EntityDef as Station } from "./Station/Schema"; import { EntityDef as Subscription } from "./Subscription/Schema"; +import { EntityDef as Subway } from "./Subway/Schema"; +import { EntityDef as SubwayStation } from "./SubwayStation/Schema"; import { EntityDef as System } from "./System/Schema"; import { EntityDef as Token } from "./Token/Schema"; import { EntityDef as UserSystem } from "./UserSystem/Schema"; @@ -31,12 +38,16 @@ import { EntityDef as WechatPublicTag } from "./WechatPublicTag/Schema"; import { EntityDef as WechatQrCode } from "./WechatQrCode/Schema"; import { EntityDef as WechatUser } from "./WechatUser/Schema"; export declare type EntityDict = { + actionAuth: ActionAuth; modi: Modi; modiEntity: ModiEntity; oper: Oper; operEntity: OperEntity; + relation: Relation; + relationAuth: RelationAuth; user: User; userEntityGrant: UserEntityGrant; + userRelation: UserRelation; address: Address; application: Application; area: Area; @@ -55,7 +66,10 @@ export declare type EntityDict = { platform: Platform; userRole: UserRole; role: Role; + station: Station; subscription: Subscription; + subway: Subway; + subwayStation: SubwayStation; system: System; token: Token; userSystem: UserSystem; diff --git a/lib/general-app-domain/Station/Schema.d.ts b/lib/general-app-domain/Station/Schema.d.ts new file mode 100644 index 000000000..f9c3f909b --- /dev/null +++ b/lib/general-app-domain/Station/Schema.d.ts @@ -0,0 +1,115 @@ +import { String, ForeignKey } from "oak-domain/lib/types/DataType"; +import { Q_DateValue, Q_StringValue, NodeId, MakeFilter, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; +import { OneOf } from "oak-domain/lib/types/Polyfill"; +import * as SubQuery from "../_SubQuery"; +import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, EntityShape, AggregationResult } from "oak-domain/lib/types/Entity"; +import { GenericAction } from "oak-domain/lib/actions/action"; +import * as Area from "../Area/Schema"; +import * as SubwayStation from "../SubwayStation/Schema"; +export declare type OpSchema = EntityShape & { + name: String<32>; + areaId: ForeignKey<"area">; +}; +export declare type OpAttr = keyof OpSchema; +export declare type Schema = EntityShape & { + name: String<32>; + areaId: ForeignKey<"area">; + area: Area.Schema; + subwayStation$station?: Array; + subwayStation$station$$aggr?: AggregationResult; +} & { + [A in ExpressionKey]?: any; +}; +declare type AttrFilter = { + id: Q_StringValue | SubQuery.StationIdSubQuery; + $$createAt$$: Q_DateValue; + $$seq$$: Q_StringValue; + $$updateAt$$: Q_DateValue; + name: Q_StringValue; + areaId: Q_StringValue | SubQuery.AreaIdSubQuery; + area: Area.Filter; +}; +export declare type Filter = MakeFilter>; +export declare type Projection = { + "#id"?: NodeId; + [k: string]: any; + id?: number; + $$createAt$$?: number; + $$updateAt$$?: number; + $$seq$$?: number; + name?: number; + areaId?: number; + area?: Area.Projection; + subwayStation$station?: SubwayStation.Selection & { + $entity: "subwayStation"; + }; + subwayStation$station$$aggr?: SubwayStation.Aggregation & { + $entity: "subwayStation"; + }; +} & Partial>; +declare type StationIdProjection = OneOf<{ + id: number; +}>; +declare type AreaIdProjection = OneOf<{ + areaId: number; +}>; +export declare type SortAttr = { + id: number; +} | { + $$createAt$$: number; +} | { + $$seq$$: number; +} | { + $$updateAt$$: number; +} | { + name: number; +} | { + areaId: number; +} | { + area: Area.SortAttr; +} | { + [k: string]: any; +} | OneOf>; +export declare type SortNode = { + $attr: SortAttr; + $direction?: "asc" | "desc"; +}; +export declare type Sorter = SortNode[]; +export declare type SelectOperation

= OakSelection<"select", P, Filter, Sorter>; +export declare type Selection

= Omit, "action">; +export declare type Aggregation = DeduceAggregation; +export declare type CreateOperationData = FormCreateData> & ({ + areaId: String<64>; +}) & { + subwayStation$station?: OakOperation, SubwayStation.Filter> | OakOperation<"create", Omit[]> | Array> | OakOperation, SubwayStation.Filter>>; +}; +export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>; +export declare type CreateMultipleOperation = OakOperation<"create", Array>; +export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation; +export declare type UpdateOperationData = FormUpdateData> & ({ + area?: never; + areaId?: String<64> | null; +}) & { + [k: string]: any; + subwayStation$station?: SubwayStation.UpdateOperation | SubwayStation.RemoveOperation | OakOperation<"create", Omit[]> | Array> | SubwayStation.UpdateOperation | SubwayStation.RemoveOperation>; +}; +export declare type UpdateOperation = OakOperation<"update" | string, UpdateOperationData, Filter, Sorter>; +export declare type RemoveOperationData = {}; +export declare type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>; +export declare type Operation = CreateOperation | UpdateOperation | RemoveOperation; +export declare type AreaIdSubQuery = Selection; +export declare type StationIdSubQuery = Selection; +export declare type EntityDef = { + Schema: Schema; + OpSchema: OpSchema; + Action: OakMakeAction | string; + Selection: Selection; + Aggregation: Aggregation; + Operation: Operation; + Create: CreateOperation; + Update: UpdateOperation; + Remove: RemoveOperation; + CreateSingle: CreateSingleOperation; + CreateMulti: CreateMultipleOperation; +}; +export {}; diff --git a/lib/general-app-domain/Station/Schema.js b/lib/general-app-domain/Station/Schema.js new file mode 100644 index 000000000..c8ad2e549 --- /dev/null +++ b/lib/general-app-domain/Station/Schema.js @@ -0,0 +1,2 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/lib/general-app-domain/Station/Storage.d.ts b/lib/general-app-domain/Station/Storage.d.ts new file mode 100644 index 000000000..a3f0fbbb0 --- /dev/null +++ b/lib/general-app-domain/Station/Storage.d.ts @@ -0,0 +1,3 @@ +import { StorageDesc } from "oak-domain/lib/types/Storage"; +import { OpSchema } from "./Schema"; +export declare const desc: StorageDesc; diff --git a/lib/general-app-domain/Station/Storage.js b/lib/general-app-domain/Station/Storage.js new file mode 100644 index 000000000..41b950842 --- /dev/null +++ b/lib/general-app-domain/Station/Storage.js @@ -0,0 +1,22 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.desc = void 0; +var action_1 = require("oak-domain/lib/actions/action"); +exports.desc = { + attributes: { + name: { + notNull: true, + type: "varchar", + params: { + length: 32 + } + }, + areaId: { + notNull: true, + type: "ref", + ref: "area" + } + }, + actionType: "crud", + actions: action_1.genericActions +}; diff --git a/lib/general-app-domain/Station/locales/zh_CN.json b/lib/general-app-domain/Station/locales/zh_CN.json new file mode 100644 index 000000000..664136c95 --- /dev/null +++ b/lib/general-app-domain/Station/locales/zh_CN.json @@ -0,0 +1 @@ +{ "name": "站点", "attr": { "name": "站点名", "area": "城市" } } diff --git a/lib/general-app-domain/Storage.js b/lib/general-app-domain/Storage.js index da6feb3e1..2a823f295 100644 --- a/lib/general-app-domain/Storage.js +++ b/lib/general-app-domain/Storage.js @@ -1,69 +1,83 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.storageSchema = void 0; -var Storage_1 = require("./Modi/Storage"); -var Storage_2 = require("./ModiEntity/Storage"); -var Storage_3 = require("./Oper/Storage"); -var Storage_4 = require("./OperEntity/Storage"); -var Storage_5 = require("./User/Storage"); -var Storage_6 = require("./UserEntityGrant/Storage"); -var Storage_7 = require("./Address/Storage"); -var Storage_8 = require("./Application/Storage"); -var Storage_9 = require("./Area/Storage"); -var Storage_10 = require("./Article/Storage"); -var Storage_11 = require("./Captcha/Storage"); -var Storage_12 = require("./Domain/Storage"); -var Storage_13 = require("./Email/Storage"); -var Storage_14 = require("./ExtraFile/Storage"); -var Storage_15 = require("./Livestream/Storage"); -var Storage_16 = require("./Message/Storage"); -var Storage_17 = require("./MessageSystem/Storage"); -var Storage_18 = require("./MessageType/Storage"); -var Storage_19 = require("./MessageTypeTemplateId/Storage"); -var Storage_20 = require("./Mobile/Storage"); -var Storage_21 = require("./Notification/Storage"); -var Storage_22 = require("./Platform/Storage"); -var Storage_23 = require("./UserRole/Storage"); -var Storage_24 = require("./Role/Storage"); -var Storage_25 = require("./Subscription/Storage"); -var Storage_26 = require("./System/Storage"); -var Storage_27 = require("./Token/Storage"); -var Storage_28 = require("./UserSystem/Storage"); -var Storage_29 = require("./UserWechatPublicTag/Storage"); -var Storage_30 = require("./WechatPublicTag/Storage"); -var Storage_31 = require("./WechatQrCode/Storage"); -var Storage_32 = require("./WechatUser/Storage"); +var Storage_1 = require("./ActionAuth/Storage"); +var Storage_2 = require("./Modi/Storage"); +var Storage_3 = require("./ModiEntity/Storage"); +var Storage_4 = require("./Oper/Storage"); +var Storage_5 = require("./OperEntity/Storage"); +var Storage_6 = require("./Relation/Storage"); +var Storage_7 = require("./RelationAuth/Storage"); +var Storage_8 = require("./User/Storage"); +var Storage_9 = require("./UserEntityGrant/Storage"); +var Storage_10 = require("./UserRelation/Storage"); +var Storage_11 = require("./Address/Storage"); +var Storage_12 = require("./Application/Storage"); +var Storage_13 = require("./Area/Storage"); +var Storage_14 = require("./Article/Storage"); +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("./UserRole/Storage"); +var Storage_28 = require("./Role/Storage"); +var Storage_29 = require("./Station/Storage"); +var Storage_30 = require("./Subscription/Storage"); +var Storage_31 = require("./Subway/Storage"); +var Storage_32 = require("./SubwayStation/Storage"); +var Storage_33 = require("./System/Storage"); +var Storage_34 = require("./Token/Storage"); +var Storage_35 = require("./UserSystem/Storage"); +var Storage_36 = require("./UserWechatPublicTag/Storage"); +var Storage_37 = require("./WechatPublicTag/Storage"); +var Storage_38 = require("./WechatQrCode/Storage"); +var Storage_39 = require("./WechatUser/Storage"); exports.storageSchema = { - modi: Storage_1.desc, - modiEntity: Storage_2.desc, - oper: Storage_3.desc, - operEntity: Storage_4.desc, - user: Storage_5.desc, - userEntityGrant: Storage_6.desc, - address: Storage_7.desc, - application: Storage_8.desc, - area: Storage_9.desc, - article: Storage_10.desc, - captcha: Storage_11.desc, - domain: Storage_12.desc, - email: Storage_13.desc, - extraFile: Storage_14.desc, - livestream: Storage_15.desc, - message: Storage_16.desc, - messageSystem: Storage_17.desc, - messageType: Storage_18.desc, - messageTypeTemplateId: Storage_19.desc, - mobile: Storage_20.desc, - notification: Storage_21.desc, - platform: Storage_22.desc, - userRole: Storage_23.desc, - role: Storage_24.desc, - subscription: Storage_25.desc, - system: Storage_26.desc, - token: Storage_27.desc, - userSystem: Storage_28.desc, - userWechatPublicTag: Storage_29.desc, - wechatPublicTag: Storage_30.desc, - wechatQrCode: Storage_31.desc, - wechatUser: Storage_32.desc + actionAuth: Storage_1.desc, + modi: Storage_2.desc, + modiEntity: Storage_3.desc, + oper: Storage_4.desc, + operEntity: Storage_5.desc, + relation: Storage_6.desc, + relationAuth: Storage_7.desc, + user: Storage_8.desc, + userEntityGrant: Storage_9.desc, + userRelation: Storage_10.desc, + address: Storage_11.desc, + application: Storage_12.desc, + area: Storage_13.desc, + article: Storage_14.desc, + 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, + userRole: Storage_27.desc, + role: Storage_28.desc, + station: Storage_29.desc, + subscription: Storage_30.desc, + subway: Storage_31.desc, + subwayStation: Storage_32.desc, + system: Storage_33.desc, + token: Storage_34.desc, + userSystem: Storage_35.desc, + userWechatPublicTag: Storage_36.desc, + wechatPublicTag: Storage_37.desc, + wechatQrCode: Storage_38.desc, + wechatUser: Storage_39.desc }; diff --git a/lib/general-app-domain/Subway/Schema.d.ts b/lib/general-app-domain/Subway/Schema.d.ts new file mode 100644 index 000000000..e1856e1d3 --- /dev/null +++ b/lib/general-app-domain/Subway/Schema.d.ts @@ -0,0 +1,115 @@ +import { String, ForeignKey } from "oak-domain/lib/types/DataType"; +import { Q_DateValue, Q_StringValue, NodeId, MakeFilter, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; +import { OneOf } from "oak-domain/lib/types/Polyfill"; +import * as SubQuery from "../_SubQuery"; +import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, EntityShape, AggregationResult } from "oak-domain/lib/types/Entity"; +import { GenericAction } from "oak-domain/lib/actions/action"; +import * as Area from "../Area/Schema"; +import * as SubwayStation from "../SubwayStation/Schema"; +export declare type OpSchema = EntityShape & { + name: String<32>; + areaId: ForeignKey<"area">; +}; +export declare type OpAttr = keyof OpSchema; +export declare type Schema = EntityShape & { + name: String<32>; + areaId: ForeignKey<"area">; + area: Area.Schema; + subwayStation$subway?: Array; + subwayStation$subway$$aggr?: AggregationResult; +} & { + [A in ExpressionKey]?: any; +}; +declare type AttrFilter = { + id: Q_StringValue | SubQuery.SubwayIdSubQuery; + $$createAt$$: Q_DateValue; + $$seq$$: Q_StringValue; + $$updateAt$$: Q_DateValue; + name: Q_StringValue; + areaId: Q_StringValue | SubQuery.AreaIdSubQuery; + area: Area.Filter; +}; +export declare type Filter = MakeFilter>; +export declare type Projection = { + "#id"?: NodeId; + [k: string]: any; + id?: number; + $$createAt$$?: number; + $$updateAt$$?: number; + $$seq$$?: number; + name?: number; + areaId?: number; + area?: Area.Projection; + subwayStation$subway?: SubwayStation.Selection & { + $entity: "subwayStation"; + }; + subwayStation$subway$$aggr?: SubwayStation.Aggregation & { + $entity: "subwayStation"; + }; +} & Partial>; +declare type SubwayIdProjection = OneOf<{ + id: number; +}>; +declare type AreaIdProjection = OneOf<{ + areaId: number; +}>; +export declare type SortAttr = { + id: number; +} | { + $$createAt$$: number; +} | { + $$seq$$: number; +} | { + $$updateAt$$: number; +} | { + name: number; +} | { + areaId: number; +} | { + area: Area.SortAttr; +} | { + [k: string]: any; +} | OneOf>; +export declare type SortNode = { + $attr: SortAttr; + $direction?: "asc" | "desc"; +}; +export declare type Sorter = SortNode[]; +export declare type SelectOperation

= OakSelection<"select", P, Filter, Sorter>; +export declare type Selection

= Omit, "action">; +export declare type Aggregation = DeduceAggregation; +export declare type CreateOperationData = FormCreateData> & ({ + areaId: String<64>; +}) & { + subwayStation$subway?: OakOperation, SubwayStation.Filter> | OakOperation<"create", Omit[]> | Array> | OakOperation, SubwayStation.Filter>>; +}; +export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>; +export declare type CreateMultipleOperation = OakOperation<"create", Array>; +export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation; +export declare type UpdateOperationData = FormUpdateData> & ({ + area?: never; + areaId?: String<64> | null; +}) & { + [k: string]: any; + subwayStation$subway?: SubwayStation.UpdateOperation | SubwayStation.RemoveOperation | OakOperation<"create", Omit[]> | Array> | SubwayStation.UpdateOperation | SubwayStation.RemoveOperation>; +}; +export declare type UpdateOperation = OakOperation<"update" | string, UpdateOperationData, Filter, Sorter>; +export declare type RemoveOperationData = {}; +export declare type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>; +export declare type Operation = CreateOperation | UpdateOperation | RemoveOperation; +export declare type AreaIdSubQuery = Selection; +export declare type SubwayIdSubQuery = Selection; +export declare type EntityDef = { + Schema: Schema; + OpSchema: OpSchema; + Action: OakMakeAction | string; + Selection: Selection; + Aggregation: Aggregation; + Operation: Operation; + Create: CreateOperation; + Update: UpdateOperation; + Remove: RemoveOperation; + CreateSingle: CreateSingleOperation; + CreateMulti: CreateMultipleOperation; +}; +export {}; diff --git a/lib/general-app-domain/Subway/Schema.js b/lib/general-app-domain/Subway/Schema.js new file mode 100644 index 000000000..c8ad2e549 --- /dev/null +++ b/lib/general-app-domain/Subway/Schema.js @@ -0,0 +1,2 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/lib/general-app-domain/Subway/Storage.d.ts b/lib/general-app-domain/Subway/Storage.d.ts new file mode 100644 index 000000000..a3f0fbbb0 --- /dev/null +++ b/lib/general-app-domain/Subway/Storage.d.ts @@ -0,0 +1,3 @@ +import { StorageDesc } from "oak-domain/lib/types/Storage"; +import { OpSchema } from "./Schema"; +export declare const desc: StorageDesc; diff --git a/lib/general-app-domain/Subway/Storage.js b/lib/general-app-domain/Subway/Storage.js new file mode 100644 index 000000000..41b950842 --- /dev/null +++ b/lib/general-app-domain/Subway/Storage.js @@ -0,0 +1,22 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.desc = void 0; +var action_1 = require("oak-domain/lib/actions/action"); +exports.desc = { + attributes: { + name: { + notNull: true, + type: "varchar", + params: { + length: 32 + } + }, + areaId: { + notNull: true, + type: "ref", + ref: "area" + } + }, + actionType: "crud", + actions: action_1.genericActions +}; diff --git a/lib/general-app-domain/Subway/locales/zh_CN.json b/lib/general-app-domain/Subway/locales/zh_CN.json new file mode 100644 index 000000000..b1d24dc92 --- /dev/null +++ b/lib/general-app-domain/Subway/locales/zh_CN.json @@ -0,0 +1 @@ +{ "name": "地铁", "attr": { "name": "线路", "area": "城市" } } diff --git a/lib/general-app-domain/SubwayStation/Schema.d.ts b/lib/general-app-domain/SubwayStation/Schema.d.ts new file mode 100644 index 000000000..f233839b0 --- /dev/null +++ b/lib/general-app-domain/SubwayStation/Schema.d.ts @@ -0,0 +1,152 @@ +import { String, ForeignKey } from "oak-domain/lib/types/DataType"; +import { Q_DateValue, Q_StringValue, NodeId, MakeFilter, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; +import { OneOf } from "oak-domain/lib/types/Polyfill"; +import * as SubQuery from "../_SubQuery"; +import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; +import { GenericAction } from "oak-domain/lib/actions/action"; +import * as Station from "../Station/Schema"; +import * as Subway from "../Subway/Schema"; +export declare type OpSchema = EntityShape & { + stationId: ForeignKey<"station">; + subwayId: ForeignKey<"subway">; +}; +export declare type OpAttr = keyof OpSchema; +export declare type Schema = EntityShape & { + stationId: ForeignKey<"station">; + subwayId: ForeignKey<"subway">; + station: Station.Schema; + subway: Subway.Schema; +} & { + [A in ExpressionKey]?: any; +}; +declare type AttrFilter = { + id: Q_StringValue | SubQuery.SubwayStationIdSubQuery; + $$createAt$$: Q_DateValue; + $$seq$$: Q_StringValue; + $$updateAt$$: Q_DateValue; + stationId: Q_StringValue | SubQuery.StationIdSubQuery; + station: Station.Filter; + subwayId: Q_StringValue | SubQuery.SubwayIdSubQuery; + subway: Subway.Filter; +}; +export declare type Filter = MakeFilter>; +export declare type Projection = { + "#id"?: NodeId; + [k: string]: any; + id?: number; + $$createAt$$?: number; + $$updateAt$$?: number; + $$seq$$?: number; + stationId?: number; + station?: Station.Projection; + subwayId?: number; + subway?: Subway.Projection; +} & Partial>; +declare type SubwayStationIdProjection = OneOf<{ + id: number; +}>; +declare type StationIdProjection = OneOf<{ + stationId: number; +}>; +declare type SubwayIdProjection = OneOf<{ + subwayId: number; +}>; +export declare type SortAttr = { + id: number; +} | { + $$createAt$$: number; +} | { + $$seq$$: number; +} | { + $$updateAt$$: number; +} | { + stationId: number; +} | { + station: Station.SortAttr; +} | { + subwayId: number; +} | { + subway: Subway.SortAttr; +} | { + [k: string]: any; +} | OneOf>; +export declare type SortNode = { + $attr: SortAttr; + $direction?: "asc" | "desc"; +}; +export declare type Sorter = SortNode[]; +export declare type SelectOperation

= OakSelection<"select", P, Filter, Sorter>; +export declare type Selection

= Omit, "action">; +export declare type Aggregation = DeduceAggregation; +export declare type CreateOperationData = FormCreateData> & (({ + stationId?: never; + station: Station.CreateSingleOperation; +} | { + stationId: String<64>; + station?: Station.UpdateOperation; +} | { + stationId: String<64>; +}) & ({ + subwayId?: never; + subway: Subway.CreateSingleOperation; +} | { + subwayId: String<64>; + subway?: Subway.UpdateOperation; +} | { + subwayId: String<64>; +})); +export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>; +export declare type CreateMultipleOperation = OakOperation<"create", Array>; +export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation; +export declare type UpdateOperationData = FormUpdateData> & (({ + station: Station.CreateSingleOperation; + stationId?: never; +} | { + station: Station.UpdateOperation; + stationId?: never; +} | { + station: Station.RemoveOperation; + stationId?: never; +} | { + station?: never; + stationId?: String<64> | null; +}) & ({ + subway: Subway.CreateSingleOperation; + subwayId?: never; +} | { + subway: Subway.UpdateOperation; + subwayId?: never; +} | { + subway: Subway.RemoveOperation; + subwayId?: never; +} | { + subway?: never; + subwayId?: String<64> | null; +})) & { + [k: string]: any; +}; +export declare type UpdateOperation = OakOperation<"update" | string, UpdateOperationData, Filter, Sorter>; +export declare type RemoveOperationData = {} & (({ + station?: Station.UpdateOperation | Station.RemoveOperation; +}) & ({ + subway?: Subway.UpdateOperation | Subway.RemoveOperation; +})); +export declare type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>; +export declare type Operation = CreateOperation | UpdateOperation | RemoveOperation; +export declare type StationIdSubQuery = Selection; +export declare type SubwayIdSubQuery = Selection; +export declare type SubwayStationIdSubQuery = Selection; +export declare type EntityDef = { + Schema: Schema; + OpSchema: OpSchema; + Action: OakMakeAction | string; + Selection: Selection; + Aggregation: Aggregation; + Operation: Operation; + Create: CreateOperation; + Update: UpdateOperation; + Remove: RemoveOperation; + CreateSingle: CreateSingleOperation; + CreateMulti: CreateMultipleOperation; +}; +export {}; diff --git a/lib/general-app-domain/SubwayStation/Schema.js b/lib/general-app-domain/SubwayStation/Schema.js new file mode 100644 index 000000000..c8ad2e549 --- /dev/null +++ b/lib/general-app-domain/SubwayStation/Schema.js @@ -0,0 +1,2 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/lib/general-app-domain/SubwayStation/Storage.d.ts b/lib/general-app-domain/SubwayStation/Storage.d.ts new file mode 100644 index 000000000..a3f0fbbb0 --- /dev/null +++ b/lib/general-app-domain/SubwayStation/Storage.d.ts @@ -0,0 +1,3 @@ +import { StorageDesc } from "oak-domain/lib/types/Storage"; +import { OpSchema } from "./Schema"; +export declare const desc: StorageDesc; diff --git a/lib/general-app-domain/SubwayStation/Storage.js b/lib/general-app-domain/SubwayStation/Storage.js new file mode 100644 index 000000000..656b48709 --- /dev/null +++ b/lib/general-app-domain/SubwayStation/Storage.js @@ -0,0 +1,20 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.desc = void 0; +var action_1 = require("oak-domain/lib/actions/action"); +exports.desc = { + attributes: { + stationId: { + notNull: true, + type: "ref", + ref: "station" + }, + subwayId: { + notNull: true, + type: "ref", + ref: "subway" + } + }, + actionType: "crud", + actions: action_1.genericActions +}; diff --git a/lib/general-app-domain/SubwayStation/locales/zh_CN.json b/lib/general-app-domain/SubwayStation/locales/zh_CN.json new file mode 100644 index 000000000..92afdde14 --- /dev/null +++ b/lib/general-app-domain/SubwayStation/locales/zh_CN.json @@ -0,0 +1 @@ +{ "name": "地铁站点连接表", "attr": { "station": "站点", "subway": "地铁线" } } diff --git a/lib/general-app-domain/User/Schema.d.ts b/lib/general-app-domain/User/Schema.d.ts index c103ac3dc..0066d9911 100644 --- a/lib/general-app-domain/User/Schema.d.ts +++ b/lib/general-app-domain/User/Schema.d.ts @@ -6,6 +6,7 @@ import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOper import { Action, ParticularAction, UserState, IdState } from "./Action"; import { RelationAction } from "oak-domain/lib/actions/action"; import * as Oper from "../Oper/Schema"; +import * as UserRelation from "../UserRelation/Schema"; import * as Email from "../Email/Schema"; import * as Message from "../Message/Schema"; import * as Mobile from "../Mobile/Schema"; @@ -50,6 +51,8 @@ export declare type Schema = EntityShape & { oper$operator$$aggr?: AggregationResult; user$ref?: Array; user$ref$$aggr?: AggregationResult; + userRelation$user?: Array; + userRelation$user$$aggr?: AggregationResult; email$user?: Array; email$user$$aggr?: AggregationResult; message$user?: Array; @@ -133,6 +136,12 @@ export declare type Projection = { user$ref$$aggr?: Aggregation & { $entity: "user"; }; + userRelation$user?: UserRelation.Selection & { + $entity: "userRelation"; + }; + userRelation$user$$aggr?: UserRelation.Aggregation & { + $entity: "userRelation"; + }; email$user?: Email.Selection & { $entity: "email"; }; @@ -282,6 +291,7 @@ export declare type CreateOperationData = FormCreateData })) & { oper$operator?: OakOperation<"create", Omit[]> | Array>>; user$ref?: OakOperation, Filter> | OakOperation<"create", Omit[]> | Array> | OakOperation, Filter>>; + userRelation$user?: OakOperation, UserRelation.Filter> | OakOperation<"create", Omit[]> | Array> | OakOperation, UserRelation.Filter>>; email$user?: OakOperation, Email.Filter> | OakOperation<"create", Omit[]> | Array> | OakOperation, Email.Filter>>; message$user?: OakOperation, Message.Filter> | OakOperation<"create", Omit[]> | Array> | OakOperation, Message.Filter>>; mobile$user?: OakOperation, Mobile.Filter> | OakOperation<"create", Omit[]> | Array> | OakOperation, Mobile.Filter>>; @@ -317,6 +327,7 @@ export declare type UpdateOperationData = FormUpdateData [k: string]: any; oper$operator?: OakOperation<"create", Omit[]> | Array>>; user$ref?: UpdateOperation | RemoveOperation | OakOperation<"create", Omit[]> | Array> | UpdateOperation | RemoveOperation>; + userRelation$user?: UserRelation.UpdateOperation | UserRelation.RemoveOperation | OakOperation<"create", Omit[]> | Array> | UserRelation.UpdateOperation | UserRelation.RemoveOperation>; email$user?: Email.UpdateOperation | Email.RemoveOperation | OakOperation<"create", Omit[]> | Array> | Email.UpdateOperation | Email.RemoveOperation>; message$user?: Message.UpdateOperation | Message.RemoveOperation | OakOperation<"create", Omit[]> | Array> | Message.UpdateOperation | Message.RemoveOperation>; mobile$user?: Mobile.UpdateOperation | Mobile.RemoveOperation | OakOperation<"create", Omit[]> | Array> | Mobile.UpdateOperation | Mobile.RemoveOperation>; diff --git a/lib/general-app-domain/_SubQuery.d.ts b/lib/general-app-domain/_SubQuery.d.ts index 52d255b89..811374931 100644 --- a/lib/general-app-domain/_SubQuery.d.ts +++ b/lib/general-app-domain/_SubQuery.d.ts @@ -1,9 +1,13 @@ +import * as ActionAuth from "./ActionAuth/Schema"; import * as Modi from "./Modi/Schema"; import * as ModiEntity from "./ModiEntity/Schema"; import * as Oper from "./Oper/Schema"; import * as OperEntity from "./OperEntity/Schema"; +import * as Relation from "./Relation/Schema"; +import * as RelationAuth from "./RelationAuth/Schema"; import * as User from "./User/Schema"; import * as UserEntityGrant from "./UserEntityGrant/Schema"; +import * as UserRelation from "./UserRelation/Schema"; import * as Address from "./Address/Schema"; import * as Application from "./Application/Schema"; import * as Area from "./Area/Schema"; @@ -22,7 +26,10 @@ import * as Notification from "./Notification/Schema"; import * as Platform from "./Platform/Schema"; import * as UserRole from "./UserRole/Schema"; import * as Role from "./Role/Schema"; +import * as Station from "./Station/Schema"; import * as Subscription from "./Subscription/Schema"; +import * as Subway from "./Subway/Schema"; +import * as SubwayStation from "./SubwayStation/Schema"; import * as System from "./System/Schema"; import * as Token from "./Token/Schema"; import * as UserSystem from "./UserSystem/Schema"; @@ -30,6 +37,11 @@ import * as UserWechatPublicTag from "./UserWechatPublicTag/Schema"; import * as WechatPublicTag from "./WechatPublicTag/Schema"; import * as WechatQrCode from "./WechatQrCode/Schema"; import * as WechatUser from "./WechatUser/Schema"; +export declare type ActionAuthIdSubQuery = { + [K in "$in" | "$nin"]?: (ActionAuth.ActionAuthIdSubQuery & { + entity: "actionAuth"; + }) | any; +}; export declare type ModiIdSubQuery = { [K in "$in" | "$nin"]?: (ModiEntity.ModiIdSubQuery & { entity: "modiEntity"; @@ -54,11 +66,29 @@ export declare type OperEntityIdSubQuery = { entity: "operEntity"; }) | any; }; +export declare type RelationIdSubQuery = { + [K in "$in" | "$nin"]?: (ActionAuth.RelationIdSubQuery & { + entity: "actionAuth"; + }) | (RelationAuth.RelationIdSubQuery & { + entity: "relationAuth"; + }) | (UserRelation.RelationIdSubQuery & { + entity: "userRelation"; + }) | (Relation.RelationIdSubQuery & { + entity: "relation"; + }) | any; +}; +export declare type RelationAuthIdSubQuery = { + [K in "$in" | "$nin"]?: (RelationAuth.RelationAuthIdSubQuery & { + entity: "relationAuth"; + }) | any; +}; export declare type UserIdSubQuery = { [K in "$in" | "$nin"]?: (Oper.UserIdSubQuery & { entity: "oper"; }) | (User.UserIdSubQuery & { entity: "user"; + }) | (UserRelation.UserIdSubQuery & { + entity: "userRelation"; }) | (Email.UserIdSubQuery & { entity: "email"; }) | (Message.UserIdSubQuery & { @@ -86,6 +116,11 @@ export declare type UserEntityGrantIdSubQuery = { entity: "userEntityGrant"; }) | any; }; +export declare type UserRelationIdSubQuery = { + [K in "$in" | "$nin"]?: (UserRelation.UserRelationIdSubQuery & { + entity: "userRelation"; + }) | any; +}; export declare type AddressIdSubQuery = { [K in "$in" | "$nin"]?: (Address.AddressIdSubQuery & { entity: "address"; @@ -113,6 +148,10 @@ export declare type AreaIdSubQuery = { entity: "address"; }) | (Area.AreaIdSubQuery & { entity: "area"; + }) | (Station.AreaIdSubQuery & { + entity: "station"; + }) | (Subway.AreaIdSubQuery & { + entity: "subway"; }) | (Area.AreaIdSubQuery & { entity: "area"; }) | any; @@ -200,11 +239,30 @@ export declare type RoleIdSubQuery = { entity: "role"; }) | any; }; +export declare type StationIdSubQuery = { + [K in "$in" | "$nin"]?: (SubwayStation.StationIdSubQuery & { + entity: "subwayStation"; + }) | (Station.StationIdSubQuery & { + entity: "station"; + }) | any; +}; export declare type SubscriptionIdSubQuery = { [K in "$in" | "$nin"]?: (Subscription.SubscriptionIdSubQuery & { entity: "subscription"; }) | any; }; +export declare type SubwayIdSubQuery = { + [K in "$in" | "$nin"]?: (SubwayStation.SubwayIdSubQuery & { + entity: "subwayStation"; + }) | (Subway.SubwayIdSubQuery & { + entity: "subway"; + }) | any; +}; +export declare type SubwayStationIdSubQuery = { + [K in "$in" | "$nin"]?: (SubwayStation.SubwayStationIdSubQuery & { + entity: "subwayStation"; + }) | any; +}; export declare type SystemIdSubQuery = { [K in "$in" | "$nin"]?: (Application.SystemIdSubQuery & { entity: "application"; diff --git a/lib/pages/address/list/web.d.ts b/lib/pages/address/list/web.d.ts index 151352c32..931b1c0f9 100644 --- a/lib/pages/address/list/web.d.ts +++ b/lib/pages/address/list/web.d.ts @@ -1,3 +1,4 @@ +/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { AppType, WebConfig, WechatPublicConfig, WechatMpConfig } from '../../../../general-app-domain/Application/Schema'; import { EntityDict } from '../../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/pages/application/detail/web.d.ts b/lib/pages/application/detail/web.d.ts index 1d08193b0..3245360b4 100644 --- a/lib/pages/application/detail/web.d.ts +++ b/lib/pages/application/detail/web.d.ts @@ -1,3 +1,4 @@ +/// import { WebConfig, WechatPublicConfig, WechatMpConfig } from '../../../general-app-domain/Application/Schema'; import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/pages/application/list/web.pc.d.ts b/lib/pages/application/list/web.pc.d.ts index aa970833b..a405a678b 100644 --- a/lib/pages/application/list/web.pc.d.ts +++ b/lib/pages/application/list/web.pc.d.ts @@ -1,3 +1,4 @@ +/// import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps, RowWithActions } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from './../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import '@wangeditor/editor/dist/css/style.css'; import { EntityDict } from './../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/pages/domain/detail/web.d.ts b/lib/pages/domain/detail/web.d.ts index 8703ed615..9431c85e7 100644 --- a/lib/pages/domain/detail/web.d.ts +++ b/lib/pages/domain/detail/web.d.ts @@ -1,3 +1,4 @@ +/// import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps, RowWithActions } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps): JSX.Element; diff --git a/lib/pages/login/web.d.ts b/lib/pages/login/web.d.ts index d1e2321ed..c55b51a22 100644 --- a/lib/pages/login/web.d.ts +++ b/lib/pages/login/web.d.ts @@ -1,3 +1,4 @@ +/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../general-app-domain'; export default function render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function render(props: WebComponentProps export default function Render(): JSX.Element; diff --git a/lib/pages/personal/web.pc.d.ts b/lib/pages/personal/web.pc.d.ts index baca2f3aa..aa9c8f0b9 100644 --- a/lib/pages/personal/web.pc.d.ts +++ b/lib/pages/personal/web.pc.d.ts @@ -1 +1,2 @@ +/// export default function Render(): JSX.Element; diff --git a/lib/pages/pickers/area/web.d.ts b/lib/pages/pickers/area/web.d.ts index 96962c2b8..402dea2d5 100644 --- a/lib/pages/pickers/area/web.d.ts +++ b/lib/pages/pickers/area/web.d.ts @@ -1,3 +1,4 @@ +/// import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function render(props: WebComponentProps import { Config } from '../../../../types/Config'; import { EntityDict } from '../../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/pages/platform/detail/web.d.ts b/lib/pages/platform/detail/web.d.ts index e934cc279..5cf6f9d31 100644 --- a/lib/pages/platform/detail/web.d.ts +++ b/lib/pages/platform/detail/web.d.ts @@ -1,3 +1,4 @@ +/// import { EntityDict } from '../../../general-app-domain'; import { Config } from '../../../types/Config'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/pages/platform/list/web.pc.d.ts b/lib/pages/platform/list/web.pc.d.ts index d4b06b33f..1787ac384 100644 --- a/lib/pages/platform/list/web.pc.d.ts +++ b/lib/pages/platform/list/web.pc.d.ts @@ -1,3 +1,4 @@ +/// import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps, RowWithActions } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../general-app-domain'; export default function render(props: WebComponentProps export default function Render(): JSX.Element; diff --git a/lib/pages/subscription/config/upsert/web.pc.d.ts b/lib/pages/subscription/config/upsert/web.pc.d.ts index 40fe3752c..0c0225cc7 100644 --- a/lib/pages/subscription/config/upsert/web.pc.d.ts +++ b/lib/pages/subscription/config/upsert/web.pc.d.ts @@ -1,3 +1,4 @@ +/// import { WechatPublicConfig } from '../../../../general-app-domain/Application/Schema'; import { EntityDict } from '../../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/pages/subscription/detail/web.d.ts b/lib/pages/subscription/detail/web.d.ts index 858e76969..d2533c1fd 100644 --- a/lib/pages/subscription/detail/web.d.ts +++ b/lib/pages/subscription/detail/web.d.ts @@ -1,3 +1,4 @@ +/// import { WechatPublicConfig } from '../../../general-app-domain/Application/Schema'; import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/pages/subscription/list/web.pc.d.ts b/lib/pages/subscription/list/web.pc.d.ts index 9eabafa88..2a06fbb52 100644 --- a/lib/pages/subscription/list/web.pc.d.ts +++ b/lib/pages/subscription/list/web.pc.d.ts @@ -1,3 +1,4 @@ +/// import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../../general-app-domain'; import { Config } from '../../../../types/Config'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/pages/system/detail/web.d.ts b/lib/pages/system/detail/web.d.ts index cce76388c..b5371919f 100644 --- a/lib/pages/system/detail/web.d.ts +++ b/lib/pages/system/detail/web.d.ts @@ -1,3 +1,4 @@ +/// import { EntityDict } from '../../../general-app-domain'; import { Config } from '../../../types/Config'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/pages/system/list/web.pc.d.ts b/lib/pages/system/list/web.pc.d.ts index 450397c85..eb690396f 100644 --- a/lib/pages/system/list/web.pc.d.ts +++ b/lib/pages/system/list/web.pc.d.ts @@ -1,3 +1,4 @@ +/// import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps, RowWithActions } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; declare type DataProps = { diff --git a/lib/pages/user/info/web.pc.d.ts b/lib/pages/user/info/web.pc.d.ts index 82f9b08a1..70490bc7c 100644 --- a/lib/pages/user/info/web.pc.d.ts +++ b/lib/pages/user/info/web.pc.d.ts @@ -1,3 +1,4 @@ +/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../../general-app-domain'; export default function render(props: WebComponentProps import { EntityDict } from '../../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function render(props: WebComponentProps export default function render(this: any): JSX.Element; diff --git a/lib/pages/user/search/web.d.ts b/lib/pages/user/search/web.d.ts index cfaabf286..5eaeadcc2 100644 --- a/lib/pages/user/search/web.d.ts +++ b/lib/pages/user/search/web.d.ts @@ -1 +1,2 @@ +/// export default function render(): JSX.Element; diff --git a/lib/pages/userEntityGrant/confirm/web.d.ts b/lib/pages/userEntityGrant/confirm/web.d.ts index 39e80cc1e..7862971f2 100644 --- a/lib/pages/userEntityGrant/confirm/web.d.ts +++ b/lib/pages/userEntityGrant/confirm/web.d.ts @@ -1,3 +1,4 @@ +/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function render(props: WebComponentProps export default function Render(props: any): JSX.Element; diff --git a/lib/pages/userEntityGrant/detail/web.pc.d.ts b/lib/pages/userEntityGrant/detail/web.pc.d.ts index 3e68edd33..d80fa2a25 100644 --- a/lib/pages/userEntityGrant/detail/web.pc.d.ts +++ b/lib/pages/userEntityGrant/detail/web.pc.d.ts @@ -1,3 +1,4 @@ +/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps export default function render(this: any): JSX.Element; diff --git a/lib/pages/userRelation/onEntity/web.d.ts b/lib/pages/userRelation/onEntity/web.d.ts index 11df1296a..ad0b8f2aa 100644 --- a/lib/pages/userRelation/onEntity/web.d.ts +++ b/lib/pages/userRelation/onEntity/web.d.ts @@ -1 +1,2 @@ +/// export default function render(this: any): JSX.Element; diff --git a/lib/pages/userRelation/upsert/byMobile/web.pc.d.ts b/lib/pages/userRelation/upsert/byMobile/web.pc.d.ts index e8bc02e8e..a01f4efad 100644 --- a/lib/pages/userRelation/upsert/byMobile/web.pc.d.ts +++ b/lib/pages/userRelation/upsert/byMobile/web.pc.d.ts @@ -1,3 +1,4 @@ +/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../../general-app-domain'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../../general-app-domain'; export default function Render(props: WebComponentProps export default function render(this: any): JSX.Element; diff --git a/lib/pages/userRelation/upsert/byUserEntityGrant/web.pc.d.ts b/lib/pages/userRelation/upsert/byUserEntityGrant/web.pc.d.ts index ce6f8ebd9..cc15e66f5 100644 --- a/lib/pages/userRelation/upsert/byUserEntityGrant/web.pc.d.ts +++ b/lib/pages/userRelation/upsert/byUserEntityGrant/web.pc.d.ts @@ -1,3 +1,4 @@ +/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../../general-app-domain'; export default function render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../../../general-app-domain'; export default function Render(props: WebComponentProps export default function render(this: any): JSX.Element; diff --git a/lib/pages/userRelation/upsert/onUser/web.pc.d.ts b/lib/pages/userRelation/upsert/onUser/web.pc.d.ts index e3e0e14e4..8ffaa6708 100644 --- a/lib/pages/userRelation/upsert/onUser/web.pc.d.ts +++ b/lib/pages/userRelation/upsert/onUser/web.pc.d.ts @@ -1,3 +1,4 @@ +/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../../general-app-domain'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; import { QrCodeType } from '../../../types/Config'; diff --git a/lib/pages/userRelation/upsert/web.pc.d.ts b/lib/pages/userRelation/upsert/web.pc.d.ts index 9f38deb60..0f68e24b6 100644 --- a/lib/pages/userRelation/upsert/web.pc.d.ts +++ b/lib/pages/userRelation/upsert/web.pc.d.ts @@ -1,3 +1,4 @@ +/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; import { QrCodeType } from '../../../types/Config'; diff --git a/lib/pages/wechatPublic/tag/list/web.pc.d.ts b/lib/pages/wechatPublic/tag/list/web.pc.d.ts index afe6d7786..a831f4dc7 100644 --- a/lib/pages/wechatPublic/tag/list/web.pc.d.ts +++ b/lib/pages/wechatPublic/tag/list/web.pc.d.ts @@ -1,3 +1,4 @@ +/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../../general-app-domain'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function render(props: WebComponentProps; + area: Area; +} + +const locale: LocaleDef = { + zh_CN: { + name: "站点", + attr: { + name: "站点名", + area: "城市", + }, + }, +}; diff --git a/src/entities/Subway.ts b/src/entities/Subway.ts new file mode 100644 index 000000000..28126796a --- /dev/null +++ b/src/entities/Subway.ts @@ -0,0 +1,19 @@ +import { String } from "oak-domain/lib/types/DataType"; +import { EntityShape } from "oak-domain/lib/types/Entity"; +import { LocaleDef } from "oak-domain/lib/types/Locale"; +import { Schema as Area } from "./Area"; + +export interface Schema extends EntityShape { + name: String<32>; + area: Area; +} + +const locale: LocaleDef = { + zh_CN: { + name: "地铁", + attr: { + name: "线路", + area: "城市", + }, + }, +}; diff --git a/src/entities/SubwayStation.ts b/src/entities/SubwayStation.ts new file mode 100644 index 000000000..e876d1c1a --- /dev/null +++ b/src/entities/SubwayStation.ts @@ -0,0 +1,20 @@ +import { String } from "oak-domain/lib/types/DataType"; +import { EntityShape } from "oak-domain/lib/types/Entity"; +import { LocaleDef } from "oak-domain/lib/types/Locale"; +import { Schema as Subway } from "./Subway"; +import { Schema as Station } from "./Station"; + +export interface Schema extends EntityShape { + station: Station; + subway: Subway; +} + +const locale: LocaleDef = { + zh_CN: { + name: "地铁站点连接表", + attr: { + station: "站点", + subway: "地铁线", + }, + }, +};