Oak-Team
/
oak-general-business
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 38 Wiki Activity

2.3.8-publish

This commit is contained in:
Xu Chang 2023-02-03 16:19:48 +08:00
parent bfb183653e
commit 9b2f010e2a
27 changed files with 157 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/entities/User.js
View File

@ -56,7 +56,7 @@ var locale = {
avatar: '头像',
idCardType: '证件类型',
idNumber: '证件号码',
ref: '介绍人',
ref: '指向用户',
files: '相关文件',
userState: '用户状态',
idState: '身份验证状态',

16
lib/general-app-domain/ActionDefDict.d.ts vendored
View File

@ -1,22 +1,22 @@
export declare const ActionDefDict: {
modi: {
iState: import("oak-domain/lib/types").ActionDef<import("./Modi/Action").IAction, import("./Modi/Action").IState>;
iState: import("oak-domain/lib/types").ActionDef<string, string>;
};
article: {
iState: import("oak-domain/lib/types").ActionDef<import("./Article/Action").IAction, import("./Article/Action").IState>;
iState: import("oak-domain/lib/types").ActionDef<string, string>;
};
captcha: {
iState: import("oak-domain/lib/types").ActionDef<import("./Captcha/Action").IAction, import("./Captcha/Action").IState>;
iState: import("oak-domain/lib/types").ActionDef<string, string>;
};
email: {
ableState: import("oak-domain/lib/types").ActionDef<import("oak-domain/lib/actions/action").AbleAction, import("oak-domain/lib/actions/action").AbleState>;
};
message: {
iState: import("oak-domain/lib/types").ActionDef<import("./Message/Action").IAction, import("./Message/Action").IState>;
visitState: import("oak-domain/lib/types").ActionDef<"visit", import("./Message/Action").VisitState>;
iState: import("oak-domain/lib/types").ActionDef<string, string>;
visitState: import("oak-domain/lib/types").ActionDef<string, string>;
};
messageSent: {
iState: import("oak-domain/lib/types").ActionDef<import("./MessageSent/Action").IAction, import("./MessageSent/Action").IState>;
iState: import("oak-domain/lib/types").ActionDef<string, string>;
};
mobile: {
ableState: import("oak-domain/lib/types").ActionDef<import("oak-domain/lib/actions/action").AbleAction, import("oak-domain/lib/actions/action").AbleState>;
@ -25,8 +25,8 @@ export declare const ActionDefDict: {
ableState: import("oak-domain/lib/types").ActionDef<import("oak-domain/lib/actions/action").AbleAction, import("oak-domain/lib/actions/action").AbleState>;
};
user: {
idState: import("oak-domain/lib/types").ActionDef<import("./User/Action").IdAction, import("./User/Action").IdState>;
userState: import("oak-domain/lib/types").ActionDef<import("./User/Action").UserAction, import("./User/Action").UserState>;
idState: import("oak-domain/lib/types").ActionDef<string, string>;
userState: import("oak-domain/lib/types").ActionDef<string, string>;
};
userEntityGrant: {};
};

8
lib/general-app-domain/Article/Action.d.ts vendored
View File

@ -1,10 +1,10 @@
import { ActionDef } from "oak-domain/lib/types/Action";
import { GenericAction } from "oak-domain/lib/actions/action";
export declare type IAction = 'online' | 'offline' | 'disabled';
export declare type IState = 'online' | 'offline' | 'disabled';
export declare type IAction = 'online' | 'offline' | 'disabled' | string;
export declare type IState = 'online' | 'offline' | 'disabled' | string;
export declare type ParticularAction = IAction;
export declare type Action = GenericAction | ParticularAction;
export declare type Action = GenericAction | ParticularAction | string;
export declare const actions: string[];
export declare const ActionDefDict: {
iState: ActionDef<IAction, IState>;
iState: ActionDef<string, string>;
};

8
lib/general-app-domain/Captcha/Action.d.ts vendored
View File

@ -1,10 +1,10 @@
import { ActionDef } from "oak-domain/lib/types/Action";
import { GenericAction } from "oak-domain/lib/actions/action";
export declare type IState = 'unsent' | 'sending' | 'sent' | 'failure';
export declare type IAction = 'send' | 'success' | 'fail';
export declare type IState = 'unsent' | 'sending' | 'sent' | 'failure' | string;
export declare type IAction = 'send' | 'success' | 'fail' | string;
export declare type ParticularAction = IAction;
export declare type Action = GenericAction | ParticularAction;
export declare type Action = GenericAction | ParticularAction | string;
export declare const actions: string[];
export declare const ActionDefDict: {
iState: ActionDef<IAction, IState>;
iState: ActionDef<string, string>;
};

2
lib/general-app-domain/Email/Action.d.ts vendored
View File

@ -2,7 +2,7 @@ import { AbleAction, AbleState } from 'oak-domain/lib/actions/action';
import { ActionDef } from "oak-domain/lib/types/Action";
import { GenericAction } from "oak-domain/lib/actions/action";
export declare type ParticularAction = AbleAction;
export declare type Action = GenericAction | ParticularAction;
export declare type Action = GenericAction | ParticularAction | string;
export declare const actions: string[];
export declare const ActionDefDict: {
ableState: ActionDef<AbleAction, AbleState>;

4
lib/general-app-domain/EntityDict.d.ts vendored
View File

@ -3,6 +3,7 @@ import { EntityDef as ModiEntity } from "./ModiEntity/Schema";
import { EntityDef as Oper } from "./Oper/Schema";
import { EntityDef as OperEntity } from "./OperEntity/Schema";
import { EntityDef as User } from "./User/Schema";
import { EntityDef as UserEntityGrant } from "./UserEntityGrant/Schema";
import { EntityDef as Address } from "./Address/Schema";
import { EntityDef as Application } from "./Application/Schema";
import { EntityDef as Area } from "./Area/Schema";
@ -21,7 +22,6 @@ import { EntityDef as Role } from "./Role/Schema";
import { EntityDef as Subscription } from "./Subscription/Schema";
import { EntityDef as System } from "./System/Schema";
import { EntityDef as Token } from "./Token/Schema";
import { EntityDef as UserEntityGrant } from "./UserEntityGrant/Schema";
import { EntityDef as UserSystem } from "./UserSystem/Schema";
import { EntityDef as UserWechatPublicTag } from "./UserWechatPublicTag/Schema";
import { EntityDef as WechatPublicTag } from "./WechatPublicTag/Schema";
@ -33,6 +33,7 @@ export declare type EntityDict = {
oper: Oper;
operEntity: OperEntity;
user: User;
userEntityGrant: UserEntityGrant;
address: Address;
application: Application;
area: Area;
@ -51,7 +52,6 @@ export declare type EntityDict = {
subscription: Subscription;
system: System;
token: Token;
userEntityGrant: UserEntityGrant;
userSystem: UserSystem;
userWechatPublicTag: UserWechatPublicTag;
wechatPublicTag: WechatPublicTag;

3
lib/general-app-domain/ExtraFile/Storage.js
View File

@ -53,7 +53,8 @@ exports.desc = {
type: "varchar",
params: {
length: 32
}
},
ref: ["article", "user"]
},
entityId: {
type: "varchar",

14
lib/general-app-domain/Message/Action.d.ts vendored
View File

@ -1,13 +1,13 @@
import { ActionDef } from "oak-domain/lib/types/Action";
import { GenericAction } from "oak-domain/lib/actions/action";
export declare type IAction = 'succeed' | 'fail';
export declare type IState = 'sending' | 'success' | 'failure';
export declare type VisitState = 'unvisited' | 'visited';
export declare type VisitAction = 'visit';
export declare type IAction = 'succeed' | 'fail' | string;
export declare type IState = 'sending' | 'success' | 'failure' | string;
export declare type VisitState = 'unvisited' | 'visited' | string;
export declare type VisitAction = 'visit' | string;
export declare type ParticularAction = IAction | VisitAction;
export declare type Action = GenericAction | ParticularAction;
export declare type Action = GenericAction | ParticularAction | string;
export declare const actions: string[];
export declare const ActionDefDict: {
iState: ActionDef<IAction, IState>;
visitState: ActionDef<"visit", VisitState>;
iState: ActionDef<string, string>;
visitState: ActionDef<string, string>;
};

8
lib/general-app-domain/MessageSent/Action.d.ts vendored
View File

@ -1,10 +1,10 @@
import { ActionDef } from "oak-domain/lib/types/Action";
import { GenericAction } from "oak-domain/lib/actions/action";
export declare type IAction = 'succeed' | 'fail';
export declare type IState = 'sending' | 'success' | 'failure';
export declare type IAction = 'succeed' | 'fail' | string;
export declare type IState = 'sending' | 'success' | 'failure' | string;
export declare type ParticularAction = IAction;
export declare type Action = GenericAction | ParticularAction;
export declare type Action = GenericAction | ParticularAction | string;
export declare const actions: string[];
export declare const ActionDefDict: {
iState: ActionDef<IAction, IState>;
iState: ActionDef<string, string>;
};

2
lib/general-app-domain/Mobile/Action.d.ts vendored
View File

@ -2,7 +2,7 @@ import { AbleAction, AbleState } from 'oak-domain/lib/actions/action';
import { ActionDef } from "oak-domain/lib/types/Action";
import { GenericAction } from "oak-domain/lib/actions/action";
export declare type ParticularAction = AbleAction;
export declare type Action = GenericAction | ParticularAction;
export declare type Action = GenericAction | ParticularAction | string;
export declare const actions: string[];
export declare const ActionDefDict: {
ableState: ActionDef<AbleAction, AbleState>;

8
lib/general-app-domain/Modi/Action.d.ts vendored
View File

@ -1,10 +1,10 @@
import { ActionDef } from "oak-domain/lib/types/Action";
import { GenericAction } from "oak-domain/lib/actions/action";
export declare type IState = 'active' | 'applied' | 'abandoned';
export declare type IAction = 'apply' | 'abandon';
export declare type IState = 'active' | 'applied' | 'abandoned' | string;
export declare type IAction = 'apply' | 'abandon' | string;
export declare type ParticularAction = IAction;
export declare type Action = GenericAction | ParticularAction;
export declare type Action = GenericAction | ParticularAction | string;
export declare const actions: string[];
export declare const ActionDefDict: {
iState: ActionDef<IAction, IState>;
iState: ActionDef<string, string>;
};

3
lib/general-app-domain/ModiEntity/Storage.js
View File

@ -12,7 +12,8 @@ exports.desc = {
type: "varchar",
params: {
length: 32
}
},
ref: ["user", "userEntityGrant", "userSystem", "userWechatPublicTag", "wechatPublicTag", "wechatQrCode", "wechatUser"]
},
entityId: {
type: "varchar",

3
lib/general-app-domain/OperEntity/Storage.js
View File

@ -12,7 +12,8 @@ exports.desc = {
type: "varchar",
params: {
length: 32
}
},
ref: ["user", "userEntityGrant", "userSystem", "userWechatPublicTag", "wechatPublicTag", "wechatQrCode", "wechatUser"]
},
entityId: {
type: "varchar",

11
lib/general-app-domain/Role/Schema.d.ts vendored
View File

@ -6,6 +6,7 @@ import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOper
import { ReadOnlyAction, RelationAction } from "oak-domain/lib/actions/action";
export declare type Relation = 'owner';
import * as UserRole from "../UserRole/Schema";
import * as UserEntityGrant from "../UserEntityGrant/Schema";
export declare type OpSchema = EntityShape & {
name: String<64>;
};
@ -14,6 +15,8 @@ export declare type Schema = EntityShape & {
name: String<64>;
userRole$role?: Array<UserRole.Schema>;
userRole$role$$aggr?: AggregationResult<UserRole.Schema>;
userEntityGrant$entity?: Array<UserEntityGrant.Schema>;
userEntityGrant$entity$$aggr?: AggregationResult<UserEntityGrant.Schema>;
} & {
[A in ExpressionKey]?: any;
};
@ -39,6 +42,12 @@ export declare type Projection = {
userRole$role$$aggr?: UserRole.Aggregation & {
$entity: "userRole";
};
userEntityGrant$entity?: UserEntityGrant.Selection & {
$entity: "userEntityGrant";
};
userEntityGrant$entity$$aggr?: UserEntityGrant.Aggregation & {
$entity: "userEntityGrant";
};
} & Partial<ExprOp<OpAttr | string>>;
declare type RoleIdProjection = OneOf<{
id: number;
@ -66,6 +75,7 @@ export declare type Selection<P extends Object = Projection> = Omit<SelectOperat
export declare type Aggregation = DeduceAggregation<Projection, Filter, Sorter>;
export declare type CreateOperationData = FormCreateData<OpSchema> & {
userRole$role?: OakOperation<"create", Omit<UserRole.CreateOperationData, "role" | "roleId">[]> | Array<OakOperation<"create", Omit<UserRole.CreateOperationData, "role" | "roleId">>>;
userEntityGrant$entity?: OakOperation<UserEntityGrant.UpdateOperation["action"], Omit<UserEntityGrant.UpdateOperationData, "entity" | "entityId">, UserEntityGrant.Filter> | OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "entity" | "entityId">> | OakOperation<UserEntityGrant.UpdateOperation["action"], Omit<UserEntityGrant.UpdateOperationData, "entity" | "entityId">, UserEntityGrant.Filter>>;
};
export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
@ -73,6 +83,7 @@ export declare type CreateOperation = CreateSingleOperation | CreateMultipleOper
export declare type UpdateOperationData = FormUpdateData<OpSchema> & {
[k: string]: any;
userRole$role?: UserRole.RemoveOperation | OakOperation<"create", Omit<UserRole.CreateOperationData, "role" | "roleId">[]> | Array<OakOperation<"create", Omit<UserRole.CreateOperationData, "role" | "roleId">> | UserRole.RemoveOperation>;
userEntityGrant$entity?: UserEntityGrant.UpdateOperation | UserEntityGrant.RemoveOperation | OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "entity" | "entityId">> | UserEntityGrant.UpdateOperation | UserEntityGrant.RemoveOperation>;
};
export declare type UpdateOperation = OakOperation<"update" | RelationAction | string, UpdateOperationData, Filter, Sorter>;
export declare type RemoveOperationData = {};

76
lib/general-app-domain/Storage.js
View File

@ -6,25 +6,25 @@ 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("./Address/Storage");
var Storage_7 = require("./Application/Storage");
var Storage_8 = require("./Area/Storage");
var Storage_9 = require("./Article/Storage");
var Storage_10 = require("./Captcha/Storage");
var Storage_11 = require("./Domain/Storage");
var Storage_12 = require("./Email/Storage");
var Storage_13 = require("./ExtraFile/Storage");
var Storage_14 = require("./Livestream/Storage");
var Storage_15 = require("./Message/Storage");
var Storage_16 = require("./MessageSent/Storage");
var Storage_17 = require("./Mobile/Storage");
var Storage_18 = require("./Platform/Storage");
var Storage_19 = require("./UserRole/Storage");
var Storage_20 = require("./Role/Storage");
var Storage_21 = require("./Subscription/Storage");
var Storage_22 = require("./System/Storage");
var Storage_23 = require("./Token/Storage");
var Storage_24 = require("./UserEntityGrant/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("./MessageSent/Storage");
var Storage_18 = require("./Mobile/Storage");
var Storage_19 = require("./Platform/Storage");
var Storage_20 = require("./UserRole/Storage");
var Storage_21 = require("./Role/Storage");
var Storage_22 = require("./Subscription/Storage");
var Storage_23 = require("./System/Storage");
var Storage_24 = require("./Token/Storage");
var Storage_25 = require("./UserSystem/Storage");
var Storage_26 = require("./UserWechatPublicTag/Storage");
var Storage_27 = require("./WechatPublicTag/Storage");
@ -36,25 +36,25 @@ exports.storageSchema = {
oper: Storage_3.desc,
operEntity: Storage_4.desc,
user: Storage_5.desc,
address: Storage_6.desc,
application: Storage_7.desc,
area: Storage_8.desc,
article: Storage_9.desc,
captcha: Storage_10.desc,
domain: Storage_11.desc,
email: Storage_12.desc,
extraFile: Storage_13.desc,
livestream: Storage_14.desc,
message: Storage_15.desc,
messageSent: Storage_16.desc,
mobile: Storage_17.desc,
platform: Storage_18.desc,
userRole: Storage_19.desc,
role: Storage_20.desc,
subscription: Storage_21.desc,
system: Storage_22.desc,
token: Storage_23.desc,
userEntityGrant: Storage_24.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,
messageSent: Storage_17.desc,
mobile: Storage_18.desc,
platform: Storage_19.desc,
userRole: Storage_20.desc,
role: Storage_21.desc,
subscription: Storage_22.desc,
system: Storage_23.desc,
token: Storage_24.desc,
userSystem: Storage_25.desc,
userWechatPublicTag: Storage_26.desc,
wechatPublicTag: Storage_27.desc,

2
lib/general-app-domain/Token/Action.d.ts vendored
View File

@ -2,7 +2,7 @@ import { AbleAction, AbleState } from 'oak-domain/lib/actions/action';
import { ActionDef } from "oak-domain/lib/types/Action";
import { GenericAction } from "oak-domain/lib/actions/action";
export declare type ParticularAction = AbleAction;
export declare type Action = GenericAction | ParticularAction;
export declare type Action = GenericAction | ParticularAction | string;
export declare const actions: string[];
export declare const ActionDefDict: {
ableState: ActionDef<AbleAction, AbleState>;

3
lib/general-app-domain/Token/Storage.js
View File

@ -12,7 +12,8 @@ exports.desc = {
type: "varchar",
params: {
length: 32
}
},
ref: ["email", "mobile", "wechatUser"]
},
entityId: {
type: "varchar",

14
lib/general-app-domain/User/Action.d.ts vendored
View File

@ -1,13 +1,13 @@
import { ActionDef } from "oak-domain/lib/types/Action";
import { GenericAction, RelationAction } from "oak-domain/lib/actions/action";
export declare type IdAction = 'verify' | 'accept' | 'reject';
export declare type IdState = 'unverified' | 'verified' | 'verifying';
export declare type UserAction = 'activate' | 'disable' | 'enable' | 'mergeTo' | 'mergeFrom';
export declare type UserState = 'shadow' | 'normal' | 'disabled' | 'merged';
export declare type IdAction = 'verify' | 'accept' | 'reject' | string;
export declare type IdState = 'unverified' | 'verified' | 'verifying' | string;
export declare type UserAction = 'activate' | 'disable' | 'enable' | 'mergeTo' | 'mergeFrom' | string;
export declare type UserState = 'shadow' | 'normal' | 'disabled' | 'merged' | string;
export declare type ParticularAction = UserAction | IdAction;
export declare type Action = GenericAction | ParticularAction | RelationAction;
export declare type Action = GenericAction | ParticularAction | RelationAction | string;
export declare const actions: string[];
export declare const ActionDefDict: {
idState: ActionDef<IdAction, IdState>;
userState: ActionDef<UserAction, UserState>;
idState: ActionDef<string, string>;
userState: ActionDef<string, string>;
};

20
lib/general-app-domain/User/Schema.d.ts vendored
View File

@ -50,6 +50,8 @@ export declare type Schema = EntityShape & {
ref?: Schema | null;
oper$operator?: Array<Oper.Schema>;
oper$operator$$aggr?: AggregationResult<Oper.Schema>;
user$ref?: Array<Schema>;
user$ref$$aggr?: AggregationResult<Schema>;
email$user?: Array<Email.Schema>;
email$user$$aggr?: AggregationResult<Email.Schema>;
message$user?: Array<Message.Schema>;
@ -62,8 +64,6 @@ export declare type Schema = EntityShape & {
token$user$$aggr?: AggregationResult<Token.Schema>;
token$player?: Array<Token.Schema>;
token$player$$aggr?: AggregationResult<Token.Schema>;
user$ref?: Array<Schema>;
user$ref$$aggr?: AggregationResult<Schema>;
userEntityGrant$granter?: Array<UserEntityGrant.Schema>;
userEntityGrant$granter$$aggr?: AggregationResult<UserEntityGrant.Schema>;
userEntityGrant$grantee?: Array<UserEntityGrant.Schema>;
@ -131,6 +131,12 @@ export declare type Projection = {
oper$operator$$aggr?: Oper.Aggregation & {
$entity: "oper";
};
user$ref?: Selection & {
$entity: "user";
};
user$ref$$aggr?: Aggregation & {
$entity: "user";
};
email$user?: Email.Selection & {
$entity: "email";
};
@ -167,12 +173,6 @@ export declare type Projection = {
token$player$$aggr?: Token.Aggregation & {
$entity: "token";
};
user$ref?: Selection & {
$entity: "user";
};
user$ref$$aggr?: Aggregation & {
$entity: "user";
};
userEntityGrant$granter?: UserEntityGrant.Selection & {
$entity: "userEntityGrant";
};
@ -287,13 +287,13 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "refId">
refId?: String<64>;
})) & {
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>>;
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>>;
userRole$user?: OakOperation<"create", Omit<UserRole.CreateOperationData, "user" | "userId">[]> | Array<OakOperation<"create", Omit<UserRole.CreateOperationData, "user" | "userId">>>;
token$user?: OakOperation<Token.UpdateOperation["action"], Omit<Token.UpdateOperationData, "user" | "userId">, Token.Filter> | OakOperation<"create", Omit<Token.CreateOperationData, "user" | "userId">[]> | Array<OakOperation<"create", Omit<Token.CreateOperationData, "user" | "userId">> | OakOperation<Token.UpdateOperation["action"], Omit<Token.UpdateOperationData, "user" | "userId">, Token.Filter>>;
token$player?: OakOperation<Token.UpdateOperation["action"], Omit<Token.UpdateOperationData, "player" | "playerId">, Token.Filter> | OakOperation<"create", Omit<Token.CreateOperationData, "player" | "playerId">[]> | Array<OakOperation<"create", Omit<Token.CreateOperationData, "player" | "playerId">> | OakOperation<Token.UpdateOperation["action"], Omit<Token.UpdateOperationData, "player" | "playerId">, Token.Filter>>;
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>>;
userEntityGrant$granter?: OakOperation<UserEntityGrant.UpdateOperation["action"], Omit<UserEntityGrant.UpdateOperationData, "granter" | "granterId">, UserEntityGrant.Filter> | OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "granter" | "granterId">[]> | Array<OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "granter" | "granterId">> | OakOperation<UserEntityGrant.UpdateOperation["action"], Omit<UserEntityGrant.UpdateOperationData, "granter" | "granterId">, UserEntityGrant.Filter>>;
userEntityGrant$grantee?: OakOperation<UserEntityGrant.UpdateOperation["action"], Omit<UserEntityGrant.UpdateOperationData, "grantee" | "granteeId">, UserEntityGrant.Filter> | OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "grantee" | "granteeId">[]> | Array<OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "grantee" | "granteeId">> | OakOperation<UserEntityGrant.UpdateOperation["action"], Omit<UserEntityGrant.UpdateOperationData, "grantee" | "granteeId">, UserEntityGrant.Filter>>;
userSystem$user?: OakOperation<UserSystem.UpdateOperation["action"], Omit<UserSystem.UpdateOperationData, "user" | "userId">, UserSystem.Filter> | OakOperation<"create", Omit<UserSystem.CreateOperationData, "user" | "userId">[]> | Array<OakOperation<"create", Omit<UserSystem.CreateOperationData, "user" | "userId">> | OakOperation<UserSystem.UpdateOperation["action"], Omit<UserSystem.UpdateOperationData, "user" | "userId">, UserSystem.Filter>>;
@ -322,13 +322,13 @@ 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>;
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>;
userRole$user?: UserRole.RemoveOperation | OakOperation<"create", Omit<UserRole.CreateOperationData, "user" | "userId">[]> | Array<OakOperation<"create", Omit<UserRole.CreateOperationData, "user" | "userId">> | UserRole.RemoveOperation>;
token$user?: Token.UpdateOperation | Token.RemoveOperation | OakOperation<"create", Omit<Token.CreateOperationData, "user" | "userId">[]> | Array<OakOperation<"create", Omit<Token.CreateOperationData, "user" | "userId">> | Token.UpdateOperation | Token.RemoveOperation>;
token$player?: Token.UpdateOperation | Token.RemoveOperation | OakOperation<"create", Omit<Token.CreateOperationData, "player" | "playerId">[]> | Array<OakOperation<"create", Omit<Token.CreateOperationData, "player" | "playerId">> | Token.UpdateOperation | Token.RemoveOperation>;
user$ref?: UpdateOperation | RemoveOperation | OakOperation<"create", Omit<CreateOperationData, "ref" | "refId">[]> | Array<OakOperation<"create", Omit<CreateOperationData, "ref" | "refId">> | UpdateOperation | RemoveOperation>;
userEntityGrant$granter?: UserEntityGrant.UpdateOperation | UserEntityGrant.RemoveOperation | OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "granter" | "granterId">[]> | Array<OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "granter" | "granterId">> | UserEntityGrant.UpdateOperation | UserEntityGrant.RemoveOperation>;
userEntityGrant$grantee?: UserEntityGrant.UpdateOperation | UserEntityGrant.RemoveOperation | OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "grantee" | "granteeId">[]> | Array<OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "grantee" | "granteeId">> | UserEntityGrant.UpdateOperation | UserEntityGrant.RemoveOperation>;
userSystem$user?: UserSystem.UpdateOperation | UserSystem.RemoveOperation | OakOperation<"create", Omit<UserSystem.CreateOperationData, "user" | "userId">[]> | Array<OakOperation<"create", Omit<UserSystem.CreateOperationData, "user" | "userId">> | UserSystem.UpdateOperation | UserSystem.RemoveOperation>;

2
lib/general-app-domain/User/locales/zh_CN.json
View File

@ -1 +1 @@
{ "attr": { "name": "姓名", "nickname": "昵称", "birth": "生日", "password": "密码", "passwordSha1": "sha1加密密码", "gender": "性别", "avatar": "头像", "idCardType": "证件类型", "idNumber": "证件号码", "ref": "介绍人", "files": "相关文件", "userState": "用户状态", "idState": "身份验证状态", "codes": "微信分享二维码" }, "action": { "activate": "激活", "accept": "同意", "verify": "验证", "reject": "拒绝", "enable": "启用", "disable": "禁用", "mergeTo": "合并", "mergeFrom": "使合并" }, "v": { "userState": { "shadow": "未激活", "normal": "正常", "disabled": "禁用", "merged": "已被合并" }, "idState": { "unverified": "未验证", "verifying": "验证中", "verified": "已验证" }, "gender": { "male": "男", "female": "女" }, "idCardType": { "ID-Card": "身份证", "passport": "护照", "Mainland-passport": "港澳台通行证" } } }
{ "attr": { "name": "姓名", "nickname": "昵称", "birth": "生日", "password": "密码", "passwordSha1": "sha1加密密码", "gender": "性别", "avatar": "头像", "idCardType": "证件类型", "idNumber": "证件号码", "ref": "指向用户", "files": "相关文件", "userState": "用户状态", "idState": "身份验证状态", "codes": "微信分享二维码" }, "action": { "activate": "激活", "accept": "同意", "verify": "验证", "reject": "拒绝", "enable": "启用", "disable": "禁用", "mergeTo": "合并", "mergeFrom": "使合并" }, "v": { "userState": { "shadow": "未激活", "normal": "正常", "disabled": "禁用", "merged": "已被合并" }, "idState": { "unverified": "未验证", "verifying": "验证中", "verified": "已验证" }, "gender": { "male": "男", "female": "女" }, "idCardType": { "ID-Card": "身份证", "passport": "护照", "Mainland-passport": "港澳台通行证" } } }

2
lib/general-app-domain/UserEntityGrant/Action.d.ts vendored
View File

@ -1,5 +1,5 @@
import { GenericAction } from "oak-domain/lib/actions/action";
export declare type ParticularAction = 'confirm';
export declare type Action = GenericAction | ParticularAction;
export declare type Action = GenericAction | ParticularAction | string;
export declare const actions: string[];
export declare const ActionDefDict: {};

34
lib/general-app-domain/UserEntityGrant/Schema.d.ts vendored
View File

@ -5,11 +5,12 @@ 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 { Action, ParticularAction } from "./Action";
import * as User from "../User/Schema";
import * as Role from "../Role/Schema";
import * as OperEntity from "../OperEntity/Schema";
import * as ModiEntity from "../ModiEntity/Schema";
import * as WechatQrCode from "../WechatQrCode/Schema";
export declare type OpSchema = EntityShape & {
entity: String<32>;
entity: "role" | string;
entityId: String<64>;
relation: String<32>;
type: 'grant' | 'transfer';
@ -24,7 +25,7 @@ export declare type OpSchema = EntityShape & {
};
export declare type OpAttr = keyof OpSchema;
export declare type Schema = EntityShape & {
entity: String<32>;
entity: "role" | string;
entityId: String<64>;
relation: String<32>;
type: 'grant' | 'transfer';
@ -38,6 +39,7 @@ export declare type Schema = EntityShape & {
redirectTo?: Object | null;
granter: User.Schema;
grantee?: User.Schema | null;
role?: Role.Schema;
operEntity$entity?: Array<OperEntity.Schema>;
operEntity$entity$$aggr?: AggregationResult<OperEntity.Schema>;
modiEntity$entity?: Array<ModiEntity.Schema>;
@ -47,12 +49,12 @@ export declare type Schema = EntityShape & {
} & {
[A in ExpressionKey]?: any;
};
declare type AttrFilter = {
declare type AttrFilter<E> = {
id: Q_StringValue | SubQuery.UserEntityGrantIdSubQuery;
$$createAt$$: Q_DateValue;
$$seq$$: Q_StringValue;
$$updateAt$$: Q_DateValue;
entity: Q_StringValue;
entity: E;
entityId: Q_StringValue;
relation: Q_StringValue;
type: Q_EnumValue<'grant' | 'transfer'>;
@ -66,8 +68,9 @@ declare type AttrFilter = {
expiresAt: Q_DateValue;
expired: Q_BooleanValue;
redirectTo: Object;
role: Role.Filter;
};
export declare type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
export declare type Filter<E = Q_EnumValue<"role" | string>> = MakeFilter<AttrFilter<E> & ExprOp<OpAttr | string>>;
export declare type Projection = {
"#id"?: NodeId;
[k: string]: any;
@ -89,6 +92,7 @@ export declare type Projection = {
expiresAt?: number;
expired?: number;
redirectTo?: number;
role?: Role.Projection;
operEntity$entity?: OperEntity.Selection & {
$entity: "operEntity";
};
@ -115,6 +119,9 @@ declare type UserIdProjection = OneOf<{
granterId: number;
granteeId: number;
}>;
declare type RoleIdProjection = OneOf<{
entityId: number;
}>;
export declare type SortAttr = {
id: number;
} | {
@ -149,6 +156,8 @@ export declare type SortAttr = {
expiresAt: number;
} | {
expired: number;
} | {
role: Role.SortAttr;
} | {
[k: string]: any;
} | OneOf<ExprOp<OpAttr | string>>;
@ -177,6 +186,9 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity"
} | {
granteeId?: String<64>;
})) & ({
entity: "role";
entityId: String<64>;
} | {
entity?: string;
entityId?: string;
[K: string]: any;
@ -188,7 +200,7 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity"
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, "granterId" | "granteeId">> & (({
export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entity" | "entityId" | "granterId" | "granteeId">> & (({
granter: User.CreateSingleOperation;
granterId?: never;
} | {
@ -212,7 +224,10 @@ export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "granter
} | {
grantee?: never;
granteeId?: String<64> | null;
})) & {
})) & ({
entity?: ("role" | string) | null;
entityId?: String<64> | null;
}) & {
[k: string]: any;
operEntity$entity?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">>>;
modiEntity$entity?: OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">>>;
@ -223,10 +238,13 @@ export declare type RemoveOperationData = {} & (({
granter?: User.UpdateOperation | User.RemoveOperation;
}) & ({
grantee?: User.UpdateOperation | User.RemoveOperation;
}));
})) & ({
[k: string]: any;
});
export declare type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
export declare type Operation = CreateOperation | UpdateOperation | RemoveOperation;
export declare type UserIdSubQuery = Selection<UserIdProjection>;
export declare type RoleIdSubQuery = Selection<RoleIdProjection>;
export declare type UserEntityGrantIdSubQuery = Selection<UserEntityGrantIdProjection>;
export declare type EntityDef = {
Schema: Schema;

3
lib/general-app-domain/UserEntityGrant/Storage.js
View File

@ -8,7 +8,8 @@ exports.desc = {
type: "varchar",
params: {
length: 32
}
},
ref: ["role"]
},
entityId: {
type: "varchar",

3
lib/general-app-domain/WechatQrCode/Storage.js
View File

@ -8,7 +8,8 @@ exports.desc = {
type: "varchar",
params: {
length: 32
}
},
ref: ["user", "userEntityGrant"]
},
entityId: {
type: "varchar",

16
lib/general-app-domain/_SubQuery.d.ts vendored
View File

@ -3,6 +3,7 @@ import * as ModiEntity from "./ModiEntity/Schema";
import * as Oper from "./Oper/Schema";
import * as OperEntity from "./OperEntity/Schema";
import * as User from "./User/Schema";
import * as UserEntityGrant from "./UserEntityGrant/Schema";
import * as Address from "./Address/Schema";
import * as Application from "./Application/Schema";
import * as Area from "./Area/Schema";
@ -21,7 +22,6 @@ import * as Role from "./Role/Schema";
import * as Subscription from "./Subscription/Schema";
import * as System from "./System/Schema";
import * as Token from "./Token/Schema";
import * as UserEntityGrant from "./UserEntityGrant/Schema";
import * as UserSystem from "./UserSystem/Schema";
import * as UserWechatPublicTag from "./UserWechatPublicTag/Schema";
import * as WechatPublicTag from "./WechatPublicTag/Schema";
@ -54,6 +54,8 @@ export declare type OperEntityIdSubQuery = {
export declare type UserIdSubQuery = {
[K in "$in" | "$nin"]?: (Oper.UserIdSubQuery & {
entity: "oper";
}) | (User.UserIdSubQuery & {
entity: "user";
}) | (Email.UserIdSubQuery & {
entity: "email";
}) | (Message.UserIdSubQuery & {
@ -64,8 +66,6 @@ export declare type UserIdSubQuery = {
entity: "userRole";
}) | (Token.UserIdSubQuery & {
entity: "token";
}) | (User.UserIdSubQuery & {
entity: "user";
}) | (UserEntityGrant.UserIdSubQuery & {
entity: "userEntityGrant";
}) | (UserSystem.UserIdSubQuery & {
@ -78,6 +78,11 @@ export declare type UserIdSubQuery = {
entity: "user";
}) | any;
};
export declare type UserEntityGrantIdSubQuery = {
[K in "$in" | "$nin"]?: (UserEntityGrant.UserEntityGrantIdSubQuery & {
entity: "userEntityGrant";
}) | any;
};
export declare type AddressIdSubQuery = {
[K in "$in" | "$nin"]?: (Address.AddressIdSubQuery & {
entity: "address";
@ -194,11 +199,6 @@ export declare type TokenIdSubQuery = {
entity: "token";
}) | any;
};
export declare type UserEntityGrantIdSubQuery = {
[K in "$in" | "$nin"]?: (UserEntityGrant.UserEntityGrantIdSubQuery & {
entity: "userEntityGrant";
}) | any;
};
export declare type UserSystemIdSubQuery = {
[K in "$in" | "$nin"]?: (UserSystem.UserSystemIdSubQuery & {
entity: "userSystem";

10
package.json
View File

@ -16,11 +16,11 @@
"@wangeditor/editor-for-react": "^1.0.4",
"classnames": "^2.3.1",
"dayjs": "^1.11.5",
"oak-common-aspect": "file:../oak-common-aspect",
"oak-domain": "file:../oak-domain",
"oak-external-sdk": "file:../oak-external-sdk",
"oak-frontend-base": "file:../oak-frontend-base",
"oak-memory-tree-store": "file:../oak-memory-tree-store",
"oak-common-aspect": "^2.1.5",
"oak-domain": "^2.5.1",
"oak-external-sdk": "^1.0.8",
"oak-frontend-base": "2.3.7",
"oak-memory-tree-store": "^2.2.1",
"qr-image": "^3.2.0",
"react-scripts": "^5.0.1",
"sha1": "^1.1.1",

2
src/entities/User.ts
View File

@ -90,7 +90,7 @@ const locale: LocaleDef<Schema, Action, '', {
avatar: '头像',
idCardType: '证件类型',
idNumber: '证件号码',
ref: '介绍人',
ref: '指向用户',
files: '相关文件',
userState: '用户状态',
idState: '身份验证状态',