新增地铁线及站点entities

lib/components/common/empty/empty.d.ts

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

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

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { AppType, WebConfig, WechatPublicConfig, WechatMpConfig } from '../../../general-app-domain/Application/Schema';
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebConfig } from '../../../../general-app-domain/Application/Schema';
 export default function Web(props: {
     config: WebConfig;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WechatMpConfig } from '../../../../general-app-domain/Application/Schema';
 export default function WechatMp(props: {
     config: WechatMpConfig;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WechatPublicConfig } from '../../../../general-app-domain/Application/Schema';
 export default function WechatPublic(props: {
     isService?: boolean;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Style as StyleType } from '../../../types/Style';
 declare type StyleProps = {
     value?: StyleType | null;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Config } from '../../../../types/Config';
 export default function Account(props: {
     account: Required<Config>['Account'];

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Config } from '../../../../types/Config';
 export default function Cos(props: {
     cos: Required<Config>['Cos'];

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Config } from '../../../../types/Config';
 export default function Cos(props: {
     live: Required<Config>['Live'];

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Config } from '../../../../types/Config';
 export default function Cos(props: {
     map: Required<Config>['Map'];

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Config } from '../../../../types/Config';
 export default function Sms(props: {
     sms: Required<Config>['Sms'];

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Config } from '../../../types/Config';
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function render(props: WebComponentProps<EntityDict, 'extraFile', true, {

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

@@ -1 +1,2 @@
+/// <reference types="react" />
 export default function render(): JSX.Element;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { UploadFile } from 'antd';
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from "oak-frontend-base";
 import { EntityDict } from "../../../general-app-domain";
 export default function Render(props: WebComponentProps<EntityDict, 'user', false, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function render(props: WebComponentProps<EntityDict, 'address', true, {

lib/components/icon-font-awesome/web.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../general-app-domain';
 import './web.less';

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function Render(props: WebComponentProps<EntityDict, 'message', false, {

lib/components/message/cellButton/web.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function Render(props: WebComponentProps<EntityDict, 'message', false, {}, {

lib/components/message/web.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { MessageProps } from 'oak-frontend-base/lib/types/Message';
 export default function render(props: {
     data: {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from "oak-frontend-base";
 import { EntityDict } from '../../../general-app-domain';
 export default function Render(props: WebComponentProps<EntityDict, 'messageTypeTemplateId', true, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
 import { AvatarSize } from 'antd/es/avatar/SizeContext';

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function Render(props: WebComponentProps<EntityDict, 'token', false, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function Render(props: WebComponentProps<EntityDict, 'token', false, {

lib/components/userEntityGrant/cellButton/web.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
 export default function Render(props: WebComponentProps<EntityDict, 'userEntityGrant', true, {

lib/entities/Station.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;
+}

lib/entities/Station.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var locale = {
+    zh_CN: {
+        name: "站点",
+        attr: {
+            name: "站点名",
+            area: "城市",
+        },
+    },
+};

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;
+}

lib/entities/Subway.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var locale = {
+    zh_CN: {
+        name: "地铁",
+        attr: {
+            name: "线路",
+            area: "城市",
+        },
+    },
+};

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;
+}

lib/entities/SubwayStation.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var locale = {
+    zh_CN: {
+        name: "地铁站点连接表",
+        attr: {
+            station: "站点",
+            subway: "地铁线",
+        },
+    },
+};

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<Address.Schema>;
     area$parent?: Array<Schema>;
     area$parent$$aggr?: AggregationResult<Schema>;
+    station$area?: Array<Station.Schema>;
+    station$area$$aggr?: AggregationResult<Station.Schema>;
+    subway$area?: Array<Subway.Schema>;
+    subway$area$$aggr?: AggregationResult<Subway.Schema>;
 } & {
     [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<ExprOp<OpAttr | string>>;
 declare type AreaIdProjection = OneOf<{
     id: number;
@@ -110,6 +128,8 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "parentI
     parentId?: String<64>;
 }) & {
     address$area?: OakOperation<Address.UpdateOperation["action"], Omit<Address.UpdateOperationData, "area" | "areaId">, Address.Filter> | OakOperation<"create", Omit<Address.CreateOperationData, "area" | "areaId">[]> | Array<OakOperation<"create", Omit<Address.CreateOperationData, "area" | "areaId">> | OakOperation<Address.UpdateOperation["action"], Omit<Address.UpdateOperationData, "area" | "areaId">, Address.Filter>>;
+    station$area?: OakOperation<Station.UpdateOperation["action"], Omit<Station.UpdateOperationData, "area" | "areaId">, Station.Filter> | OakOperation<"create", Omit<Station.CreateOperationData, "area" | "areaId">[]> | Array<OakOperation<"create", Omit<Station.CreateOperationData, "area" | "areaId">> | OakOperation<Station.UpdateOperation["action"], Omit<Station.UpdateOperationData, "area" | "areaId">, Station.Filter>>;
+    subway$area?: OakOperation<Subway.UpdateOperation["action"], Omit<Subway.UpdateOperationData, "area" | "areaId">, Subway.Filter> | OakOperation<"create", Omit<Subway.CreateOperationData, "area" | "areaId">[]> | Array<OakOperation<"create", Omit<Subway.CreateOperationData, "area" | "areaId">> | OakOperation<Subway.UpdateOperation["action"], Omit<Subway.UpdateOperationData, "area" | "areaId">, Subway.Filter>>;
 };
 export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
 export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
@@ -120,6 +140,8 @@ export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "parentI
 }) & {
     [k: string]: any;
     address$area?: Address.UpdateOperation | Address.RemoveOperation | OakOperation<"create", Omit<Address.CreateOperationData, "area" | "areaId">[]> | Array<OakOperation<"create", Omit<Address.CreateOperationData, "area" | "areaId">> | Address.UpdateOperation | Address.RemoveOperation>;
+    station$area?: Station.UpdateOperation | Station.RemoveOperation | OakOperation<"create", Omit<Station.CreateOperationData, "area" | "areaId">[]> | Array<OakOperation<"create", Omit<Station.CreateOperationData, "area" | "areaId">> | Station.UpdateOperation | Station.RemoveOperation>;
+    subway$area?: Subway.UpdateOperation | Subway.RemoveOperation | OakOperation<"create", Omit<Subway.CreateOperationData, "area" | "areaId">[]> | Array<OakOperation<"create", Omit<Subway.CreateOperationData, "area" | "areaId">> | Subway.UpdateOperation | Subway.RemoveOperation>;
 };
 export declare type UpdateOperation = OakOperation<"update" | string, UpdateOperationData, Filter, Sorter>;
 export declare type RemoveOperationData = {};

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;

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.Schema>;
+    subwayStation$station$$aggr?: AggregationResult<SubwayStation.Schema>;
+} & {
+    [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<AttrFilter & ExprOp<OpAttr | string>>;
+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<ExprOp<OpAttr | string>>;
+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<ExprOp<OpAttr | string>>;
+export declare type SortNode = {
+    $attr: SortAttr;
+    $direction?: "asc" | "desc";
+};
+export declare type Sorter = SortNode[];
+export declare type SelectOperation<P extends Object = Projection> = OakSelection<"select", P, Filter, Sorter>;
+export declare type Selection<P extends Object = Projection> = Omit<SelectOperation<P>, "action">;
+export declare type Aggregation = DeduceAggregation<Projection, Filter, Sorter>;
+export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "areaId">> & ({
+    areaId: String<64>;
+}) & {
+    subwayStation$station?: OakOperation<SubwayStation.UpdateOperation["action"], Omit<SubwayStation.UpdateOperationData, "station" | "stationId">, SubwayStation.Filter> | OakOperation<"create", Omit<SubwayStation.CreateOperationData, "station" | "stationId">[]> | Array<OakOperation<"create", Omit<SubwayStation.CreateOperationData, "station" | "stationId">> | OakOperation<SubwayStation.UpdateOperation["action"], Omit<SubwayStation.UpdateOperationData, "station" | "stationId">, SubwayStation.Filter>>;
+};
+export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
+export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
+export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
+export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "areaId">> & ({
+    area?: never;
+    areaId?: String<64> | null;
+}) & {
+    [k: string]: any;
+    subwayStation$station?: SubwayStation.UpdateOperation | SubwayStation.RemoveOperation | OakOperation<"create", Omit<SubwayStation.CreateOperationData, "station" | "stationId">[]> | Array<OakOperation<"create", Omit<SubwayStation.CreateOperationData, "station" | "stationId">> | 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<AreaIdProjection>;
+export declare type StationIdSubQuery = Selection<StationIdProjection>;
+export declare type EntityDef = {
+    Schema: Schema;
+    OpSchema: OpSchema;
+    Action: OakMakeAction<GenericAction> | string;
+    Selection: Selection;
+    Aggregation: Aggregation;
+    Operation: Operation;
+    Create: CreateOperation;
+    Update: UpdateOperation;
+    Remove: RemoveOperation;
+    CreateSingle: CreateSingleOperation;
+    CreateMulti: CreateMultipleOperation;
+};
+export {};

lib/general-app-domain/Station/Schema.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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<OpSchema>;

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
+};

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

@@ -0,0 +1 @@
+{ "name": "站点", "attr": { "name": "站点名", "area": "城市" } }

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
 };

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.Schema>;
+    subwayStation$subway$$aggr?: AggregationResult<SubwayStation.Schema>;
+} & {
+    [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<AttrFilter & ExprOp<OpAttr | string>>;
+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<ExprOp<OpAttr | string>>;
+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<ExprOp<OpAttr | string>>;
+export declare type SortNode = {
+    $attr: SortAttr;
+    $direction?: "asc" | "desc";
+};
+export declare type Sorter = SortNode[];
+export declare type SelectOperation<P extends Object = Projection> = OakSelection<"select", P, Filter, Sorter>;
+export declare type Selection<P extends Object = Projection> = Omit<SelectOperation<P>, "action">;
+export declare type Aggregation = DeduceAggregation<Projection, Filter, Sorter>;
+export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "areaId">> & ({
+    areaId: String<64>;
+}) & {
+    subwayStation$subway?: OakOperation<SubwayStation.UpdateOperation["action"], Omit<SubwayStation.UpdateOperationData, "subway" | "subwayId">, SubwayStation.Filter> | OakOperation<"create", Omit<SubwayStation.CreateOperationData, "subway" | "subwayId">[]> | Array<OakOperation<"create", Omit<SubwayStation.CreateOperationData, "subway" | "subwayId">> | OakOperation<SubwayStation.UpdateOperation["action"], Omit<SubwayStation.UpdateOperationData, "subway" | "subwayId">, SubwayStation.Filter>>;
+};
+export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
+export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
+export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
+export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "areaId">> & ({
+    area?: never;
+    areaId?: String<64> | null;
+}) & {
+    [k: string]: any;
+    subwayStation$subway?: SubwayStation.UpdateOperation | SubwayStation.RemoveOperation | OakOperation<"create", Omit<SubwayStation.CreateOperationData, "subway" | "subwayId">[]> | Array<OakOperation<"create", Omit<SubwayStation.CreateOperationData, "subway" | "subwayId">> | 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<AreaIdProjection>;
+export declare type SubwayIdSubQuery = Selection<SubwayIdProjection>;
+export declare type EntityDef = {
+    Schema: Schema;
+    OpSchema: OpSchema;
+    Action: OakMakeAction<GenericAction> | string;
+    Selection: Selection;
+    Aggregation: Aggregation;
+    Operation: Operation;
+    Create: CreateOperation;
+    Update: UpdateOperation;
+    Remove: RemoveOperation;
+    CreateSingle: CreateSingleOperation;
+    CreateMulti: CreateMultipleOperation;
+};
+export {};

lib/general-app-domain/Subway/Schema.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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<OpSchema>;

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
+};

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

@@ -0,0 +1 @@
+{ "name": "地铁", "attr": { "name": "线路", "area": "城市" } }

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<AttrFilter & ExprOp<OpAttr | string>>;
+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<ExprOp<OpAttr | string>>;
+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<ExprOp<OpAttr | string>>;
+export declare type SortNode = {
+    $attr: SortAttr;
+    $direction?: "asc" | "desc";
+};
+export declare type Sorter = SortNode[];
+export declare type SelectOperation<P extends Object = Projection> = OakSelection<"select", P, Filter, Sorter>;
+export declare type Selection<P extends Object = Projection> = Omit<SelectOperation<P>, "action">;
+export declare type Aggregation = DeduceAggregation<Projection, Filter, Sorter>;
+export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "stationId" | "subwayId">> & (({
+    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<CreateOperationData>>;
+export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
+export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "stationId" | "subwayId">> & (({
+    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<StationIdProjection>;
+export declare type SubwayIdSubQuery = Selection<SubwayIdProjection>;
+export declare type SubwayStationIdSubQuery = Selection<SubwayStationIdProjection>;
+export declare type EntityDef = {
+    Schema: Schema;
+    OpSchema: OpSchema;
+    Action: OakMakeAction<GenericAction> | string;
+    Selection: Selection;
+    Aggregation: Aggregation;
+    Operation: Operation;
+    Create: CreateOperation;
+    Update: UpdateOperation;
+    Remove: RemoveOperation;
+    CreateSingle: CreateSingleOperation;
+    CreateMulti: CreateMultipleOperation;
+};
+export {};

lib/general-app-domain/SubwayStation/Schema.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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<OpSchema>;

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
+};

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

@@ -0,0 +1 @@
+{ "name": "地铁站点连接表", "attr": { "station": "站点", "subway": "地铁线" } }

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<Oper.Schema>;
     user$ref?: Array<Schema>;
     user$ref$$aggr?: AggregationResult<Schema>;
+    userRelation$user?: Array<UserRelation.Schema>;
+    userRelation$user$$aggr?: AggregationResult<UserRelation.Schema>;
     email$user?: Array<Email.Schema>;
     email$user$$aggr?: AggregationResult<Email.Schema>;
     message$user?: Array<Message.Schema>;
@@ -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<Omit<OpSchema, "refId">
 })) & {
     oper$operator?: OakOperation<"create", Omit<Oper.CreateOperationData, "operator" | "operatorId">[]> | Array<OakOperation<"create", Omit<Oper.CreateOperationData, "operator" | "operatorId">>>;
     user$ref?: OakOperation<UpdateOperation["action"], Omit<UpdateOperationData, "ref" | "refId">, Filter> | OakOperation<"create", Omit<CreateOperationData, "ref" | "refId">[]> | Array<OakOperation<"create", Omit<CreateOperationData, "ref" | "refId">> | OakOperation<UpdateOperation["action"], Omit<UpdateOperationData, "ref" | "refId">, Filter>>;
+    userRelation$user?: OakOperation<UserRelation.UpdateOperation["action"], Omit<UserRelation.UpdateOperationData, "user" | "userId">, UserRelation.Filter> | OakOperation<"create", Omit<UserRelation.CreateOperationData, "user" | "userId">[]> | Array<OakOperation<"create", Omit<UserRelation.CreateOperationData, "user" | "userId">> | OakOperation<UserRelation.UpdateOperation["action"], Omit<UserRelation.UpdateOperationData, "user" | "userId">, UserRelation.Filter>>;
     email$user?: OakOperation<Email.UpdateOperation["action"], Omit<Email.UpdateOperationData, "user" | "userId">, Email.Filter> | OakOperation<"create", Omit<Email.CreateOperationData, "user" | "userId">[]> | Array<OakOperation<"create", Omit<Email.CreateOperationData, "user" | "userId">> | OakOperation<Email.UpdateOperation["action"], Omit<Email.UpdateOperationData, "user" | "userId">, Email.Filter>>;
     message$user?: OakOperation<Message.UpdateOperation["action"], Omit<Message.UpdateOperationData, "user" | "userId">, Message.Filter> | OakOperation<"create", Omit<Message.CreateOperationData, "user" | "userId">[]> | Array<OakOperation<"create", Omit<Message.CreateOperationData, "user" | "userId">> | OakOperation<Message.UpdateOperation["action"], Omit<Message.UpdateOperationData, "user" | "userId">, Message.Filter>>;
     mobile$user?: OakOperation<Mobile.UpdateOperation["action"], Omit<Mobile.UpdateOperationData, "user" | "userId">, Mobile.Filter> | OakOperation<"create", Omit<Mobile.CreateOperationData, "user" | "userId">[]> | Array<OakOperation<"create", Omit<Mobile.CreateOperationData, "user" | "userId">> | OakOperation<Mobile.UpdateOperation["action"], Omit<Mobile.UpdateOperationData, "user" | "userId">, Mobile.Filter>>;
@@ -317,6 +327,7 @@ export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "refId">
     [k: string]: any;
     oper$operator?: OakOperation<"create", Omit<Oper.CreateOperationData, "operator" | "operatorId">[]> | Array<OakOperation<"create", Omit<Oper.CreateOperationData, "operator" | "operatorId">>>;
     user$ref?: UpdateOperation | RemoveOperation | OakOperation<"create", Omit<CreateOperationData, "ref" | "refId">[]> | Array<OakOperation<"create", Omit<CreateOperationData, "ref" | "refId">> | UpdateOperation | RemoveOperation>;
+    userRelation$user?: UserRelation.UpdateOperation | UserRelation.RemoveOperation | OakOperation<"create", Omit<UserRelation.CreateOperationData, "user" | "userId">[]> | Array<OakOperation<"create", Omit<UserRelation.CreateOperationData, "user" | "userId">> | UserRelation.UpdateOperation | UserRelation.RemoveOperation>;
     email$user?: Email.UpdateOperation | Email.RemoveOperation | OakOperation<"create", Omit<Email.CreateOperationData, "user" | "userId">[]> | Array<OakOperation<"create", Omit<Email.CreateOperationData, "user" | "userId">> | Email.UpdateOperation | Email.RemoveOperation>;
     message$user?: Message.UpdateOperation | Message.RemoveOperation | OakOperation<"create", Omit<Message.CreateOperationData, "user" | "userId">[]> | Array<OakOperation<"create", Omit<Message.CreateOperationData, "user" | "userId">> | Message.UpdateOperation | Message.RemoveOperation>;
     mobile$user?: Mobile.UpdateOperation | Mobile.RemoveOperation | OakOperation<"create", Omit<Mobile.CreateOperationData, "user" | "userId">[]> | Array<OakOperation<"create", Omit<Mobile.CreateOperationData, "user" | "userId">> | Mobile.UpdateOperation | Mobile.RemoveOperation>;

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";

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function Render(props: WebComponentProps<EntityDict, 'address', true, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function Render(props: WebComponentProps<EntityDict, 'address', false, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { AppType, WebConfig, WechatPublicConfig, WechatMpConfig } from '../../../../general-app-domain/Application/Schema';
 import { EntityDict } from '../../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebConfig, WechatPublicConfig, WechatMpConfig } from '../../../general-app-domain/Application/Schema';
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps, RowWithActions } from 'oak-frontend-base';
 export default function Render(props: WebComponentProps<EntityDict, 'application', true, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
 export default function Render(props: WebComponentProps<EntityDict, 'application', false, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from './../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
 export default function render(props: WebComponentProps<EntityDict, 'article', false, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function render(props: WebComponentProps<EntityDict, 'article', true, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function Render(props: WebComponentProps<EntityDict, 'article', false, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '@wangeditor/editor/dist/css/style.css';
 import { EntityDict } from './../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
 export default function Render(props: WebComponentProps<EntityDict, 'domain', false, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps, RowWithActions } from 'oak-frontend-base';
 export default function Render(props: WebComponentProps<EntityDict, 'domain', true, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
 export default function Render(props: WebComponentProps<EntityDict, 'domain', false, {

lib/pages/icon/web.d.ts

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

lib/pages/login/web.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../general-app-domain';
 export default function render(props: WebComponentProps<EntityDict, 'token', false, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
 export default function Render(props: WebComponentProps<EntityDict, 'message', false, {

lib/pages/message/detail/web.pc.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
 export default function Render(props: WebComponentProps<EntityDict, 'message', false, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function Render(props: WebComponentProps<EntityDict, 'message', false, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function Render(props: WebComponentProps<EntityDict, 'message', true, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function Render(props: WebComponentProps<EntityDict, 'message', true, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function render(props: WebComponentProps<EntityDict, 'token', false, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function render(props: WebComponentProps<EntityDict, 'token', false, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function render(props: WebComponentProps<EntityDict, 'mobile', true, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function render(props: WebComponentProps<EntityDict, 'mobile', true, {

lib/pages/personal/web.d.ts

@@ -1 +1,2 @@
+/// <reference types="react" />
 export default function Render(): JSX.Element;

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

@@ -1 +1,2 @@
+/// <reference types="react" />
 export default function Render(): JSX.Element;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
 export default function render(props: WebComponentProps<EntityDict, 'area', true, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Config } from '../../../../types/Config';
 import { EntityDict } from '../../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { Config } from '../../../types/Config';
 import { WebComponentProps } from 'oak-frontend-base';

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps, RowWithActions } from 'oak-frontend-base';
 export default function Render(props: WebComponentProps<EntityDict, 'platform', true, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
 export default function Render(props: WebComponentProps<EntityDict, 'platform', false, {

lib/pages/setting/web.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../general-app-domain';
 export default function render(props: WebComponentProps<EntityDict, 'user', false, {

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

@@ -1 +1,2 @@
+/// <reference types="react" />
 export default function Render(): JSX.Element;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WechatPublicConfig } from '../../../../general-app-domain/Application/Schema';
 import { EntityDict } from '../../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WechatPublicConfig } from '../../../general-app-domain/Application/Schema';
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
 export default function Render(props: WebComponentProps<EntityDict, 'subscription', true, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
 export default function Render(props: WebComponentProps<EntityDict, 'subscription', false, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../../general-app-domain';
 import { Config } from '../../../../types/Config';
 import { WebComponentProps } from 'oak-frontend-base';

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { Config } from '../../../types/Config';
 import { WebComponentProps } from 'oak-frontend-base';

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps, RowWithActions } from 'oak-frontend-base';
 export default function Render(props: WebComponentProps<EntityDict, 'system', true, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
 export default function Render(props: WebComponentProps<EntityDict, 'system', false, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
 export default function Render(props: WebComponentProps<EntityDict, 'token', true, {

lib/pages/user/info/web.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 declare type DataProps = {

lib/pages/user/info/web.pc.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../general-app-domain';
 export default function Render(props: WebComponentProps<EntityDict, 'user', false, {

lib/pages/user/manage/detail/web.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../../general-app-domain';
 export default function render(props: WebComponentProps<EntityDict, 'user', false, {

lib/pages/user/manage/upsert/web.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
 export default function Render(props: WebComponentProps<EntityDict, 'user', false, {

lib/pages/user/manage/web.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
 import { WebComponentProps } from 'oak-frontend-base';
 export default function render(props: WebComponentProps<EntityDict, 'user', true, {