From d87b9b591e972bee502a34c2c808e5447bad3ef9 Mon Sep 17 00:00:00 2001 From: qsc <3153284618@qq.com> Date: Thu, 12 Oct 2023 13:59:12 +0800 Subject: [PATCH] =?UTF-8?q?wechatUser=E5=8E=BB=E6=8E=89remark=E3=80=81lang?= =?UTF-8?q?uage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subscribedList/index.js | 4 -- .../subscribedList/web.pc.d.ts | 1 - .../subscribedList/web.pc.js | 3 +- es/entities/WechatUser.d.ts | 2 - es/entities/WechatUser.js | 7 -- es/oak-app-domain/Application/Schema.d.ts | 24 +++---- es/oak-app-domain/EntityDict.d.ts | 4 +- es/oak-app-domain/ModiEntity/Schema.d.ts | 64 +++++++++---------- es/oak-app-domain/ModiEntity/Storage.js | 2 +- es/oak-app-domain/OperEntity/Schema.d.ts | 64 +++++++++---------- es/oak-app-domain/OperEntity/Storage.js | 2 +- es/oak-app-domain/Storage.js | 6 +- es/oak-app-domain/WechatUser/Schema.d.ts | 12 ---- es/oak-app-domain/WechatUser/Storage.js | 11 ---- .../WechatUser/locales/zh_CN.json | 2 +- es/oak-app-domain/_SubQuery.d.ts | 24 +++---- .../subscribedList/index.js | 4 -- .../subscribedList/web.pc.d.ts | 1 - .../subscribedList/web.pc.js | 3 +- lib/entities/WechatUser.d.ts | 2 - lib/entities/WechatUser.js | 7 -- lib/oak-app-domain/Application/Schema.d.ts | 24 +++---- lib/oak-app-domain/EntityDict.d.ts | 4 +- lib/oak-app-domain/ModiEntity/Schema.d.ts | 64 +++++++++---------- lib/oak-app-domain/ModiEntity/Storage.js | 2 +- lib/oak-app-domain/OperEntity/Schema.d.ts | 64 +++++++++---------- lib/oak-app-domain/OperEntity/Storage.js | 2 +- lib/oak-app-domain/Storage.js | 20 +++--- lib/oak-app-domain/WechatUser/Schema.d.ts | 12 ---- lib/oak-app-domain/WechatUser/Storage.js | 11 ---- .../WechatUser/locales/zh_CN.json | 2 +- lib/oak-app-domain/_SubQuery.d.ts | 24 +++---- lib/triggers/sessionMessage.js | 2 +- .../subscribedList/index.ts | 4 -- .../subscribedList/web.pc.tsx | 8 --- src/entities/WechatUser.ts | 12 +--- src/oak-app-domain/Application/Schema.ts | 24 +++---- src/oak-app-domain/EntityDict.ts | 4 +- src/oak-app-domain/ModiEntity/Schema.ts | 64 +++++++++---------- src/oak-app-domain/ModiEntity/Storage.ts | 2 +- src/oak-app-domain/OperEntity/Schema.ts | 64 +++++++++---------- src/oak-app-domain/OperEntity/Storage.ts | 2 +- src/oak-app-domain/Storage.ts | 6 +- src/oak-app-domain/WechatUser/Schema.ts | 12 ---- src/oak-app-domain/WechatUser/Storage.ts | 11 ---- .../WechatUser/locales/zh_CN.json | 2 +- src/oak-app-domain/_SubQuery.ts | 24 +++---- 47 files changed, 299 insertions(+), 420 deletions(-) diff --git a/es/components/userWechatPublicTag/subscribedList/index.js b/es/components/userWechatPublicTag/subscribedList/index.js index 2942897ff..4450955ce 100644 --- a/es/components/userWechatPublicTag/subscribedList/index.js +++ b/es/components/userWechatPublicTag/subscribedList/index.js @@ -16,8 +16,6 @@ export default OakComponent({ subscribedAt: 1, applicationId: 1, userId: 1, - remark: 1, - language: 1, nickname: 1, avatar: 1, userWechatPublicTag$wechatUser: { @@ -59,8 +57,6 @@ export default OakComponent({ nickname: ele?.nickname, avatar: ele?.avatar, subscribedAt: ele?.subscribedAt, - remark: ele?.remark, - language: ele?.language, }; }); return { diff --git a/es/components/userWechatPublicTag/subscribedList/web.pc.d.ts b/es/components/userWechatPublicTag/subscribedList/web.pc.d.ts index 7c5f9af3d..52c62d02d 100644 --- a/es/components/userWechatPublicTag/subscribedList/web.pc.d.ts +++ b/es/components/userWechatPublicTag/subscribedList/web.pc.d.ts @@ -4,7 +4,6 @@ export default function Render(props: WebComponentProps { setEditOpen(false); setEditTags([]); setOpenId(''); }, footer: _jsxs(Space, { style: { display: 'flex', justifyContent: 'center' }, children: [_jsx(Button, { onClick: () => { setEditOpen(false); setEditTags([]); setOpenId(''); }, children: "\u53D6\u6D88" }), _jsx(Button, { type: 'primary', onClick: () => { setEditOpen(false); setEditTags([]); @@ -98,7 +97,7 @@ export default function Render(props) { }, } }), _jsx(Modal, { title: '\u7528\u6237\u8BE6\u60C5', open: open, onCancel: () => { setOpen(false); - }, footer: null, width: 750, children: _jsxs(Descriptions, { bordered: true, column: 3, children: [_jsx(Descriptions.Item, { label: '\u6635\u79F0', children: user.nickname ? user.nickname : '--' }), _jsx(Descriptions.Item, { label: '\u5934\u50CF', children: user.avatar ? _jsx(Image, { src: user.avatar }) : '--' }), _jsx(Descriptions.Item, { label: '\u5907\u6CE8', children: user.remark ? user.remark : '--' }), _jsx(Descriptions.Item, { label: '\u7528\u6237\u6807\u8BC6', children: user.openId ? user.openId : '--' }), _jsx(Descriptions.Item, { label: '\u540C\u6B65\u72B6\u6001', children: user.sync ? '同步' : '未同步' }), _jsx(Descriptions.Item, { label: '\u540C\u6B65\u65F6\u95F4', children: user.syncAt ? dayjs(user.syncAt).format('YYYY-MM-DD HH:mm') : '--' }), _jsx(Descriptions.Item, { label: '\u5173\u6CE8\u65F6\u95F4', children: user.subscribedAt ? dayjs(user.subscribedAt * 1000).format('YYYY-MM-DD HH:mm') : '--' }), _jsx(Descriptions.Item, { label: '\u7528\u6237\u6807\u7B7E', children: user.tags && user.tags.length > 0 ? + }, footer: null, width: 750, children: _jsxs(Descriptions, { bordered: true, column: 3, children: [_jsx(Descriptions.Item, { label: '\u6635\u79F0', children: user.nickname ? user.nickname : '--' }), _jsx(Descriptions.Item, { label: '\u5934\u50CF', children: user.avatar ? _jsx(Image, { src: user.avatar }) : '--' }), _jsx(Descriptions.Item, { label: '\u7528\u6237\u6807\u8BC6', children: user.openId ? user.openId : '--' }), _jsx(Descriptions.Item, { label: '\u540C\u6B65\u72B6\u6001', children: user.sync ? '同步' : '未同步' }), _jsx(Descriptions.Item, { label: '\u540C\u6B65\u65F6\u95F4', children: user.syncAt ? dayjs(user.syncAt).format('YYYY-MM-DD HH:mm') : '--' }), _jsx(Descriptions.Item, { label: '\u5173\u6CE8\u65F6\u95F4', children: user.subscribedAt ? dayjs(user.subscribedAt * 1000).format('YYYY-MM-DD HH:mm') : '--' }), _jsx(Descriptions.Item, { label: '\u7528\u6237\u6807\u7B7E', children: user.tags && user.tags.length > 0 ? user.tags.map((tag) => { return _jsx(Tag, { children: tag.text }); }) : '暂无标签' })] }) })] })); diff --git a/es/entities/WechatUser.d.ts b/es/entities/WechatUser.d.ts index 0e2552be8..65f554c1a 100644 --- a/es/entities/WechatUser.d.ts +++ b/es/entities/WechatUser.d.ts @@ -21,6 +21,4 @@ export interface Schema extends EntityShape { tokens: Array; nickname?: String<128>; avatar?: Image; - remark?: String<32>; - language: 'zh_CN' | 'zh_TW' | 'en'; } diff --git a/es/entities/WechatUser.js b/es/entities/WechatUser.js index a36e402fd..a0850e931 100644 --- a/es/entities/WechatUser.js +++ b/es/entities/WechatUser.js @@ -21,8 +21,6 @@ const entityDesc = { application: '应用', nickname: '昵称', avatar: '头像', - remark: '备注', - language: '语言', }, v: { origin: { @@ -30,11 +28,6 @@ const entityDesc = { public: '公众号', web: '网站', }, - language: { - zh_CN: '简体', - zh_TW: '繁体', - en: '英语' - } } }, } diff --git a/es/oak-app-domain/Application/Schema.d.ts b/es/oak-app-domain/Application/Schema.d.ts index c2ffffff4..62eb2c5bf 100644 --- a/es/oak-app-domain/Application/Schema.d.ts +++ b/es/oak-app-domain/Application/Schema.d.ts @@ -12,11 +12,11 @@ import * as Notification from "../Notification/Schema"; import * as SessionMessage from "../SessionMessage/Schema"; import * as Token from "../Token/Schema"; import * as WechatMenu from "../WechatMenu/Schema"; +import * as wechatPublicAutoReply from "../wechatPublicAutoReply/Schema"; import * as WechatPublicTag from "../WechatPublicTag/Schema"; import * as WechatPublicTemplate from "../WechatPublicTemplate/Schema"; import * as WechatQrCode from "../WechatQrCode/Schema"; import * as WechatUser from "../WechatUser/Schema"; -import * as wechatPublicAutoReply from "../wechatPublicAutoReply/Schema"; import * as Session from "../Session/Schema"; export type Passport = 'email' | 'mobile' | 'wechat' | 'wechatPublic'; export type AppType = 'web' | 'wechatMp' | 'wechatPublic'; @@ -93,6 +93,8 @@ export type Schema = EntityShape & { token$application$$aggr?: AggregationResult; wechatMenu$application?: Array; wechatMenu$application$$aggr?: AggregationResult; + wechatPublicAutoReply$application?: Array; + wechatPublicAutoReply$application$$aggr?: AggregationResult; wechatPublicTag$application?: Array; wechatPublicTag$application$$aggr?: AggregationResult; wechatPublicTemplate$application?: Array; @@ -101,8 +103,6 @@ export type Schema = EntityShape & { wechatQrCode$application$$aggr?: AggregationResult; wechatUser$application?: Array; wechatUser$application$$aggr?: AggregationResult; - wechatPublicAutoReply$application?: Array; - wechatPublicAutoReply$application$$aggr?: AggregationResult; session$entity?: Array; session$entity$$aggr?: AggregationResult; } & { @@ -125,11 +125,11 @@ type AttrFilter = { sessionMessage$application: SessionMessage.Filter & SubQueryPredicateMetadata; token$application: Token.Filter & SubQueryPredicateMetadata; wechatMenu$application: WechatMenu.Filter & SubQueryPredicateMetadata; + wechatPublicAutoReply$application: wechatPublicAutoReply.Filter & SubQueryPredicateMetadata; wechatPublicTag$application: WechatPublicTag.Filter & SubQueryPredicateMetadata; wechatPublicTemplate$application: WechatPublicTemplate.Filter & SubQueryPredicateMetadata; wechatQrCode$application: WechatQrCode.Filter & SubQueryPredicateMetadata; wechatUser$application: WechatUser.Filter & SubQueryPredicateMetadata; - wechatPublicAutoReply$application: wechatPublicAutoReply.Filter & SubQueryPredicateMetadata; session$entity: Session.Filter & SubQueryPredicateMetadata; }; export type Filter = MakeFilter>; @@ -177,6 +177,12 @@ export type Projection = { wechatMenu$application$$aggr?: WechatMenu.Aggregation & { $entity: "wechatMenu"; }; + wechatPublicAutoReply$application?: wechatPublicAutoReply.Selection & { + $entity: "wechatPublicAutoReply"; + }; + wechatPublicAutoReply$application$$aggr?: wechatPublicAutoReply.Aggregation & { + $entity: "wechatPublicAutoReply"; + }; wechatPublicTag$application?: WechatPublicTag.Selection & { $entity: "wechatPublicTag"; }; @@ -201,12 +207,6 @@ export type Projection = { wechatUser$application$$aggr?: WechatUser.Aggregation & { $entity: "wechatUser"; }; - wechatPublicAutoReply$application?: wechatPublicAutoReply.Selection & { - $entity: "wechatPublicAutoReply"; - }; - wechatPublicAutoReply$application$$aggr?: wechatPublicAutoReply.Aggregation & { - $entity: "wechatPublicAutoReply"; - }; session$entity?: Session.Selection & { $entity: "session"; }; @@ -265,11 +265,11 @@ export type CreateOperationData = FormCreateData> & ( sessionMessage$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; token$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; wechatMenu$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; + wechatPublicAutoReply$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; wechatPublicTag$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; wechatPublicTemplate$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; wechatQrCode$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; wechatUser$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; - wechatPublicAutoReply$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; session$entity?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; }; export type CreateSingleOperation = OakOperation<"create", CreateOperationData>; @@ -294,11 +294,11 @@ export type UpdateOperationData = FormUpdateData> & ( sessionMessage$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; token$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; wechatMenu$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; + wechatPublicAutoReply$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; wechatPublicTag$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; wechatPublicTemplate$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; wechatQrCode$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; wechatUser$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; - wechatPublicAutoReply$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; session$entity?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; }; export type UpdateOperation = OakOperation<"update" | string, UpdateOperationData, Filter, Sorter>; diff --git a/es/oak-app-domain/EntityDict.d.ts b/es/oak-app-domain/EntityDict.d.ts index e5e7ec01f..900b03749 100644 --- a/es/oak-app-domain/EntityDict.d.ts +++ b/es/oak-app-domain/EntityDict.d.ts @@ -41,11 +41,11 @@ import { EntityDef as UserSystem } from "./UserSystem/Schema"; import { EntityDef as UserWechatPublicTag } from "./UserWechatPublicTag/Schema"; import { EntityDef as WechatLogin } from "./WechatLogin/Schema"; import { EntityDef as WechatMenu } from "./WechatMenu/Schema"; +import { EntityDef as wechatPublicAutoReply } from "./wechatPublicAutoReply/Schema"; import { EntityDef as WechatPublicTag } from "./WechatPublicTag/Schema"; import { EntityDef as WechatPublicTemplate } from "./WechatPublicTemplate/Schema"; import { EntityDef as WechatQrCode } from "./WechatQrCode/Schema"; import { EntityDef as WechatUser } from "./WechatUser/Schema"; -import { EntityDef as wechatPublicAutoReply } from "./wechatPublicAutoReply/Schema"; export type EntityDict = { actionAuth: ActionAuth; i18n: I18n; @@ -90,9 +90,9 @@ export type EntityDict = { userWechatPublicTag: UserWechatPublicTag; wechatLogin: WechatLogin; wechatMenu: WechatMenu; + wechatPublicAutoReply: wechatPublicAutoReply; wechatPublicTag: WechatPublicTag; wechatPublicTemplate: WechatPublicTemplate; wechatQrCode: WechatQrCode; wechatUser: WechatUser; - wechatPublicAutoReply: wechatPublicAutoReply; }; diff --git a/es/oak-app-domain/ModiEntity/Schema.d.ts b/es/oak-app-domain/ModiEntity/Schema.d.ts index 6b5fb3a49..75a650554 100644 --- a/es/oak-app-domain/ModiEntity/Schema.d.ts +++ b/es/oak-app-domain/ModiEntity/Schema.d.ts @@ -12,20 +12,20 @@ import * as UserSystem from "../UserSystem/Schema"; import * as UserWechatPublicTag from "../UserWechatPublicTag/Schema"; import * as WechatLogin from "../WechatLogin/Schema"; import * as WechatMenu from "../WechatMenu/Schema"; +import * as wechatPublicAutoReply from "../wechatPublicAutoReply/Schema"; import * as WechatPublicTag from "../WechatPublicTag/Schema"; import * as WechatPublicTemplate from "../WechatPublicTemplate/Schema"; import * as WechatQrCode from "../WechatQrCode/Schema"; import * as WechatUser from "../WechatUser/Schema"; -import * as wechatPublicAutoReply from "../wechatPublicAutoReply/Schema"; export type OpSchema = EntityShape & { modiId: ForeignKey<"modi">; - entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string; + entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string; entityId: String<64>; }; export type OpAttr = keyof OpSchema; export type Schema = EntityShape & { modiId: ForeignKey<"modi">; - entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string; + entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string; entityId: String<64>; modi: Modi.Schema; user?: User.Schema; @@ -34,11 +34,11 @@ export type Schema = EntityShape & { userWechatPublicTag?: UserWechatPublicTag.Schema; wechatLogin?: WechatLogin.Schema; wechatMenu?: WechatMenu.Schema; + wechatPublicAutoReply?: wechatPublicAutoReply.Schema; wechatPublicTag?: WechatPublicTag.Schema; wechatPublicTemplate?: WechatPublicTemplate.Schema; wechatQrCode?: WechatQrCode.Schema; wechatUser?: WechatUser.Schema; - wechatPublicAutoReply?: wechatPublicAutoReply.Schema; } & { [A in ExpressionKey]?: any; }; @@ -49,7 +49,7 @@ type AttrFilter = { $$updateAt$$: Q_DateValue; modiId: Q_StringValue; modi: Modi.Filter; - entity: Q_EnumValue<"user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string>; + entity: Q_EnumValue<"user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string>; entityId: Q_StringValue; user: User.Filter; userEntityGrant: UserEntityGrant.Filter; @@ -57,11 +57,11 @@ type AttrFilter = { userWechatPublicTag: UserWechatPublicTag.Filter; wechatLogin: WechatLogin.Filter; wechatMenu: WechatMenu.Filter; + wechatPublicAutoReply: wechatPublicAutoReply.Filter; wechatPublicTag: WechatPublicTag.Filter; wechatPublicTemplate: WechatPublicTemplate.Filter; wechatQrCode: WechatQrCode.Filter; wechatUser: WechatUser.Filter; - wechatPublicAutoReply: wechatPublicAutoReply.Filter; }; export type Filter = MakeFilter>; export type Projection = { @@ -81,11 +81,11 @@ export type Projection = { userWechatPublicTag?: UserWechatPublicTag.Projection; wechatLogin?: WechatLogin.Projection; wechatMenu?: WechatMenu.Projection; + wechatPublicAutoReply?: wechatPublicAutoReply.Projection; wechatPublicTag?: WechatPublicTag.Projection; wechatPublicTemplate?: WechatPublicTemplate.Projection; wechatQrCode?: WechatQrCode.Projection; wechatUser?: WechatUser.Projection; - wechatPublicAutoReply?: wechatPublicAutoReply.Projection; } & Partial>; type ModiEntityIdProjection = OneOf<{ id: number; @@ -111,6 +111,9 @@ type WechatLoginIdProjection = OneOf<{ type WechatMenuIdProjection = OneOf<{ entityId: number; }>; +type wechatPublicAutoReplyIdProjection = OneOf<{ + entityId: number; +}>; type WechatPublicTagIdProjection = OneOf<{ entityId: number; }>; @@ -123,9 +126,6 @@ type WechatQrCodeIdProjection = OneOf<{ type WechatUserIdProjection = OneOf<{ entityId: number; }>; -type wechatPublicAutoReplyIdProjection = OneOf<{ - entityId: number; -}>; export type SortAttr = { id: number; } | { @@ -154,6 +154,8 @@ export type SortAttr = { wechatLogin: WechatLogin.SortAttr; } | { wechatMenu: WechatMenu.SortAttr; +} | { + wechatPublicAutoReply: wechatPublicAutoReply.SortAttr; } | { wechatPublicTag: WechatPublicTag.SortAttr; } | { @@ -162,8 +164,6 @@ export type SortAttr = { wechatQrCode: WechatQrCode.SortAttr; } | { wechatUser: WechatUser.SortAttr; -} | { - wechatPublicAutoReply: wechatPublicAutoReply.SortAttr; } | { [k: string]: any; } | OneOf>; @@ -249,6 +249,17 @@ export type CreateOperationData = FormCreateData; +} | { + entity?: never; + entityId?: never; + wechatPublicAutoReply: wechatPublicAutoReply.CreateSingleOperation; +} | { + entity: "wechatPublicAutoReply"; + entityId: ForeignKey<"wechatPublicAutoReply">; + wechatPublicAutoReply: wechatPublicAutoReply.UpdateOperation; +} | { + entity: "wechatPublicAutoReply"; + entityId: ForeignKey<"wechatPublicAutoReply">; } | { entity?: never; entityId?: never; @@ -293,17 +304,6 @@ export type CreateOperationData = FormCreateData; -} | { - entity?: never; - entityId?: never; - wechatPublicAutoReply: wechatPublicAutoReply.CreateSingleOperation; -} | { - entity: "wechatPublicAutoReply"; - entityId: ForeignKey<"wechatPublicAutoReply">; - wechatPublicAutoReply: wechatPublicAutoReply.UpdateOperation; -} | { - entity: "wechatPublicAutoReply"; - entityId: ForeignKey<"wechatPublicAutoReply">; } | { entity?: string; entityId?: string; @@ -348,6 +348,10 @@ export type UpdateOperationData = FormUpdateData | null; + entity?: ("user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string) | null; + entityId?: ForeignKey<"User" | "UserEntityGrant" | "UserSystem" | "UserWechatPublicTag" | "WechatLogin" | "WechatMenu" | "wechatPublicAutoReply" | "WechatPublicTag" | "WechatPublicTemplate" | "WechatQrCode" | "WechatUser"> | null; }) & { [k: string]: any; }; @@ -389,6 +389,8 @@ export type RemoveOperationData = {} & (({ wechatLogin?: WechatLogin.UpdateOperation | WechatLogin.RemoveOperation; } | { wechatMenu?: WechatMenu.UpdateOperation | WechatMenu.RemoveOperation; +} | { + wechatPublicAutoReply?: wechatPublicAutoReply.UpdateOperation | wechatPublicAutoReply.RemoveOperation; } | { wechatPublicTag?: WechatPublicTag.UpdateOperation | WechatPublicTag.RemoveOperation; } | { @@ -397,8 +399,6 @@ export type RemoveOperationData = {} & (({ wechatQrCode?: WechatQrCode.UpdateOperation | WechatQrCode.RemoveOperation; } | { wechatUser?: WechatUser.UpdateOperation | WechatUser.RemoveOperation; -} | { - wechatPublicAutoReply?: wechatPublicAutoReply.UpdateOperation | wechatPublicAutoReply.RemoveOperation; } | { [k: string]: any; }); @@ -411,11 +411,11 @@ export type UserSystemIdSubQuery = Selection; export type UserWechatPublicTagIdSubQuery = Selection; export type WechatLoginIdSubQuery = Selection; export type WechatMenuIdSubQuery = Selection; +export type wechatPublicAutoReplyIdSubQuery = Selection; export type WechatPublicTagIdSubQuery = Selection; export type WechatPublicTemplateIdSubQuery = Selection; export type WechatQrCodeIdSubQuery = Selection; export type WechatUserIdSubQuery = Selection; -export type wechatPublicAutoReplyIdSubQuery = Selection; export type ModiEntityIdSubQuery = Selection; export type EntityDef = { Schema: Schema; diff --git a/es/oak-app-domain/ModiEntity/Storage.js b/es/oak-app-domain/ModiEntity/Storage.js index ad32edf73..43b50da64 100644 --- a/es/oak-app-domain/ModiEntity/Storage.js +++ b/es/oak-app-domain/ModiEntity/Storage.js @@ -12,7 +12,7 @@ export const desc = { params: { length: 32 }, - ref: ["user", "userEntityGrant", "userSystem", "userWechatPublicTag", "wechatLogin", "wechatMenu", "wechatPublicTag", "wechatPublicTemplate", "wechatQrCode", "wechatUser", "wechatPublicAutoReply"] + ref: ["user", "userEntityGrant", "userSystem", "userWechatPublicTag", "wechatLogin", "wechatMenu", "wechatPublicAutoReply", "wechatPublicTag", "wechatPublicTemplate", "wechatQrCode", "wechatUser"] }, entityId: { notNull: true, diff --git a/es/oak-app-domain/OperEntity/Schema.d.ts b/es/oak-app-domain/OperEntity/Schema.d.ts index 756afd24f..aaf1d2b78 100644 --- a/es/oak-app-domain/OperEntity/Schema.d.ts +++ b/es/oak-app-domain/OperEntity/Schema.d.ts @@ -12,20 +12,20 @@ import * as UserSystem from "../UserSystem/Schema"; import * as UserWechatPublicTag from "../UserWechatPublicTag/Schema"; import * as WechatLogin from "../WechatLogin/Schema"; import * as WechatMenu from "../WechatMenu/Schema"; +import * as wechatPublicAutoReply from "../wechatPublicAutoReply/Schema"; import * as WechatPublicTag from "../WechatPublicTag/Schema"; import * as WechatPublicTemplate from "../WechatPublicTemplate/Schema"; import * as WechatQrCode from "../WechatQrCode/Schema"; import * as WechatUser from "../WechatUser/Schema"; -import * as wechatPublicAutoReply from "../wechatPublicAutoReply/Schema"; export type OpSchema = EntityShape & { operId: ForeignKey<"oper">; - entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string; + entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string; entityId: String<64>; }; export type OpAttr = keyof OpSchema; export type Schema = EntityShape & { operId: ForeignKey<"oper">; - entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string; + entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string; entityId: String<64>; oper: Oper.Schema; user?: User.Schema; @@ -34,11 +34,11 @@ export type Schema = EntityShape & { userWechatPublicTag?: UserWechatPublicTag.Schema; wechatLogin?: WechatLogin.Schema; wechatMenu?: WechatMenu.Schema; + wechatPublicAutoReply?: wechatPublicAutoReply.Schema; wechatPublicTag?: WechatPublicTag.Schema; wechatPublicTemplate?: WechatPublicTemplate.Schema; wechatQrCode?: WechatQrCode.Schema; wechatUser?: WechatUser.Schema; - wechatPublicAutoReply?: wechatPublicAutoReply.Schema; } & { [A in ExpressionKey]?: any; }; @@ -49,7 +49,7 @@ type AttrFilter = { $$updateAt$$: Q_DateValue; operId: Q_StringValue; oper: Oper.Filter; - entity: Q_EnumValue<"user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string>; + entity: Q_EnumValue<"user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string>; entityId: Q_StringValue; user: User.Filter; userEntityGrant: UserEntityGrant.Filter; @@ -57,11 +57,11 @@ type AttrFilter = { userWechatPublicTag: UserWechatPublicTag.Filter; wechatLogin: WechatLogin.Filter; wechatMenu: WechatMenu.Filter; + wechatPublicAutoReply: wechatPublicAutoReply.Filter; wechatPublicTag: WechatPublicTag.Filter; wechatPublicTemplate: WechatPublicTemplate.Filter; wechatQrCode: WechatQrCode.Filter; wechatUser: WechatUser.Filter; - wechatPublicAutoReply: wechatPublicAutoReply.Filter; }; export type Filter = MakeFilter>; export type Projection = { @@ -81,11 +81,11 @@ export type Projection = { userWechatPublicTag?: UserWechatPublicTag.Projection; wechatLogin?: WechatLogin.Projection; wechatMenu?: WechatMenu.Projection; + wechatPublicAutoReply?: wechatPublicAutoReply.Projection; wechatPublicTag?: WechatPublicTag.Projection; wechatPublicTemplate?: WechatPublicTemplate.Projection; wechatQrCode?: WechatQrCode.Projection; wechatUser?: WechatUser.Projection; - wechatPublicAutoReply?: wechatPublicAutoReply.Projection; } & Partial>; type OperEntityIdProjection = OneOf<{ id: number; @@ -111,6 +111,9 @@ type WechatLoginIdProjection = OneOf<{ type WechatMenuIdProjection = OneOf<{ entityId: number; }>; +type wechatPublicAutoReplyIdProjection = OneOf<{ + entityId: number; +}>; type WechatPublicTagIdProjection = OneOf<{ entityId: number; }>; @@ -123,9 +126,6 @@ type WechatQrCodeIdProjection = OneOf<{ type WechatUserIdProjection = OneOf<{ entityId: number; }>; -type wechatPublicAutoReplyIdProjection = OneOf<{ - entityId: number; -}>; export type SortAttr = { id: number; } | { @@ -154,6 +154,8 @@ export type SortAttr = { wechatLogin: WechatLogin.SortAttr; } | { wechatMenu: WechatMenu.SortAttr; +} | { + wechatPublicAutoReply: wechatPublicAutoReply.SortAttr; } | { wechatPublicTag: WechatPublicTag.SortAttr; } | { @@ -162,8 +164,6 @@ export type SortAttr = { wechatQrCode: WechatQrCode.SortAttr; } | { wechatUser: WechatUser.SortAttr; -} | { - wechatPublicAutoReply: wechatPublicAutoReply.SortAttr; } | { [k: string]: any; } | OneOf>; @@ -246,6 +246,17 @@ export type CreateOperationData = FormCreateData; +} | { + entity?: never; + entityId?: never; + wechatPublicAutoReply: wechatPublicAutoReply.CreateSingleOperation; +} | { + entity: "wechatPublicAutoReply"; + entityId: ForeignKey<"wechatPublicAutoReply">; + wechatPublicAutoReply: wechatPublicAutoReply.UpdateOperation; +} | { + entity: "wechatPublicAutoReply"; + entityId: ForeignKey<"wechatPublicAutoReply">; } | { entity?: never; entityId?: never; @@ -290,17 +301,6 @@ export type CreateOperationData = FormCreateData; -} | { - entity?: never; - entityId?: never; - wechatPublicAutoReply: wechatPublicAutoReply.CreateSingleOperation; -} | { - entity: "wechatPublicAutoReply"; - entityId: ForeignKey<"wechatPublicAutoReply">; - wechatPublicAutoReply: wechatPublicAutoReply.UpdateOperation; -} | { - entity: "wechatPublicAutoReply"; - entityId: ForeignKey<"wechatPublicAutoReply">; } | { entity?: string; entityId?: string; @@ -339,6 +339,10 @@ export type UpdateOperationData = FormUpdateData | null; + entity?: ("user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string) | null; + entityId?: ForeignKey<"User" | "UserEntityGrant" | "UserSystem" | "UserWechatPublicTag" | "WechatLogin" | "WechatMenu" | "wechatPublicAutoReply" | "WechatPublicTag" | "WechatPublicTemplate" | "WechatQrCode" | "WechatUser"> | null; }) & { [k: string]: any; }; @@ -378,6 +378,8 @@ export type RemoveOperationData = {} & ({ wechatLogin?: WechatLogin.UpdateOperation | WechatLogin.RemoveOperation; } | { wechatMenu?: WechatMenu.UpdateOperation | WechatMenu.RemoveOperation; +} | { + wechatPublicAutoReply?: wechatPublicAutoReply.UpdateOperation | wechatPublicAutoReply.RemoveOperation; } | { wechatPublicTag?: WechatPublicTag.UpdateOperation | WechatPublicTag.RemoveOperation; } | { @@ -386,8 +388,6 @@ export type RemoveOperationData = {} & ({ wechatQrCode?: WechatQrCode.UpdateOperation | WechatQrCode.RemoveOperation; } | { wechatUser?: WechatUser.UpdateOperation | WechatUser.RemoveOperation; -} | { - wechatPublicAutoReply?: wechatPublicAutoReply.UpdateOperation | wechatPublicAutoReply.RemoveOperation; } | { [k: string]: any; }); @@ -400,11 +400,11 @@ export type UserSystemIdSubQuery = Selection; export type UserWechatPublicTagIdSubQuery = Selection; export type WechatLoginIdSubQuery = Selection; export type WechatMenuIdSubQuery = Selection; +export type wechatPublicAutoReplyIdSubQuery = Selection; export type WechatPublicTagIdSubQuery = Selection; export type WechatPublicTemplateIdSubQuery = Selection; export type WechatQrCodeIdSubQuery = Selection; export type WechatUserIdSubQuery = Selection; -export type wechatPublicAutoReplyIdSubQuery = Selection; export type OperEntityIdSubQuery = Selection; export type EntityDef = { Schema: Schema; diff --git a/es/oak-app-domain/OperEntity/Storage.js b/es/oak-app-domain/OperEntity/Storage.js index 0921d345a..60714c888 100644 --- a/es/oak-app-domain/OperEntity/Storage.js +++ b/es/oak-app-domain/OperEntity/Storage.js @@ -12,7 +12,7 @@ export const desc = { params: { length: 32 }, - ref: ["user", "userEntityGrant", "userSystem", "userWechatPublicTag", "wechatLogin", "wechatMenu", "wechatPublicTag", "wechatPublicTemplate", "wechatQrCode", "wechatUser", "wechatPublicAutoReply"] + ref: ["user", "userEntityGrant", "userSystem", "userWechatPublicTag", "wechatLogin", "wechatMenu", "wechatPublicAutoReply", "wechatPublicTag", "wechatPublicTemplate", "wechatQrCode", "wechatUser"] }, entityId: { notNull: true, diff --git a/es/oak-app-domain/Storage.js b/es/oak-app-domain/Storage.js index 1ec333107..a53aed58b 100644 --- a/es/oak-app-domain/Storage.js +++ b/es/oak-app-domain/Storage.js @@ -41,11 +41,11 @@ import { desc as userSystemDesc } from "./UserSystem/Storage"; import { desc as userWechatPublicTagDesc } from "./UserWechatPublicTag/Storage"; import { desc as wechatLoginDesc } from "./WechatLogin/Storage"; import { desc as wechatMenuDesc } from "./WechatMenu/Storage"; +import { desc as wechatPublicAutoReplyDesc } from "./wechatPublicAutoReply/Storage"; import { desc as wechatPublicTagDesc } from "./WechatPublicTag/Storage"; import { desc as wechatPublicTemplateDesc } from "./WechatPublicTemplate/Storage"; import { desc as wechatQrCodeDesc } from "./WechatQrCode/Storage"; import { desc as wechatUserDesc } from "./WechatUser/Storage"; -import { desc as wechatPublicAutoReplyDesc } from "./wechatPublicAutoReply/Storage"; export const storageSchema = { actionAuth: actionAuthDesc, i18n: i18nDesc, @@ -90,9 +90,9 @@ export const storageSchema = { userWechatPublicTag: userWechatPublicTagDesc, wechatLogin: wechatLoginDesc, wechatMenu: wechatMenuDesc, + wechatPublicAutoReply: wechatPublicAutoReplyDesc, wechatPublicTag: wechatPublicTagDesc, wechatPublicTemplate: wechatPublicTemplateDesc, wechatQrCode: wechatQrCodeDesc, - wechatUser: wechatUserDesc, - wechatPublicAutoReply: wechatPublicAutoReplyDesc + wechatUser: wechatUserDesc }; diff --git a/es/oak-app-domain/WechatUser/Schema.d.ts b/es/oak-app-domain/WechatUser/Schema.d.ts index 8c5097f62..b49673ef4 100644 --- a/es/oak-app-domain/WechatUser/Schema.d.ts +++ b/es/oak-app-domain/WechatUser/Schema.d.ts @@ -29,8 +29,6 @@ export type OpSchema = EntityShape & { applicationId: ForeignKey<"application">; nickname?: String<128> | null; avatar?: Image | null; - remark?: String<32> | null; - language: 'zh_CN' | 'zh_TW' | 'en'; }; export type OpAttr = keyof OpSchema; export type Schema = EntityShape & { @@ -50,8 +48,6 @@ export type Schema = EntityShape & { applicationId: ForeignKey<"application">; nickname?: String<128> | null; avatar?: Image | null; - remark?: String<32> | null; - language: 'zh_CN' | 'zh_TW' | 'en'; user?: User.Schema | null; application: Application.Schema; sessionMessage$wechatUser?: Array; @@ -90,8 +86,6 @@ type AttrFilter = { application: Application.Filter; nickname: Q_StringValue; avatar: Q_StringValue; - remark: Q_StringValue; - language: Q_EnumValue<'zh_CN' | 'zh_TW' | 'en'>; sessionMessage$wechatUser: SessionMessage.Filter & SubQueryPredicateMetadata; userWechatPublicTag$wechatUser: UserWechatPublicTag.Filter & SubQueryPredicateMetadata; modiEntity$entity: ModiEntity.Filter & SubQueryPredicateMetadata; @@ -124,8 +118,6 @@ export type Projection = { application?: Application.Projection; nickname?: number; avatar?: number; - remark?: number; - language?: number; sessionMessage$wechatUser?: SessionMessage.Selection & { $entity: "sessionMessage"; }; @@ -210,10 +202,6 @@ export type SortAttr = { nickname: number; } | { avatar: number; -} | { - remark: number; -} | { - language: number; } | { [k: string]: any; } | OneOf>; diff --git a/es/oak-app-domain/WechatUser/Storage.js b/es/oak-app-domain/WechatUser/Storage.js index 96b0223a7..66ae1bad0 100644 --- a/es/oak-app-domain/WechatUser/Storage.js +++ b/es/oak-app-domain/WechatUser/Storage.js @@ -74,17 +74,6 @@ export const desc = { }, avatar: { type: "text" - }, - remark: { - type: "varchar", - params: { - length: 32 - } - }, - language: { - notNull: true, - type: "enum", - enumeration: ["zh_CN", "zh_TW", "en"] } }, actionType: "crud", diff --git a/es/oak-app-domain/WechatUser/locales/zh_CN.json b/es/oak-app-domain/WechatUser/locales/zh_CN.json index fc9300ac4..0c1d0b3d7 100644 --- a/es/oak-app-domain/WechatUser/locales/zh_CN.json +++ b/es/oak-app-domain/WechatUser/locales/zh_CN.json @@ -1 +1 @@ -{ "name": "微信用户", "attr": { "origin": "源", "openId": "openId", "unionId": "unionId", "sessionKey": "sessionKey", "accessToken": "accessToken", "refreshToken": "refreshToken", "atExpiredAt": "accessToken过期时间", "rtExpiredAt": "refreshToken过期时间", "scope": "accessToken域", "subscribed": "是否订阅", "subscribedAt": "订阅时间", "unsubscribedAt": "取关时间", "user": "用户", "tokens": "相关令牌", "application": "应用", "nickname": "昵称", "avatar": "头像", "remark": "备注", "language": "语言" }, "v": { "origin": { "mp": "小程序", "public": "公众号", "web": "网站" }, "language": { "zh_CN": "简体", "zh_TW": "繁体", "en": "英语" } } } +{ "name": "微信用户", "attr": { "origin": "源", "openId": "openId", "unionId": "unionId", "sessionKey": "sessionKey", "accessToken": "accessToken", "refreshToken": "refreshToken", "atExpiredAt": "accessToken过期时间", "rtExpiredAt": "refreshToken过期时间", "scope": "accessToken域", "subscribed": "是否订阅", "subscribedAt": "订阅时间", "unsubscribedAt": "取关时间", "user": "用户", "tokens": "相关令牌", "application": "应用", "nickname": "昵称", "avatar": "头像" }, "v": { "origin": { "mp": "小程序", "public": "公众号", "web": "网站" } } } diff --git a/es/oak-app-domain/_SubQuery.d.ts b/es/oak-app-domain/_SubQuery.d.ts index 348615219..c282755ad 100644 --- a/es/oak-app-domain/_SubQuery.d.ts +++ b/es/oak-app-domain/_SubQuery.d.ts @@ -41,11 +41,11 @@ import * as UserSystem from "./UserSystem/Schema"; import * as UserWechatPublicTag from "./UserWechatPublicTag/Schema"; import * as WechatLogin from "./WechatLogin/Schema"; import * as WechatMenu from "./WechatMenu/Schema"; +import * as wechatPublicAutoReply from "./wechatPublicAutoReply/Schema"; import * as WechatPublicTag from "./WechatPublicTag/Schema"; import * as WechatPublicTemplate from "./WechatPublicTemplate/Schema"; import * as WechatQrCode from "./WechatQrCode/Schema"; import * as WechatUser from "./WechatUser/Schema"; -import * as wechatPublicAutoReply from "./wechatPublicAutoReply/Schema"; export type ActionAuthIdSubQuery = { [K in "$in" | "$nin"]?: (ActionAuth.ActionAuthIdSubQuery & { entity: "actionAuth"; @@ -175,6 +175,8 @@ export type ApplicationIdSubQuery = { entity: "token"; }) | (WechatMenu.ApplicationIdSubQuery & { entity: "wechatMenu"; + }) | (wechatPublicAutoReply.ApplicationIdSubQuery & { + entity: "wechatPublicAutoReply"; }) | (WechatPublicTag.ApplicationIdSubQuery & { entity: "wechatPublicTag"; }) | (WechatPublicTemplate.ApplicationIdSubQuery & { @@ -183,8 +185,6 @@ export type ApplicationIdSubQuery = { entity: "wechatQrCode"; }) | (WechatUser.ApplicationIdSubQuery & { entity: "wechatUser"; - }) | (wechatPublicAutoReply.ApplicationIdSubQuery & { - entity: "wechatPublicAutoReply"; }) | (Session.ApplicationIdSubQuery & { entity: "session"; }) | (Application.ApplicationIdSubQuery & { @@ -413,6 +413,15 @@ export type WechatMenuIdSubQuery = { entity: "wechatMenu"; }) | any; }; +export type wechatPublicAutoReplyIdSubQuery = { + [K in "$in" | "$nin"]?: (ModiEntity.wechatPublicAutoReplyIdSubQuery & { + entity: "modiEntity"; + }) | (OperEntity.wechatPublicAutoReplyIdSubQuery & { + entity: "operEntity"; + }) | (wechatPublicAutoReply.wechatPublicAutoReplyIdSubQuery & { + entity: "wechatPublicAutoReply"; + }) | any; +}; export type WechatPublicTagIdSubQuery = { [K in "$in" | "$nin"]?: (UserWechatPublicTag.WechatPublicTagIdSubQuery & { entity: "userWechatPublicTag"; @@ -461,12 +470,3 @@ export type WechatUserIdSubQuery = { entity: "wechatUser"; }) | any; }; -export type wechatPublicAutoReplyIdSubQuery = { - [K in "$in" | "$nin"]?: (ModiEntity.wechatPublicAutoReplyIdSubQuery & { - entity: "modiEntity"; - }) | (OperEntity.wechatPublicAutoReplyIdSubQuery & { - entity: "operEntity"; - }) | (wechatPublicAutoReply.wechatPublicAutoReplyIdSubQuery & { - entity: "wechatPublicAutoReply"; - }) | any; -}; diff --git a/lib/components/userWechatPublicTag/subscribedList/index.js b/lib/components/userWechatPublicTag/subscribedList/index.js index bdb35402b..d608bae47 100644 --- a/lib/components/userWechatPublicTag/subscribedList/index.js +++ b/lib/components/userWechatPublicTag/subscribedList/index.js @@ -18,8 +18,6 @@ exports.default = OakComponent({ subscribedAt: 1, applicationId: 1, userId: 1, - remark: 1, - language: 1, nickname: 1, avatar: 1, userWechatPublicTag$wechatUser: { @@ -61,8 +59,6 @@ exports.default = OakComponent({ nickname: ele?.nickname, avatar: ele?.avatar, subscribedAt: ele?.subscribedAt, - remark: ele?.remark, - language: ele?.language, }; }); return { diff --git a/lib/components/userWechatPublicTag/subscribedList/web.pc.d.ts b/lib/components/userWechatPublicTag/subscribedList/web.pc.d.ts index 7c5f9af3d..52c62d02d 100644 --- a/lib/components/userWechatPublicTag/subscribedList/web.pc.d.ts +++ b/lib/components/userWechatPublicTag/subscribedList/web.pc.d.ts @@ -4,7 +4,6 @@ export default function Render(props: WebComponentProps { setEditOpen(false); setEditTags([]); setOpenId(''); }, footer: (0, jsx_runtime_1.jsxs)(antd_1.Space, { style: { display: 'flex', justifyContent: 'center' }, children: [(0, jsx_runtime_1.jsx)(antd_1.Button, { onClick: () => { setEditOpen(false); setEditTags([]); setOpenId(''); }, children: "\u53D6\u6D88" }), (0, jsx_runtime_1.jsx)(antd_1.Button, { type: 'primary', onClick: () => { setEditOpen(false); setEditTags([]); @@ -101,7 +100,7 @@ function Render(props) { }, } }), (0, jsx_runtime_1.jsx)(antd_1.Modal, { title: '\u7528\u6237\u8BE6\u60C5', open: open, onCancel: () => { setOpen(false); - }, footer: null, width: 750, children: (0, jsx_runtime_1.jsxs)(antd_1.Descriptions, { bordered: true, column: 3, children: [(0, jsx_runtime_1.jsx)(antd_1.Descriptions.Item, { label: '\u6635\u79F0', children: user.nickname ? user.nickname : '--' }), (0, jsx_runtime_1.jsx)(antd_1.Descriptions.Item, { label: '\u5934\u50CF', children: user.avatar ? (0, jsx_runtime_1.jsx)(antd_1.Image, { src: user.avatar }) : '--' }), (0, jsx_runtime_1.jsx)(antd_1.Descriptions.Item, { label: '\u5907\u6CE8', children: user.remark ? user.remark : '--' }), (0, jsx_runtime_1.jsx)(antd_1.Descriptions.Item, { label: '\u7528\u6237\u6807\u8BC6', children: user.openId ? user.openId : '--' }), (0, jsx_runtime_1.jsx)(antd_1.Descriptions.Item, { label: '\u540C\u6B65\u72B6\u6001', children: user.sync ? '同步' : '未同步' }), (0, jsx_runtime_1.jsx)(antd_1.Descriptions.Item, { label: '\u540C\u6B65\u65F6\u95F4', children: user.syncAt ? (0, dayjs_1.default)(user.syncAt).format('YYYY-MM-DD HH:mm') : '--' }), (0, jsx_runtime_1.jsx)(antd_1.Descriptions.Item, { label: '\u5173\u6CE8\u65F6\u95F4', children: user.subscribedAt ? (0, dayjs_1.default)(user.subscribedAt * 1000).format('YYYY-MM-DD HH:mm') : '--' }), (0, jsx_runtime_1.jsx)(antd_1.Descriptions.Item, { label: '\u7528\u6237\u6807\u7B7E', children: user.tags && user.tags.length > 0 ? + }, footer: null, width: 750, children: (0, jsx_runtime_1.jsxs)(antd_1.Descriptions, { bordered: true, column: 3, children: [(0, jsx_runtime_1.jsx)(antd_1.Descriptions.Item, { label: '\u6635\u79F0', children: user.nickname ? user.nickname : '--' }), (0, jsx_runtime_1.jsx)(antd_1.Descriptions.Item, { label: '\u5934\u50CF', children: user.avatar ? (0, jsx_runtime_1.jsx)(antd_1.Image, { src: user.avatar }) : '--' }), (0, jsx_runtime_1.jsx)(antd_1.Descriptions.Item, { label: '\u7528\u6237\u6807\u8BC6', children: user.openId ? user.openId : '--' }), (0, jsx_runtime_1.jsx)(antd_1.Descriptions.Item, { label: '\u540C\u6B65\u72B6\u6001', children: user.sync ? '同步' : '未同步' }), (0, jsx_runtime_1.jsx)(antd_1.Descriptions.Item, { label: '\u540C\u6B65\u65F6\u95F4', children: user.syncAt ? (0, dayjs_1.default)(user.syncAt).format('YYYY-MM-DD HH:mm') : '--' }), (0, jsx_runtime_1.jsx)(antd_1.Descriptions.Item, { label: '\u5173\u6CE8\u65F6\u95F4', children: user.subscribedAt ? (0, dayjs_1.default)(user.subscribedAt * 1000).format('YYYY-MM-DD HH:mm') : '--' }), (0, jsx_runtime_1.jsx)(antd_1.Descriptions.Item, { label: '\u7528\u6237\u6807\u7B7E', children: user.tags && user.tags.length > 0 ? user.tags.map((tag) => { return (0, jsx_runtime_1.jsx)(antd_1.Tag, { children: tag.text }); }) : '暂无标签' })] }) })] })); diff --git a/lib/entities/WechatUser.d.ts b/lib/entities/WechatUser.d.ts index 0e2552be8..65f554c1a 100644 --- a/lib/entities/WechatUser.d.ts +++ b/lib/entities/WechatUser.d.ts @@ -21,6 +21,4 @@ export interface Schema extends EntityShape { tokens: Array; nickname?: String<128>; avatar?: Image; - remark?: String<32>; - language: 'zh_CN' | 'zh_TW' | 'en'; } diff --git a/lib/entities/WechatUser.js b/lib/entities/WechatUser.js index 20ff88bbc..0501fa138 100644 --- a/lib/entities/WechatUser.js +++ b/lib/entities/WechatUser.js @@ -23,8 +23,6 @@ const entityDesc = { application: '应用', nickname: '昵称', avatar: '头像', - remark: '备注', - language: '语言', }, v: { origin: { @@ -32,11 +30,6 @@ const entityDesc = { public: '公众号', web: '网站', }, - language: { - zh_CN: '简体', - zh_TW: '繁体', - en: '英语' - } } }, } diff --git a/lib/oak-app-domain/Application/Schema.d.ts b/lib/oak-app-domain/Application/Schema.d.ts index c2ffffff4..62eb2c5bf 100644 --- a/lib/oak-app-domain/Application/Schema.d.ts +++ b/lib/oak-app-domain/Application/Schema.d.ts @@ -12,11 +12,11 @@ import * as Notification from "../Notification/Schema"; import * as SessionMessage from "../SessionMessage/Schema"; import * as Token from "../Token/Schema"; import * as WechatMenu from "../WechatMenu/Schema"; +import * as wechatPublicAutoReply from "../wechatPublicAutoReply/Schema"; import * as WechatPublicTag from "../WechatPublicTag/Schema"; import * as WechatPublicTemplate from "../WechatPublicTemplate/Schema"; import * as WechatQrCode from "../WechatQrCode/Schema"; import * as WechatUser from "../WechatUser/Schema"; -import * as wechatPublicAutoReply from "../wechatPublicAutoReply/Schema"; import * as Session from "../Session/Schema"; export type Passport = 'email' | 'mobile' | 'wechat' | 'wechatPublic'; export type AppType = 'web' | 'wechatMp' | 'wechatPublic'; @@ -93,6 +93,8 @@ export type Schema = EntityShape & { token$application$$aggr?: AggregationResult; wechatMenu$application?: Array; wechatMenu$application$$aggr?: AggregationResult; + wechatPublicAutoReply$application?: Array; + wechatPublicAutoReply$application$$aggr?: AggregationResult; wechatPublicTag$application?: Array; wechatPublicTag$application$$aggr?: AggregationResult; wechatPublicTemplate$application?: Array; @@ -101,8 +103,6 @@ export type Schema = EntityShape & { wechatQrCode$application$$aggr?: AggregationResult; wechatUser$application?: Array; wechatUser$application$$aggr?: AggregationResult; - wechatPublicAutoReply$application?: Array; - wechatPublicAutoReply$application$$aggr?: AggregationResult; session$entity?: Array; session$entity$$aggr?: AggregationResult; } & { @@ -125,11 +125,11 @@ type AttrFilter = { sessionMessage$application: SessionMessage.Filter & SubQueryPredicateMetadata; token$application: Token.Filter & SubQueryPredicateMetadata; wechatMenu$application: WechatMenu.Filter & SubQueryPredicateMetadata; + wechatPublicAutoReply$application: wechatPublicAutoReply.Filter & SubQueryPredicateMetadata; wechatPublicTag$application: WechatPublicTag.Filter & SubQueryPredicateMetadata; wechatPublicTemplate$application: WechatPublicTemplate.Filter & SubQueryPredicateMetadata; wechatQrCode$application: WechatQrCode.Filter & SubQueryPredicateMetadata; wechatUser$application: WechatUser.Filter & SubQueryPredicateMetadata; - wechatPublicAutoReply$application: wechatPublicAutoReply.Filter & SubQueryPredicateMetadata; session$entity: Session.Filter & SubQueryPredicateMetadata; }; export type Filter = MakeFilter>; @@ -177,6 +177,12 @@ export type Projection = { wechatMenu$application$$aggr?: WechatMenu.Aggregation & { $entity: "wechatMenu"; }; + wechatPublicAutoReply$application?: wechatPublicAutoReply.Selection & { + $entity: "wechatPublicAutoReply"; + }; + wechatPublicAutoReply$application$$aggr?: wechatPublicAutoReply.Aggregation & { + $entity: "wechatPublicAutoReply"; + }; wechatPublicTag$application?: WechatPublicTag.Selection & { $entity: "wechatPublicTag"; }; @@ -201,12 +207,6 @@ export type Projection = { wechatUser$application$$aggr?: WechatUser.Aggregation & { $entity: "wechatUser"; }; - wechatPublicAutoReply$application?: wechatPublicAutoReply.Selection & { - $entity: "wechatPublicAutoReply"; - }; - wechatPublicAutoReply$application$$aggr?: wechatPublicAutoReply.Aggregation & { - $entity: "wechatPublicAutoReply"; - }; session$entity?: Session.Selection & { $entity: "session"; }; @@ -265,11 +265,11 @@ export type CreateOperationData = FormCreateData> & ( sessionMessage$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; token$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; wechatMenu$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; + wechatPublicAutoReply$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; wechatPublicTag$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; wechatPublicTemplate$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; wechatQrCode$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; wechatUser$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; - wechatPublicAutoReply$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; session$entity?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; }; export type CreateSingleOperation = OakOperation<"create", CreateOperationData>; @@ -294,11 +294,11 @@ export type UpdateOperationData = FormUpdateData> & ( sessionMessage$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; token$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; wechatMenu$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; + wechatPublicAutoReply$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; wechatPublicTag$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; wechatPublicTemplate$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; wechatQrCode$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; wechatUser$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; - wechatPublicAutoReply$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; session$entity?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; }; export type UpdateOperation = OakOperation<"update" | string, UpdateOperationData, Filter, Sorter>; diff --git a/lib/oak-app-domain/EntityDict.d.ts b/lib/oak-app-domain/EntityDict.d.ts index e5e7ec01f..900b03749 100644 --- a/lib/oak-app-domain/EntityDict.d.ts +++ b/lib/oak-app-domain/EntityDict.d.ts @@ -41,11 +41,11 @@ import { EntityDef as UserSystem } from "./UserSystem/Schema"; import { EntityDef as UserWechatPublicTag } from "./UserWechatPublicTag/Schema"; import { EntityDef as WechatLogin } from "./WechatLogin/Schema"; import { EntityDef as WechatMenu } from "./WechatMenu/Schema"; +import { EntityDef as wechatPublicAutoReply } from "./wechatPublicAutoReply/Schema"; import { EntityDef as WechatPublicTag } from "./WechatPublicTag/Schema"; import { EntityDef as WechatPublicTemplate } from "./WechatPublicTemplate/Schema"; import { EntityDef as WechatQrCode } from "./WechatQrCode/Schema"; import { EntityDef as WechatUser } from "./WechatUser/Schema"; -import { EntityDef as wechatPublicAutoReply } from "./wechatPublicAutoReply/Schema"; export type EntityDict = { actionAuth: ActionAuth; i18n: I18n; @@ -90,9 +90,9 @@ export type EntityDict = { userWechatPublicTag: UserWechatPublicTag; wechatLogin: WechatLogin; wechatMenu: WechatMenu; + wechatPublicAutoReply: wechatPublicAutoReply; wechatPublicTag: WechatPublicTag; wechatPublicTemplate: WechatPublicTemplate; wechatQrCode: WechatQrCode; wechatUser: WechatUser; - wechatPublicAutoReply: wechatPublicAutoReply; }; diff --git a/lib/oak-app-domain/ModiEntity/Schema.d.ts b/lib/oak-app-domain/ModiEntity/Schema.d.ts index 6b5fb3a49..75a650554 100644 --- a/lib/oak-app-domain/ModiEntity/Schema.d.ts +++ b/lib/oak-app-domain/ModiEntity/Schema.d.ts @@ -12,20 +12,20 @@ import * as UserSystem from "../UserSystem/Schema"; import * as UserWechatPublicTag from "../UserWechatPublicTag/Schema"; import * as WechatLogin from "../WechatLogin/Schema"; import * as WechatMenu from "../WechatMenu/Schema"; +import * as wechatPublicAutoReply from "../wechatPublicAutoReply/Schema"; import * as WechatPublicTag from "../WechatPublicTag/Schema"; import * as WechatPublicTemplate from "../WechatPublicTemplate/Schema"; import * as WechatQrCode from "../WechatQrCode/Schema"; import * as WechatUser from "../WechatUser/Schema"; -import * as wechatPublicAutoReply from "../wechatPublicAutoReply/Schema"; export type OpSchema = EntityShape & { modiId: ForeignKey<"modi">; - entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string; + entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string; entityId: String<64>; }; export type OpAttr = keyof OpSchema; export type Schema = EntityShape & { modiId: ForeignKey<"modi">; - entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string; + entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string; entityId: String<64>; modi: Modi.Schema; user?: User.Schema; @@ -34,11 +34,11 @@ export type Schema = EntityShape & { userWechatPublicTag?: UserWechatPublicTag.Schema; wechatLogin?: WechatLogin.Schema; wechatMenu?: WechatMenu.Schema; + wechatPublicAutoReply?: wechatPublicAutoReply.Schema; wechatPublicTag?: WechatPublicTag.Schema; wechatPublicTemplate?: WechatPublicTemplate.Schema; wechatQrCode?: WechatQrCode.Schema; wechatUser?: WechatUser.Schema; - wechatPublicAutoReply?: wechatPublicAutoReply.Schema; } & { [A in ExpressionKey]?: any; }; @@ -49,7 +49,7 @@ type AttrFilter = { $$updateAt$$: Q_DateValue; modiId: Q_StringValue; modi: Modi.Filter; - entity: Q_EnumValue<"user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string>; + entity: Q_EnumValue<"user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string>; entityId: Q_StringValue; user: User.Filter; userEntityGrant: UserEntityGrant.Filter; @@ -57,11 +57,11 @@ type AttrFilter = { userWechatPublicTag: UserWechatPublicTag.Filter; wechatLogin: WechatLogin.Filter; wechatMenu: WechatMenu.Filter; + wechatPublicAutoReply: wechatPublicAutoReply.Filter; wechatPublicTag: WechatPublicTag.Filter; wechatPublicTemplate: WechatPublicTemplate.Filter; wechatQrCode: WechatQrCode.Filter; wechatUser: WechatUser.Filter; - wechatPublicAutoReply: wechatPublicAutoReply.Filter; }; export type Filter = MakeFilter>; export type Projection = { @@ -81,11 +81,11 @@ export type Projection = { userWechatPublicTag?: UserWechatPublicTag.Projection; wechatLogin?: WechatLogin.Projection; wechatMenu?: WechatMenu.Projection; + wechatPublicAutoReply?: wechatPublicAutoReply.Projection; wechatPublicTag?: WechatPublicTag.Projection; wechatPublicTemplate?: WechatPublicTemplate.Projection; wechatQrCode?: WechatQrCode.Projection; wechatUser?: WechatUser.Projection; - wechatPublicAutoReply?: wechatPublicAutoReply.Projection; } & Partial>; type ModiEntityIdProjection = OneOf<{ id: number; @@ -111,6 +111,9 @@ type WechatLoginIdProjection = OneOf<{ type WechatMenuIdProjection = OneOf<{ entityId: number; }>; +type wechatPublicAutoReplyIdProjection = OneOf<{ + entityId: number; +}>; type WechatPublicTagIdProjection = OneOf<{ entityId: number; }>; @@ -123,9 +126,6 @@ type WechatQrCodeIdProjection = OneOf<{ type WechatUserIdProjection = OneOf<{ entityId: number; }>; -type wechatPublicAutoReplyIdProjection = OneOf<{ - entityId: number; -}>; export type SortAttr = { id: number; } | { @@ -154,6 +154,8 @@ export type SortAttr = { wechatLogin: WechatLogin.SortAttr; } | { wechatMenu: WechatMenu.SortAttr; +} | { + wechatPublicAutoReply: wechatPublicAutoReply.SortAttr; } | { wechatPublicTag: WechatPublicTag.SortAttr; } | { @@ -162,8 +164,6 @@ export type SortAttr = { wechatQrCode: WechatQrCode.SortAttr; } | { wechatUser: WechatUser.SortAttr; -} | { - wechatPublicAutoReply: wechatPublicAutoReply.SortAttr; } | { [k: string]: any; } | OneOf>; @@ -249,6 +249,17 @@ export type CreateOperationData = FormCreateData; +} | { + entity?: never; + entityId?: never; + wechatPublicAutoReply: wechatPublicAutoReply.CreateSingleOperation; +} | { + entity: "wechatPublicAutoReply"; + entityId: ForeignKey<"wechatPublicAutoReply">; + wechatPublicAutoReply: wechatPublicAutoReply.UpdateOperation; +} | { + entity: "wechatPublicAutoReply"; + entityId: ForeignKey<"wechatPublicAutoReply">; } | { entity?: never; entityId?: never; @@ -293,17 +304,6 @@ export type CreateOperationData = FormCreateData; -} | { - entity?: never; - entityId?: never; - wechatPublicAutoReply: wechatPublicAutoReply.CreateSingleOperation; -} | { - entity: "wechatPublicAutoReply"; - entityId: ForeignKey<"wechatPublicAutoReply">; - wechatPublicAutoReply: wechatPublicAutoReply.UpdateOperation; -} | { - entity: "wechatPublicAutoReply"; - entityId: ForeignKey<"wechatPublicAutoReply">; } | { entity?: string; entityId?: string; @@ -348,6 +348,10 @@ export type UpdateOperationData = FormUpdateData | null; + entity?: ("user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string) | null; + entityId?: ForeignKey<"User" | "UserEntityGrant" | "UserSystem" | "UserWechatPublicTag" | "WechatLogin" | "WechatMenu" | "wechatPublicAutoReply" | "WechatPublicTag" | "WechatPublicTemplate" | "WechatQrCode" | "WechatUser"> | null; }) & { [k: string]: any; }; @@ -389,6 +389,8 @@ export type RemoveOperationData = {} & (({ wechatLogin?: WechatLogin.UpdateOperation | WechatLogin.RemoveOperation; } | { wechatMenu?: WechatMenu.UpdateOperation | WechatMenu.RemoveOperation; +} | { + wechatPublicAutoReply?: wechatPublicAutoReply.UpdateOperation | wechatPublicAutoReply.RemoveOperation; } | { wechatPublicTag?: WechatPublicTag.UpdateOperation | WechatPublicTag.RemoveOperation; } | { @@ -397,8 +399,6 @@ export type RemoveOperationData = {} & (({ wechatQrCode?: WechatQrCode.UpdateOperation | WechatQrCode.RemoveOperation; } | { wechatUser?: WechatUser.UpdateOperation | WechatUser.RemoveOperation; -} | { - wechatPublicAutoReply?: wechatPublicAutoReply.UpdateOperation | wechatPublicAutoReply.RemoveOperation; } | { [k: string]: any; }); @@ -411,11 +411,11 @@ export type UserSystemIdSubQuery = Selection; export type UserWechatPublicTagIdSubQuery = Selection; export type WechatLoginIdSubQuery = Selection; export type WechatMenuIdSubQuery = Selection; +export type wechatPublicAutoReplyIdSubQuery = Selection; export type WechatPublicTagIdSubQuery = Selection; export type WechatPublicTemplateIdSubQuery = Selection; export type WechatQrCodeIdSubQuery = Selection; export type WechatUserIdSubQuery = Selection; -export type wechatPublicAutoReplyIdSubQuery = Selection; export type ModiEntityIdSubQuery = Selection; export type EntityDef = { Schema: Schema; diff --git a/lib/oak-app-domain/ModiEntity/Storage.js b/lib/oak-app-domain/ModiEntity/Storage.js index 601555fd0..03943e07b 100644 --- a/lib/oak-app-domain/ModiEntity/Storage.js +++ b/lib/oak-app-domain/ModiEntity/Storage.js @@ -15,7 +15,7 @@ exports.desc = { params: { length: 32 }, - ref: ["user", "userEntityGrant", "userSystem", "userWechatPublicTag", "wechatLogin", "wechatMenu", "wechatPublicTag", "wechatPublicTemplate", "wechatQrCode", "wechatUser", "wechatPublicAutoReply"] + ref: ["user", "userEntityGrant", "userSystem", "userWechatPublicTag", "wechatLogin", "wechatMenu", "wechatPublicAutoReply", "wechatPublicTag", "wechatPublicTemplate", "wechatQrCode", "wechatUser"] }, entityId: { notNull: true, diff --git a/lib/oak-app-domain/OperEntity/Schema.d.ts b/lib/oak-app-domain/OperEntity/Schema.d.ts index 756afd24f..aaf1d2b78 100644 --- a/lib/oak-app-domain/OperEntity/Schema.d.ts +++ b/lib/oak-app-domain/OperEntity/Schema.d.ts @@ -12,20 +12,20 @@ import * as UserSystem from "../UserSystem/Schema"; import * as UserWechatPublicTag from "../UserWechatPublicTag/Schema"; import * as WechatLogin from "../WechatLogin/Schema"; import * as WechatMenu from "../WechatMenu/Schema"; +import * as wechatPublicAutoReply from "../wechatPublicAutoReply/Schema"; import * as WechatPublicTag from "../WechatPublicTag/Schema"; import * as WechatPublicTemplate from "../WechatPublicTemplate/Schema"; import * as WechatQrCode from "../WechatQrCode/Schema"; import * as WechatUser from "../WechatUser/Schema"; -import * as wechatPublicAutoReply from "../wechatPublicAutoReply/Schema"; export type OpSchema = EntityShape & { operId: ForeignKey<"oper">; - entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string; + entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string; entityId: String<64>; }; export type OpAttr = keyof OpSchema; export type Schema = EntityShape & { operId: ForeignKey<"oper">; - entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string; + entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string; entityId: String<64>; oper: Oper.Schema; user?: User.Schema; @@ -34,11 +34,11 @@ export type Schema = EntityShape & { userWechatPublicTag?: UserWechatPublicTag.Schema; wechatLogin?: WechatLogin.Schema; wechatMenu?: WechatMenu.Schema; + wechatPublicAutoReply?: wechatPublicAutoReply.Schema; wechatPublicTag?: WechatPublicTag.Schema; wechatPublicTemplate?: WechatPublicTemplate.Schema; wechatQrCode?: WechatQrCode.Schema; wechatUser?: WechatUser.Schema; - wechatPublicAutoReply?: wechatPublicAutoReply.Schema; } & { [A in ExpressionKey]?: any; }; @@ -49,7 +49,7 @@ type AttrFilter = { $$updateAt$$: Q_DateValue; operId: Q_StringValue; oper: Oper.Filter; - entity: Q_EnumValue<"user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string>; + entity: Q_EnumValue<"user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string>; entityId: Q_StringValue; user: User.Filter; userEntityGrant: UserEntityGrant.Filter; @@ -57,11 +57,11 @@ type AttrFilter = { userWechatPublicTag: UserWechatPublicTag.Filter; wechatLogin: WechatLogin.Filter; wechatMenu: WechatMenu.Filter; + wechatPublicAutoReply: wechatPublicAutoReply.Filter; wechatPublicTag: WechatPublicTag.Filter; wechatPublicTemplate: WechatPublicTemplate.Filter; wechatQrCode: WechatQrCode.Filter; wechatUser: WechatUser.Filter; - wechatPublicAutoReply: wechatPublicAutoReply.Filter; }; export type Filter = MakeFilter>; export type Projection = { @@ -81,11 +81,11 @@ export type Projection = { userWechatPublicTag?: UserWechatPublicTag.Projection; wechatLogin?: WechatLogin.Projection; wechatMenu?: WechatMenu.Projection; + wechatPublicAutoReply?: wechatPublicAutoReply.Projection; wechatPublicTag?: WechatPublicTag.Projection; wechatPublicTemplate?: WechatPublicTemplate.Projection; wechatQrCode?: WechatQrCode.Projection; wechatUser?: WechatUser.Projection; - wechatPublicAutoReply?: wechatPublicAutoReply.Projection; } & Partial>; type OperEntityIdProjection = OneOf<{ id: number; @@ -111,6 +111,9 @@ type WechatLoginIdProjection = OneOf<{ type WechatMenuIdProjection = OneOf<{ entityId: number; }>; +type wechatPublicAutoReplyIdProjection = OneOf<{ + entityId: number; +}>; type WechatPublicTagIdProjection = OneOf<{ entityId: number; }>; @@ -123,9 +126,6 @@ type WechatQrCodeIdProjection = OneOf<{ type WechatUserIdProjection = OneOf<{ entityId: number; }>; -type wechatPublicAutoReplyIdProjection = OneOf<{ - entityId: number; -}>; export type SortAttr = { id: number; } | { @@ -154,6 +154,8 @@ export type SortAttr = { wechatLogin: WechatLogin.SortAttr; } | { wechatMenu: WechatMenu.SortAttr; +} | { + wechatPublicAutoReply: wechatPublicAutoReply.SortAttr; } | { wechatPublicTag: WechatPublicTag.SortAttr; } | { @@ -162,8 +164,6 @@ export type SortAttr = { wechatQrCode: WechatQrCode.SortAttr; } | { wechatUser: WechatUser.SortAttr; -} | { - wechatPublicAutoReply: wechatPublicAutoReply.SortAttr; } | { [k: string]: any; } | OneOf>; @@ -246,6 +246,17 @@ export type CreateOperationData = FormCreateData; +} | { + entity?: never; + entityId?: never; + wechatPublicAutoReply: wechatPublicAutoReply.CreateSingleOperation; +} | { + entity: "wechatPublicAutoReply"; + entityId: ForeignKey<"wechatPublicAutoReply">; + wechatPublicAutoReply: wechatPublicAutoReply.UpdateOperation; +} | { + entity: "wechatPublicAutoReply"; + entityId: ForeignKey<"wechatPublicAutoReply">; } | { entity?: never; entityId?: never; @@ -290,17 +301,6 @@ export type CreateOperationData = FormCreateData; -} | { - entity?: never; - entityId?: never; - wechatPublicAutoReply: wechatPublicAutoReply.CreateSingleOperation; -} | { - entity: "wechatPublicAutoReply"; - entityId: ForeignKey<"wechatPublicAutoReply">; - wechatPublicAutoReply: wechatPublicAutoReply.UpdateOperation; -} | { - entity: "wechatPublicAutoReply"; - entityId: ForeignKey<"wechatPublicAutoReply">; } | { entity?: string; entityId?: string; @@ -339,6 +339,10 @@ export type UpdateOperationData = FormUpdateData | null; + entity?: ("user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string) | null; + entityId?: ForeignKey<"User" | "UserEntityGrant" | "UserSystem" | "UserWechatPublicTag" | "WechatLogin" | "WechatMenu" | "wechatPublicAutoReply" | "WechatPublicTag" | "WechatPublicTemplate" | "WechatQrCode" | "WechatUser"> | null; }) & { [k: string]: any; }; @@ -378,6 +378,8 @@ export type RemoveOperationData = {} & ({ wechatLogin?: WechatLogin.UpdateOperation | WechatLogin.RemoveOperation; } | { wechatMenu?: WechatMenu.UpdateOperation | WechatMenu.RemoveOperation; +} | { + wechatPublicAutoReply?: wechatPublicAutoReply.UpdateOperation | wechatPublicAutoReply.RemoveOperation; } | { wechatPublicTag?: WechatPublicTag.UpdateOperation | WechatPublicTag.RemoveOperation; } | { @@ -386,8 +388,6 @@ export type RemoveOperationData = {} & ({ wechatQrCode?: WechatQrCode.UpdateOperation | WechatQrCode.RemoveOperation; } | { wechatUser?: WechatUser.UpdateOperation | WechatUser.RemoveOperation; -} | { - wechatPublicAutoReply?: wechatPublicAutoReply.UpdateOperation | wechatPublicAutoReply.RemoveOperation; } | { [k: string]: any; }); @@ -400,11 +400,11 @@ export type UserSystemIdSubQuery = Selection; export type UserWechatPublicTagIdSubQuery = Selection; export type WechatLoginIdSubQuery = Selection; export type WechatMenuIdSubQuery = Selection; +export type wechatPublicAutoReplyIdSubQuery = Selection; export type WechatPublicTagIdSubQuery = Selection; export type WechatPublicTemplateIdSubQuery = Selection; export type WechatQrCodeIdSubQuery = Selection; export type WechatUserIdSubQuery = Selection; -export type wechatPublicAutoReplyIdSubQuery = Selection; export type OperEntityIdSubQuery = Selection; export type EntityDef = { Schema: Schema; diff --git a/lib/oak-app-domain/OperEntity/Storage.js b/lib/oak-app-domain/OperEntity/Storage.js index 4a90040d4..986f2468c 100644 --- a/lib/oak-app-domain/OperEntity/Storage.js +++ b/lib/oak-app-domain/OperEntity/Storage.js @@ -15,7 +15,7 @@ exports.desc = { params: { length: 32 }, - ref: ["user", "userEntityGrant", "userSystem", "userWechatPublicTag", "wechatLogin", "wechatMenu", "wechatPublicTag", "wechatPublicTemplate", "wechatQrCode", "wechatUser", "wechatPublicAutoReply"] + ref: ["user", "userEntityGrant", "userSystem", "userWechatPublicTag", "wechatLogin", "wechatMenu", "wechatPublicAutoReply", "wechatPublicTag", "wechatPublicTemplate", "wechatQrCode", "wechatUser"] }, entityId: { notNull: true, diff --git a/lib/oak-app-domain/Storage.js b/lib/oak-app-domain/Storage.js index 1e42e8821..8e6d28131 100644 --- a/lib/oak-app-domain/Storage.js +++ b/lib/oak-app-domain/Storage.js @@ -44,11 +44,11 @@ const Storage_40 = require("./UserSystem/Storage"); const Storage_41 = require("./UserWechatPublicTag/Storage"); const Storage_42 = require("./WechatLogin/Storage"); const Storage_43 = require("./WechatMenu/Storage"); -const Storage_44 = require("./WechatPublicTag/Storage"); -const Storage_45 = require("./WechatPublicTemplate/Storage"); -const Storage_46 = require("./WechatQrCode/Storage"); -const Storage_47 = require("./WechatUser/Storage"); -const Storage_48 = require("./wechatPublicAutoReply/Storage"); +const Storage_44 = require("./wechatPublicAutoReply/Storage"); +const Storage_45 = require("./WechatPublicTag/Storage"); +const Storage_46 = require("./WechatPublicTemplate/Storage"); +const Storage_47 = require("./WechatQrCode/Storage"); +const Storage_48 = require("./WechatUser/Storage"); exports.storageSchema = { actionAuth: Storage_1.desc, i18n: Storage_2.desc, @@ -93,9 +93,9 @@ exports.storageSchema = { userWechatPublicTag: Storage_41.desc, wechatLogin: Storage_42.desc, wechatMenu: Storage_43.desc, - wechatPublicTag: Storage_44.desc, - wechatPublicTemplate: Storage_45.desc, - wechatQrCode: Storage_46.desc, - wechatUser: Storage_47.desc, - wechatPublicAutoReply: Storage_48.desc + wechatPublicAutoReply: Storage_44.desc, + wechatPublicTag: Storage_45.desc, + wechatPublicTemplate: Storage_46.desc, + wechatQrCode: Storage_47.desc, + wechatUser: Storage_48.desc }; diff --git a/lib/oak-app-domain/WechatUser/Schema.d.ts b/lib/oak-app-domain/WechatUser/Schema.d.ts index 8c5097f62..b49673ef4 100644 --- a/lib/oak-app-domain/WechatUser/Schema.d.ts +++ b/lib/oak-app-domain/WechatUser/Schema.d.ts @@ -29,8 +29,6 @@ export type OpSchema = EntityShape & { applicationId: ForeignKey<"application">; nickname?: String<128> | null; avatar?: Image | null; - remark?: String<32> | null; - language: 'zh_CN' | 'zh_TW' | 'en'; }; export type OpAttr = keyof OpSchema; export type Schema = EntityShape & { @@ -50,8 +48,6 @@ export type Schema = EntityShape & { applicationId: ForeignKey<"application">; nickname?: String<128> | null; avatar?: Image | null; - remark?: String<32> | null; - language: 'zh_CN' | 'zh_TW' | 'en'; user?: User.Schema | null; application: Application.Schema; sessionMessage$wechatUser?: Array; @@ -90,8 +86,6 @@ type AttrFilter = { application: Application.Filter; nickname: Q_StringValue; avatar: Q_StringValue; - remark: Q_StringValue; - language: Q_EnumValue<'zh_CN' | 'zh_TW' | 'en'>; sessionMessage$wechatUser: SessionMessage.Filter & SubQueryPredicateMetadata; userWechatPublicTag$wechatUser: UserWechatPublicTag.Filter & SubQueryPredicateMetadata; modiEntity$entity: ModiEntity.Filter & SubQueryPredicateMetadata; @@ -124,8 +118,6 @@ export type Projection = { application?: Application.Projection; nickname?: number; avatar?: number; - remark?: number; - language?: number; sessionMessage$wechatUser?: SessionMessage.Selection & { $entity: "sessionMessage"; }; @@ -210,10 +202,6 @@ export type SortAttr = { nickname: number; } | { avatar: number; -} | { - remark: number; -} | { - language: number; } | { [k: string]: any; } | OneOf>; diff --git a/lib/oak-app-domain/WechatUser/Storage.js b/lib/oak-app-domain/WechatUser/Storage.js index d37d0a98e..bfb5e0f05 100644 --- a/lib/oak-app-domain/WechatUser/Storage.js +++ b/lib/oak-app-domain/WechatUser/Storage.js @@ -77,17 +77,6 @@ exports.desc = { }, avatar: { type: "text" - }, - remark: { - type: "varchar", - params: { - length: 32 - } - }, - language: { - notNull: true, - type: "enum", - enumeration: ["zh_CN", "zh_TW", "en"] } }, actionType: "crud", diff --git a/lib/oak-app-domain/WechatUser/locales/zh_CN.json b/lib/oak-app-domain/WechatUser/locales/zh_CN.json index fc9300ac4..0c1d0b3d7 100644 --- a/lib/oak-app-domain/WechatUser/locales/zh_CN.json +++ b/lib/oak-app-domain/WechatUser/locales/zh_CN.json @@ -1 +1 @@ -{ "name": "微信用户", "attr": { "origin": "源", "openId": "openId", "unionId": "unionId", "sessionKey": "sessionKey", "accessToken": "accessToken", "refreshToken": "refreshToken", "atExpiredAt": "accessToken过期时间", "rtExpiredAt": "refreshToken过期时间", "scope": "accessToken域", "subscribed": "是否订阅", "subscribedAt": "订阅时间", "unsubscribedAt": "取关时间", "user": "用户", "tokens": "相关令牌", "application": "应用", "nickname": "昵称", "avatar": "头像", "remark": "备注", "language": "语言" }, "v": { "origin": { "mp": "小程序", "public": "公众号", "web": "网站" }, "language": { "zh_CN": "简体", "zh_TW": "繁体", "en": "英语" } } } +{ "name": "微信用户", "attr": { "origin": "源", "openId": "openId", "unionId": "unionId", "sessionKey": "sessionKey", "accessToken": "accessToken", "refreshToken": "refreshToken", "atExpiredAt": "accessToken过期时间", "rtExpiredAt": "refreshToken过期时间", "scope": "accessToken域", "subscribed": "是否订阅", "subscribedAt": "订阅时间", "unsubscribedAt": "取关时间", "user": "用户", "tokens": "相关令牌", "application": "应用", "nickname": "昵称", "avatar": "头像" }, "v": { "origin": { "mp": "小程序", "public": "公众号", "web": "网站" } } } diff --git a/lib/oak-app-domain/_SubQuery.d.ts b/lib/oak-app-domain/_SubQuery.d.ts index 348615219..c282755ad 100644 --- a/lib/oak-app-domain/_SubQuery.d.ts +++ b/lib/oak-app-domain/_SubQuery.d.ts @@ -41,11 +41,11 @@ import * as UserSystem from "./UserSystem/Schema"; import * as UserWechatPublicTag from "./UserWechatPublicTag/Schema"; import * as WechatLogin from "./WechatLogin/Schema"; import * as WechatMenu from "./WechatMenu/Schema"; +import * as wechatPublicAutoReply from "./wechatPublicAutoReply/Schema"; import * as WechatPublicTag from "./WechatPublicTag/Schema"; import * as WechatPublicTemplate from "./WechatPublicTemplate/Schema"; import * as WechatQrCode from "./WechatQrCode/Schema"; import * as WechatUser from "./WechatUser/Schema"; -import * as wechatPublicAutoReply from "./wechatPublicAutoReply/Schema"; export type ActionAuthIdSubQuery = { [K in "$in" | "$nin"]?: (ActionAuth.ActionAuthIdSubQuery & { entity: "actionAuth"; @@ -175,6 +175,8 @@ export type ApplicationIdSubQuery = { entity: "token"; }) | (WechatMenu.ApplicationIdSubQuery & { entity: "wechatMenu"; + }) | (wechatPublicAutoReply.ApplicationIdSubQuery & { + entity: "wechatPublicAutoReply"; }) | (WechatPublicTag.ApplicationIdSubQuery & { entity: "wechatPublicTag"; }) | (WechatPublicTemplate.ApplicationIdSubQuery & { @@ -183,8 +185,6 @@ export type ApplicationIdSubQuery = { entity: "wechatQrCode"; }) | (WechatUser.ApplicationIdSubQuery & { entity: "wechatUser"; - }) | (wechatPublicAutoReply.ApplicationIdSubQuery & { - entity: "wechatPublicAutoReply"; }) | (Session.ApplicationIdSubQuery & { entity: "session"; }) | (Application.ApplicationIdSubQuery & { @@ -413,6 +413,15 @@ export type WechatMenuIdSubQuery = { entity: "wechatMenu"; }) | any; }; +export type wechatPublicAutoReplyIdSubQuery = { + [K in "$in" | "$nin"]?: (ModiEntity.wechatPublicAutoReplyIdSubQuery & { + entity: "modiEntity"; + }) | (OperEntity.wechatPublicAutoReplyIdSubQuery & { + entity: "operEntity"; + }) | (wechatPublicAutoReply.wechatPublicAutoReplyIdSubQuery & { + entity: "wechatPublicAutoReply"; + }) | any; +}; export type WechatPublicTagIdSubQuery = { [K in "$in" | "$nin"]?: (UserWechatPublicTag.WechatPublicTagIdSubQuery & { entity: "userWechatPublicTag"; @@ -461,12 +470,3 @@ export type WechatUserIdSubQuery = { entity: "wechatUser"; }) | any; }; -export type wechatPublicAutoReplyIdSubQuery = { - [K in "$in" | "$nin"]?: (ModiEntity.wechatPublicAutoReplyIdSubQuery & { - entity: "modiEntity"; - }) | (OperEntity.wechatPublicAutoReplyIdSubQuery & { - entity: "operEntity"; - }) | (wechatPublicAutoReply.wechatPublicAutoReplyIdSubQuery & { - entity: "wechatPublicAutoReply"; - }) | any; -}; diff --git a/lib/triggers/sessionMessage.js b/lib/triggers/sessionMessage.js index dcb58c594..8e57b9936 100644 --- a/lib/triggers/sessionMessage.js +++ b/lib/triggers/sessionMessage.js @@ -43,7 +43,7 @@ const triggers = [ aaoe: 1, }, filter: { - sessionId, + id: sessionId, aaoe: false, createTime: { $gt: Date.now() - (48 * 60 * 60 * 1000 - 5 * 60 * 1000) diff --git a/src/components/userWechatPublicTag/subscribedList/index.ts b/src/components/userWechatPublicTag/subscribedList/index.ts index 3f7b83faf..0ba4eb91c 100644 --- a/src/components/userWechatPublicTag/subscribedList/index.ts +++ b/src/components/userWechatPublicTag/subscribedList/index.ts @@ -17,8 +17,6 @@ export default OakComponent({ subscribedAt: 1, applicationId: 1, userId: 1, - remark: 1, - language: 1, nickname: 1, avatar: 1, userWechatPublicTag$wechatUser: { @@ -60,8 +58,6 @@ export default OakComponent({ nickname: ele?.nickname, avatar: ele?.avatar, subscribedAt: ele?.subscribedAt, - remark: ele?.remark, - language: ele?.language, } }) return { diff --git a/src/components/userWechatPublicTag/subscribedList/web.pc.tsx b/src/components/userWechatPublicTag/subscribedList/web.pc.tsx index 60bdd4209..3719e0b97 100644 --- a/src/components/userWechatPublicTag/subscribedList/web.pc.tsx +++ b/src/components/userWechatPublicTag/subscribedList/web.pc.tsx @@ -18,7 +18,6 @@ export default function Render( wechatUsers: { nickname: string, avatar: string, - remark: string, openId: string, sync: boolean, syncAt: number, @@ -46,14 +45,12 @@ export default function Render( const [user, setUser] = useState({} as { nickname: string, avatar: string, - remark: string, openId: string, sync: boolean, syncAt: number, subscribedAt: number, tags: { id: string, text: string }[], }); - console.log(editTags); return (
: '--' } - - {user.remark ? user.remark : '--'} - diff --git a/src/entities/WechatUser.ts b/src/entities/WechatUser.ts index 72b62a369..298e908b1 100644 --- a/src/entities/WechatUser.ts +++ b/src/entities/WechatUser.ts @@ -23,13 +23,10 @@ export interface Schema extends EntityShape { tokens: Array; nickname?: String<128>; avatar?: Image; - remark?: String<32>; - language: 'zh_CN' | 'zh_TW' | 'en'; }; const entityDesc: EntityDesc = { locales: { zh_CN: { @@ -52,8 +49,6 @@ const entityDesc: EntityDesc; wechatMenu$application?: Array; wechatMenu$application$$aggr?: AggregationResult; + wechatPublicAutoReply$application?: Array; + wechatPublicAutoReply$application$$aggr?: AggregationResult; wechatPublicTag$application?: Array; wechatPublicTag$application$$aggr?: AggregationResult; wechatPublicTemplate$application?: Array; @@ -103,8 +105,6 @@ export type Schema = EntityShape & { wechatQrCode$application$$aggr?: AggregationResult; wechatUser$application?: Array; wechatUser$application$$aggr?: AggregationResult; - wechatPublicAutoReply$application?: Array; - wechatPublicAutoReply$application$$aggr?: AggregationResult; session$entity?: Array; session$entity$$aggr?: AggregationResult; } & { @@ -127,11 +127,11 @@ type AttrFilter = { sessionMessage$application: SessionMessage.Filter & SubQueryPredicateMetadata; token$application: Token.Filter & SubQueryPredicateMetadata; wechatMenu$application: WechatMenu.Filter & SubQueryPredicateMetadata; + wechatPublicAutoReply$application: wechatPublicAutoReply.Filter & SubQueryPredicateMetadata; wechatPublicTag$application: WechatPublicTag.Filter & SubQueryPredicateMetadata; wechatPublicTemplate$application: WechatPublicTemplate.Filter & SubQueryPredicateMetadata; wechatQrCode$application: WechatQrCode.Filter & SubQueryPredicateMetadata; wechatUser$application: WechatUser.Filter & SubQueryPredicateMetadata; - wechatPublicAutoReply$application: wechatPublicAutoReply.Filter & SubQueryPredicateMetadata; session$entity: Session.Filter & SubQueryPredicateMetadata; }; export type Filter = MakeFilter>; @@ -179,6 +179,12 @@ export type Projection = { wechatMenu$application$$aggr?: WechatMenu.Aggregation & { $entity: "wechatMenu"; }; + wechatPublicAutoReply$application?: wechatPublicAutoReply.Selection & { + $entity: "wechatPublicAutoReply"; + }; + wechatPublicAutoReply$application$$aggr?: wechatPublicAutoReply.Aggregation & { + $entity: "wechatPublicAutoReply"; + }; wechatPublicTag$application?: WechatPublicTag.Selection & { $entity: "wechatPublicTag"; }; @@ -203,12 +209,6 @@ export type Projection = { wechatUser$application$$aggr?: WechatUser.Aggregation & { $entity: "wechatUser"; }; - wechatPublicAutoReply$application?: wechatPublicAutoReply.Selection & { - $entity: "wechatPublicAutoReply"; - }; - wechatPublicAutoReply$application$$aggr?: wechatPublicAutoReply.Aggregation & { - $entity: "wechatPublicAutoReply"; - }; session$entity?: Session.Selection & { $entity: "session"; }; @@ -267,11 +267,11 @@ export type CreateOperationData = FormCreateData> & ( sessionMessage$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; token$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; wechatMenu$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; + wechatPublicAutoReply$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; wechatPublicTag$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; wechatPublicTemplate$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; wechatQrCode$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; wechatUser$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; - wechatPublicAutoReply$application?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; session$entity?: OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit>>; }; export type CreateSingleOperation = OakOperation<"create", CreateOperationData>; @@ -296,11 +296,11 @@ export type UpdateOperationData = FormUpdateData> & ( sessionMessage$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; token$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; wechatMenu$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; + wechatPublicAutoReply$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; wechatPublicTag$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; wechatPublicTemplate$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; wechatQrCode$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; wechatUser$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; - wechatPublicAutoReply$application?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; session$entity?: OakOperation, Omit> | OakOperation, Omit> | OakOperation<"create", Omit[]> | Array> | OakOperation, Omit> | OakOperation, Omit>>; }; export type UpdateOperation = OakOperation<"update" | string, UpdateOperationData, Filter, Sorter>; diff --git a/src/oak-app-domain/EntityDict.ts b/src/oak-app-domain/EntityDict.ts index e5e7ec01f..900b03749 100644 --- a/src/oak-app-domain/EntityDict.ts +++ b/src/oak-app-domain/EntityDict.ts @@ -41,11 +41,11 @@ import { EntityDef as UserSystem } from "./UserSystem/Schema"; import { EntityDef as UserWechatPublicTag } from "./UserWechatPublicTag/Schema"; import { EntityDef as WechatLogin } from "./WechatLogin/Schema"; import { EntityDef as WechatMenu } from "./WechatMenu/Schema"; +import { EntityDef as wechatPublicAutoReply } from "./wechatPublicAutoReply/Schema"; import { EntityDef as WechatPublicTag } from "./WechatPublicTag/Schema"; import { EntityDef as WechatPublicTemplate } from "./WechatPublicTemplate/Schema"; import { EntityDef as WechatQrCode } from "./WechatQrCode/Schema"; import { EntityDef as WechatUser } from "./WechatUser/Schema"; -import { EntityDef as wechatPublicAutoReply } from "./wechatPublicAutoReply/Schema"; export type EntityDict = { actionAuth: ActionAuth; i18n: I18n; @@ -90,9 +90,9 @@ export type EntityDict = { userWechatPublicTag: UserWechatPublicTag; wechatLogin: WechatLogin; wechatMenu: WechatMenu; + wechatPublicAutoReply: wechatPublicAutoReply; wechatPublicTag: WechatPublicTag; wechatPublicTemplate: WechatPublicTemplate; wechatQrCode: WechatQrCode; wechatUser: WechatUser; - wechatPublicAutoReply: wechatPublicAutoReply; }; diff --git a/src/oak-app-domain/ModiEntity/Schema.ts b/src/oak-app-domain/ModiEntity/Schema.ts index 6f1487eb7..32df0171b 100644 --- a/src/oak-app-domain/ModiEntity/Schema.ts +++ b/src/oak-app-domain/ModiEntity/Schema.ts @@ -13,20 +13,20 @@ import * as UserSystem from "../UserSystem/Schema"; import * as UserWechatPublicTag from "../UserWechatPublicTag/Schema"; import * as WechatLogin from "../WechatLogin/Schema"; import * as WechatMenu from "../WechatMenu/Schema"; +import * as wechatPublicAutoReply from "../wechatPublicAutoReply/Schema"; import * as WechatPublicTag from "../WechatPublicTag/Schema"; import * as WechatPublicTemplate from "../WechatPublicTemplate/Schema"; import * as WechatQrCode from "../WechatQrCode/Schema"; import * as WechatUser from "../WechatUser/Schema"; -import * as wechatPublicAutoReply from "../wechatPublicAutoReply/Schema"; export type OpSchema = EntityShape & { modiId: ForeignKey<"modi">; - entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string; + entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string; entityId: String<64>; }; export type OpAttr = keyof OpSchema; export type Schema = EntityShape & { modiId: ForeignKey<"modi">; - entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string; + entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string; entityId: String<64>; modi: Modi.Schema; user?: User.Schema; @@ -35,11 +35,11 @@ export type Schema = EntityShape & { userWechatPublicTag?: UserWechatPublicTag.Schema; wechatLogin?: WechatLogin.Schema; wechatMenu?: WechatMenu.Schema; + wechatPublicAutoReply?: wechatPublicAutoReply.Schema; wechatPublicTag?: WechatPublicTag.Schema; wechatPublicTemplate?: WechatPublicTemplate.Schema; wechatQrCode?: WechatQrCode.Schema; wechatUser?: WechatUser.Schema; - wechatPublicAutoReply?: wechatPublicAutoReply.Schema; } & { [A in ExpressionKey]?: any; }; @@ -50,7 +50,7 @@ type AttrFilter = { $$updateAt$$: Q_DateValue; modiId: Q_StringValue; modi: Modi.Filter; - entity: Q_EnumValue<"user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string>; + entity: Q_EnumValue<"user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string>; entityId: Q_StringValue; user: User.Filter; userEntityGrant: UserEntityGrant.Filter; @@ -58,11 +58,11 @@ type AttrFilter = { userWechatPublicTag: UserWechatPublicTag.Filter; wechatLogin: WechatLogin.Filter; wechatMenu: WechatMenu.Filter; + wechatPublicAutoReply: wechatPublicAutoReply.Filter; wechatPublicTag: WechatPublicTag.Filter; wechatPublicTemplate: WechatPublicTemplate.Filter; wechatQrCode: WechatQrCode.Filter; wechatUser: WechatUser.Filter; - wechatPublicAutoReply: wechatPublicAutoReply.Filter; }; export type Filter = MakeFilter>; export type Projection = { @@ -82,11 +82,11 @@ export type Projection = { userWechatPublicTag?: UserWechatPublicTag.Projection; wechatLogin?: WechatLogin.Projection; wechatMenu?: WechatMenu.Projection; + wechatPublicAutoReply?: wechatPublicAutoReply.Projection; wechatPublicTag?: WechatPublicTag.Projection; wechatPublicTemplate?: WechatPublicTemplate.Projection; wechatQrCode?: WechatQrCode.Projection; wechatUser?: WechatUser.Projection; - wechatPublicAutoReply?: wechatPublicAutoReply.Projection; } & Partial>; type ModiEntityIdProjection = OneOf<{ id: number; @@ -112,6 +112,9 @@ type WechatLoginIdProjection = OneOf<{ type WechatMenuIdProjection = OneOf<{ entityId: number; }>; +type wechatPublicAutoReplyIdProjection = OneOf<{ + entityId: number; +}>; type WechatPublicTagIdProjection = OneOf<{ entityId: number; }>; @@ -124,9 +127,6 @@ type WechatQrCodeIdProjection = OneOf<{ type WechatUserIdProjection = OneOf<{ entityId: number; }>; -type wechatPublicAutoReplyIdProjection = OneOf<{ - entityId: number; -}>; export type SortAttr = { id: number; } | { @@ -155,6 +155,8 @@ export type SortAttr = { wechatLogin: WechatLogin.SortAttr; } | { wechatMenu: WechatMenu.SortAttr; +} | { + wechatPublicAutoReply: wechatPublicAutoReply.SortAttr; } | { wechatPublicTag: WechatPublicTag.SortAttr; } | { @@ -163,8 +165,6 @@ export type SortAttr = { wechatQrCode: WechatQrCode.SortAttr; } | { wechatUser: WechatUser.SortAttr; -} | { - wechatPublicAutoReply: wechatPublicAutoReply.SortAttr; } | { [k: string]: any; } | OneOf>; @@ -250,6 +250,17 @@ export type CreateOperationData = FormCreateData; +} | { + entity?: never; + entityId?: never; + wechatPublicAutoReply: wechatPublicAutoReply.CreateSingleOperation; +} | { + entity: "wechatPublicAutoReply"; + entityId: ForeignKey<"wechatPublicAutoReply">; + wechatPublicAutoReply: wechatPublicAutoReply.UpdateOperation; +} | { + entity: "wechatPublicAutoReply"; + entityId: ForeignKey<"wechatPublicAutoReply">; } | { entity?: never; entityId?: never; @@ -294,17 +305,6 @@ export type CreateOperationData = FormCreateData; -} | { - entity?: never; - entityId?: never; - wechatPublicAutoReply: wechatPublicAutoReply.CreateSingleOperation; -} | { - entity: "wechatPublicAutoReply"; - entityId: ForeignKey<"wechatPublicAutoReply">; - wechatPublicAutoReply: wechatPublicAutoReply.UpdateOperation; -} | { - entity: "wechatPublicAutoReply"; - entityId: ForeignKey<"wechatPublicAutoReply">; } | { entity?: string; entityId?: string; @@ -349,6 +349,10 @@ export type UpdateOperationData = FormUpdateData | null; + entity?: ("user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string) | null; + entityId?: ForeignKey<"User" | "UserEntityGrant" | "UserSystem" | "UserWechatPublicTag" | "WechatLogin" | "WechatMenu" | "wechatPublicAutoReply" | "WechatPublicTag" | "WechatPublicTemplate" | "WechatQrCode" | "WechatUser"> | null; }) & { [k: string]: any; }; @@ -390,6 +390,8 @@ export type RemoveOperationData = {} & (({ wechatLogin?: WechatLogin.UpdateOperation | WechatLogin.RemoveOperation; } | { wechatMenu?: WechatMenu.UpdateOperation | WechatMenu.RemoveOperation; +} | { + wechatPublicAutoReply?: wechatPublicAutoReply.UpdateOperation | wechatPublicAutoReply.RemoveOperation; } | { wechatPublicTag?: WechatPublicTag.UpdateOperation | WechatPublicTag.RemoveOperation; } | { @@ -398,8 +400,6 @@ export type RemoveOperationData = {} & (({ wechatQrCode?: WechatQrCode.UpdateOperation | WechatQrCode.RemoveOperation; } | { wechatUser?: WechatUser.UpdateOperation | WechatUser.RemoveOperation; -} | { - wechatPublicAutoReply?: wechatPublicAutoReply.UpdateOperation | wechatPublicAutoReply.RemoveOperation; } | { [k: string]: any; }); @@ -412,11 +412,11 @@ export type UserSystemIdSubQuery = Selection; export type UserWechatPublicTagIdSubQuery = Selection; export type WechatLoginIdSubQuery = Selection; export type WechatMenuIdSubQuery = Selection; +export type wechatPublicAutoReplyIdSubQuery = Selection; export type WechatPublicTagIdSubQuery = Selection; export type WechatPublicTemplateIdSubQuery = Selection; export type WechatQrCodeIdSubQuery = Selection; export type WechatUserIdSubQuery = Selection; -export type wechatPublicAutoReplyIdSubQuery = Selection; export type ModiEntityIdSubQuery = Selection; export type EntityDef = { Schema: Schema; diff --git a/src/oak-app-domain/ModiEntity/Storage.ts b/src/oak-app-domain/ModiEntity/Storage.ts index ddb980bfa..9831db398 100644 --- a/src/oak-app-domain/ModiEntity/Storage.ts +++ b/src/oak-app-domain/ModiEntity/Storage.ts @@ -14,7 +14,7 @@ export const desc: StorageDesc = { params: { length: 32 }, - ref: ["user", "userEntityGrant", "userSystem", "userWechatPublicTag", "wechatLogin", "wechatMenu", "wechatPublicTag", "wechatPublicTemplate", "wechatQrCode", "wechatUser", "wechatPublicAutoReply"] + ref: ["user", "userEntityGrant", "userSystem", "userWechatPublicTag", "wechatLogin", "wechatMenu", "wechatPublicAutoReply", "wechatPublicTag", "wechatPublicTemplate", "wechatQrCode", "wechatUser"] }, entityId: { notNull: true, diff --git a/src/oak-app-domain/OperEntity/Schema.ts b/src/oak-app-domain/OperEntity/Schema.ts index 5defadbb9..84aae296f 100644 --- a/src/oak-app-domain/OperEntity/Schema.ts +++ b/src/oak-app-domain/OperEntity/Schema.ts @@ -14,20 +14,20 @@ import * as UserSystem from "../UserSystem/Schema"; import * as UserWechatPublicTag from "../UserWechatPublicTag/Schema"; import * as WechatLogin from "../WechatLogin/Schema"; import * as WechatMenu from "../WechatMenu/Schema"; +import * as wechatPublicAutoReply from "../wechatPublicAutoReply/Schema"; import * as WechatPublicTag from "../WechatPublicTag/Schema"; import * as WechatPublicTemplate from "../WechatPublicTemplate/Schema"; import * as WechatQrCode from "../WechatQrCode/Schema"; import * as WechatUser from "../WechatUser/Schema"; -import * as wechatPublicAutoReply from "../wechatPublicAutoReply/Schema"; export type OpSchema = EntityShape & { operId: ForeignKey<"oper">; - entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string; + entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string; entityId: String<64>; }; export type OpAttr = keyof OpSchema; export type Schema = EntityShape & { operId: ForeignKey<"oper">; - entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string; + entity: "user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string; entityId: String<64>; oper: Oper.Schema; user?: User.Schema; @@ -36,11 +36,11 @@ export type Schema = EntityShape & { userWechatPublicTag?: UserWechatPublicTag.Schema; wechatLogin?: WechatLogin.Schema; wechatMenu?: WechatMenu.Schema; + wechatPublicAutoReply?: wechatPublicAutoReply.Schema; wechatPublicTag?: WechatPublicTag.Schema; wechatPublicTemplate?: WechatPublicTemplate.Schema; wechatQrCode?: WechatQrCode.Schema; wechatUser?: WechatUser.Schema; - wechatPublicAutoReply?: wechatPublicAutoReply.Schema; } & { [A in ExpressionKey]?: any; }; @@ -51,7 +51,7 @@ type AttrFilter = { $$updateAt$$: Q_DateValue; operId: Q_StringValue; oper: Oper.Filter; - entity: Q_EnumValue<"user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | "wechatPublicAutoReply" | string>; + entity: Q_EnumValue<"user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string>; entityId: Q_StringValue; user: User.Filter; userEntityGrant: UserEntityGrant.Filter; @@ -59,11 +59,11 @@ type AttrFilter = { userWechatPublicTag: UserWechatPublicTag.Filter; wechatLogin: WechatLogin.Filter; wechatMenu: WechatMenu.Filter; + wechatPublicAutoReply: wechatPublicAutoReply.Filter; wechatPublicTag: WechatPublicTag.Filter; wechatPublicTemplate: WechatPublicTemplate.Filter; wechatQrCode: WechatQrCode.Filter; wechatUser: WechatUser.Filter; - wechatPublicAutoReply: wechatPublicAutoReply.Filter; }; export type Filter = MakeFilter>; export type Projection = { @@ -83,11 +83,11 @@ export type Projection = { userWechatPublicTag?: UserWechatPublicTag.Projection; wechatLogin?: WechatLogin.Projection; wechatMenu?: WechatMenu.Projection; + wechatPublicAutoReply?: wechatPublicAutoReply.Projection; wechatPublicTag?: WechatPublicTag.Projection; wechatPublicTemplate?: WechatPublicTemplate.Projection; wechatQrCode?: WechatQrCode.Projection; wechatUser?: WechatUser.Projection; - wechatPublicAutoReply?: wechatPublicAutoReply.Projection; } & Partial>; type OperEntityIdProjection = OneOf<{ id: number; @@ -113,6 +113,9 @@ type WechatLoginIdProjection = OneOf<{ type WechatMenuIdProjection = OneOf<{ entityId: number; }>; +type wechatPublicAutoReplyIdProjection = OneOf<{ + entityId: number; +}>; type WechatPublicTagIdProjection = OneOf<{ entityId: number; }>; @@ -125,9 +128,6 @@ type WechatQrCodeIdProjection = OneOf<{ type WechatUserIdProjection = OneOf<{ entityId: number; }>; -type wechatPublicAutoReplyIdProjection = OneOf<{ - entityId: number; -}>; export type SortAttr = { id: number; } | { @@ -156,6 +156,8 @@ export type SortAttr = { wechatLogin: WechatLogin.SortAttr; } | { wechatMenu: WechatMenu.SortAttr; +} | { + wechatPublicAutoReply: wechatPublicAutoReply.SortAttr; } | { wechatPublicTag: WechatPublicTag.SortAttr; } | { @@ -164,8 +166,6 @@ export type SortAttr = { wechatQrCode: WechatQrCode.SortAttr; } | { wechatUser: WechatUser.SortAttr; -} | { - wechatPublicAutoReply: wechatPublicAutoReply.SortAttr; } | { [k: string]: any; } | OneOf>; @@ -248,6 +248,17 @@ export type CreateOperationData = FormCreateData; +} | { + entity?: never; + entityId?: never; + wechatPublicAutoReply: wechatPublicAutoReply.CreateSingleOperation; +} | { + entity: "wechatPublicAutoReply"; + entityId: ForeignKey<"wechatPublicAutoReply">; + wechatPublicAutoReply: wechatPublicAutoReply.UpdateOperation; +} | { + entity: "wechatPublicAutoReply"; + entityId: ForeignKey<"wechatPublicAutoReply">; } | { entity?: never; entityId?: never; @@ -292,17 +303,6 @@ export type CreateOperationData = FormCreateData; -} | { - entity?: never; - entityId?: never; - wechatPublicAutoReply: wechatPublicAutoReply.CreateSingleOperation; -} | { - entity: "wechatPublicAutoReply"; - entityId: ForeignKey<"wechatPublicAutoReply">; - wechatPublicAutoReply: wechatPublicAutoReply.UpdateOperation; -} | { - entity: "wechatPublicAutoReply"; - entityId: ForeignKey<"wechatPublicAutoReply">; } | { entity?: string; entityId?: string; @@ -341,6 +341,10 @@ export type UpdateOperationData = FormUpdateData | null; + entity?: ("user" | "userEntityGrant" | "userSystem" | "userWechatPublicTag" | "wechatLogin" | "wechatMenu" | "wechatPublicAutoReply" | "wechatPublicTag" | "wechatPublicTemplate" | "wechatQrCode" | "wechatUser" | string) | null; + entityId?: ForeignKey<"User" | "UserEntityGrant" | "UserSystem" | "UserWechatPublicTag" | "WechatLogin" | "WechatMenu" | "wechatPublicAutoReply" | "WechatPublicTag" | "WechatPublicTemplate" | "WechatQrCode" | "WechatUser"> | null; }) & { [k: string]: any; }; @@ -380,6 +380,8 @@ export type RemoveOperationData = {} & ({ wechatLogin?: WechatLogin.UpdateOperation | WechatLogin.RemoveOperation; } | { wechatMenu?: WechatMenu.UpdateOperation | WechatMenu.RemoveOperation; +} | { + wechatPublicAutoReply?: wechatPublicAutoReply.UpdateOperation | wechatPublicAutoReply.RemoveOperation; } | { wechatPublicTag?: WechatPublicTag.UpdateOperation | WechatPublicTag.RemoveOperation; } | { @@ -388,8 +390,6 @@ export type RemoveOperationData = {} & ({ wechatQrCode?: WechatQrCode.UpdateOperation | WechatQrCode.RemoveOperation; } | { wechatUser?: WechatUser.UpdateOperation | WechatUser.RemoveOperation; -} | { - wechatPublicAutoReply?: wechatPublicAutoReply.UpdateOperation | wechatPublicAutoReply.RemoveOperation; } | { [k: string]: any; }); @@ -402,11 +402,11 @@ export type UserSystemIdSubQuery = Selection; export type UserWechatPublicTagIdSubQuery = Selection; export type WechatLoginIdSubQuery = Selection; export type WechatMenuIdSubQuery = Selection; +export type wechatPublicAutoReplyIdSubQuery = Selection; export type WechatPublicTagIdSubQuery = Selection; export type WechatPublicTemplateIdSubQuery = Selection; export type WechatQrCodeIdSubQuery = Selection; export type WechatUserIdSubQuery = Selection; -export type wechatPublicAutoReplyIdSubQuery = Selection; export type OperEntityIdSubQuery = Selection; export type EntityDef = { Schema: Schema; diff --git a/src/oak-app-domain/OperEntity/Storage.ts b/src/oak-app-domain/OperEntity/Storage.ts index eab62b30b..377ba9175 100644 --- a/src/oak-app-domain/OperEntity/Storage.ts +++ b/src/oak-app-domain/OperEntity/Storage.ts @@ -14,7 +14,7 @@ export const desc: StorageDesc = { params: { length: 32 }, - ref: ["user", "userEntityGrant", "userSystem", "userWechatPublicTag", "wechatLogin", "wechatMenu", "wechatPublicTag", "wechatPublicTemplate", "wechatQrCode", "wechatUser", "wechatPublicAutoReply"] + ref: ["user", "userEntityGrant", "userSystem", "userWechatPublicTag", "wechatLogin", "wechatMenu", "wechatPublicAutoReply", "wechatPublicTag", "wechatPublicTemplate", "wechatQrCode", "wechatUser"] }, entityId: { notNull: true, diff --git a/src/oak-app-domain/Storage.ts b/src/oak-app-domain/Storage.ts index 7ccfed448..9ad20f8c7 100644 --- a/src/oak-app-domain/Storage.ts +++ b/src/oak-app-domain/Storage.ts @@ -43,11 +43,11 @@ import { desc as userSystemDesc } from "./UserSystem/Storage"; import { desc as userWechatPublicTagDesc } from "./UserWechatPublicTag/Storage"; import { desc as wechatLoginDesc } from "./WechatLogin/Storage"; import { desc as wechatMenuDesc } from "./WechatMenu/Storage"; +import { desc as wechatPublicAutoReplyDesc } from "./wechatPublicAutoReply/Storage"; import { desc as wechatPublicTagDesc } from "./WechatPublicTag/Storage"; import { desc as wechatPublicTemplateDesc } from "./WechatPublicTemplate/Storage"; import { desc as wechatQrCodeDesc } from "./WechatQrCode/Storage"; import { desc as wechatUserDesc } from "./WechatUser/Storage"; -import { desc as wechatPublicAutoReplyDesc } from "./wechatPublicAutoReply/Storage"; export const storageSchema: StorageSchema = { actionAuth: actionAuthDesc, i18n: i18nDesc, @@ -92,9 +92,9 @@ export const storageSchema: StorageSchema = { userWechatPublicTag: userWechatPublicTagDesc, wechatLogin: wechatLoginDesc, wechatMenu: wechatMenuDesc, + wechatPublicAutoReply: wechatPublicAutoReplyDesc, wechatPublicTag: wechatPublicTagDesc, wechatPublicTemplate: wechatPublicTemplateDesc, wechatQrCode: wechatQrCodeDesc, - wechatUser: wechatUserDesc, - wechatPublicAutoReply: wechatPublicAutoReplyDesc + wechatUser: wechatUserDesc }; \ No newline at end of file diff --git a/src/oak-app-domain/WechatUser/Schema.ts b/src/oak-app-domain/WechatUser/Schema.ts index f7f2aded2..9f5d9b9bd 100644 --- a/src/oak-app-domain/WechatUser/Schema.ts +++ b/src/oak-app-domain/WechatUser/Schema.ts @@ -30,8 +30,6 @@ export type OpSchema = EntityShape & { applicationId: ForeignKey<"application">; nickname?: String<128> | null; avatar?: Image | null; - remark?: String<32> | null; - language: 'zh_CN' | 'zh_TW' | 'en'; }; export type OpAttr = keyof OpSchema; export type Schema = EntityShape & { @@ -51,8 +49,6 @@ export type Schema = EntityShape & { applicationId: ForeignKey<"application">; nickname?: String<128> | null; avatar?: Image | null; - remark?: String<32> | null; - language: 'zh_CN' | 'zh_TW' | 'en'; user?: User.Schema | null; application: Application.Schema; sessionMessage$wechatUser?: Array; @@ -91,8 +87,6 @@ type AttrFilter = { application: Application.Filter; nickname: Q_StringValue; avatar: Q_StringValue; - remark: Q_StringValue; - language: Q_EnumValue<'zh_CN' | 'zh_TW' | 'en'>; sessionMessage$wechatUser: SessionMessage.Filter & SubQueryPredicateMetadata; userWechatPublicTag$wechatUser: UserWechatPublicTag.Filter & SubQueryPredicateMetadata; modiEntity$entity: ModiEntity.Filter & SubQueryPredicateMetadata; @@ -125,8 +119,6 @@ export type Projection = { application?: Application.Projection; nickname?: number; avatar?: number; - remark?: number; - language?: number; sessionMessage$wechatUser?: SessionMessage.Selection & { $entity: "sessionMessage"; }; @@ -211,10 +203,6 @@ export type SortAttr = { nickname: number; } | { avatar: number; -} | { - remark: number; -} | { - language: number; } | { [k: string]: any; } | OneOf>; diff --git a/src/oak-app-domain/WechatUser/Storage.ts b/src/oak-app-domain/WechatUser/Storage.ts index c3d20f3f0..17e4b3f1e 100644 --- a/src/oak-app-domain/WechatUser/Storage.ts +++ b/src/oak-app-domain/WechatUser/Storage.ts @@ -76,17 +76,6 @@ export const desc: StorageDesc = { }, avatar: { type: "text" - }, - remark: { - type: "varchar", - params: { - length: 32 - } - }, - language: { - notNull: true, - type: "enum", - enumeration: ["zh_CN", "zh_TW", "en"] } }, actionType: "crud", diff --git a/src/oak-app-domain/WechatUser/locales/zh_CN.json b/src/oak-app-domain/WechatUser/locales/zh_CN.json index 47ac2ae7b..7d268c273 100644 --- a/src/oak-app-domain/WechatUser/locales/zh_CN.json +++ b/src/oak-app-domain/WechatUser/locales/zh_CN.json @@ -1 +1 @@ -{"name":"微信用户","attr":{"origin":"源","openId":"openId","unionId":"unionId","sessionKey":"sessionKey","accessToken":"accessToken","refreshToken":"refreshToken","atExpiredAt":"accessToken过期时间","rtExpiredAt":"refreshToken过期时间","scope":"accessToken域","subscribed":"是否订阅","subscribedAt":"订阅时间","unsubscribedAt":"取关时间","user":"用户","tokens":"相关令牌","application":"应用","nickname":"昵称","avatar":"头像","remark":"备注","language":"语言"},"v":{"origin":{"mp":"小程序","public":"公众号","web":"网站"},"language":{"zh_CN":"简体","zh_TW":"繁体","en":"英语"}}} \ No newline at end of file +{"name":"微信用户","attr":{"origin":"源","openId":"openId","unionId":"unionId","sessionKey":"sessionKey","accessToken":"accessToken","refreshToken":"refreshToken","atExpiredAt":"accessToken过期时间","rtExpiredAt":"refreshToken过期时间","scope":"accessToken域","subscribed":"是否订阅","subscribedAt":"订阅时间","unsubscribedAt":"取关时间","user":"用户","tokens":"相关令牌","application":"应用","nickname":"昵称","avatar":"头像"},"v":{"origin":{"mp":"小程序","public":"公众号","web":"网站"}}} \ No newline at end of file diff --git a/src/oak-app-domain/_SubQuery.ts b/src/oak-app-domain/_SubQuery.ts index 348615219..c282755ad 100644 --- a/src/oak-app-domain/_SubQuery.ts +++ b/src/oak-app-domain/_SubQuery.ts @@ -41,11 +41,11 @@ import * as UserSystem from "./UserSystem/Schema"; import * as UserWechatPublicTag from "./UserWechatPublicTag/Schema"; import * as WechatLogin from "./WechatLogin/Schema"; import * as WechatMenu from "./WechatMenu/Schema"; +import * as wechatPublicAutoReply from "./wechatPublicAutoReply/Schema"; import * as WechatPublicTag from "./WechatPublicTag/Schema"; import * as WechatPublicTemplate from "./WechatPublicTemplate/Schema"; import * as WechatQrCode from "./WechatQrCode/Schema"; import * as WechatUser from "./WechatUser/Schema"; -import * as wechatPublicAutoReply from "./wechatPublicAutoReply/Schema"; export type ActionAuthIdSubQuery = { [K in "$in" | "$nin"]?: (ActionAuth.ActionAuthIdSubQuery & { entity: "actionAuth"; @@ -175,6 +175,8 @@ export type ApplicationIdSubQuery = { entity: "token"; }) | (WechatMenu.ApplicationIdSubQuery & { entity: "wechatMenu"; + }) | (wechatPublicAutoReply.ApplicationIdSubQuery & { + entity: "wechatPublicAutoReply"; }) | (WechatPublicTag.ApplicationIdSubQuery & { entity: "wechatPublicTag"; }) | (WechatPublicTemplate.ApplicationIdSubQuery & { @@ -183,8 +185,6 @@ export type ApplicationIdSubQuery = { entity: "wechatQrCode"; }) | (WechatUser.ApplicationIdSubQuery & { entity: "wechatUser"; - }) | (wechatPublicAutoReply.ApplicationIdSubQuery & { - entity: "wechatPublicAutoReply"; }) | (Session.ApplicationIdSubQuery & { entity: "session"; }) | (Application.ApplicationIdSubQuery & { @@ -413,6 +413,15 @@ export type WechatMenuIdSubQuery = { entity: "wechatMenu"; }) | any; }; +export type wechatPublicAutoReplyIdSubQuery = { + [K in "$in" | "$nin"]?: (ModiEntity.wechatPublicAutoReplyIdSubQuery & { + entity: "modiEntity"; + }) | (OperEntity.wechatPublicAutoReplyIdSubQuery & { + entity: "operEntity"; + }) | (wechatPublicAutoReply.wechatPublicAutoReplyIdSubQuery & { + entity: "wechatPublicAutoReply"; + }) | any; +}; export type WechatPublicTagIdSubQuery = { [K in "$in" | "$nin"]?: (UserWechatPublicTag.WechatPublicTagIdSubQuery & { entity: "userWechatPublicTag"; @@ -461,12 +470,3 @@ export type WechatUserIdSubQuery = { entity: "wechatUser"; }) | any; }; -export type wechatPublicAutoReplyIdSubQuery = { - [K in "$in" | "$nin"]?: (ModiEntity.wechatPublicAutoReplyIdSubQuery & { - entity: "modiEntity"; - }) | (OperEntity.wechatPublicAutoReplyIdSubQuery & { - entity: "operEntity"; - }) | (wechatPublicAutoReply.wechatPublicAutoReplyIdSubQuery & { - entity: "wechatPublicAutoReply"; - }) | any; -};