diff --git a/es/aspects/token.js b/es/aspects/token.js index dc5eb8966..2b90eb918 100644 --- a/es/aspects/token.js +++ b/es/aspects/token.js @@ -2422,8 +2422,8 @@ export async function refreshToken(params, context) { // 只有server模式去刷新token // 'development' | 'production' | 'staging' const intervals = { - development: 7200 * 1000, // 2小时 - staging: 600 * 1000, // 十分钟 + development: 7200 * 1000, + staging: 600 * 1000, production: 600 * 1000, // 十分钟 }; let applicationId = token.applicationId; diff --git a/es/aspects/wechatQrCode.js b/es/aspects/wechatQrCode.js index ef80f4cc2..2ce3a1b8d 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, // wecharQrCode里的过期时间都放到最大,由上层关联对象来主动过期(by Xc, 20230131) + expiresAt: Date.now() + 2592000 * 1000, props, }; // 直接创建 diff --git a/es/checkers/index.d.ts b/es/checkers/index.d.ts index d00bb13df..d5207458d 100644 --- a/es/checkers/index.d.ts +++ b/es/checkers/index.d.ts @@ -1,2 +1,2 @@ -declare const checkers: (import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker>)[]; +declare const checkers: (import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker> | import("oak-domain/lib/types").Checker>)[]; export default checkers; diff --git a/es/components/article/detail/index.js b/es/components/article/detail/index.js index b4b764ba5..4fd6712b2 100644 --- a/es/components/article/detail/index.js +++ b/es/components/article/detail/index.js @@ -23,12 +23,12 @@ export default OakComponent({ tocFixed: true, tocPosition: 'none', highlightBgColor: 'none', - headerTop: 0, //页面中吸顶部分高度 + headerTop: 0, className: '', - scrollId: '', // 滚动条所在容器id,不传默认body + scrollId: '', tocWidth: undefined, tocHeight: undefined, - showtitle: false, //大纲顶层显示文章名称 + showtitle: false, activeColor: undefined, }, data: { diff --git a/es/components/article/editor/index.js b/es/components/article/editor/index.js index 76d054141..dc2829ed7 100644 --- a/es/components/article/editor/index.js +++ b/es/components/article/editor/index.js @@ -26,11 +26,11 @@ export default OakComponent({ properties: { articleMenuId: '', changeIsEdit: () => undefined, - tocPosition: 'none', //目录显示位置,none为不显示目录 - highlightBgColor: 'none', //点击目录时标题高亮背景色,none为不显示高亮背景色 - onArticlePreview: (content, title) => undefined, //预览文章 - origin: 'qiniu', // 默认为七牛云 - scrollId: '', // 滚动条所在容器id,不传默认页面编辑器容器id + tocPosition: 'none', + highlightBgColor: 'none', + onArticlePreview: (content, title) => undefined, + origin: 'qiniu', + scrollId: '', height: 600, activeColor: undefined, }, diff --git a/es/components/article/list/index.d.ts b/es/components/article/list/index.d.ts index c63d888b1..8550d91d3 100644 --- a/es/components/article/list/index.d.ts +++ b/es/components/article/list/index.d.ts @@ -1,9 +1,10 @@ +/// import { GenerateUrlFn } from "../../../types/Article"; declare const _default: (props: import("oak-frontend-base").ReactComponentProps void; }>) => React.ReactElement; export default _default; diff --git a/es/components/article/preview/index.js b/es/components/article/preview/index.js index e0e47a85e..e2ada07d4 100644 --- a/es/components/article/preview/index.js +++ b/es/components/article/preview/index.js @@ -28,12 +28,12 @@ export default OakComponent({ tocFixed: true, tocPosition: 'none', highlightBgColor: 'none', - headerTop: 0, //页面中吸顶部分高度 + headerTop: 0, className: '', - scrollId: '', // 滚动条所在容器id,不传默认body + scrollId: '', tocWidth: undefined, tocHeight: undefined, - showtitle: false, //大纲顶层显示文章名称 + showtitle: false, activeColor: undefined, }, methods: {}, diff --git a/es/components/article/treeList/index.d.ts b/es/components/article/treeList/index.d.ts index 6f4290f52..b82c03103 100644 --- a/es/components/article/treeList/index.d.ts +++ b/es/components/article/treeList/index.d.ts @@ -1,7 +1,7 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps void; - show: "preview" | "doc" | "edit"; + show: "preview" | "edit" | "doc"; getBreadcrumbItemsByParent: (breadcrumbItems: string[]) => void; breadcrumbItems: string[]; drawerOpen: boolean; diff --git a/es/components/article/treeList/index.js b/es/components/article/treeList/index.js index dc05b4dbd..4c04d8285 100644 --- a/es/components/article/treeList/index.js +++ b/es/components/article/treeList/index.js @@ -4,7 +4,7 @@ export default OakComponent({ properties: { articleMenuId: '', onChildEditArticleChange: (data) => undefined, - show: 'edit', // edit为编辑,doc为查看,preview为预览 + show: 'edit', getBreadcrumbItemsByParent: (breadcrumbItems) => undefined, breadcrumbItems: [], drawerOpen: false, diff --git a/es/components/article/upsert/index.js b/es/components/article/upsert/index.js index 9917788a3..59dd7c571 100644 --- a/es/components/article/upsert/index.js +++ b/es/components/article/upsert/index.js @@ -25,11 +25,11 @@ export default OakComponent({ properties: { articleMenuId: '', changeIsEdit: () => undefined, - tocPosition: 'none', //目录显示位置,none为不显示目录 - highlightBgColor: 'none', //点击目录时标题高亮背景色,none为不显示高亮背景色 - onArticlePreview: (content, title) => undefined, //预览文章 - origin: 'qiniu', // 默认为七牛云 - scrollId: '', // 滚动条所在容器id,不传默认页面编辑器容器id + tocPosition: 'none', + highlightBgColor: 'none', + onArticlePreview: (content, title) => undefined, + origin: 'qiniu', + scrollId: '', height: 600, activeColor: undefined, }, diff --git a/es/components/articleMenu/container/index.d.ts b/es/components/articleMenu/container/index.d.ts index dec902a78..c84d52042 100644 --- a/es/components/articleMenu/container/index.d.ts +++ b/es/components/articleMenu/container/index.d.ts @@ -1,3 +1,4 @@ +/// import { EntityDict } from "../../../oak-app-domain"; import { GenerateUrlFn } from "../../../types/Article"; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; export default _default; diff --git a/es/components/articleMenu/container/index.js b/es/components/articleMenu/container/index.js index 7063b94e9..6e83667e6 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: 'qiniu', // cos origin默认七牛云 + origin: 'qiniu', menuEmpty: undefined, articleEmpty: undefined, generateUrl: ((mode, type, id) => { }), //构造文章显示路由 @@ -20,7 +20,7 @@ export default OakComponent({ showAddArticle: false, showAddMenu: true, parentId: undefined, - articleMenuId: '', //非空时展示atricle表格 + articleMenuId: '', unsub: undefined, }, listeners: { diff --git a/es/components/articleMenu/detail/index.js b/es/components/articleMenu/detail/index.js index aab9188be..f274a1606 100644 --- a/es/components/articleMenu/detail/index.js +++ b/es/components/articleMenu/detail/index.js @@ -50,7 +50,7 @@ export default OakComponent({ }; }, properties: { - highlightBgColor: 'none', //点击文章目录时标题高亮背景色,none为不显示高亮背景色 + highlightBgColor: 'none', allowHiddenMenu: false, }, }); diff --git a/es/components/articleMenu/list/index.d.ts b/es/components/articleMenu/list/index.d.ts index 6ee318932..cbe48873f 100644 --- a/es/components/articleMenu/list/index.d.ts +++ b/es/components/articleMenu/list/index.d.ts @@ -1,3 +1,4 @@ +/// declare const _default: (props: import("oak-frontend-base").ReactComponentProps void; onArticleClick: (atricleId: string) => void; - empty: React.ReactNode | undefined; + empty: import("react").ReactNode; changeAddArticle: (show: boolean) => void; - generateUrl: (mode: "article" | "menu", type: "detail" | "editor" | "preview" | "create", id: string) => string; + generateUrl: (mode: 'article' | 'menu', type: 'detail' | 'editor' | 'preview' | 'create', id: string) => string; }>) => React.ReactElement; export default _default; diff --git a/es/components/articleMenu/list/index.js b/es/components/articleMenu/list/index.js index f69f5e194..99b6d9ee8 100644 --- a/es/components/articleMenu/list/index.js +++ b/es/components/articleMenu/list/index.js @@ -93,7 +93,7 @@ export default OakComponent({ entity: '', entityId: '', parentId: '', - origin: 'qiniu', // cos origin默认七牛云 + origin: 'qiniu', onMenuClick: (menuId, menuName, isArticle) => undefined, onArticleClick: (atricleId) => undefined, empty: undefined, diff --git a/es/components/articleMenu/treeCell/index.d.ts b/es/components/articleMenu/treeCell/index.d.ts index 759325b36..e6a2629a8 100644 --- a/es/components/articleMenu/treeCell/index.d.ts +++ b/es/components/articleMenu/treeCell/index.d.ts @@ -2,7 +2,7 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< onRemove: () => void; onUpdateName: (name: string) => Promise; onChildEditArticleChange: (data: string) => void; - show: "preview" | "doc" | "edit"; + show: "preview" | "edit" | "doc"; getBreadcrumbItemsByParent: (breadcrumbItems: string[]) => void; breadItems: string[]; drawerOpen: boolean; diff --git a/es/components/articleMenu/treeCell/index.js b/es/components/articleMenu/treeCell/index.js index 9e2269f08..044ee9ff6 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', // edit为编辑,doc为查看,preview为预览 + show: 'edit', getBreadcrumbItemsByParent: (breadcrumbItems) => undefined, breadItems: [], drawerOpen: false, diff --git a/es/components/articleMenu/treeList/index.d.ts b/es/components/articleMenu/treeList/index.d.ts index 883f2ec84..6ccbe30a4 100644 --- a/es/components/articleMenu/treeList/index.d.ts +++ b/es/components/articleMenu/treeList/index.d.ts @@ -4,7 +4,7 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< entityId: string; parentId: string | undefined; onGrandChildEditArticleChange: (data: string) => void; - show: "preview" | "doc" | "edit"; + show: "preview" | "edit" | "doc"; articleMenuId: string; articleId: string; getBreadcrumbItems: (breadcrumbItems: string[]) => void; diff --git a/es/components/articleMenu/treeList/index.js b/es/components/articleMenu/treeList/index.js index 84ab67d6a..302412fd5 100644 --- a/es/components/articleMenu/treeList/index.js +++ b/es/components/articleMenu/treeList/index.js @@ -6,7 +6,7 @@ export default OakComponent({ entityId: '', parentId: '', onGrandChildEditArticleChange: (data) => undefined, - show: 'edit', // edit为编辑,doc为查看,preview为预览 + show: 'edit', articleMenuId: '', articleId: '', getBreadcrumbItems: (breadcrumbItems) => undefined, diff --git a/es/components/articleMenu/treeManager/index.d.ts b/es/components/articleMenu/treeManager/index.d.ts index 7e2f7ba89..925d4d1cb 100644 --- a/es/components/articleMenu/treeManager/index.d.ts +++ b/es/components/articleMenu/treeManager/index.d.ts @@ -1,7 +1,7 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps undefined, //查看全部菜单 - onMenuViewById: (articleMenuId) => undefined, //查看指定id菜单 - onArticleView: (articleId) => undefined, //查看文章 - onArticlePreview: (content, title) => undefined, //预览文章 - onArticleEdit: (articleId) => undefined, //编辑文章 + show: 'edit', + articleMenuId: '', + articleId: '', + tocPosition: 'none', + highlightBgColor: 'none', + onMenuView: () => undefined, + onMenuViewById: (articleMenuId) => undefined, + onArticleView: (articleId) => undefined, + onArticlePreview: (content, title) => undefined, + onArticleEdit: (articleId) => undefined, setCopyArticleUrl: (articleId) => '', - origin: 'qiniu', // cos origin默认七牛云 - scrollId: '', // 滚动条所在容器id,不传默认页面编辑器容器id + origin: 'qiniu', + scrollId: '', activeColor: undefined, //目录高亮颜色 }, }); diff --git a/es/components/common/qrCode/index.js b/es/components/common/qrCode/index.js index 5dd0ec1b6..9094c1ca6 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, // 传入纯Base64字符串 - encoding: 'base64', // 指定编码格式 + data: base64Data, + encoding: 'base64', success(res) { // 文件写入成功后,检查并保存到相册 that.checkAuthAndSave(filePath); diff --git a/es/components/config/style/platform/index.d.ts b/es/components/config/style/platform/index.d.ts index 2f2afe1c1..d8ca7e5a9 100644 --- a/es/components/config/style/platform/index.d.ts +++ b/es/components/config/style/platform/index.d.ts @@ -1,7 +1,7 @@ import { Style } from '../../../../types/Style'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; diff --git a/es/components/extraFile/commit/index.d.ts b/es/components/extraFile/commit/index.d.ts index 2b5d47f16..ceae5cef6 100644 --- a/es/components/extraFile/commit/index.d.ts +++ b/es/components/extraFile/commit/index.d.ts @@ -15,19 +15,19 @@ declare const _default: ) => unknown) | undefined; - type?: "button" | "submit" | "reset" | undefined; + type?: "reset" | "submit" | "button" | undefined; shape?: "default" | "rounded" | "rectangular" | undefined; children?: import("react").ReactNode; - } & Pick & import("react").ButtonHTMLAttributes, "id" | "onMouseDown" | "onMouseUp" | "onTouchEnd" | "onTouchStart"> & { + } & Pick & import("react").ButtonHTMLAttributes, "id" | "onMouseUp" | "onMouseDown" | "onTouchStart" | "onTouchEnd"> & { className?: string | undefined; style?: (import("react").CSSProperties & Partial>) | undefined; tabIndex?: number | undefined; diff --git a/es/components/extraFile/crop/index.js b/es/components/extraFile/crop/index.js index 806ab742a..125adac90 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: [], //小程序独有 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, // 下载按钮隐藏 + 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, type: 'image', origin: 'qiniu', tag1: '', @@ -67,40 +67,40 @@ export default OakComponent({ entity: '', entityId: '', theme: 'image', - enableCrop: false, //启用裁剪 - enableCompross: false, //启用压缩 + enableCrop: false, + enableCompross: false, //图片裁剪 - 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: '取消', //取消按钮的文字 + 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: '取消', //图片压缩 - 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。 + 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'], convertSize: Infinity, //文件类型包含在convertTypes中且文件大小超过此值的文件将转换为 JPEG,Infinity表示禁用该功能 }, features: ['extraFile'], diff --git a/es/components/extraFile/upload/index.js b/es/components/extraFile/upload/index.js index c61143357..9993f92db 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: [], //小程序独有 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, // 下载按钮隐藏 + 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, type: 'image', origin: 'qiniu', tag1: '', @@ -147,7 +147,7 @@ export default OakComponent({ type, tag1, tag2, - objectId: generateNewId(), // 这个域用来标识唯一性 + objectId: generateNewId(), entity, filename, size, diff --git a/es/components/session/list/index.js b/es/components/session/list/index.js index c22ab6988..afd4e8a62 100644 --- a/es/components/session/list/index.js +++ b/es/components/session/list/index.js @@ -140,12 +140,12 @@ export default OakComponent({ unSub: undefined, }, properties: { - entity: '', // entity端,指示相应的entity - entityFilter: null, // entity端,指示相应的entity查询条件 + entity: '', + entityFilter: null, entityFilterSubStr: '', - entityDisplay: (data) => [], // user端,指示如何显示entity对象名称 - entityProjection: null, // user端,指示需要取哪些entity的属性来显示entityDisplay - sessionId: '', // 指示需要打开的默认session + entityDisplay: (data) => [], + entityProjection: null, + sessionId: '', dialog: false, onItemClick: null, }, diff --git a/es/components/sessionMessage/list/index.js b/es/components/sessionMessage/list/index.js index 608733d85..c87698fd2 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) => [], // user端,指示如何显示entity对象名称 + entityDisplay: (data) => [], entityProjection: null, // user端,指示需要取哪些entity的属性来显示entityDisplay }, filters: [ diff --git a/es/components/user/login/email/index.js b/es/components/user/login/email/index.js index f87f9b258..dd10e9af6 100644 --- a/es/components/user/login/email/index.js +++ b/es/components/user/login/email/index.js @@ -21,8 +21,8 @@ export default OakComponent({ }, properties: { disabled: '', - url: '', // 登录系统之后要返回的页面 - callback: undefined, // 登录成功回调,排除微信登录方式 + url: '', + callback: undefined, setLoginMode: (value) => undefined, digit: 4, //验证码位数 }, diff --git a/es/components/user/login/index.js b/es/components/user/login/index.js index f67afca4c..71b1fb71a 100644 --- a/es/components/user/login/index.js +++ b/es/components/user/login/index.js @@ -17,15 +17,15 @@ export default OakComponent({ allowPassword: false, allowWechatMp: false, setLoginModeMp(value) { this.setLoginMode(value); }, - smsDigit: 4, //短信验证码位数 + smsDigit: 4, emailDigit: 4, //邮箱验证码位数 }, properties: { onlyCaptcha: false, onlyPassword: false, disabled: '', - redirectUri: '', // 微信登录后的redirectUri,要指向wechatUser/login去处理 - url: '', // 登录系统之后要返回的页面 + redirectUri: '', + url: '', callback: undefined, // 登录成功回调,排除微信登录方式 }, formData({ features, props }) { diff --git a/es/components/user/login/password/index.js b/es/components/user/login/password/index.js index c841c6228..df5ec579b 100644 --- a/es/components/user/login/password/index.js +++ b/es/components/user/login/password/index.js @@ -18,12 +18,12 @@ export default OakComponent({ }, properties: { disabled: '', - redirectUri: '', // 微信登录后的redirectUri,要指向wechatUser/login去处理 - url: '', // 登录系统之后要返回的页面 - callback: undefined, // 登录成功回调,排除微信登录方式 + redirectUri: '', + url: '', + callback: undefined, allowSms: false, allowEmail: false, - allowWechatMp: false, //小程序切换授权登录 + allowWechatMp: false, setLoginMode: (value) => undefined, }, lifetimes: {}, diff --git a/es/components/user/login/sms/index.js b/es/components/user/login/sms/index.js index aa98691ba..ce3cbbaac 100644 --- a/es/components/user/login/sms/index.js +++ b/es/components/user/login/sms/index.js @@ -21,10 +21,10 @@ export default OakComponent({ }, properties: { disabled: '', - url: '', // 登录系统之后要返回的页面 - callback: undefined, // 登录成功回调,排除微信登录方式 - allowPassword: false, //小程序切换密码登录 - allowWechatMp: false, //小程序切换授权登录 + url: '', + callback: undefined, + allowPassword: false, + allowWechatMp: false, setLoginMode: (value) => undefined, digit: 4 //验证码位数, }, diff --git a/es/components/userEntityGrant/share/index.js b/es/components/userEntityGrant/share/index.js index 80a0e8f3f..248669898 100644 --- a/es/components/userEntityGrant/share/index.js +++ b/es/components/userEntityGrant/share/index.js @@ -17,7 +17,7 @@ export default OakComponent({ id: 1, entity: 1, entityId: 1, - type: 1, //类型 + type: 1, ticket: 1, url: 1, buffer: 1, diff --git a/es/components/wechatLogin/qrCode/index.d.ts b/es/components/wechatLogin/qrCode/index.d.ts index 21f928111..db7fcdc9b 100644 --- a/es/components/wechatLogin/qrCode/index.d.ts +++ b/es/components/wechatLogin/qrCode/index.d.ts @@ -1,6 +1,6 @@ import { EntityDict } from '../../../oak-app-domain'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement; diff --git a/es/components/wechatQrCode/share/index.js b/es/components/wechatQrCode/share/index.js index 0e502a84d..643fb477e 100644 --- a/es/components/wechatQrCode/share/index.js +++ b/es/components/wechatQrCode/share/index.js @@ -4,7 +4,7 @@ export default OakComponent({ id: 1, entity: 1, entityId: 1, - type: 1, //类型 + type: 1, ticket: 1, url: 1, buffer: 1, diff --git a/es/oak-app-domain/ActionAuth/Storage.js b/es/oak-app-domain/ActionAuth/Storage.js index c00c97f56..44aefb81a 100644 --- a/es/oak-app-domain/ActionAuth/Storage.js +++ b/es/oak-app-domain/ActionAuth/Storage.js @@ -15,7 +15,6 @@ export const desc = { type: "object" } }, - static: true, actionType: "crud", actions, indexes: [ diff --git a/es/oak-app-domain/EntityDict.d.ts b/es/oak-app-domain/EntityDict.d.ts index 332b7d0f8..d96a55a31 100644 --- a/es/oak-app-domain/EntityDict.d.ts +++ b/es/oak-app-domain/EntityDict.d.ts @@ -87,12 +87,14 @@ export type ActionAuth = { Aggregation: DeduceAggregation; CreateOperationData: FormCreateData | OakOperation; + path?: OakOperation<"create", Path["CreateOperationData"]> | OakOperation; }>; CreateSingle: OakOperation<"create", ActionAuth["CreateOperationData"]>; CreateMulti: OakOperation<"create", Array>; Create: ActionAuth["CreateSingle"] | ActionAuth["CreateMulti"]; UpdateOperationData: FormUpdateData | OakOperation | OakOperation<"remove", Relation["RemoveOperationData"], Relation["Filter"]>; + path?: OakOperation<"create", Path["CreateOperationData"]> | OakOperation | OakOperation<"remove", Path["RemoveOperationData"], Path["Filter"]>; }>; Update: OakOperation; RemoveOperationData: {}; @@ -370,11 +372,17 @@ export type Path = { Sorter: Path["SortNode"][]; Selection: OakSelection<"select", Path["Projection"], Path["Filter"], Path["Sorter"]>; Aggregation: DeduceAggregation; - CreateOperationData: FormCreateData; + CreateOperationData: FormCreateData | Omit[]> | OakOperation, ActionAuth["Filter"]>)[]; + relationAuth$path?: (OakOperation<"create", Omit | Omit[]> | OakOperation, RelationAuth["Filter"]>)[]; + }>; CreateSingle: OakOperation<"create", Path["CreateOperationData"]>; CreateMulti: OakOperation<"create", Array>; Create: Path["CreateSingle"] | Path["CreateMulti"]; - UpdateOperationData: FormUpdateData; + UpdateOperationData: FormUpdateData | Omit[]> | OakOperation, ActionAuth["Filter"]> | OakOperation<"remove", ActionAuth["RemoveOperationData"], ActionAuth["Filter"]>)[]; + relationAuth$path?: (OakOperation<"create", Omit | Omit[]> | OakOperation, RelationAuth["Filter"]> | OakOperation<"remove", RelationAuth["RemoveOperationData"], RelationAuth["Filter"]>)[]; + }>; Update: OakOperation; RemoveOperationData: {}; Remove: OakOperation<"remove", Path["RemoveOperationData"], Path["Filter"], Path["Sorter"]>; @@ -460,6 +468,9 @@ export type Relation = { platform?: OakOperation<"create", Platform["CreateOperationData"]> | OakOperation; session?: OakOperation<"create", Session["CreateOperationData"]> | OakOperation; toDo?: OakOperation<"create", ToDo["CreateOperationData"]> | OakOperation; + actionAuth$relation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, ActionAuth["Filter"]>)[]; + relationAuth$sourceRelation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, RelationAuth["Filter"]>)[]; + relationAuth$destRelation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, RelationAuth["Filter"]>)[]; userEntityClaim$relation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, UserEntityClaim["Filter"]>)[]; userRelation$relation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, UserRelation["Filter"]>)[]; }>; @@ -470,6 +481,9 @@ export type Relation = { platform?: OakOperation<"create", Platform["CreateOperationData"]> | OakOperation | OakOperation<"remove", Platform["RemoveOperationData"], Platform["Filter"]>; session?: OakOperation<"create", Session["CreateOperationData"]> | OakOperation | OakOperation<"remove", Session["RemoveOperationData"], Session["Filter"]>; toDo?: OakOperation<"create", ToDo["CreateOperationData"]> | OakOperation | OakOperation<"remove", ToDo["RemoveOperationData"], ToDo["Filter"]>; + actionAuth$relation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, ActionAuth["Filter"]> | OakOperation<"remove", ActionAuth["RemoveOperationData"], ActionAuth["Filter"]>)[]; + relationAuth$sourceRelation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, RelationAuth["Filter"]> | OakOperation<"remove", RelationAuth["RemoveOperationData"], RelationAuth["Filter"]>)[]; + relationAuth$destRelation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, RelationAuth["Filter"]> | OakOperation<"remove", RelationAuth["RemoveOperationData"], RelationAuth["Filter"]>)[]; userEntityClaim$relation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, UserEntityClaim["Filter"]> | OakOperation<"remove", UserEntityClaim["RemoveOperationData"], UserEntityClaim["Filter"]>)[]; userRelation$relation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, UserRelation["Filter"]> | OakOperation<"remove", UserRelation["RemoveOperationData"], UserRelation["Filter"]>)[]; }>; @@ -511,6 +525,7 @@ export type RelationAuth = { Aggregation: DeduceAggregation; CreateOperationData: FormCreateData | OakOperation; + path?: OakOperation<"create", Path["CreateOperationData"]> | OakOperation; destRelation?: OakOperation<"create", Relation["CreateOperationData"]> | OakOperation; }>; CreateSingle: OakOperation<"create", RelationAuth["CreateOperationData"]>; @@ -518,6 +533,7 @@ export type RelationAuth = { Create: RelationAuth["CreateSingle"] | RelationAuth["CreateMulti"]; UpdateOperationData: FormUpdateData | OakOperation | OakOperation<"remove", Relation["RemoveOperationData"], Relation["Filter"]>; + path?: OakOperation<"create", Path["CreateOperationData"]> | OakOperation | OakOperation<"remove", Path["RemoveOperationData"], Path["Filter"]>; destRelation?: OakOperation<"create", Relation["CreateOperationData"]> | OakOperation | OakOperation<"remove", Relation["RemoveOperationData"], Relation["Filter"]>; }>; Update: OakOperation; diff --git a/es/oak-app-domain/I18n/Storage.js b/es/oak-app-domain/I18n/Storage.js index fdd6b8711..aa5cee379 100644 --- a/es/oak-app-domain/I18n/Storage.js +++ b/es/oak-app-domain/I18n/Storage.js @@ -34,7 +34,6 @@ export const desc = { type: "object" } }, - static: true, actionType: "crud", actions, indexes: [ diff --git a/es/oak-app-domain/Path/Storage.js b/es/oak-app-domain/Path/Storage.js index d3562b8ca..ced462487 100644 --- a/es/oak-app-domain/Path/Storage.js +++ b/es/oak-app-domain/Path/Storage.js @@ -16,7 +16,6 @@ export const desc = { } }, recursive: { - notNull: true, type: "boolean" }, sourceEntity: { @@ -33,7 +32,6 @@ export const desc = { } } }, - static: true, actionType: "crud", actions, indexes: [ diff --git a/es/oak-app-domain/Path/_baseSchema.d.ts b/es/oak-app-domain/Path/_baseSchema.d.ts index 8b80c7430..8801ba0ba 100644 --- a/es/oak-app-domain/Path/_baseSchema.d.ts +++ b/es/oak-app-domain/Path/_baseSchema.d.ts @@ -5,7 +5,7 @@ import { String, Boolean } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { destEntity: String<32>; value: String<256>; - recursive: Boolean; + recursive?: Boolean | null; sourceEntity: String<32>; desc?: String<256> | null; } & { diff --git a/es/oak-app-domain/RelationAuth/Storage.js b/es/oak-app-domain/RelationAuth/Storage.js index 72fd67db3..8e4d8fc63 100644 --- a/es/oak-app-domain/RelationAuth/Storage.js +++ b/es/oak-app-domain/RelationAuth/Storage.js @@ -17,7 +17,6 @@ export const desc = { ref: "relation" } }, - static: true, actionType: "crud", actions, indexes: [ diff --git a/es/triggers/index.d.ts b/es/triggers/index.d.ts index 318750dd1..fc7f50979 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>)[]; +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>)[]; export default _default; diff --git a/es/triggers/notification.js b/es/triggers/notification.js index c5859ffeb..0d40730d2 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, // 在notification创建时就赋值了 + openId: data1.openId, page, state: StateDict[process.env.NODE_ENV], }); diff --git a/lib/aspects/token.js b/lib/aspects/token.js index 41a58cee0..69b28ccbe 100644 --- a/lib/aspects/token.js +++ b/lib/aspects/token.js @@ -2444,8 +2444,8 @@ async function refreshToken(params, context) { // 只有server模式去刷新token // 'development' | 'production' | 'staging' const intervals = { - development: 7200 * 1000, // 2小时 - staging: 600 * 1000, // 十分钟 + development: 7200 * 1000, + staging: 600 * 1000, production: 600 * 1000, // 十分钟 }; let applicationId = token.applicationId; diff --git a/lib/aspects/wechatQrCode.js b/lib/aspects/wechatQrCode.js index ca61a4536..c53c64cc7 100644 --- a/lib/aspects/wechatQrCode.js +++ b/lib/aspects/wechatQrCode.js @@ -166,7 +166,7 @@ async function createWechatQrCode(options, context) { permanent, url, expired: false, - expiresAt: Date.now() + 2592000 * 1000, // wecharQrCode里的过期时间都放到最大,由上层关联对象来主动过期(by Xc, 20230131) + expiresAt: Date.now() + 2592000 * 1000, props, }; // 直接创建 diff --git a/lib/oak-app-domain/ActionAuth/Storage.js b/lib/oak-app-domain/ActionAuth/Storage.js index dd1c1f749..492f275fb 100644 --- a/lib/oak-app-domain/ActionAuth/Storage.js +++ b/lib/oak-app-domain/ActionAuth/Storage.js @@ -18,7 +18,6 @@ exports.desc = { type: "object" } }, - static: true, actionType: "crud", actions: action_1.genericActions, indexes: [ diff --git a/lib/oak-app-domain/EntityDict.d.ts b/lib/oak-app-domain/EntityDict.d.ts index 332b7d0f8..d96a55a31 100644 --- a/lib/oak-app-domain/EntityDict.d.ts +++ b/lib/oak-app-domain/EntityDict.d.ts @@ -87,12 +87,14 @@ export type ActionAuth = { Aggregation: DeduceAggregation; CreateOperationData: FormCreateData | OakOperation; + path?: OakOperation<"create", Path["CreateOperationData"]> | OakOperation; }>; CreateSingle: OakOperation<"create", ActionAuth["CreateOperationData"]>; CreateMulti: OakOperation<"create", Array>; Create: ActionAuth["CreateSingle"] | ActionAuth["CreateMulti"]; UpdateOperationData: FormUpdateData | OakOperation | OakOperation<"remove", Relation["RemoveOperationData"], Relation["Filter"]>; + path?: OakOperation<"create", Path["CreateOperationData"]> | OakOperation | OakOperation<"remove", Path["RemoveOperationData"], Path["Filter"]>; }>; Update: OakOperation; RemoveOperationData: {}; @@ -370,11 +372,17 @@ export type Path = { Sorter: Path["SortNode"][]; Selection: OakSelection<"select", Path["Projection"], Path["Filter"], Path["Sorter"]>; Aggregation: DeduceAggregation; - CreateOperationData: FormCreateData; + CreateOperationData: FormCreateData | Omit[]> | OakOperation, ActionAuth["Filter"]>)[]; + relationAuth$path?: (OakOperation<"create", Omit | Omit[]> | OakOperation, RelationAuth["Filter"]>)[]; + }>; CreateSingle: OakOperation<"create", Path["CreateOperationData"]>; CreateMulti: OakOperation<"create", Array>; Create: Path["CreateSingle"] | Path["CreateMulti"]; - UpdateOperationData: FormUpdateData; + UpdateOperationData: FormUpdateData | Omit[]> | OakOperation, ActionAuth["Filter"]> | OakOperation<"remove", ActionAuth["RemoveOperationData"], ActionAuth["Filter"]>)[]; + relationAuth$path?: (OakOperation<"create", Omit | Omit[]> | OakOperation, RelationAuth["Filter"]> | OakOperation<"remove", RelationAuth["RemoveOperationData"], RelationAuth["Filter"]>)[]; + }>; Update: OakOperation; RemoveOperationData: {}; Remove: OakOperation<"remove", Path["RemoveOperationData"], Path["Filter"], Path["Sorter"]>; @@ -460,6 +468,9 @@ export type Relation = { platform?: OakOperation<"create", Platform["CreateOperationData"]> | OakOperation; session?: OakOperation<"create", Session["CreateOperationData"]> | OakOperation; toDo?: OakOperation<"create", ToDo["CreateOperationData"]> | OakOperation; + actionAuth$relation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, ActionAuth["Filter"]>)[]; + relationAuth$sourceRelation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, RelationAuth["Filter"]>)[]; + relationAuth$destRelation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, RelationAuth["Filter"]>)[]; userEntityClaim$relation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, UserEntityClaim["Filter"]>)[]; userRelation$relation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, UserRelation["Filter"]>)[]; }>; @@ -470,6 +481,9 @@ export type Relation = { platform?: OakOperation<"create", Platform["CreateOperationData"]> | OakOperation | OakOperation<"remove", Platform["RemoveOperationData"], Platform["Filter"]>; session?: OakOperation<"create", Session["CreateOperationData"]> | OakOperation | OakOperation<"remove", Session["RemoveOperationData"], Session["Filter"]>; toDo?: OakOperation<"create", ToDo["CreateOperationData"]> | OakOperation | OakOperation<"remove", ToDo["RemoveOperationData"], ToDo["Filter"]>; + actionAuth$relation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, ActionAuth["Filter"]> | OakOperation<"remove", ActionAuth["RemoveOperationData"], ActionAuth["Filter"]>)[]; + relationAuth$sourceRelation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, RelationAuth["Filter"]> | OakOperation<"remove", RelationAuth["RemoveOperationData"], RelationAuth["Filter"]>)[]; + relationAuth$destRelation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, RelationAuth["Filter"]> | OakOperation<"remove", RelationAuth["RemoveOperationData"], RelationAuth["Filter"]>)[]; userEntityClaim$relation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, UserEntityClaim["Filter"]> | OakOperation<"remove", UserEntityClaim["RemoveOperationData"], UserEntityClaim["Filter"]>)[]; userRelation$relation?: (OakOperation<"create", Omit | Omit[]> | OakOperation, UserRelation["Filter"]> | OakOperation<"remove", UserRelation["RemoveOperationData"], UserRelation["Filter"]>)[]; }>; @@ -511,6 +525,7 @@ export type RelationAuth = { Aggregation: DeduceAggregation; CreateOperationData: FormCreateData | OakOperation; + path?: OakOperation<"create", Path["CreateOperationData"]> | OakOperation; destRelation?: OakOperation<"create", Relation["CreateOperationData"]> | OakOperation; }>; CreateSingle: OakOperation<"create", RelationAuth["CreateOperationData"]>; @@ -518,6 +533,7 @@ export type RelationAuth = { Create: RelationAuth["CreateSingle"] | RelationAuth["CreateMulti"]; UpdateOperationData: FormUpdateData | OakOperation | OakOperation<"remove", Relation["RemoveOperationData"], Relation["Filter"]>; + path?: OakOperation<"create", Path["CreateOperationData"]> | OakOperation | OakOperation<"remove", Path["RemoveOperationData"], Path["Filter"]>; destRelation?: OakOperation<"create", Relation["CreateOperationData"]> | OakOperation | OakOperation<"remove", Relation["RemoveOperationData"], Relation["Filter"]>; }>; Update: OakOperation; diff --git a/lib/oak-app-domain/I18n/Storage.js b/lib/oak-app-domain/I18n/Storage.js index 5e5fed31d..a320afc20 100644 --- a/lib/oak-app-domain/I18n/Storage.js +++ b/lib/oak-app-domain/I18n/Storage.js @@ -37,7 +37,6 @@ exports.desc = { type: "object" } }, - static: true, actionType: "crud", actions: action_1.genericActions, indexes: [ diff --git a/lib/oak-app-domain/Path/Storage.js b/lib/oak-app-domain/Path/Storage.js index 30e5cb42e..b2d3c6fb0 100644 --- a/lib/oak-app-domain/Path/Storage.js +++ b/lib/oak-app-domain/Path/Storage.js @@ -19,7 +19,6 @@ exports.desc = { } }, recursive: { - notNull: true, type: "boolean" }, sourceEntity: { @@ -36,7 +35,6 @@ exports.desc = { } } }, - static: true, actionType: "crud", actions: action_1.genericActions, indexes: [ diff --git a/lib/oak-app-domain/Path/_baseSchema.d.ts b/lib/oak-app-domain/Path/_baseSchema.d.ts index 8b80c7430..8801ba0ba 100644 --- a/lib/oak-app-domain/Path/_baseSchema.d.ts +++ b/lib/oak-app-domain/Path/_baseSchema.d.ts @@ -5,7 +5,7 @@ import { String, Boolean } from "oak-domain/lib/types/DataType"; export type OpSchema = EntityShape & { destEntity: String<32>; value: String<256>; - recursive: Boolean; + recursive?: Boolean | null; sourceEntity: String<32>; desc?: String<256> | null; } & { diff --git a/lib/oak-app-domain/RelationAuth/Storage.js b/lib/oak-app-domain/RelationAuth/Storage.js index d47538ab6..94b4052d4 100644 --- a/lib/oak-app-domain/RelationAuth/Storage.js +++ b/lib/oak-app-domain/RelationAuth/Storage.js @@ -20,7 +20,6 @@ exports.desc = { ref: "relation" } }, - static: true, actionType: "crud", actions: action_1.genericActions, indexes: [ diff --git a/lib/triggers/notification.js b/lib/triggers/notification.js index ca7df6315..594d30e40 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, // 在notification创建时就赋值了 + openId: data1.openId, page, state: StateDict[process.env.NODE_ENV], });