From cd1bf2ce21bb62258a1b53894b84cb7ec26afbec Mon Sep 17 00:00:00 2001 From: qcqcqc <1220204124@zust.edu.cn> Date: Fri, 7 Nov 2025 14:40:57 +0800 Subject: [PATCH 1/2] build --- es/aspects/session.js | 6 +- es/aspects/wechatQrCode.js | 2 +- es/components/articleMenu/container/index.js | 4 +- es/components/articleMenu/treeCell/index.js | 2 +- .../articleMenu/treeManager/index.js | 24 ++-- es/components/common/errorPage/index.js | 2 +- es/components/common/qrCode/index.js | 10 +- es/components/extraFile/crop/index.js | 90 +++++++-------- es/components/extraFile/forUrl/index.js | 4 +- es/components/extraFile/gallery/index.js | 8 +- es/components/extraFile/upload/index.js | 28 ++--- .../management/oauthApps/upsert/index.js | 4 +- es/components/sessionMessage/list/index.js | 2 +- es/components/wechatQrCode/scan/index.js | 2 +- es/entities/Livestream.js | 4 +- es/entities/Test.d.ts | 28 +++++ es/entities/Test.js | 77 +++++++++++++ .../Application/_baseSchema.d.ts | 1 + es/oak-app-domain/I18n/_baseSchema.d.ts | 2 +- es/oak-app-domain/Log/_baseSchema.d.ts | 2 +- es/oak-app-domain/Modi/_baseSchema.d.ts | 2 +- es/oak-app-domain/ModiEntity/_baseSchema.d.ts | 2 +- es/oak-app-domain/Oper/_baseSchema.d.ts | 2 +- es/oak-app-domain/OperEntity/_baseSchema.d.ts | 2 +- es/oak-app-domain/Path/_baseSchema.d.ts | 2 +- es/oak-app-domain/Relation/_baseSchema.d.ts | 2 +- es/oak-app-domain/Test/Schema.d.ts | 19 ++++ es/oak-app-domain/Test/Schema.js | 1 + es/oak-app-domain/Test/Storage.d.ts | 3 + es/oak-app-domain/Test/Storage.js | 102 +++++++++++++++++ es/oak-app-domain/Test/Style.d.ts | 3 + es/oak-app-domain/Test/Style.js | 11 ++ es/oak-app-domain/Test/_baseSchema.d.ts | 92 +++++++++++++++ es/oak-app-domain/Test/_baseSchema.js | 1 + es/oak-app-domain/Test/locales/zh_CN.json | 27 +++++ .../UserEntityClaim/_baseSchema.d.ts | 2 +- .../UserRelation/_baseSchema.d.ts | 2 +- es/triggers/index.d.ts | 2 +- es/triggers/notification.js | 2 +- es/triggers/toDo.d.ts | 2 +- lib/aspects/application.js | 17 ++- lib/aspects/applicationPassport.js | 5 +- lib/aspects/config.js | 7 +- lib/aspects/extraFile.js | 5 +- lib/aspects/session.js | 9 +- lib/aspects/sms.js | 3 +- lib/aspects/template.js | 7 +- lib/aspects/userWechatPublicTag.js | 19 ++-- lib/aspects/wechatLogin.js | 3 +- lib/aspects/wechatMenu.js | 13 +-- lib/aspects/wechatMpJump.js | 3 +- lib/aspects/wechatPublicTag.js | 13 +-- lib/aspects/wechatQrCode.js | 7 +- lib/aspects/wechatUser.js | 3 +- lib/config/constants.js | 6 +- lib/entities/Livestream.js | 4 +- lib/entities/Test.d.ts | 28 +++++ lib/entities/Test.js | 80 +++++++++++++ lib/features/index.js | 5 +- lib/hooks/useFeatures.js | 2 +- lib/hooks/useMyInfo.js | 2 +- .../Application/_baseSchema.d.ts | 1 + lib/oak-app-domain/I18n/_baseSchema.d.ts | 2 +- lib/oak-app-domain/Log/_baseSchema.d.ts | 2 +- lib/oak-app-domain/Modi/_baseSchema.d.ts | 2 +- .../ModiEntity/_baseSchema.d.ts | 2 +- lib/oak-app-domain/Oper/_baseSchema.d.ts | 2 +- .../OperEntity/_baseSchema.d.ts | 2 +- lib/oak-app-domain/Path/_baseSchema.d.ts | 2 +- lib/oak-app-domain/Relation/_baseSchema.d.ts | 2 +- lib/oak-app-domain/Test/Schema.d.ts | 19 ++++ lib/oak-app-domain/Test/Schema.js | 4 + lib/oak-app-domain/Test/Storage.d.ts | 3 + lib/oak-app-domain/Test/Storage.js | 105 ++++++++++++++++++ lib/oak-app-domain/Test/Style.d.ts | 3 + lib/oak-app-domain/Test/Style.js | 14 +++ lib/oak-app-domain/Test/_baseSchema.d.ts | 92 +++++++++++++++ lib/oak-app-domain/Test/_baseSchema.js | 2 + lib/oak-app-domain/Test/locales/zh_CN.json | 27 +++++ .../UserEntityClaim/_baseSchema.d.ts | 2 +- .../UserRelation/_baseSchema.d.ts | 2 +- lib/triggers/index.d.ts | 2 +- lib/triggers/message.js | 7 +- lib/triggers/notification.js | 2 +- lib/triggers/toDo.d.ts | 2 +- lib/triggers/toDo.js | 5 +- lib/types/Exception.js | 4 +- lib/utils/appVersion.js | 3 +- lib/utils/application.js | 3 +- lib/utils/area.js | 5 +- lib/utils/cos/index.backend.js | 7 +- lib/utils/cos/index.frontend.js | 7 +- lib/utils/domain.js | 5 +- lib/utils/email/index.frontend.js | 3 +- lib/utils/email/index.js | 9 +- lib/utils/extraFile.js | 5 +- lib/utils/getContextConfig.js | 3 +- lib/utils/livestream.js | 7 +- lib/utils/oauth/index.js | 4 +- lib/utils/passport.js | 3 +- lib/utils/password.js | 3 +- lib/utils/randomUser.js | 5 +- lib/utils/selectionRewriter.js | 5 +- lib/utils/sign.js | 7 +- lib/utils/sms/index.js | 9 +- lib/utils/strings.js | 5 +- lib/utils/user.js | 7 +- lib/utils/wechatPublicException/index.js | 3 +- 108 files changed, 975 insertions(+), 269 deletions(-) create mode 100644 es/entities/Test.d.ts create mode 100644 es/entities/Test.js create mode 100644 es/oak-app-domain/Test/Schema.d.ts create mode 100644 es/oak-app-domain/Test/Schema.js create mode 100644 es/oak-app-domain/Test/Storage.d.ts create mode 100644 es/oak-app-domain/Test/Storage.js create mode 100644 es/oak-app-domain/Test/Style.d.ts create mode 100644 es/oak-app-domain/Test/Style.js create mode 100644 es/oak-app-domain/Test/_baseSchema.d.ts create mode 100644 es/oak-app-domain/Test/_baseSchema.js create mode 100644 es/oak-app-domain/Test/locales/zh_CN.json create mode 100644 lib/entities/Test.d.ts create mode 100644 lib/entities/Test.js create mode 100644 lib/oak-app-domain/Test/Schema.d.ts create mode 100644 lib/oak-app-domain/Test/Schema.js create mode 100644 lib/oak-app-domain/Test/Storage.d.ts create mode 100644 lib/oak-app-domain/Test/Storage.js create mode 100644 lib/oak-app-domain/Test/Style.d.ts create mode 100644 lib/oak-app-domain/Test/Style.js create mode 100644 lib/oak-app-domain/Test/_baseSchema.d.ts create mode 100644 lib/oak-app-domain/Test/_baseSchema.js create mode 100644 lib/oak-app-domain/Test/locales/zh_CN.json diff --git a/es/aspects/session.js b/es/aspects/session.js index 022bb1b58..53276de61 100644 --- a/es/aspects/session.js +++ b/es/aspects/session.js @@ -103,7 +103,7 @@ export async function createSession(params, context) { origin: 'wechat', type: 'image', tag1: 'image', - objectId: await generateNewIdAsync(), + objectId: await generateNewIdAsync(), // 这个域用来标识唯一性 sort: 1000, uploadState: 'success', extra1: data.MediaId, @@ -128,7 +128,7 @@ export async function createSession(params, context) { origin: 'wechat', type: 'video', tag1: 'video', - objectId: await generateNewIdAsync(), + objectId: await generateNewIdAsync(), // 这个域用来标识唯一性 sort: 1000, uploadState: 'success', extra1: data.MediaId, @@ -150,7 +150,7 @@ export async function createSession(params, context) { origin: 'wechat', type: 'audio', tag1: 'audio', - objectId: await generateNewIdAsync(), + objectId: await generateNewIdAsync(), // 这个域用来标识唯一性 sort: 1000, uploadState: 'success', extra1: data.MediaId, diff --git a/es/aspects/wechatQrCode.js b/es/aspects/wechatQrCode.js index 2ce3a1b8d..ef80f4cc2 100644 --- a/es/aspects/wechatQrCode.js +++ b/es/aspects/wechatQrCode.js @@ -162,7 +162,7 @@ export async function createWechatQrCode(options, context) { permanent, url, expired: false, - expiresAt: Date.now() + 2592000 * 1000, + expiresAt: Date.now() + 2592000 * 1000, // wecharQrCode里的过期时间都放到最大，由上层关联对象来主动过期（by Xc, 20230131) props, }; // 直接创建 diff --git a/es/components/articleMenu/container/index.js b/es/components/articleMenu/container/index.js index cc62363b1..690174bb4 100644 --- a/es/components/articleMenu/container/index.js +++ b/es/components/articleMenu/container/index.js @@ -7,7 +7,7 @@ export default OakComponent({ entity: '', entityId: '', title: '', - origin: null, + origin: null, // cos origin默认由系统决定 menuEmpty: undefined, articleEmpty: undefined, generateUrl: ((mode, type, id) => { }), //构造文章显示路由 @@ -20,7 +20,7 @@ export default OakComponent({ showAddArticle: false, showAddMenu: true, parentId: '', - articleMenuId: '', + articleMenuId: '', //非空时展示atricle表格 unsub: undefined, }, listeners: { diff --git a/es/components/articleMenu/treeCell/index.js b/es/components/articleMenu/treeCell/index.js index 94efcfd06..2c69babc9 100644 --- a/es/components/articleMenu/treeCell/index.js +++ b/es/components/articleMenu/treeCell/index.js @@ -47,7 +47,7 @@ export default OakComponent({ onRemove: () => undefined, onUpdateName: async (name) => undefined, onChildEditArticleChange: (data) => undefined, - show: 'edit', + show: 'edit', // edit为编辑，doc为查看，preview为预览 getBreadcrumbItemsByParent: (breadcrumbItems) => undefined, breadItems: [], drawerOpen: false, diff --git a/es/components/articleMenu/treeManager/index.js b/es/components/articleMenu/treeManager/index.js index e982ce398..91142e98d 100644 --- a/es/components/articleMenu/treeManager/index.js +++ b/es/components/articleMenu/treeManager/index.js @@ -14,19 +14,19 @@ export default OakComponent({ properties: { entity: '', entityId: '', - show: 'edit', - articleMenuId: '', - articleId: '', - tocPosition: 'none', - highlightBgColor: 'none', - onMenuView: () => undefined, - onMenuViewById: (articleMenuId) => undefined, - onArticleView: (articleId) => undefined, - onArticlePreview: (content, title) => undefined, - onArticleEdit: (articleId) => undefined, + show: 'edit', // edit为编辑，doc为查看，preview为预览 + articleMenuId: '', // 菜单id + articleId: '', //文章id + tocPosition: 'none', //文章目录显示位置，none为不显示目录 + highlightBgColor: 'none', //点击文章目录时标题高亮背景色，none为不显示高亮背景色 + onMenuView: () => undefined, //查看全部菜单 + onMenuViewById: (articleMenuId) => undefined, //查看指定id菜单 + onArticleView: (articleId) => undefined, //查看文章 + onArticlePreview: (content, title) => undefined, //预览文章 + onArticleEdit: (articleId) => undefined, //编辑文章 setCopyArticleUrl: (articleId) => '', - origin: null, - scrollId: '', + origin: null, // cos origin默认由系统决定 + scrollId: '', // 滚动条所在容器id，不传默认页面编辑器容器id activeColor: undefined, //目录高亮颜色 }, }); diff --git a/es/components/common/errorPage/index.js b/es/components/common/errorPage/index.js index 45afa922d..8dfa687a8 100644 --- a/es/components/common/errorPage/index.js +++ b/es/components/common/errorPage/index.js @@ -37,7 +37,7 @@ export default OakComponent({ code: '', title: '', desc: '', - icon: '', + icon: '', //web独有 imagePath: '', //小程序独有 }, lifetimes: { diff --git a/es/components/common/qrCode/index.js b/es/components/common/qrCode/index.js index 9094c1ca6..5dd0ec1b6 100644 --- a/es/components/common/qrCode/index.js +++ b/es/components/common/qrCode/index.js @@ -43,9 +43,9 @@ export default OakComponent({ return; } const qrCodeURL = qrcode.drawImg(url, { - typeNumber: 4, - errorCorrectLevel: 'L', - size: size, + typeNumber: 4, // 密度 + errorCorrectLevel: 'L', // 纠错等级 + size: size, // 白色边框 color, bgColor }); @@ -77,8 +77,8 @@ export default OakComponent({ // 注意：写入前需确保Base64数据已经去掉了数据URL前缀（如"data:image/png;base64,"） fs.writeFile({ filePath: filePath, - data: base64Data, - encoding: 'base64', + data: base64Data, // 传入纯Base64字符串 + encoding: 'base64', // 指定编码格式 success(res) { // 文件写入成功后，检查并保存到相册 that.checkAuthAndSave(filePath); diff --git a/es/components/extraFile/crop/index.js b/es/components/extraFile/crop/index.js index f5c12b44a..c2c84fe08 100644 --- a/es/components/extraFile/crop/index.js +++ b/es/components/extraFile/crop/index.js @@ -47,19 +47,19 @@ export default OakComponent({ bucket: '', autoUpload: false, maxNumber: 20, - extension: [], - selectCount: 1, - sourceType: ['album', 'camera'], - mediaType: ['image'], - mode: 'aspectFit', - size: 3, - showUploadList: true, - showUploadProgress: false, - accept: 'image/*', - disablePreview: false, - disableDelete: false, - disableAdd: false, - disableDownload: false, + extension: [], //小程序独有 chooseMessageFile + selectCount: 1, // 每次打开图片时，可选中的数量 小程序独有 + sourceType: ['album', 'camera'], // 小程序独有 chooseMedia + mediaType: ['image'], // 小程序独有 chooseMedia + mode: 'aspectFit', // 图片显示模式 + size: 3, // 每行可显示的个数 小程序独有 + showUploadList: true, //web独有 + showUploadProgress: false, // web独有 + accept: 'image/*', // web独有 + disablePreview: false, // 图片是否可预览 + disableDelete: false, // 图片是否可删除 + disableAdd: false, // 上传按钮隐藏 + disableDownload: false, // 下载按钮隐藏 type: 'image', origin: null, tag1: '', @@ -67,40 +67,40 @@ export default OakComponent({ entity: '', entityId: '', theme: 'image', - enableCrop: false, - enableCompross: false, + enableCrop: false, //启用裁剪 + enableCompross: false, //启用压缩 //图片裁剪 - cropQuality: 1, - showRest: false, - showGrid: false, - fillColor: 'white', - rotationSlider: false, - aspectSlider: false, - zoomSlider: true, - resetText: '重置', - aspect: 1 / 1, - minZoom: 1, - maxZoom: 3, - cropShape: 'rect', - cropperProps: {}, - modalTitle: '编辑图片', - modalWidth: '40vw', - modalOk: '确定', - modalCancel: '取消', + cropQuality: 1, //图片裁剪质量，范围：0 ~ 1 + showRest: false, //显示重置按钮，重置缩放及旋转 + showGrid: false, //显示裁切区域网格（九宫格） + fillColor: 'white', //裁切图像填充色 + rotationSlider: false, //图片旋转控制 + aspectSlider: false, //裁切比率控制 + zoomSlider: true, //图片缩放控制 + resetText: '重置', //重置按钮文字 + aspect: 1 / 1, //裁切区域宽高比，width / height + minZoom: 1, //最小缩放倍数 + maxZoom: 3, //最大缩放倍数 + cropShape: 'rect', //裁切区域形状，'rect' 或 'round' + cropperProps: {}, //recat-easy-crop的props + modalTitle: '编辑图片', //弹窗标题 + modalWidth: '40vw', //弹窗宽度 + modalOk: '确定', //确定按钮文字 + modalCancel: '取消', //取消按钮的文字 //图片压缩 - strict: true, - checkOrientation: true, - retainExif: false, - maxWidth: Infinity, - maxHeight: Infinity, - minWidth: 0, - minHeight: 0, - compressWidth: undefined, - compressHeight: undefined, - resize: 'none', - compressQuality: 0.8, - mimeType: 'auto', - convertTypes: ['image/png'], + strict: true, //当压缩后的图片尺寸大于原图尺寸时输出原图 + checkOrientation: true, //读取图像的Exif方向值并自动旋转或翻转图像（仅限 JPEG 图像） + retainExif: false, //压缩后保留图片的Exif信息 + maxWidth: Infinity, //输出图片的最大宽度，值需大于0 + maxHeight: Infinity, //输出图片的最大高度，值需大于0 + minWidth: 0, //输出图片的最小宽度，值需大于0且不应大于maxWidth + minHeight: 0, //输出图片的最小高度。值需大于0且不应大于maxHeight + compressWidth: undefined, //输出图像的宽度。如果未指定，则将使用原始图像的宽度，若设置了height，则宽度将根据自然纵横比自动计算。 + compressHeight: undefined, //输出图像的高度。如果未指定，则将使用原始图像的高度，若设置了width，则高度将根据自然纵横比自动计算。 + resize: 'none', //仅在同时指定了width和height时生效 + compressQuality: 0.8, //输出图像的质量。范围：0 ~ 1 + mimeType: 'auto', //输出图片的 MIME 类型。默认情况下，将使用源图片文件的原始 MIME 类型。 + convertTypes: ['image/png'], //文件类型包含在其中且文件大小超过该convertSize值的文件将被转换为 JPEG。 convertSize: Infinity, //文件类型包含在convertTypes中且文件大小超过此值的文件将转换为 JPEG，Infinity表示禁用该功能 }, features: ['extraFile'], diff --git a/es/components/extraFile/forUrl/index.js b/es/components/extraFile/forUrl/index.js index 8d6a0b5d6..18546b28f 100644 --- a/es/components/extraFile/forUrl/index.js +++ b/es/components/extraFile/forUrl/index.js @@ -55,9 +55,9 @@ export default OakComponent({ data: { isModalOpen: false, isModalOpen1: false, - renderImgs: [], + renderImgs: [], // 读取的原文图片，在modal使用 methodsType: '', - bridgeUrl: '', + bridgeUrl: '', // 通过桥接方式获得的url selectedId: -1, }, properties: { diff --git a/es/components/extraFile/gallery/index.js b/es/components/extraFile/gallery/index.js index 7e3d08e92..aaa8f4633 100644 --- a/es/components/extraFile/gallery/index.js +++ b/es/components/extraFile/gallery/index.js @@ -67,10 +67,10 @@ export default OakComponent({ }, ], properties: { - mode: 'aspectFit', - size: 3, - disablePreview: false, - disableDownload: false, + mode: 'aspectFit', // 图片显示模式 + size: 3, // 每行可显示的个数 小程序独有 + disablePreview: false, // 图片是否可预览 + disableDownload: false, // 下载按钮隐藏 tag1: '', tag2: '', entity: '', diff --git a/es/components/extraFile/upload/index.js b/es/components/extraFile/upload/index.js index f4159dfb3..aabf14b30 100644 --- a/es/components/extraFile/upload/index.js +++ b/es/components/extraFile/upload/index.js @@ -50,19 +50,19 @@ export default OakComponent({ bucket: '', autoUpload: false, maxNumber: 20, - extension: [], - selectCount: 1, - sourceType: ['album', 'camera'], - mediaType: ['image'], - mode: 'aspectFit', - size: 3, - showUploadList: true, - showUploadProgress: false, - accept: 'image/*', - disablePreview: false, - disableDelete: false, - disableAdd: false, - disableDownload: false, + extension: [], //小程序独有 chooseMessageFile + selectCount: 1, // 每次打开图片时，可选中的数量 小程序独有 + sourceType: ['album', 'camera'], // 小程序独有 chooseMedia + mediaType: ['image'], // 小程序独有 chooseMedia + mode: 'aspectFit', // 图片显示模式 + size: 3, // 每行可显示的个数 小程序独有 + showUploadList: true, //web独有 + showUploadProgress: false, // web独有 + accept: 'image/*', // web独有 + disablePreview: false, // 图片是否可预览 + disableDelete: false, // 图片是否可删除 + disableAdd: false, // 上传按钮隐藏 + disableDownload: false, // 下载按钮隐藏 type: 'image', origin: null, tag1: '', @@ -147,7 +147,7 @@ export default OakComponent({ type, tag1, tag2, - objectId: generateNewId(), + objectId: generateNewId(), // 这个域用来标识唯一性 entity, filename, size, diff --git a/es/components/oauth/management/oauthApps/upsert/index.js b/es/components/oauth/management/oauthApps/upsert/index.js index 94552d16a..ce02e3564 100644 --- a/es/components/oauth/management/oauthApps/upsert/index.js +++ b/es/components/oauth/management/oauthApps/upsert/index.js @@ -6,9 +6,9 @@ export default OakComponent({ name: 1, description: 1, redirectUris: 1, - logo: 1, + logo: 1, // string isConfidential: 1, - scopes: 1, + scopes: 1, // string[] ableState: 1, requirePKCE: 1, }, diff --git a/es/components/sessionMessage/list/index.js b/es/components/sessionMessage/list/index.js index 6c926c3a6..329843f88 100644 --- a/es/components/sessionMessage/list/index.js +++ b/es/components/sessionMessage/list/index.js @@ -102,7 +102,7 @@ export default OakComponent({ dialog: false, entity: '', entityId: '', - entityDisplay: (data) => [], + entityDisplay: (data) => [], // user端，指示如何显示entity对象名称 entityProjection: null, // user端，指示需要取哪些entity的属性来显示entityDisplay }, filters: [ diff --git a/es/components/wechatQrCode/scan/index.js b/es/components/wechatQrCode/scan/index.js index 8c8c5e99f..3d25bce61 100644 --- a/es/components/wechatQrCode/scan/index.js +++ b/es/components/wechatQrCode/scan/index.js @@ -5,7 +5,7 @@ export default OakComponent({ id: 1, entity: 1, entityId: 1, - type: 1, + type: 1, //类型 ticket: 1, url: 1, expired: 1, diff --git a/es/entities/Livestream.js b/es/entities/Livestream.js index bc927d8d5..4bd3382f0 100644 --- a/es/entities/Livestream.js +++ b/es/entities/Livestream.js @@ -3,10 +3,10 @@ export const entityDesc = { zh_CN: { name: '直播流', attr: { - title: '名称', + title: '名称', // 用户定义直播间名称, streamTitle: '直播流名称', liveonly: '活跃状态', - hub: '直播空间名称', + hub: '直播空间名称', // 所属直播空间名称 entity: '所属实体', entityId: '所属实体id', rtmpPushUrl: '推流地址', diff --git a/es/entities/Test.d.ts b/es/entities/Test.d.ts new file mode 100644 index 000000000..706b1f2f6 --- /dev/null +++ b/es/entities/Test.d.ts @@ -0,0 +1,28 @@ +import { String, Text, Datetime, Boolean } from 'oak-domain/lib/types/DataType'; +import { EntityShape } from 'oak-domain/lib/types/Entity'; +import { QrCodeType } from '../types/Config'; +import { EntityDesc } from 'oak-domain/lib/types/EntityDesc'; +export type WechatQrCodeProps = { + pathname: string; + props?: Record; + state?: Record; + isTabBar?: boolean; +}; +export interface Schema extends EntityShape { + entity: String<32>; + entityId: String<64>; + type: QrCodeType; + allowShare: Boolean; + tag?: String<32>; + tag2?: String<64>; + expiresAt?: Datetime; + expired?: Boolean; + ticket?: Text; + url?: String<256>; + permanent?: Boolean; + buffer?: Text; + props: WechatQrCodeProps; +} +export declare const entityDesc: EntityDesc; diff --git a/es/entities/Test.js b/es/entities/Test.js new file mode 100644 index 000000000..8d7a3657f --- /dev/null +++ b/es/entities/Test.js @@ -0,0 +1,77 @@ +export const entityDesc = { + locales: { + zh_CN: { + name: '微信识别码', + attr: { + entity: '关联对象', + entityId: '关联对象id', + type: '类型', + allowShare: '允许分享', + tag: 'tag', + tag2: 'tag2', + ticket: 'ticket', + url: 'url', + permanent: '是否永久码', + buffer: '小程序码数据（动态）', + expired: '是否过期', + expiresAt: '过期时间', + props: '属性', + }, + v: { + type: { + webForWechatPublic: '网站引流到公众号', + wechatMpDomainUrl: '小程序普通链接二维码', + wechatMpWxaCode: '小程序码', + wechatPublic: '公众号关注码', + wechatPublicForMp: '公众号回复小程序码', + }, + }, + }, + }, + indexes: [ + { + name: 'index_entity_entityId_tag', + attributes: [ + { + name: 'entity', + }, + { + name: 'entityId', + }, + { + name: 'tag', + }, + ], + }, + { + name: 'index_expired_expiresAt', + attributes: [ + { + name: 'expired', + }, + { + name: 'expiresAt', + }, + ], + }, + { + name: 'index_url', + attributes: [ + { + name: 'url', + }, + ], + }, + ], + style: { + color: { + type: { + webForWechatPublic: '#00FF7F', + wechatMpDomainUrl: '#008000', + wechatMpWxaCode: '#32CD32', + wechatPublic: '#90EE90', + wechatPublicForMp: '#9ACD32', + } + } + } +}; diff --git a/es/oak-app-domain/Application/_baseSchema.d.ts b/es/oak-app-domain/Application/_baseSchema.d.ts index af5f6ccfc..22850524b 100644 --- a/es/oak-app-domain/Application/_baseSchema.d.ts +++ b/es/oak-app-domain/Application/_baseSchema.d.ts @@ -12,6 +12,7 @@ export type WechatMpConfig = { appSecret: string; originalId?: string; qrCodePrefix?: string; + getPhone?: boolean; server?: { url?: string; token: string; diff --git a/es/oak-app-domain/I18n/_baseSchema.d.ts b/es/oak-app-domain/I18n/_baseSchema.d.ts index a51caacaf..606b4ae07 100644 --- a/es/oak-app-domain/I18n/_baseSchema.d.ts +++ b/es/oak-app-domain/I18n/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String } from "oak-domain/lib/types/DataType"; +import { String } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { module: String<64>; position: String<188>; diff --git a/es/oak-app-domain/Log/_baseSchema.d.ts b/es/oak-app-domain/Log/_baseSchema.d.ts index dd4e1ae17..e09eb1013 100644 --- a/es/oak-app-domain/Log/_baseSchema.d.ts +++ b/es/oak-app-domain/Log/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { Action, ParticularAction } from "./Action"; -import { String } from "oak-domain/lib/types/DataType"; +import { String } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { entity: String<32>; entityId: String<64>; diff --git a/es/oak-app-domain/Modi/_baseSchema.d.ts b/es/oak-app-domain/Modi/_baseSchema.d.ts index 478c6937b..bf97b925e 100644 --- a/es/oak-app-domain/Modi/_baseSchema.d.ts +++ b/es/oak-app-domain/Modi/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { Action, ParticularAction, IState } from "./Action"; -import { String } from "oak-domain/lib/types/DataType"; +import { String } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { targetEntity: String<32>; entity: String<32>; diff --git a/es/oak-app-domain/ModiEntity/_baseSchema.d.ts b/es/oak-app-domain/ModiEntity/_baseSchema.d.ts index 2638b43b6..61d386c1d 100644 --- a/es/oak-app-domain/ModiEntity/_baseSchema.d.ts +++ b/es/oak-app-domain/ModiEntity/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { AppendOnlyAction } from "oak-domain/lib/actions/action"; -import { String } from "oak-domain/lib/types/DataType"; +import { String } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { modiId: ForeignKey<"modi">; entity: String<32>; diff --git a/es/oak-app-domain/Oper/_baseSchema.d.ts b/es/oak-app-domain/Oper/_baseSchema.d.ts index 7896ea9ef..259609e3f 100644 --- a/es/oak-app-domain/Oper/_baseSchema.d.ts +++ b/es/oak-app-domain/Oper/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { Action, ParticularAction, IState } from "./Action"; -import { String, Datetime } from "oak-domain/lib/types/DataType"; +import { String, Datetime } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { action: String<24>; data: Object; diff --git a/es/oak-app-domain/OperEntity/_baseSchema.d.ts b/es/oak-app-domain/OperEntity/_baseSchema.d.ts index 076f111be..03ba456c0 100644 --- a/es/oak-app-domain/OperEntity/_baseSchema.d.ts +++ b/es/oak-app-domain/OperEntity/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { AppendOnlyAction } from "oak-domain/lib/actions/action"; -import { String } from "oak-domain/lib/types/DataType"; +import { String } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { operId: ForeignKey<"oper">; entity: String<32>; diff --git a/es/oak-app-domain/Path/_baseSchema.d.ts b/es/oak-app-domain/Path/_baseSchema.d.ts index 8801ba0ba..647b18dc5 100644 --- a/es/oak-app-domain/Path/_baseSchema.d.ts +++ b/es/oak-app-domain/Path/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_BooleanValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String, Boolean } from "oak-domain/lib/types/DataType"; +import { String, Boolean } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { destEntity: String<32>; value: String<256>; diff --git a/es/oak-app-domain/Relation/_baseSchema.d.ts b/es/oak-app-domain/Relation/_baseSchema.d.ts index 0f6f49e12..06b60c10e 100644 --- a/es/oak-app-domain/Relation/_baseSchema.d.ts +++ b/es/oak-app-domain/Relation/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String } from "oak-domain/lib/types/DataType"; +import { String } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { entity: "platform" | "session" | "toDo" | string; entityId?: String<64> | null; diff --git a/es/oak-app-domain/Test/Schema.d.ts b/es/oak-app-domain/Test/Schema.d.ts new file mode 100644 index 000000000..86015d4d0 --- /dev/null +++ b/es/oak-app-domain/Test/Schema.d.ts @@ -0,0 +1,19 @@ +export * from "./_baseSchema"; +import { Test } from "../EntityDict"; +export type Schema = Test["Schema"]; +export type Action = Test["Action"]; +export type Projection = Test["Projection"]; +export type Filter = Test["Filter"]; +export type SortNode = Test["SortNode"]; +export type Sorter = Test["Sorter"]; +export type Selection = Test["Selection"]; +export type Aggregation = Test["Aggregation"]; +export type CreateOperationData = Test["CreateOperationData"]; +export type CreateSingle = Test["CreateSingle"]; +export type CreateMulti = Test["CreateMulti"]; +export type Create = Test["Create"]; +export type UpdateOperationData = Test["UpdateOperationData"]; +export type Update = Test["Update"]; +export type RemoveOperationData = Test["RemoveOperationData"]; +export type Remove = Test["Remove"]; +export type Operation = Test["Operation"]; diff --git a/es/oak-app-domain/Test/Schema.js b/es/oak-app-domain/Test/Schema.js new file mode 100644 index 000000000..6a83e4bac --- /dev/null +++ b/es/oak-app-domain/Test/Schema.js @@ -0,0 +1 @@ +export * from "./_baseSchema"; diff --git a/es/oak-app-domain/Test/Storage.d.ts b/es/oak-app-domain/Test/Storage.d.ts new file mode 100644 index 000000000..a3f0fbbb0 --- /dev/null +++ b/es/oak-app-domain/Test/Storage.d.ts @@ -0,0 +1,3 @@ +import { StorageDesc } from "oak-domain/lib/types/Storage"; +import { OpSchema } from "./Schema"; +export declare const desc: StorageDesc; diff --git a/es/oak-app-domain/Test/Storage.js b/es/oak-app-domain/Test/Storage.js new file mode 100644 index 000000000..0235fb780 --- /dev/null +++ b/es/oak-app-domain/Test/Storage.js @@ -0,0 +1,102 @@ +import { genericActions as actions } from "oak-domain/lib/actions/action"; +export const desc = { + attributes: { + entity: { + notNull: true, + type: "varchar", + params: { + length: 32 + } + }, + entityId: { + notNull: true, + type: "varchar", + params: { + length: 64 + } + }, + type: { + notNull: true, + type: "enum", + enumeration: ["wechatPublic", "wechatMpDomainUrl", "wechatMpWxaCode", "wechatPublicForMp", "webForWechatPublic"] + }, + allowShare: { + notNull: true, + type: "boolean" + }, + tag: { + type: "varchar", + params: { + length: 32 + } + }, + tag2: { + type: "varchar", + params: { + length: 64 + } + }, + expiresAt: { + type: "datetime" + }, + expired: { + type: "boolean" + }, + ticket: { + type: "text" + }, + url: { + type: "varchar", + params: { + length: 256 + } + }, + permanent: { + type: "boolean" + }, + buffer: { + type: "text" + }, + props: { + notNull: true, + type: "object" + } + }, + actionType: "crud", + actions, + indexes: [ + { + name: 'index_entity_entityId_tag', + attributes: [ + { + name: 'entity', + }, + { + name: 'entityId', + }, + { + name: 'tag', + }, + ], + }, + { + name: 'index_expired_expiresAt', + attributes: [ + { + name: 'expired', + }, + { + name: 'expiresAt', + }, + ], + }, + { + name: 'index_url', + attributes: [ + { + name: 'url', + }, + ], + } + ] +}; diff --git a/es/oak-app-domain/Test/Style.d.ts b/es/oak-app-domain/Test/Style.d.ts new file mode 100644 index 000000000..24c9a5eae --- /dev/null +++ b/es/oak-app-domain/Test/Style.d.ts @@ -0,0 +1,3 @@ +import { Action, OpSchema } from "./Schema"; +import { StyleDef } from "oak-domain/lib/types/Style"; +export declare const style: StyleDef; diff --git a/es/oak-app-domain/Test/Style.js b/es/oak-app-domain/Test/Style.js new file mode 100644 index 000000000..d16d98b07 --- /dev/null +++ b/es/oak-app-domain/Test/Style.js @@ -0,0 +1,11 @@ +export const style = { + color: { + type: { + webForWechatPublic: '#00FF7F', + wechatMpDomainUrl: '#008000', + wechatMpWxaCode: '#32CD32', + wechatPublic: '#90EE90', + wechatPublicForMp: '#9ACD32', + } + } +}; diff --git a/es/oak-app-domain/Test/_baseSchema.d.ts b/es/oak-app-domain/Test/_baseSchema.d.ts new file mode 100644 index 000000000..a4aa3eafc --- /dev/null +++ b/es/oak-app-domain/Test/_baseSchema.d.ts @@ -0,0 +1,92 @@ +import { JsonProjection } from "oak-domain/lib/types/DataType"; +import { Q_DateValue, Q_BooleanValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey, JsonFilter } from "oak-domain/lib/types/Demand"; +import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; +import { GenericAction } from "oak-domain/lib/actions/action"; +import { String, Boolean, Datetime, Text } from "oak-domain/lib/types/DataType"; +import { QrCodeType } from "../../types/Config"; +export type WechatQrCodeProps = { + pathname: string; + props?: Record; + state?: Record; + isTabBar?: boolean; +}; +export type OpSchema = EntityShape & { + entity: String<32>; + entityId: String<64>; + type: QrCodeType; + allowShare: Boolean; + tag?: String<32> | null; + tag2?: String<64> | null; + expiresAt?: Datetime | null; + expired?: Boolean | null; + ticket?: Text | null; + url?: String<256> | null; + permanent?: Boolean | null; + buffer?: Text | null; + props: WechatQrCodeProps; +} & { + [A in ExpressionKey]?: any; +}; +export type OpAttr = keyof OpSchema; +export type OpFilter = { + id: Q_StringValue; + $$createAt$$: Q_DateValue; + $$seq$$: Q_NumberValue; + $$updateAt$$: Q_DateValue; + entity: Q_StringValue; + entityId: Q_StringValue; + type: Q_EnumValue; + allowShare: Q_BooleanValue; + tag: Q_StringValue; + tag2: Q_StringValue; + expiresAt: Q_DateValue; + expired: Q_BooleanValue; + ticket: Q_StringValue; + url: Q_StringValue; + permanent: Q_BooleanValue; + buffer: Q_StringValue; + props: JsonFilter; +} & ExprOp; +export type OpProjection = { + "#id"?: NodeId; + [k: string]: any; + id?: number; + $$createAt$$?: number; + $$updateAt$$?: number; + $$seq$$?: number; + entity?: number; + entityId?: number; + type?: number; + allowShare?: number; + tag?: number; + tag2?: number; + expiresAt?: number; + expired?: number; + ticket?: number; + url?: number; + permanent?: number; + buffer?: number; + props?: number | JsonProjection; +} & Partial>; +export type OpSortAttr = Partial<{ + id: number; + $$createAt$$: number; + $$seq$$: number; + $$updateAt$$: number; + entity: number; + entityId: number; + type: number; + allowShare: number; + tag: number; + tag2: number; + expiresAt: number; + expired: number; + ticket: number; + url: number; + permanent: number; + buffer: number; + props: number; + [k: string]: any; +} | ExprOp>; +export type OpAction = OakMakeAction; +export type OpUpdateAction = "update" | string; diff --git a/es/oak-app-domain/Test/_baseSchema.js b/es/oak-app-domain/Test/_baseSchema.js new file mode 100644 index 000000000..cb0ff5c3b --- /dev/null +++ b/es/oak-app-domain/Test/_baseSchema.js @@ -0,0 +1 @@ +export {}; diff --git a/es/oak-app-domain/Test/locales/zh_CN.json b/es/oak-app-domain/Test/locales/zh_CN.json new file mode 100644 index 000000000..f4f9080d6 --- /dev/null +++ b/es/oak-app-domain/Test/locales/zh_CN.json @@ -0,0 +1,27 @@ +{ + "name": "微信识别码", + "attr": { + "entity": "关联对象", + "entityId": "关联对象id", + "type": "类型", + "allowShare": "允许分享", + "tag": "tag", + "tag2": "tag2", + "ticket": "ticket", + "url": "url", + "permanent": "是否永久码", + "buffer": "小程序码数据（动态）", + "expired": "是否过期", + "expiresAt": "过期时间", + "props": "属性" + }, + "v": { + "type": { + "webForWechatPublic": "网站引流到公众号", + "wechatMpDomainUrl": "小程序普通链接二维码", + "wechatMpWxaCode": "小程序码", + "wechatPublic": "公众号关注码", + "wechatPublicForMp": "公众号回复小程序码" + } + } +} diff --git a/es/oak-app-domain/UserEntityClaim/_baseSchema.d.ts b/es/oak-app-domain/UserEntityClaim/_baseSchema.d.ts index b560c6bd9..6140be203 100644 --- a/es/oak-app-domain/UserEntityClaim/_baseSchema.d.ts +++ b/es/oak-app-domain/UserEntityClaim/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String } from "oak-domain/lib/types/DataType"; +import { String } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { uegId: ForeignKey<"userEntityGrant">; userId: ForeignKey<"user">; diff --git a/es/oak-app-domain/UserRelation/_baseSchema.d.ts b/es/oak-app-domain/UserRelation/_baseSchema.d.ts index f2e49f2ac..7ca8072dc 100644 --- a/es/oak-app-domain/UserRelation/_baseSchema.d.ts +++ b/es/oak-app-domain/UserRelation/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String } from "oak-domain/lib/types/DataType"; +import { String } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { userId: ForeignKey<"user">; relationId: ForeignKey<"relation">; diff --git a/es/triggers/index.d.ts b/es/triggers/index.d.ts index 3316bb20f..d18172ea8 100644 --- a/es/triggers/index.d.ts +++ b/es/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; +declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; export default _default; diff --git a/es/triggers/notification.js b/es/triggers/notification.js index 0d40730d2..c5859ffeb 100644 --- a/es/triggers/notification.js +++ b/es/triggers/notification.js @@ -61,7 +61,7 @@ async function sendNotification(notification, context) { await instance.sendSubscribedMessage({ templateId: templateId, data: data, - openId: data1.openId, + openId: data1.openId, // 在notification创建时就赋值了 page, state: StateDict[process.env.NODE_ENV], }); diff --git a/es/triggers/toDo.d.ts b/es/triggers/toDo.d.ts index 1d9bc2ce2..e5be399e1 100644 --- a/es/triggers/toDo.d.ts +++ b/es/triggers/toDo.d.ts @@ -14,7 +14,7 @@ export declare function createToDo; +}, userIds?: string[]): Promise<1 | 0>; /** * 完成todo例程，当在entity对象上进行action操作时（操作条件是filter），将对应的todo完成 * 必须在entity的action的后trigger中调用 diff --git a/lib/aspects/application.js b/lib/aspects/application.js index 05fe5671c..163bafc77 100644 --- a/lib/aspects/application.js +++ b/lib/aspects/application.js @@ -1,6 +1,13 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.batchGetMaterialList = exports.getArticle = exports.batchGetArticle = exports.deleteMaterial = exports.getMaterial = exports.uploadWechatMedia = exports.signatureJsSDK = exports.getApplication = void 0; +exports.getApplication = getApplication; +exports.signatureJsSDK = signatureJsSDK; +exports.uploadWechatMedia = uploadWechatMedia; +exports.getMaterial = getMaterial; +exports.deleteMaterial = deleteMaterial; +exports.batchGetArticle = batchGetArticle; +exports.getArticle = getArticle; +exports.batchGetMaterialList = batchGetMaterialList; const tslib_1 = require("tslib"); const assert_1 = require("oak-domain/lib/utils/assert"); const Projection_1 = require("../types/Projection"); @@ -114,7 +121,6 @@ async function getApplication(params, context) { } } } -exports.getApplication = getApplication; async function signatureJsSDK({ url, env }, context) { const application = context.getApplication(); const { type, config } = application; @@ -125,7 +131,6 @@ async function signatureJsSDK({ url, env }, context) { const result = await wechatInstance.signatureJsSDK({ url }); return result; } -exports.signatureJsSDK = signatureJsSDK; async function uploadWechatMedia(params, // FormData表单提交 isPermanent 变成 'true' | 'false' context) { const { applicationId, file, type: mediaType, description, extraFileId, } = params; @@ -206,7 +211,6 @@ context) { mediaId, }; } -exports.uploadWechatMedia = uploadWechatMedia; async function getMaterial(params, context) { const { mediaId, applicationId, isPermanent = false } = params; (0, assert_1.assert)(applicationId); @@ -251,7 +255,6 @@ async function getMaterial(params, context) { } return result; } -exports.getMaterial = getMaterial; async function deleteMaterial(params, context) { const { mediaId, applicationId } = params; (0, assert_1.assert)(applicationId); @@ -275,7 +278,6 @@ async function deleteMaterial(params, context) { }); return result; } -exports.deleteMaterial = deleteMaterial; async function batchGetArticle(params, context) { const { applicationId, offset, count, noContent } = params; (0, assert_1.assert)(applicationId); @@ -302,7 +304,6 @@ async function batchGetArticle(params, context) { }); return result; } -exports.batchGetArticle = batchGetArticle; async function getArticle(params, context) { const { applicationId, articleId } = params; (0, assert_1.assert)(applicationId); @@ -327,7 +328,6 @@ async function getArticle(params, context) { }); return result; } -exports.getArticle = getArticle; async function batchGetMaterialList(params, context) { const { applicationId } = params; (0, assert_1.assert)(applicationId); @@ -355,4 +355,3 @@ async function batchGetMaterialList(params, context) { }); return result; } -exports.batchGetMaterialList = batchGetMaterialList; diff --git a/lib/aspects/applicationPassport.js b/lib/aspects/applicationPassport.js index 333824e6e..5fec34249 100644 --- a/lib/aspects/applicationPassport.js +++ b/lib/aspects/applicationPassport.js @@ -1,6 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.removeApplicationPassportsByPIds = exports.getApplicationPassports = void 0; +exports.getApplicationPassports = getApplicationPassports; +exports.removeApplicationPassportsByPIds = removeApplicationPassportsByPIds; const uuid_1 = require("oak-domain/lib/utils/uuid"); async function getApplicationPassports(params, context) { const { applicationId } = params; @@ -23,7 +24,6 @@ async function getApplicationPassports(params, context) { closeRoot(); return applicationPassports; } -exports.getApplicationPassports = getApplicationPassports; async function removeApplicationPassportsByPIds(params, context) { const { passportIds } = params; const applicationPassports = await context.select('applicationPassport', { @@ -51,4 +51,3 @@ async function removeApplicationPassportsByPIds(params, context) { }, {}); } } -exports.removeApplicationPassportsByPIds = removeApplicationPassportsByPIds; diff --git a/lib/aspects/config.js b/lib/aspects/config.js index f75072b6c..0643205b5 100644 --- a/lib/aspects/config.js +++ b/lib/aspects/config.js @@ -1,6 +1,8 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.updateStyle = exports.updateApplicationConfig = exports.updateConfig = void 0; +exports.updateConfig = updateConfig; +exports.updateApplicationConfig = updateApplicationConfig; +exports.updateStyle = updateStyle; const uuid_1 = require("oak-domain/lib/utils/uuid"); async function updateConfig(params, context) { const { entity, entityId, config } = params; @@ -15,7 +17,6 @@ async function updateConfig(params, context) { } }, {}); } -exports.updateConfig = updateConfig; async function updateApplicationConfig(params, context) { const { entity, entityId, config } = params; await context.operate(entity, { @@ -29,7 +30,6 @@ async function updateApplicationConfig(params, context) { }, }, {}); } -exports.updateApplicationConfig = updateApplicationConfig; async function updateStyle(params, context) { const { entity, entityId, style } = params; await context.operate(entity, { @@ -43,4 +43,3 @@ async function updateStyle(params, context) { }, }, {}); } -exports.updateStyle = updateStyle; diff --git a/lib/aspects/extraFile.js b/lib/aspects/extraFile.js index 91e481ed8..1bc12f98b 100644 --- a/lib/aspects/extraFile.js +++ b/lib/aspects/extraFile.js @@ -1,6 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.uploadExtraFile = exports.getInfoByUrl = void 0; +exports.getInfoByUrl = getInfoByUrl; +exports.uploadExtraFile = uploadExtraFile; const tslib_1 = require("tslib"); const WechatSDK_1 = tslib_1.__importDefault(require("oak-external-sdk/lib/WechatSDK")); const uuid_1 = require("oak-domain/lib/utils/uuid"); @@ -13,7 +14,6 @@ async function getInfoByUrl(params) { const { url } = params; return await WechatSDK_1.default.analyzePublicArticle(url); } -exports.getInfoByUrl = getInfoByUrl; async function uploadExtraFile(params, // FormData表单提交 context) { const { applicationId, file, extraFileId, } = params; @@ -54,4 +54,3 @@ context) { success: true, }; } -exports.uploadExtraFile = uploadExtraFile; diff --git a/lib/aspects/session.js b/lib/aspects/session.js index 0f5331d91..5981a5f5b 100644 --- a/lib/aspects/session.js +++ b/lib/aspects/session.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.createSession = void 0; +exports.createSession = createSession; const uuid_1 = require("oak-domain/lib/utils/uuid"); const assert_1 = require("oak-domain/lib/utils/assert"); async function createSession(params, context) { @@ -106,7 +106,7 @@ async function createSession(params, context) { origin: 'wechat', type: 'image', tag1: 'image', - objectId: await (0, uuid_1.generateNewIdAsync)(), + objectId: await (0, uuid_1.generateNewIdAsync)(), // 这个域用来标识唯一性 sort: 1000, uploadState: 'success', extra1: data.MediaId, @@ -131,7 +131,7 @@ async function createSession(params, context) { origin: 'wechat', type: 'video', tag1: 'video', - objectId: await (0, uuid_1.generateNewIdAsync)(), + objectId: await (0, uuid_1.generateNewIdAsync)(), // 这个域用来标识唯一性 sort: 1000, uploadState: 'success', extra1: data.MediaId, @@ -153,7 +153,7 @@ async function createSession(params, context) { origin: 'wechat', type: 'audio', tag1: 'audio', - objectId: await (0, uuid_1.generateNewIdAsync)(), + objectId: await (0, uuid_1.generateNewIdAsync)(), // 这个域用来标识唯一性 sort: 1000, uploadState: 'success', extra1: data.MediaId, @@ -222,4 +222,3 @@ async function createSession(params, context) { throw e; } } -exports.createSession = createSession; diff --git a/lib/aspects/sms.js b/lib/aspects/sms.js index e1b7640b3..2fcd6119b 100644 --- a/lib/aspects/sms.js +++ b/lib/aspects/sms.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.syncSmsTemplate = void 0; +exports.syncSmsTemplate = syncSmsTemplate; const uuid_1 = require("oak-domain/lib/utils/uuid"); const index_1 = require("../utils/sms/index"); async function syncSmsTemplate(params, context) { @@ -83,4 +83,3 @@ async function syncSmsTemplate(params, context) { // ); // } } -exports.syncSmsTemplate = syncSmsTemplate; diff --git a/lib/aspects/template.js b/lib/aspects/template.js index 7dabee258..2aae3dbe5 100644 --- a/lib/aspects/template.js +++ b/lib/aspects/template.js @@ -1,6 +1,8 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.syncMessageTemplate = exports.getMessageType = exports.registerMessageType = void 0; +exports.registerMessageType = registerMessageType; +exports.getMessageType = getMessageType; +exports.syncMessageTemplate = syncMessageTemplate; const tslib_1 = require("tslib"); const assert_1 = require("oak-domain/lib/utils/assert"); const uuid_1 = require("oak-domain/lib/utils/uuid"); @@ -11,11 +13,9 @@ function registerMessageType(messageType) { let messageTypes2 = messageTypes.concat(messageType); messageTypes = (0, lodash_1.uniq)(messageTypes2); } -exports.registerMessageType = registerMessageType; async function getMessageType() { return messageTypes; } -exports.getMessageType = getMessageType; function analyseContent(content) { let content2 = content; let result = {}; @@ -129,4 +129,3 @@ async function syncMessageTemplate(params, context) { } return template_list; } -exports.syncMessageTemplate = syncMessageTemplate; diff --git a/lib/aspects/userWechatPublicTag.js b/lib/aspects/userWechatPublicTag.js index a184ff1c7..d349055b0 100644 --- a/lib/aspects/userWechatPublicTag.js +++ b/lib/aspects/userWechatPublicTag.js @@ -1,6 +1,14 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.syncToWechat = exports.syncToLocale = exports.tagging = exports.getSubscribedUserInfo = exports.getUsers = exports.getUserTags = exports.batchuntagging = exports.batchtagging = exports.getTagUsers = void 0; +exports.getTagUsers = getTagUsers; +exports.batchtagging = batchtagging; +exports.batchuntagging = batchuntagging; +exports.getUserTags = getUserTags; +exports.getUsers = getUsers; +exports.getSubscribedUserInfo = getSubscribedUserInfo; +exports.tagging = tagging; +exports.syncToLocale = syncToLocale; +exports.syncToWechat = syncToWechat; const tslib_1 = require("tslib"); const WechatSDK_1 = tslib_1.__importDefault(require("oak-external-sdk/lib/WechatSDK")); const wechatPublicException_1 = require("../utils/wechatPublicException"); @@ -146,7 +154,6 @@ async function getTagUsers(params, context) { throw new types_1.OakPreConditionUnsetException(`${(0, wechatPublicException_1.handleException)(e)}`); } } -exports.getTagUsers = getTagUsers; async function batchtagging(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -160,7 +167,6 @@ async function batchtagging(params, context) { const result = await wechatInstance.batchtagging(params.openIdList, params.tagId); return result; } -exports.batchtagging = batchtagging; async function batchuntagging(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -174,7 +180,6 @@ async function batchuntagging(params, context) { const result = await wechatInstance.batchuntagging(params.openIdList, params.tagId); return result; } -exports.batchuntagging = batchuntagging; async function getUserTags(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -193,7 +198,6 @@ async function getUserTags(params, context) { throw new types_1.OakPreConditionUnsetException(`${(0, wechatPublicException_1.handleException)(e)}`); } } -exports.getUserTags = getUserTags; async function getUsers(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -212,7 +216,6 @@ async function getUsers(params, context) { throw new types_1.OakPreConditionUnsetException(`${(0, wechatPublicException_1.handleException)(e)}`); } } -exports.getUsers = getUsers; async function getSubscribedUserInfo(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -231,7 +234,6 @@ async function getSubscribedUserInfo(params, context) { throw new types_1.OakPreConditionUnsetException(`${(0, wechatPublicException_1.handleException)(e)}`); } } -exports.getSubscribedUserInfo = getSubscribedUserInfo; async function tagging(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -310,7 +312,6 @@ async function tagging(params, context) { } } } -exports.tagging = tagging; async function syncToLocale(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -390,7 +391,6 @@ async function syncToLocale(params, context) { } } } -exports.syncToLocale = syncToLocale; async function syncToWechat(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -454,4 +454,3 @@ async function syncToWechat(params, context) { }, {}); } } -exports.syncToWechat = syncToWechat; diff --git a/lib/aspects/wechatLogin.js b/lib/aspects/wechatLogin.js index 240aa8f59..c617c04c3 100644 --- a/lib/aspects/wechatLogin.js +++ b/lib/aspects/wechatLogin.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.createWechatLogin = void 0; +exports.createWechatLogin = createWechatLogin; const uuid_1 = require("oak-domain/lib/utils/uuid"); async function createWechatLogin(params, context) { const { type, interval } = params; @@ -44,4 +44,3 @@ async function createWechatLogin(params, context) { } return id; } -exports.createWechatLogin = createWechatLogin; diff --git a/lib/aspects/wechatMenu.js b/lib/aspects/wechatMenu.js index 154111c9a..faf132ad5 100644 --- a/lib/aspects/wechatMenu.js +++ b/lib/aspects/wechatMenu.js @@ -1,6 +1,11 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.deleteMenu = exports.deleteConditionalMenu = exports.createConditionalMenu = exports.createMenu = exports.getMenu = exports.getCurrentMenu = void 0; +exports.getCurrentMenu = getCurrentMenu; +exports.getMenu = getMenu; +exports.createMenu = createMenu; +exports.createConditionalMenu = createConditionalMenu; +exports.deleteConditionalMenu = deleteConditionalMenu; +exports.deleteMenu = deleteMenu; const tslib_1 = require("tslib"); const WechatSDK_1 = tslib_1.__importDefault(require("oak-external-sdk/lib/WechatSDK")); const assert_1 = require("oak-domain/lib/utils/assert"); @@ -39,7 +44,6 @@ async function getCurrentMenu(params, context) { throw e; } } -exports.getCurrentMenu = getCurrentMenu; async function getMenu(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -66,7 +70,6 @@ async function getMenu(params, context) { throw e; } } -exports.getMenu = getMenu; async function createMenu(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -104,7 +107,6 @@ async function createMenu(params, context) { throw e; } } -exports.createMenu = createMenu; async function createConditionalMenu(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -143,7 +145,6 @@ async function createConditionalMenu(params, context) { throw e; } } -exports.createConditionalMenu = createConditionalMenu; async function deleteConditionalMenu(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -157,7 +158,6 @@ async function deleteConditionalMenu(params, context) { const result = await wechatInstance.deleteConditionalMenu(params.menuId); return result; } -exports.deleteConditionalMenu = deleteConditionalMenu; async function deleteMenu(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -171,4 +171,3 @@ async function deleteMenu(params, context) { const result = await wechatInstance.deleteMenu(); return result; } -exports.deleteMenu = deleteMenu; diff --git a/lib/aspects/wechatMpJump.js b/lib/aspects/wechatMpJump.js index 3609f8923..882e3c238 100644 --- a/lib/aspects/wechatMpJump.js +++ b/lib/aspects/wechatMpJump.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.wechatMpJump = void 0; +exports.wechatMpJump = wechatMpJump; const tslib_1 = require("tslib"); const lodash_1 = require("oak-domain/lib/utils/lodash"); const Projection_1 = require("../types/Projection"); @@ -51,4 +51,3 @@ async function wechatMpJump(params, context) { const result = await wechatInstance.getURLScheme({ jump_wxa, expireType, expiresAt, expireInterval }); return result; } -exports.wechatMpJump = wechatMpJump; diff --git a/lib/aspects/wechatPublicTag.js b/lib/aspects/wechatPublicTag.js index 9c90e4abf..d266e51bc 100644 --- a/lib/aspects/wechatPublicTag.js +++ b/lib/aspects/wechatPublicTag.js @@ -1,6 +1,11 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.oneKeySync = exports.syncTag = exports.deleteTag = exports.editTag = exports.getTags = exports.createTag = void 0; +exports.createTag = createTag; +exports.getTags = getTags; +exports.editTag = editTag; +exports.deleteTag = deleteTag; +exports.syncTag = syncTag; +exports.oneKeySync = oneKeySync; const tslib_1 = require("tslib"); const WechatSDK_1 = tslib_1.__importDefault(require("oak-external-sdk/lib/WechatSDK")); const assert_1 = require("oak-domain/lib/utils/assert"); @@ -67,7 +72,6 @@ async function createTag(params, context) { const result = await wechatInstance.createTag({ name: params.name }); return result; } -exports.createTag = createTag; async function getTags(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -81,7 +85,6 @@ async function getTags(params, context) { const result = await wechatInstance.getTags(); return result; } -exports.getTags = getTags; async function editTag(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -98,7 +101,6 @@ async function editTag(params, context) { }); return result; } -exports.editTag = editTag; async function deleteTag(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -112,7 +114,6 @@ async function deleteTag(params, context) { const result = await wechatInstance.deleteTag({ id: params.wechatId }); return result; } -exports.deleteTag = deleteTag; async function syncTag(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -197,7 +198,6 @@ async function syncTag(params, context) { throw new types_1.OakPreConditionUnsetException(`${(0, wechatPublicException_1.handleException)(e)}`); } } -exports.syncTag = syncTag; async function oneKeySync(params, context) { const application = await getWechatPublicConfig(params.applicationId, context); (0, assert_1.assert)(application); @@ -279,4 +279,3 @@ async function oneKeySync(params, context) { throw new types_1.OakPreConditionUnsetException(`${(0, wechatPublicException_1.handleException)(e)}`); } } -exports.oneKeySync = oneKeySync; diff --git a/lib/aspects/wechatQrCode.js b/lib/aspects/wechatQrCode.js index c53c64cc7..b73aafe47 100644 --- a/lib/aspects/wechatQrCode.js +++ b/lib/aspects/wechatQrCode.js @@ -1,6 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getMpUnlimitWxaCode = exports.createWechatQrCode = void 0; +exports.createWechatQrCode = createWechatQrCode; +exports.getMpUnlimitWxaCode = getMpUnlimitWxaCode; const tslib_1 = require("tslib"); const uuid_1 = require("oak-domain/lib/utils/uuid"); const assert_1 = require("oak-domain/lib/utils/assert"); @@ -166,7 +167,7 @@ async function createWechatQrCode(options, context) { permanent, url, expired: false, - expiresAt: Date.now() + 2592000 * 1000, + expiresAt: Date.now() + 2592000 * 1000, // wecharQrCode里的过期时间都放到最大，由上层关联对象来主动过期（by Xc, 20230131) props, }; // 直接创建 @@ -218,7 +219,6 @@ async function createWechatQrCode(options, context) { data, }, {}); } -exports.createWechatQrCode = createWechatQrCode; async function getMpUnlimitWxaCode(wechatQrCodeId, context) { const [wechatQrCode] = await context.select('wechatQrCode', { data: { @@ -257,4 +257,3 @@ async function getMpUnlimitWxaCode(wechatQrCodeId, context) { return str; } } -exports.getMpUnlimitWxaCode = getMpUnlimitWxaCode; diff --git a/lib/aspects/wechatUser.js b/lib/aspects/wechatUser.js index 595b1e5c7..577ce74a6 100644 --- a/lib/aspects/wechatUser.js +++ b/lib/aspects/wechatUser.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.unbindingWechat = void 0; +exports.unbindingWechat = unbindingWechat; const types_1 = require("oak-domain/lib/types"); const uuid_1 = require("oak-domain/lib/utils/uuid"); const assert_1 = require("oak-domain/lib/utils/assert"); @@ -67,4 +67,3 @@ async function unbindingWechat(params, context) { fn(); } } -exports.unbindingWechat = unbindingWechat; diff --git a/lib/config/constants.js b/lib/config/constants.js index ea8b7a7aa..9f07928d2 100644 --- a/lib/config/constants.js +++ b/lib/config/constants.js @@ -1,15 +1,15 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.DATA_SUBSCRIBER_KEYS = exports.LOCAL_STORAGE_KEYS = exports.getWechatPublicTags = exports.registerWechatPublicTags = exports.WechatPublicTags = void 0; +exports.DATA_SUBSCRIBER_KEYS = exports.LOCAL_STORAGE_KEYS = exports.WechatPublicTags = void 0; +exports.registerWechatPublicTags = registerWechatPublicTags; +exports.getWechatPublicTags = getWechatPublicTags; exports.WechatPublicTags = {}; function registerWechatPublicTags(_WechatPublicTags) { exports.WechatPublicTags = _WechatPublicTags; } -exports.registerWechatPublicTags = registerWechatPublicTags; function getWechatPublicTags() { return exports.WechatPublicTags; } -exports.getWechatPublicTags = getWechatPublicTags; exports.LOCAL_STORAGE_KEYS = { captchaSendAt: 'ogb:c-changePassword-byMobile-captchaSendAt', loginMode: 'ogb:c-user-login-loginMode', diff --git a/lib/entities/Livestream.js b/lib/entities/Livestream.js index b8849e4a3..729547ff8 100644 --- a/lib/entities/Livestream.js +++ b/lib/entities/Livestream.js @@ -6,10 +6,10 @@ exports.entityDesc = { zh_CN: { name: '直播流', attr: { - title: '名称', + title: '名称', // 用户定义直播间名称, streamTitle: '直播流名称', liveonly: '活跃状态', - hub: '直播空间名称', + hub: '直播空间名称', // 所属直播空间名称 entity: '所属实体', entityId: '所属实体id', rtmpPushUrl: '推流地址', diff --git a/lib/entities/Test.d.ts b/lib/entities/Test.d.ts new file mode 100644 index 000000000..706b1f2f6 --- /dev/null +++ b/lib/entities/Test.d.ts @@ -0,0 +1,28 @@ +import { String, Text, Datetime, Boolean } from 'oak-domain/lib/types/DataType'; +import { EntityShape } from 'oak-domain/lib/types/Entity'; +import { QrCodeType } from '../types/Config'; +import { EntityDesc } from 'oak-domain/lib/types/EntityDesc'; +export type WechatQrCodeProps = { + pathname: string; + props?: Record; + state?: Record; + isTabBar?: boolean; +}; +export interface Schema extends EntityShape { + entity: String<32>; + entityId: String<64>; + type: QrCodeType; + allowShare: Boolean; + tag?: String<32>; + tag2?: String<64>; + expiresAt?: Datetime; + expired?: Boolean; + ticket?: Text; + url?: String<256>; + permanent?: Boolean; + buffer?: Text; + props: WechatQrCodeProps; +} +export declare const entityDesc: EntityDesc; diff --git a/lib/entities/Test.js b/lib/entities/Test.js new file mode 100644 index 000000000..4e80bf03c --- /dev/null +++ b/lib/entities/Test.js @@ -0,0 +1,80 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.entityDesc = void 0; +exports.entityDesc = { + locales: { + zh_CN: { + name: '微信识别码', + attr: { + entity: '关联对象', + entityId: '关联对象id', + type: '类型', + allowShare: '允许分享', + tag: 'tag', + tag2: 'tag2', + ticket: 'ticket', + url: 'url', + permanent: '是否永久码', + buffer: '小程序码数据（动态）', + expired: '是否过期', + expiresAt: '过期时间', + props: '属性', + }, + v: { + type: { + webForWechatPublic: '网站引流到公众号', + wechatMpDomainUrl: '小程序普通链接二维码', + wechatMpWxaCode: '小程序码', + wechatPublic: '公众号关注码', + wechatPublicForMp: '公众号回复小程序码', + }, + }, + }, + }, + indexes: [ + { + name: 'index_entity_entityId_tag', + attributes: [ + { + name: 'entity', + }, + { + name: 'entityId', + }, + { + name: 'tag', + }, + ], + }, + { + name: 'index_expired_expiresAt', + attributes: [ + { + name: 'expired', + }, + { + name: 'expiresAt', + }, + ], + }, + { + name: 'index_url', + attributes: [ + { + name: 'url', + }, + ], + }, + ], + style: { + color: { + type: { + webForWechatPublic: '#00FF7F', + wechatMpDomainUrl: '#008000', + wechatMpWxaCode: '#32CD32', + wechatPublic: '#90EE90', + wechatPublicForMp: '#9ACD32', + } + } + } +}; diff --git a/lib/features/index.js b/lib/features/index.js index 5897a25b4..98a2c12cc 100644 --- a/lib/features/index.js +++ b/lib/features/index.js @@ -1,6 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.initialize = exports.create = void 0; +exports.create = create; +exports.initialize = initialize; const tslib_1 = require("tslib"); const token_1 = require("./token"); const extraFile_1 = require("./extraFile"); @@ -37,7 +38,6 @@ function create(basicFeatures) { userWechatPublicTag, }; } -exports.create = create; const selectionRewriter_1 = require("../utils/selectionRewriter"); async function initialize(features, access, config, clazzes) { features.cache.registerSelectionRewriter(selectionRewriter_1.rewriteSelection); @@ -56,4 +56,3 @@ async function initialize(features, access, config, clazzes) { } } } -exports.initialize = initialize; diff --git a/lib/hooks/useFeatures.js b/lib/hooks/useFeatures.js index 8ba852e2d..33fe3b3ca 100644 --- a/lib/hooks/useFeatures.js +++ b/lib/hooks/useFeatures.js @@ -1,9 +1,9 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = useFeatures; const features_1 = require("oak-frontend-base/es/platforms/web/features"); // react 独有 function useFeatures() { return (0, features_1.useFeatures)(); } -exports.default = useFeatures; ; diff --git a/lib/hooks/useMyInfo.js b/lib/hooks/useMyInfo.js index e971ace6f..7e8ad42ec 100644 --- a/lib/hooks/useMyInfo.js +++ b/lib/hooks/useMyInfo.js @@ -1,5 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = useMyInfo; const tslib_1 = require("tslib"); const react_1 = require("react"); const useFeatures_1 = tslib_1.__importDefault(require("./useFeatures")); @@ -54,4 +55,3 @@ function useMyInfo() { mobile, }; } -exports.default = useMyInfo; diff --git a/lib/oak-app-domain/Application/_baseSchema.d.ts b/lib/oak-app-domain/Application/_baseSchema.d.ts index af5f6ccfc..22850524b 100644 --- a/lib/oak-app-domain/Application/_baseSchema.d.ts +++ b/lib/oak-app-domain/Application/_baseSchema.d.ts @@ -12,6 +12,7 @@ export type WechatMpConfig = { appSecret: string; originalId?: string; qrCodePrefix?: string; + getPhone?: boolean; server?: { url?: string; token: string; diff --git a/lib/oak-app-domain/I18n/_baseSchema.d.ts b/lib/oak-app-domain/I18n/_baseSchema.d.ts index a51caacaf..606b4ae07 100644 --- a/lib/oak-app-domain/I18n/_baseSchema.d.ts +++ b/lib/oak-app-domain/I18n/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String } from "oak-domain/lib/types/DataType"; +import { String } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { module: String<64>; position: String<188>; diff --git a/lib/oak-app-domain/Log/_baseSchema.d.ts b/lib/oak-app-domain/Log/_baseSchema.d.ts index dd4e1ae17..e09eb1013 100644 --- a/lib/oak-app-domain/Log/_baseSchema.d.ts +++ b/lib/oak-app-domain/Log/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { Action, ParticularAction } from "./Action"; -import { String } from "oak-domain/lib/types/DataType"; +import { String } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { entity: String<32>; entityId: String<64>; diff --git a/lib/oak-app-domain/Modi/_baseSchema.d.ts b/lib/oak-app-domain/Modi/_baseSchema.d.ts index 478c6937b..bf97b925e 100644 --- a/lib/oak-app-domain/Modi/_baseSchema.d.ts +++ b/lib/oak-app-domain/Modi/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { Action, ParticularAction, IState } from "./Action"; -import { String } from "oak-domain/lib/types/DataType"; +import { String } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { targetEntity: String<32>; entity: String<32>; diff --git a/lib/oak-app-domain/ModiEntity/_baseSchema.d.ts b/lib/oak-app-domain/ModiEntity/_baseSchema.d.ts index 2638b43b6..61d386c1d 100644 --- a/lib/oak-app-domain/ModiEntity/_baseSchema.d.ts +++ b/lib/oak-app-domain/ModiEntity/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { AppendOnlyAction } from "oak-domain/lib/actions/action"; -import { String } from "oak-domain/lib/types/DataType"; +import { String } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { modiId: ForeignKey<"modi">; entity: String<32>; diff --git a/lib/oak-app-domain/Oper/_baseSchema.d.ts b/lib/oak-app-domain/Oper/_baseSchema.d.ts index 7896ea9ef..259609e3f 100644 --- a/lib/oak-app-domain/Oper/_baseSchema.d.ts +++ b/lib/oak-app-domain/Oper/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { Action, ParticularAction, IState } from "./Action"; -import { String, Datetime } from "oak-domain/lib/types/DataType"; +import { String, Datetime } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { action: String<24>; data: Object; diff --git a/lib/oak-app-domain/OperEntity/_baseSchema.d.ts b/lib/oak-app-domain/OperEntity/_baseSchema.d.ts index 076f111be..03ba456c0 100644 --- a/lib/oak-app-domain/OperEntity/_baseSchema.d.ts +++ b/lib/oak-app-domain/OperEntity/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { AppendOnlyAction } from "oak-domain/lib/actions/action"; -import { String } from "oak-domain/lib/types/DataType"; +import { String } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { operId: ForeignKey<"oper">; entity: String<32>; diff --git a/lib/oak-app-domain/Path/_baseSchema.d.ts b/lib/oak-app-domain/Path/_baseSchema.d.ts index 8801ba0ba..647b18dc5 100644 --- a/lib/oak-app-domain/Path/_baseSchema.d.ts +++ b/lib/oak-app-domain/Path/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_BooleanValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String, Boolean } from "oak-domain/lib/types/DataType"; +import { String, Boolean } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { destEntity: String<32>; value: String<256>; diff --git a/lib/oak-app-domain/Relation/_baseSchema.d.ts b/lib/oak-app-domain/Relation/_baseSchema.d.ts index 0f6f49e12..06b60c10e 100644 --- a/lib/oak-app-domain/Relation/_baseSchema.d.ts +++ b/lib/oak-app-domain/Relation/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String } from "oak-domain/lib/types/DataType"; +import { String } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { entity: "platform" | "session" | "toDo" | string; entityId?: String<64> | null; diff --git a/lib/oak-app-domain/Test/Schema.d.ts b/lib/oak-app-domain/Test/Schema.d.ts new file mode 100644 index 000000000..86015d4d0 --- /dev/null +++ b/lib/oak-app-domain/Test/Schema.d.ts @@ -0,0 +1,19 @@ +export * from "./_baseSchema"; +import { Test } from "../EntityDict"; +export type Schema = Test["Schema"]; +export type Action = Test["Action"]; +export type Projection = Test["Projection"]; +export type Filter = Test["Filter"]; +export type SortNode = Test["SortNode"]; +export type Sorter = Test["Sorter"]; +export type Selection = Test["Selection"]; +export type Aggregation = Test["Aggregation"]; +export type CreateOperationData = Test["CreateOperationData"]; +export type CreateSingle = Test["CreateSingle"]; +export type CreateMulti = Test["CreateMulti"]; +export type Create = Test["Create"]; +export type UpdateOperationData = Test["UpdateOperationData"]; +export type Update = Test["Update"]; +export type RemoveOperationData = Test["RemoveOperationData"]; +export type Remove = Test["Remove"]; +export type Operation = Test["Operation"]; diff --git a/lib/oak-app-domain/Test/Schema.js b/lib/oak-app-domain/Test/Schema.js new file mode 100644 index 000000000..63a4184a6 --- /dev/null +++ b/lib/oak-app-domain/Test/Schema.js @@ -0,0 +1,4 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const tslib_1 = require("tslib"); +tslib_1.__exportStar(require("./_baseSchema"), exports); diff --git a/lib/oak-app-domain/Test/Storage.d.ts b/lib/oak-app-domain/Test/Storage.d.ts new file mode 100644 index 000000000..a3f0fbbb0 --- /dev/null +++ b/lib/oak-app-domain/Test/Storage.d.ts @@ -0,0 +1,3 @@ +import { StorageDesc } from "oak-domain/lib/types/Storage"; +import { OpSchema } from "./Schema"; +export declare const desc: StorageDesc; diff --git a/lib/oak-app-domain/Test/Storage.js b/lib/oak-app-domain/Test/Storage.js new file mode 100644 index 000000000..102722e97 --- /dev/null +++ b/lib/oak-app-domain/Test/Storage.js @@ -0,0 +1,105 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.desc = void 0; +const action_1 = require("oak-domain/lib/actions/action"); +exports.desc = { + attributes: { + entity: { + notNull: true, + type: "varchar", + params: { + length: 32 + } + }, + entityId: { + notNull: true, + type: "varchar", + params: { + length: 64 + } + }, + type: { + notNull: true, + type: "enum", + enumeration: ["wechatPublic", "wechatMpDomainUrl", "wechatMpWxaCode", "wechatPublicForMp", "webForWechatPublic"] + }, + allowShare: { + notNull: true, + type: "boolean" + }, + tag: { + type: "varchar", + params: { + length: 32 + } + }, + tag2: { + type: "varchar", + params: { + length: 64 + } + }, + expiresAt: { + type: "datetime" + }, + expired: { + type: "boolean" + }, + ticket: { + type: "text" + }, + url: { + type: "varchar", + params: { + length: 256 + } + }, + permanent: { + type: "boolean" + }, + buffer: { + type: "text" + }, + props: { + notNull: true, + type: "object" + } + }, + actionType: "crud", + actions: action_1.genericActions, + indexes: [ + { + name: 'index_entity_entityId_tag', + attributes: [ + { + name: 'entity', + }, + { + name: 'entityId', + }, + { + name: 'tag', + }, + ], + }, + { + name: 'index_expired_expiresAt', + attributes: [ + { + name: 'expired', + }, + { + name: 'expiresAt', + }, + ], + }, + { + name: 'index_url', + attributes: [ + { + name: 'url', + }, + ], + } + ] +}; diff --git a/lib/oak-app-domain/Test/Style.d.ts b/lib/oak-app-domain/Test/Style.d.ts new file mode 100644 index 000000000..24c9a5eae --- /dev/null +++ b/lib/oak-app-domain/Test/Style.d.ts @@ -0,0 +1,3 @@ +import { Action, OpSchema } from "./Schema"; +import { StyleDef } from "oak-domain/lib/types/Style"; +export declare const style: StyleDef; diff --git a/lib/oak-app-domain/Test/Style.js b/lib/oak-app-domain/Test/Style.js new file mode 100644 index 000000000..efce9e358 --- /dev/null +++ b/lib/oak-app-domain/Test/Style.js @@ -0,0 +1,14 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.style = void 0; +exports.style = { + color: { + type: { + webForWechatPublic: '#00FF7F', + wechatMpDomainUrl: '#008000', + wechatMpWxaCode: '#32CD32', + wechatPublic: '#90EE90', + wechatPublicForMp: '#9ACD32', + } + } +}; diff --git a/lib/oak-app-domain/Test/_baseSchema.d.ts b/lib/oak-app-domain/Test/_baseSchema.d.ts new file mode 100644 index 000000000..a4aa3eafc --- /dev/null +++ b/lib/oak-app-domain/Test/_baseSchema.d.ts @@ -0,0 +1,92 @@ +import { JsonProjection } from "oak-domain/lib/types/DataType"; +import { Q_DateValue, Q_BooleanValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey, JsonFilter } from "oak-domain/lib/types/Demand"; +import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; +import { GenericAction } from "oak-domain/lib/actions/action"; +import { String, Boolean, Datetime, Text } from "oak-domain/lib/types/DataType"; +import { QrCodeType } from "../../types/Config"; +export type WechatQrCodeProps = { + pathname: string; + props?: Record; + state?: Record; + isTabBar?: boolean; +}; +export type OpSchema = EntityShape & { + entity: String<32>; + entityId: String<64>; + type: QrCodeType; + allowShare: Boolean; + tag?: String<32> | null; + tag2?: String<64> | null; + expiresAt?: Datetime | null; + expired?: Boolean | null; + ticket?: Text | null; + url?: String<256> | null; + permanent?: Boolean | null; + buffer?: Text | null; + props: WechatQrCodeProps; +} & { + [A in ExpressionKey]?: any; +}; +export type OpAttr = keyof OpSchema; +export type OpFilter = { + id: Q_StringValue; + $$createAt$$: Q_DateValue; + $$seq$$: Q_NumberValue; + $$updateAt$$: Q_DateValue; + entity: Q_StringValue; + entityId: Q_StringValue; + type: Q_EnumValue; + allowShare: Q_BooleanValue; + tag: Q_StringValue; + tag2: Q_StringValue; + expiresAt: Q_DateValue; + expired: Q_BooleanValue; + ticket: Q_StringValue; + url: Q_StringValue; + permanent: Q_BooleanValue; + buffer: Q_StringValue; + props: JsonFilter; +} & ExprOp; +export type OpProjection = { + "#id"?: NodeId; + [k: string]: any; + id?: number; + $$createAt$$?: number; + $$updateAt$$?: number; + $$seq$$?: number; + entity?: number; + entityId?: number; + type?: number; + allowShare?: number; + tag?: number; + tag2?: number; + expiresAt?: number; + expired?: number; + ticket?: number; + url?: number; + permanent?: number; + buffer?: number; + props?: number | JsonProjection; +} & Partial>; +export type OpSortAttr = Partial<{ + id: number; + $$createAt$$: number; + $$seq$$: number; + $$updateAt$$: number; + entity: number; + entityId: number; + type: number; + allowShare: number; + tag: number; + tag2: number; + expiresAt: number; + expired: number; + ticket: number; + url: number; + permanent: number; + buffer: number; + props: number; + [k: string]: any; +} | ExprOp>; +export type OpAction = OakMakeAction; +export type OpUpdateAction = "update" | string; diff --git a/lib/oak-app-domain/Test/_baseSchema.js b/lib/oak-app-domain/Test/_baseSchema.js new file mode 100644 index 000000000..c8ad2e549 --- /dev/null +++ b/lib/oak-app-domain/Test/_baseSchema.js @@ -0,0 +1,2 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/lib/oak-app-domain/Test/locales/zh_CN.json b/lib/oak-app-domain/Test/locales/zh_CN.json new file mode 100644 index 000000000..f4f9080d6 --- /dev/null +++ b/lib/oak-app-domain/Test/locales/zh_CN.json @@ -0,0 +1,27 @@ +{ + "name": "微信识别码", + "attr": { + "entity": "关联对象", + "entityId": "关联对象id", + "type": "类型", + "allowShare": "允许分享", + "tag": "tag", + "tag2": "tag2", + "ticket": "ticket", + "url": "url", + "permanent": "是否永久码", + "buffer": "小程序码数据（动态）", + "expired": "是否过期", + "expiresAt": "过期时间", + "props": "属性" + }, + "v": { + "type": { + "webForWechatPublic": "网站引流到公众号", + "wechatMpDomainUrl": "小程序普通链接二维码", + "wechatMpWxaCode": "小程序码", + "wechatPublic": "公众号关注码", + "wechatPublicForMp": "公众号回复小程序码" + } + } +} diff --git a/lib/oak-app-domain/UserEntityClaim/_baseSchema.d.ts b/lib/oak-app-domain/UserEntityClaim/_baseSchema.d.ts index b560c6bd9..6140be203 100644 --- a/lib/oak-app-domain/UserEntityClaim/_baseSchema.d.ts +++ b/lib/oak-app-domain/UserEntityClaim/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String } from "oak-domain/lib/types/DataType"; +import { String } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { uegId: ForeignKey<"userEntityGrant">; userId: ForeignKey<"user">; diff --git a/lib/oak-app-domain/UserRelation/_baseSchema.d.ts b/lib/oak-app-domain/UserRelation/_baseSchema.d.ts index f2e49f2ac..7ca8072dc 100644 --- a/lib/oak-app-domain/UserRelation/_baseSchema.d.ts +++ b/lib/oak-app-domain/UserRelation/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String } from "oak-domain/lib/types/DataType"; +import { String } from "../../../node_modules/oak-domain/src/types/DataType"; export type OpSchema = EntityShape & { userId: ForeignKey<"user">; relationId: ForeignKey<"relation">; diff --git a/lib/triggers/index.d.ts b/lib/triggers/index.d.ts index 3316bb20f..d18172ea8 100644 --- a/lib/triggers/index.d.ts +++ b/lib/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; +declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; export default _default; diff --git a/lib/triggers/message.js b/lib/triggers/message.js index 647bc2625..0529c8bdb 100644 --- a/lib/triggers/message.js +++ b/lib/triggers/message.js @@ -1,6 +1,8 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.tryMakeEmailNotification = exports.tryMakeSmsNotification = exports.registerMessageNotificationConverters = void 0; +exports.registerMessageNotificationConverters = registerMessageNotificationConverters; +exports.tryMakeSmsNotification = tryMakeSmsNotification; +exports.tryMakeEmailNotification = tryMakeEmailNotification; const uuid_1 = require("oak-domain/lib/utils/uuid"); const assert_1 = require("oak-domain/lib/utils/assert"); const lodash_1 = require("oak-domain/lib/utils/lodash"); @@ -11,7 +13,6 @@ function registerMessageNotificationConverters(converters) { ConverterDict[ele.type] = ele; }); } -exports.registerMessageNotificationConverters = registerMessageNotificationConverters; const InitialChannelByWeightMatrix = { high: ['wechatMp', 'wechatPublic', 'sms', 'email'], medium: ['wechatMp', 'wechatPublic', 'email'], @@ -46,7 +47,6 @@ async function tryMakeSmsNotification(message, context) { } } } -exports.tryMakeSmsNotification = tryMakeSmsNotification; async function tryMakeEmailNotification(message, context) { const { userId, type, entity, entityId, router } = message; const converter = ConverterDict[type] && ConverterDict[type].toEmail; @@ -61,7 +61,6 @@ async function tryMakeEmailNotification(message, context) { } } } -exports.tryMakeEmailNotification = tryMakeEmailNotification; async function createNotification(message, context) { const { restriction, userId, weight, type, entity, entityId, platformId, channels } = message; (0, assert_1.assert)(userId); diff --git a/lib/triggers/notification.js b/lib/triggers/notification.js index 594d30e40..ca7df6315 100644 --- a/lib/triggers/notification.js +++ b/lib/triggers/notification.js @@ -64,7 +64,7 @@ async function sendNotification(notification, context) { await instance.sendSubscribedMessage({ templateId: templateId, data: data, - openId: data1.openId, + openId: data1.openId, // 在notification创建时就赋值了 page, state: StateDict[process.env.NODE_ENV], }); diff --git a/lib/triggers/toDo.d.ts b/lib/triggers/toDo.d.ts index 1d9bc2ce2..e5be399e1 100644 --- a/lib/triggers/toDo.d.ts +++ b/lib/triggers/toDo.d.ts @@ -14,7 +14,7 @@ export declare function createToDo; +}, userIds?: string[]): Promise<1 | 0>; /** * 完成todo例程，当在entity对象上进行action操作时（操作条件是filter），将对应的todo完成 * 必须在entity的action的后trigger中调用 diff --git a/lib/triggers/toDo.js b/lib/triggers/toDo.js index 43c77dcf6..802a09b35 100644 --- a/lib/triggers/toDo.js +++ b/lib/triggers/toDo.js @@ -1,6 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.completeToDo = exports.createToDo = void 0; +exports.createToDo = createToDo; +exports.completeToDo = completeToDo; const tslib_1 = require("tslib"); const lodash_1 = require("oak-domain/lib/utils/lodash"); const RelationAuth_1 = require("oak-domain/lib/store/RelationAuth"); @@ -73,7 +74,6 @@ async function createToDo(entity, filter, action, context, data, userIds) { }, { dontCollect: true }); return 1; } -exports.createToDo = createToDo; /** * 完成todo例程，当在entity对象上进行action操作时（操作条件是filter），将对应的todo完成 * 必须在entity的action的后trigger中调用 @@ -120,4 +120,3 @@ async function completeToDo(entity, filter, action, context) { } return completed; } -exports.completeToDo = completeToDo; diff --git a/lib/types/Exception.js b/lib/types/Exception.js index 73095c84a..f95a4c790 100644 --- a/lib/types/Exception.js +++ b/lib/types/Exception.js @@ -1,6 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.makeException = exports.OakIncompleteConfig = exports.OakCantChangeVerifiedUser = exports.OakHasToVerifyPassword = exports.OakPasswordUnset = exports.OakUploadException = exports.OakApplicationLoadingException = exports.OakUserInfoLoadingException = exports.OakMpHaveToSubscribeMessage = exports.OakTokenExpiredException = exports.OakUserDisabledException = exports.OakUserInfoUncompletedException = exports.OakAuthenticationException = exports.OakMobileUnsetException = exports.OakChangeLoginWayException = exports.OakDistinguishUserException = void 0; +exports.OakIncompleteConfig = exports.OakCantChangeVerifiedUser = exports.OakHasToVerifyPassword = exports.OakPasswordUnset = exports.OakUploadException = exports.OakApplicationLoadingException = exports.OakUserInfoLoadingException = exports.OakMpHaveToSubscribeMessage = exports.OakTokenExpiredException = exports.OakUserDisabledException = exports.OakUserInfoUncompletedException = exports.OakAuthenticationException = exports.OakMobileUnsetException = exports.OakChangeLoginWayException = exports.OakDistinguishUserException = void 0; +exports.makeException = makeException; const types_1 = require("oak-domain/lib/types"); class OakDistinguishUserException extends types_1.OakUserException { userId; @@ -211,4 +212,3 @@ function makeException(data) { return e; } } -exports.makeException = makeException; diff --git a/lib/utils/appVersion.js b/lib/utils/appVersion.js index d09b10497..b0eece405 100644 --- a/lib/utils/appVersion.js +++ b/lib/utils/appVersion.js @@ -1,8 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.oakGetPackageJsonVersion = void 0; +exports.oakGetPackageJsonVersion = oakGetPackageJsonVersion; // 命名为这个函数，将在编译时被注入项目根目录的package.json中的version function oakGetPackageJsonVersion() { return '1.0.0'; } -exports.oakGetPackageJsonVersion = oakGetPackageJsonVersion; diff --git a/lib/utils/application.js b/lib/utils/application.js index 78a1636bf..52b465950 100644 --- a/lib/utils/application.js +++ b/lib/utils/application.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.composeLocationUrl = void 0; +exports.composeLocationUrl = composeLocationUrl; function composeLocationUrl(location, url, props) { const { port, protocol, hostname } = location; let Url = `${protocol}//${hostname}`; @@ -21,4 +21,3 @@ function composeLocationUrl(location, url, props) { } return Url; } -exports.composeLocationUrl = composeLocationUrl; diff --git a/lib/utils/area.js b/lib/utils/area.js index c23a6e80a..c466a280d 100644 --- a/lib/utils/area.js +++ b/lib/utils/area.js @@ -1,12 +1,11 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.makeAreaDecendantFilter = exports.makeAreaAncestorFilter = void 0; +exports.makeAreaAncestorFilter = makeAreaAncestorFilter; +exports.makeAreaDecendantFilter = makeAreaDecendantFilter; const filter_1 = require("oak-domain/lib/store/filter"); function makeAreaAncestorFilter(filter, level = 1, includeAll, includeSelf) { return (0, filter_1.makeTreeAncestorFilter)('area', 'parentId', filter, level, includeAll, includeSelf); } -exports.makeAreaAncestorFilter = makeAreaAncestorFilter; function makeAreaDecendantFilter(filter, level = 1, includeAll, includeSelf) { return (0, filter_1.makeTreeDescendantFilter)('area', 'parentId', filter, level, includeAll, includeSelf); } -exports.makeAreaDecendantFilter = makeAreaDecendantFilter; diff --git a/lib/utils/cos/index.backend.js b/lib/utils/cos/index.backend.js index c7c24e626..a93709f6c 100644 --- a/lib/utils/cos/index.backend.js +++ b/lib/utils/cos/index.backend.js @@ -1,6 +1,8 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.composeFileUrl = exports.getCosBackend = exports.registerCosBackend = void 0; +exports.registerCosBackend = registerCosBackend; +exports.getCosBackend = getCosBackend; +exports.composeFileUrl = composeFileUrl; const tslib_1 = require("tslib"); const assert_1 = require("oak-domain/lib/utils/assert"); const ctyun_backend_1 = tslib_1.__importDefault(require("./ctyun.backend")); @@ -27,15 +29,12 @@ function registerCosBackend(clazz) { const instance = new clazz(); CosBackendDict[instance.name] = instance; } -exports.registerCosBackend = registerCosBackend; function getCosBackend(origin) { (0, assert_1.assert)(CosBackendDict.hasOwnProperty(origin)); return CosBackendDict[origin]; } -exports.getCosBackend = getCosBackend; function composeFileUrl(application, extraFile, style) { const { origin } = extraFile; const cos = CosBackendDict[origin]; return cos.composeFileUrl(application, extraFile, style); } -exports.composeFileUrl = composeFileUrl; diff --git a/lib/utils/cos/index.frontend.js b/lib/utils/cos/index.frontend.js index 67a18751e..38c42ddc9 100644 --- a/lib/utils/cos/index.frontend.js +++ b/lib/utils/cos/index.frontend.js @@ -1,6 +1,8 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.composeFileUrl = exports.getCos = exports.registerCos = void 0; +exports.registerCos = registerCos; +exports.getCos = getCos; +exports.composeFileUrl = composeFileUrl; const tslib_1 = require("tslib"); const assert_1 = require("oak-domain/lib/utils/assert"); const unknown_1 = tslib_1.__importDefault(require("./unknown")); @@ -15,15 +17,12 @@ function registerCos(clazz) { const instance = new clazz(); CosDict[instance.name] = instance; } -exports.registerCos = registerCos; function getCos(origin) { (0, assert_1.assert)(CosDict.hasOwnProperty(origin)); return CosDict[origin]; } -exports.getCos = getCos; function composeFileUrl(application, extraFile, style) { const { origin } = extraFile; const cos = CosDict[origin]; return cos.composeFileUrl(application, extraFile, style); } -exports.composeFileUrl = composeFileUrl; diff --git a/lib/utils/domain.js b/lib/utils/domain.js index bd2722fbb..8d441ac2b 100644 --- a/lib/utils/domain.js +++ b/lib/utils/domain.js @@ -1,6 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.composeServerUrl = exports.composeDomainUrl = void 0; +exports.composeDomainUrl = composeDomainUrl; +exports.composeServerUrl = composeServerUrl; function composeDomainUrl(domain, url, props) { const { port, protocol, apiPath, url: domainUrl } = domain; let Url = `${protocol}//${domainUrl}`; @@ -21,7 +22,6 @@ function composeDomainUrl(domain, url, props) { } return Url; } -exports.composeDomainUrl = composeDomainUrl; function composeServerUrl(domain, url, props) { const { port, protocol, apiPath, url: domainUrl } = domain; let Url = `${protocol}//${domainUrl}`; @@ -45,4 +45,3 @@ function composeServerUrl(domain, url, props) { } return Url; } -exports.composeServerUrl = composeServerUrl; diff --git a/lib/utils/email/index.frontend.js b/lib/utils/email/index.frontend.js index 6ccd76abd..1e3d5c61d 100644 --- a/lib/utils/email/index.frontend.js +++ b/lib/utils/email/index.frontend.js @@ -1,8 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.sendEmail = void 0; +exports.sendEmail = sendEmail; async function sendEmail(options, context) { const { text, html } = options; console.log('邮件内容：', html || text); } -exports.sendEmail = sendEmail; diff --git a/lib/utils/email/index.js b/lib/utils/email/index.js index acee56eaa..b35b9b525 100644 --- a/lib/utils/email/index.js +++ b/lib/utils/email/index.js @@ -1,6 +1,9 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.sendEmail = exports.getOrigin = exports.getEmail = exports.registerEmail = void 0; +exports.registerEmail = registerEmail; +exports.getEmail = getEmail; +exports.getOrigin = getOrigin; +exports.sendEmail = sendEmail; const tslib_1 = require("tslib"); const assert_1 = require("oak-domain/lib/utils/assert"); const node_mailer_1 = tslib_1.__importDefault(require("./node-mailer")); @@ -15,16 +18,13 @@ function registerEmail(clazz) { const instance = new clazz(); EmailDict[instance.name] = instance; } -exports.registerEmail = registerEmail; function getEmail(origin) { (0, assert_1.assert)(EmailDict.hasOwnProperty(origin)); return EmailDict[origin]; } -exports.getEmail = getEmail; function getOrigin() { return Object.keys(EmailDict); } -exports.getOrigin = getOrigin; async function sendEmail(options, context) { try { const instance = getEmail('nodemailer'); @@ -38,4 +38,3 @@ async function sendEmail(options, context) { }; } } -exports.sendEmail = sendEmail; diff --git a/lib/utils/extraFile.js b/lib/utils/extraFile.js index de6f9d7a0..b0e751818 100644 --- a/lib/utils/extraFile.js +++ b/lib/utils/extraFile.js @@ -1,6 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.bytesToSize = exports.getFileURL = void 0; +exports.getFileURL = getFileURL; +exports.bytesToSize = bytesToSize; //获取file文件url function getFileURL(file) { let getUrl = ''; @@ -20,7 +21,6 @@ function getFileURL(file) { } return getUrl; } -exports.getFileURL = getFileURL; function bytesToSize(size) { let data = ''; if (size < 0.1 * 1024) { @@ -50,4 +50,3 @@ function bytesToSize(size) { return sizeStr.substring(0, index) + sizeStr.substring(index + 3, 2); return sizeStr; } -exports.bytesToSize = bytesToSize; diff --git a/lib/utils/getContextConfig.js b/lib/utils/getContextConfig.js index f054f78cd..d96904af7 100644 --- a/lib/utils/getContextConfig.js +++ b/lib/utils/getContextConfig.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getConfig = void 0; +exports.getConfig = getConfig; const assert_1 = require("oak-domain/lib/utils/assert"); const Exception_1 = require("oak-domain/lib/types/Exception"); const oak_external_sdk_1 = require("oak-external-sdk"); @@ -84,4 +84,3 @@ function getConfig(systemConfig, service, origin) { } } } -exports.getConfig = getConfig; diff --git a/lib/utils/livestream.js b/lib/utils/livestream.js index 672de8527..1b97eadb6 100644 --- a/lib/utils/livestream.js +++ b/lib/utils/livestream.js @@ -1,6 +1,8 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getPlayBackUrl = exports.getStreamObj = exports.getLivestream = void 0; +exports.getLivestream = getLivestream; +exports.getStreamObj = getStreamObj; +exports.getPlayBackUrl = getPlayBackUrl; const assert_1 = require("oak-domain/lib/utils/assert"); const getContextConfig_1 = require("./getContextConfig"); /** @@ -27,7 +29,6 @@ async function getLivestream(params, context) { expireAt, }; } -exports.getLivestream = getLivestream; // 获取推拉流地址 /** * 直播流已存在的情况下，获取推拉流地址 @@ -52,7 +53,6 @@ async function getStreamObj(params, context) { expireAt, }; } -exports.getStreamObj = getStreamObj; // 生成直播回放 async function getPlayBackUrl(params, context) { const { streamTitle, start, end, origin } = params; @@ -61,4 +61,3 @@ async function getPlayBackUrl(params, context) { const { hub, playBackDomain, liveHost } = config; return instance.getPlayBackUrl(hub, playBackDomain, streamTitle, start, end, 'POST', liveHost); } -exports.getPlayBackUrl = getPlayBackUrl; diff --git a/lib/utils/oauth/index.js b/lib/utils/oauth/index.js index a64f3b8e5..dba5b369b 100644 --- a/lib/utils/oauth/index.js +++ b/lib/utils/oauth/index.js @@ -1,6 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.checkOauthTokenAvaliable = exports.processUserInfo = exports.registerUserinfoHandler = void 0; +exports.processUserInfo = exports.registerUserinfoHandler = void 0; +exports.checkOauthTokenAvaliable = checkOauthTokenAvaliable; const uuid_1 = require("oak-domain/lib/utils/uuid"); const Projection_1 = require("../../types/Projection"); const handler_1 = require("./handler"); @@ -101,4 +102,3 @@ async function checkOauthTokenAvaliable(context, token) { }, {}); return { error: null, tokenRecord }; } -exports.checkOauthTokenAvaliable = checkOauthTokenAvaliable; diff --git a/lib/utils/passport.js b/lib/utils/passport.js index 8c58265ac..dd5e61577 100644 --- a/lib/utils/passport.js +++ b/lib/utils/passport.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getAndCheckPassportByEmail = void 0; +exports.getAndCheckPassportByEmail = getAndCheckPassportByEmail; const assert_1 = require("oak-domain/lib/utils/assert"); const types_1 = require("oak-domain/lib/types"); async function getAndCheckPassportByEmail(context, email) { @@ -49,4 +49,3 @@ async function getAndCheckPassportByEmail(context, email) { config }; } -exports.getAndCheckPassportByEmail = getAndCheckPassportByEmail; diff --git a/lib/utils/password.js b/lib/utils/password.js index 3f3549f55..804e6a112 100644 --- a/lib/utils/password.js +++ b/lib/utils/password.js @@ -1,9 +1,8 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.encryptPasswordSha1 = void 0; +exports.encryptPasswordSha1 = encryptPasswordSha1; const tslib_1 = require("tslib"); const sha1_1 = tslib_1.__importDefault(require("sha1")); function encryptPasswordSha1(password) { return (0, sha1_1.default)(password); } -exports.encryptPasswordSha1 = encryptPasswordSha1; diff --git a/lib/utils/randomUser.js b/lib/utils/randomUser.js index b73c32e09..b59313553 100644 --- a/lib/utils/randomUser.js +++ b/lib/utils/randomUser.js @@ -1,6 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getName = exports.randomName = void 0; +exports.randomName = randomName; +exports.getName = getName; /** * * @param prefix 第一个参数为你想生成的固定的文字开头比如: 微信用户xxxxx @@ -37,7 +38,6 @@ function randomName(prefix, randomLength) { // 将随机生成的名字返回 return name; } -exports.randomName = randomName; 1; function getName(name, start = 0, end = 1) { if (name) { @@ -45,4 +45,3 @@ function getName(name, start = 0, end = 1) { } return randomName('', end - start); } -exports.getName = getName; diff --git a/lib/utils/selectionRewriter.js b/lib/utils/selectionRewriter.js index 1406a5778..fc3a7fae0 100644 --- a/lib/utils/selectionRewriter.js +++ b/lib/utils/selectionRewriter.js @@ -1,6 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.rewriteOperation = exports.rewriteSelection = void 0; +exports.rewriteSelection = rewriteSelection; +exports.rewriteOperation = rewriteOperation; const relation_1 = require("oak-domain/lib/store/relation"); const types_1 = require("oak-domain/lib/types"); const assert_1 = require("oak-domain/lib/utils/assert"); @@ -174,7 +175,6 @@ function rewriteSelection(schema, entity, selection, context, option, isAggr) { } return; } -exports.rewriteSelection = rewriteSelection; function rewriteOperation(schema, entity, operation) { const { filter } = operation; if (filter && !filter['#oak-general-business--rewrited']) { @@ -187,4 +187,3 @@ function rewriteOperation(schema, entity, operation) { } return; } -exports.rewriteOperation = rewriteOperation; diff --git a/lib/utils/sign.js b/lib/utils/sign.js index 78a83351e..d4da48f12 100644 --- a/lib/utils/sign.js +++ b/lib/utils/sign.js @@ -1,21 +1,20 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.urlSafeBase64Encode = exports.hmacSha1 = exports.base64ToUrlSafe = void 0; +exports.base64ToUrlSafe = base64ToUrlSafe; +exports.hmacSha1 = hmacSha1; +exports.urlSafeBase64Encode = urlSafeBase64Encode; const tslib_1 = require("tslib"); const crypto_1 = tslib_1.__importDefault(require("crypto")); const buffer_1 = require("buffer"); function base64ToUrlSafe(v) { return v.replace(/\//g, '_').replace(/\+/g, '-'); } -exports.base64ToUrlSafe = base64ToUrlSafe; function hmacSha1(encodedFlags, secretKey) { const hmac = crypto_1.default.createHmac('sha1', secretKey); hmac.update(encodedFlags); return hmac.digest('base64'); } -exports.hmacSha1 = hmacSha1; function urlSafeBase64Encode(jsonFlags) { const encoded = buffer_1.Buffer.from(jsonFlags).toString('base64'); return base64ToUrlSafe(encoded); } -exports.urlSafeBase64Encode = urlSafeBase64Encode; diff --git a/lib/utils/sms/index.js b/lib/utils/sms/index.js index 228ec0447..59bbf2a1f 100644 --- a/lib/utils/sms/index.js +++ b/lib/utils/sms/index.js @@ -1,6 +1,9 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.sendSms = exports.getOrigin = exports.getSms = exports.registSms = void 0; +exports.registSms = registSms; +exports.getSms = getSms; +exports.getOrigin = getOrigin; +exports.sendSms = sendSms; const assert_1 = require("oak-domain/lib/utils/assert"); const SmsDict = {}; /** @@ -11,16 +14,13 @@ function registSms(clazz) { const instance = new clazz(); SmsDict[instance.name] = instance; } -exports.registSms = registSms; function getSms(origin) { (0, assert_1.assert)(SmsDict.hasOwnProperty(origin)); return SmsDict[origin]; } -exports.getSms = getSms; function getOrigin() { return Object.keys(SmsDict); } -exports.getOrigin = getOrigin; async function sendSms(options, context) { const { messageType, origin, templateName, mobile, templateParam } = options; (0, assert_1.assert)(messageType || (origin && templateName)); @@ -123,4 +123,3 @@ async function sendSms(options, context) { } } } -exports.sendSms = sendSms; diff --git a/lib/utils/strings.js b/lib/utils/strings.js index a6f98c973..78c912845 100644 --- a/lib/utils/strings.js +++ b/lib/utils/strings.js @@ -1,6 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.isEmptyObject = exports.isEmptyJsonObject = void 0; +exports.isEmptyJsonObject = isEmptyJsonObject; +exports.isEmptyObject = isEmptyObject; function isEmptyJsonObject(jsonString) { try { const obj = JSON.parse(jsonString); @@ -11,7 +12,6 @@ function isEmptyJsonObject(jsonString) { return false; } } -exports.isEmptyJsonObject = isEmptyJsonObject; function isEmptyObject(obj) { // 处理 null 或 undefined if (obj === null || obj === undefined) { @@ -39,4 +39,3 @@ function isEmptyObject(obj) { // 其他类型（数字、布尔值等）视为非空 return false; } -exports.isEmptyObject = isEmptyObject; diff --git a/lib/utils/user.js b/lib/utils/user.js index 0866734d7..f407104b0 100644 --- a/lib/utils/user.js +++ b/lib/utils/user.js @@ -1,6 +1,8 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.checkPassword = exports.maskPassword = exports.getUserSafetyFilter = void 0; +exports.getUserSafetyFilter = getUserSafetyFilter; +exports.maskPassword = maskPassword; +exports.checkPassword = checkPassword; const types_1 = require("oak-domain/lib/types"); function getUserSafetyFilter(context) { const application = context.getApplication(); @@ -23,12 +25,10 @@ function getUserSafetyFilter(context) { }; } } -exports.getUserSafetyFilter = getUserSafetyFilter; function maskPassword(password) { const encStr = "****************************************".slice(0, password.length - 2); return password[0] + encStr + password[password.length - 1]; } -exports.maskPassword = maskPassword; async function checkPassword(context, password) { const systemId = context.getSystemId(); const [passport] = await context.select('passport', { @@ -65,4 +65,3 @@ async function checkPassword(context, password) { } } } -exports.checkPassword = checkPassword; diff --git a/lib/utils/wechatPublicException/index.js b/lib/utils/wechatPublicException/index.js index a1f836857..5ffb02e4a 100644 --- a/lib/utils/wechatPublicException/index.js +++ b/lib/utils/wechatPublicException/index.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.handleException = void 0; +exports.handleException = handleException; function handleException(e) { const exception = JSON.parse(e); if (exception.code === 45157) { @@ -34,4 +34,3 @@ function handleException(e) { return '无效的AppID'; } } -exports.handleException = handleException; From ccdd86923fb312f9019d92c209316017b2bc0e9a Mon Sep 17 00:00:00 2001 From: qcqcqc <1220204124@zust.edu.cn> Date: Fri, 7 Nov 2025 15:27:29 +0800 Subject: [PATCH 2/2] build2 --- es/oak-app-domain/I18n/_baseSchema.d.ts | 2 +- es/oak-app-domain/Log/_baseSchema.d.ts | 2 +- es/oak-app-domain/Modi/_baseSchema.d.ts | 2 +- es/oak-app-domain/ModiEntity/_baseSchema.d.ts | 2 +- es/oak-app-domain/Oper/_baseSchema.d.ts | 2 +- es/oak-app-domain/OperEntity/_baseSchema.d.ts | 2 +- es/oak-app-domain/Path/_baseSchema.d.ts | 2 +- es/oak-app-domain/Relation/_baseSchema.d.ts | 2 +- es/oak-app-domain/UserEntityClaim/_baseSchema.d.ts | 2 +- es/oak-app-domain/UserRelation/_baseSchema.d.ts | 2 +- es/triggers/index.d.ts | 2 +- es/triggers/toDo.d.ts | 2 +- lib/oak-app-domain/I18n/_baseSchema.d.ts | 2 +- lib/oak-app-domain/Log/_baseSchema.d.ts | 2 +- lib/oak-app-domain/Modi/_baseSchema.d.ts | 2 +- lib/oak-app-domain/ModiEntity/_baseSchema.d.ts | 2 +- lib/oak-app-domain/Oper/_baseSchema.d.ts | 2 +- lib/oak-app-domain/OperEntity/_baseSchema.d.ts | 2 +- lib/oak-app-domain/Path/_baseSchema.d.ts | 2 +- lib/oak-app-domain/Relation/_baseSchema.d.ts | 2 +- lib/oak-app-domain/UserEntityClaim/_baseSchema.d.ts | 2 +- lib/oak-app-domain/UserRelation/_baseSchema.d.ts | 2 +- lib/triggers/index.d.ts | 2 +- lib/triggers/toDo.d.ts | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/es/oak-app-domain/I18n/_baseSchema.d.ts b/es/oak-app-domain/I18n/_baseSchema.d.ts index 606b4ae07..a51caacaf 100644 --- a/es/oak-app-domain/I18n/_baseSchema.d.ts +++ b/es/oak-app-domain/I18n/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { module: String<64>; position: String<188>; diff --git a/es/oak-app-domain/Log/_baseSchema.d.ts b/es/oak-app-domain/Log/_baseSchema.d.ts index e09eb1013..dd4e1ae17 100644 --- a/es/oak-app-domain/Log/_baseSchema.d.ts +++ b/es/oak-app-domain/Log/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { Action, ParticularAction } from "./Action"; -import { String } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { entity: String<32>; entityId: String<64>; diff --git a/es/oak-app-domain/Modi/_baseSchema.d.ts b/es/oak-app-domain/Modi/_baseSchema.d.ts index bf97b925e..478c6937b 100644 --- a/es/oak-app-domain/Modi/_baseSchema.d.ts +++ b/es/oak-app-domain/Modi/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { Action, ParticularAction, IState } from "./Action"; -import { String } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { targetEntity: String<32>; entity: String<32>; diff --git a/es/oak-app-domain/ModiEntity/_baseSchema.d.ts b/es/oak-app-domain/ModiEntity/_baseSchema.d.ts index 61d386c1d..2638b43b6 100644 --- a/es/oak-app-domain/ModiEntity/_baseSchema.d.ts +++ b/es/oak-app-domain/ModiEntity/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { AppendOnlyAction } from "oak-domain/lib/actions/action"; -import { String } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { modiId: ForeignKey<"modi">; entity: String<32>; diff --git a/es/oak-app-domain/Oper/_baseSchema.d.ts b/es/oak-app-domain/Oper/_baseSchema.d.ts index 259609e3f..7896ea9ef 100644 --- a/es/oak-app-domain/Oper/_baseSchema.d.ts +++ b/es/oak-app-domain/Oper/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { Action, ParticularAction, IState } from "./Action"; -import { String, Datetime } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String, Datetime } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { action: String<24>; data: Object; diff --git a/es/oak-app-domain/OperEntity/_baseSchema.d.ts b/es/oak-app-domain/OperEntity/_baseSchema.d.ts index 03ba456c0..076f111be 100644 --- a/es/oak-app-domain/OperEntity/_baseSchema.d.ts +++ b/es/oak-app-domain/OperEntity/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { AppendOnlyAction } from "oak-domain/lib/actions/action"; -import { String } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { operId: ForeignKey<"oper">; entity: String<32>; diff --git a/es/oak-app-domain/Path/_baseSchema.d.ts b/es/oak-app-domain/Path/_baseSchema.d.ts index 647b18dc5..8801ba0ba 100644 --- a/es/oak-app-domain/Path/_baseSchema.d.ts +++ b/es/oak-app-domain/Path/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_BooleanValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String, Boolean } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String, Boolean } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { destEntity: String<32>; value: String<256>; diff --git a/es/oak-app-domain/Relation/_baseSchema.d.ts b/es/oak-app-domain/Relation/_baseSchema.d.ts index 06b60c10e..0f6f49e12 100644 --- a/es/oak-app-domain/Relation/_baseSchema.d.ts +++ b/es/oak-app-domain/Relation/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { entity: "platform" | "session" | "toDo" | string; entityId?: String<64> | null; diff --git a/es/oak-app-domain/UserEntityClaim/_baseSchema.d.ts b/es/oak-app-domain/UserEntityClaim/_baseSchema.d.ts index 6140be203..b560c6bd9 100644 --- a/es/oak-app-domain/UserEntityClaim/_baseSchema.d.ts +++ b/es/oak-app-domain/UserEntityClaim/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { uegId: ForeignKey<"userEntityGrant">; userId: ForeignKey<"user">; diff --git a/es/oak-app-domain/UserRelation/_baseSchema.d.ts b/es/oak-app-domain/UserRelation/_baseSchema.d.ts index 7ca8072dc..f2e49f2ac 100644 --- a/es/oak-app-domain/UserRelation/_baseSchema.d.ts +++ b/es/oak-app-domain/UserRelation/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { userId: ForeignKey<"user">; relationId: ForeignKey<"relation">; diff --git a/es/triggers/index.d.ts b/es/triggers/index.d.ts index d18172ea8..bf8963c38 100644 --- a/es/triggers/index.d.ts +++ b/es/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; +declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; export default _default; diff --git a/es/triggers/toDo.d.ts b/es/triggers/toDo.d.ts index e5be399e1..1d9bc2ce2 100644 --- a/es/triggers/toDo.d.ts +++ b/es/triggers/toDo.d.ts @@ -14,7 +14,7 @@ export declare function createToDo; +}, userIds?: string[]): Promise<0 | 1>; /** * 完成todo例程，当在entity对象上进行action操作时（操作条件是filter），将对应的todo完成 * 必须在entity的action的后trigger中调用 diff --git a/lib/oak-app-domain/I18n/_baseSchema.d.ts b/lib/oak-app-domain/I18n/_baseSchema.d.ts index 606b4ae07..a51caacaf 100644 --- a/lib/oak-app-domain/I18n/_baseSchema.d.ts +++ b/lib/oak-app-domain/I18n/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { module: String<64>; position: String<188>; diff --git a/lib/oak-app-domain/Log/_baseSchema.d.ts b/lib/oak-app-domain/Log/_baseSchema.d.ts index e09eb1013..dd4e1ae17 100644 --- a/lib/oak-app-domain/Log/_baseSchema.d.ts +++ b/lib/oak-app-domain/Log/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { Action, ParticularAction } from "./Action"; -import { String } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { entity: String<32>; entityId: String<64>; diff --git a/lib/oak-app-domain/Modi/_baseSchema.d.ts b/lib/oak-app-domain/Modi/_baseSchema.d.ts index bf97b925e..478c6937b 100644 --- a/lib/oak-app-domain/Modi/_baseSchema.d.ts +++ b/lib/oak-app-domain/Modi/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { Action, ParticularAction, IState } from "./Action"; -import { String } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { targetEntity: String<32>; entity: String<32>; diff --git a/lib/oak-app-domain/ModiEntity/_baseSchema.d.ts b/lib/oak-app-domain/ModiEntity/_baseSchema.d.ts index 61d386c1d..2638b43b6 100644 --- a/lib/oak-app-domain/ModiEntity/_baseSchema.d.ts +++ b/lib/oak-app-domain/ModiEntity/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { AppendOnlyAction } from "oak-domain/lib/actions/action"; -import { String } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { modiId: ForeignKey<"modi">; entity: String<32>; diff --git a/lib/oak-app-domain/Oper/_baseSchema.d.ts b/lib/oak-app-domain/Oper/_baseSchema.d.ts index 259609e3f..7896ea9ef 100644 --- a/lib/oak-app-domain/Oper/_baseSchema.d.ts +++ b/lib/oak-app-domain/Oper/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { Action, ParticularAction, IState } from "./Action"; -import { String, Datetime } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String, Datetime } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { action: String<24>; data: Object; diff --git a/lib/oak-app-domain/OperEntity/_baseSchema.d.ts b/lib/oak-app-domain/OperEntity/_baseSchema.d.ts index 03ba456c0..076f111be 100644 --- a/lib/oak-app-domain/OperEntity/_baseSchema.d.ts +++ b/lib/oak-app-domain/OperEntity/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { AppendOnlyAction } from "oak-domain/lib/actions/action"; -import { String } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { operId: ForeignKey<"oper">; entity: String<32>; diff --git a/lib/oak-app-domain/Path/_baseSchema.d.ts b/lib/oak-app-domain/Path/_baseSchema.d.ts index 647b18dc5..8801ba0ba 100644 --- a/lib/oak-app-domain/Path/_baseSchema.d.ts +++ b/lib/oak-app-domain/Path/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_BooleanValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String, Boolean } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String, Boolean } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { destEntity: String<32>; value: String<256>; diff --git a/lib/oak-app-domain/Relation/_baseSchema.d.ts b/lib/oak-app-domain/Relation/_baseSchema.d.ts index 06b60c10e..0f6f49e12 100644 --- a/lib/oak-app-domain/Relation/_baseSchema.d.ts +++ b/lib/oak-app-domain/Relation/_baseSchema.d.ts @@ -1,7 +1,7 @@ import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { entity: "platform" | "session" | "toDo" | string; entityId?: String<64> | null; diff --git a/lib/oak-app-domain/UserEntityClaim/_baseSchema.d.ts b/lib/oak-app-domain/UserEntityClaim/_baseSchema.d.ts index 6140be203..b560c6bd9 100644 --- a/lib/oak-app-domain/UserEntityClaim/_baseSchema.d.ts +++ b/lib/oak-app-domain/UserEntityClaim/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { uegId: ForeignKey<"userEntityGrant">; userId: ForeignKey<"user">; diff --git a/lib/oak-app-domain/UserRelation/_baseSchema.d.ts b/lib/oak-app-domain/UserRelation/_baseSchema.d.ts index 7ca8072dc..f2e49f2ac 100644 --- a/lib/oak-app-domain/UserRelation/_baseSchema.d.ts +++ b/lib/oak-app-domain/UserRelation/_baseSchema.d.ts @@ -2,7 +2,7 @@ import { ForeignKey } from "oak-domain/lib/types/DataType"; import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand"; import { MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity"; import { GenericAction } from "oak-domain/lib/actions/action"; -import { String } from "../../../node_modules/oak-domain/src/types/DataType"; +import { String } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { userId: ForeignKey<"user">; relationId: ForeignKey<"relation">; diff --git a/lib/triggers/index.d.ts b/lib/triggers/index.d.ts index d18172ea8..bf8963c38 100644 --- a/lib/triggers/index.d.ts +++ b/lib/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; +declare const _default: (import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger> | import("oak-domain/lib/types").Trigger>)[]; export default _default; diff --git a/lib/triggers/toDo.d.ts b/lib/triggers/toDo.d.ts index e5be399e1..1d9bc2ce2 100644 --- a/lib/triggers/toDo.d.ts +++ b/lib/triggers/toDo.d.ts @@ -14,7 +14,7 @@ export declare function createToDo; +}, userIds?: string[]): Promise<0 | 1>; /** * 完成todo例程，当在entity对象上进行action操作时（操作条件是filter），将对应的todo完成 * 必须在entity的action的后trigger中调用