diff --git a/es/aspects/token.js b/es/aspects/token.js index cd5359091..d6ba541da 100644 --- a/es/aspects/token.js +++ b/es/aspects/token.js @@ -509,7 +509,7 @@ export async function loginByMobile(params, context) { }, { dontCollect: true }); if (!existMobile) { closeRootMode(); - throw new OakUserException('手机号无效,请先联系管理员获取权限'); + throw new OakUserException('账号不存在'); } } const tokenId = await loginLogic(); diff --git a/es/checkers/index.d.ts b/es/checkers/index.d.ts index 1c141fe16..46b6c8266 100644 --- a/es/checkers/index.d.ts +++ b/es/checkers/index.d.ts @@ -1,2 +1,2 @@ -declare const checkers: (import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker)[]; +declare const checkers: (import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker)[]; export default checkers; diff --git a/es/components/common/tabBar/index.d.ts b/es/components/common/tabBar/index.d.ts index 33c56713f..c56abc303 100644 --- a/es/components/common/tabBar/index.d.ts +++ b/es/components/common/tabBar/index.d.ts @@ -15,5 +15,7 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< color: string; selectedColor: string; border: boolean; + selectedIconPath: string; + iconPath: string; }>) => import("react").ReactElement>; export default _default; diff --git a/es/components/common/tabBar/index.js b/es/components/common/tabBar/index.js index 912f60bfb..eeb723dcd 100644 --- a/es/components/common/tabBar/index.js +++ b/es/components/common/tabBar/index.js @@ -35,10 +35,7 @@ export default OakComponent({ let index; for (let i = 0; i < list.length; i++) { const pagePath = list[i].pagePath; - const pathname = this.features.navigator.getPathname( - pagePath, - namespace - ); + const pathname = this.features.navigator.getPathname(pagePath, namespace); if (pathname === currentPagePath) { index = i; break; diff --git a/es/components/common/tabBar/index.xml b/es/components/common/tabBar/index.xml index 7b109225e..8abc94be8 100644 --- a/es/components/common/tabBar/index.xml +++ b/es/components/common/tabBar/index.xml @@ -5,12 +5,12 @@ - - - - - - + + + + + + diff --git a/es/components/extraFile/commit/index.d.ts b/es/components/extraFile/commit/index.d.ts index dbf84b41c..31ef8a2fb 100644 --- a/es/components/extraFile/commit/index.d.ts +++ b/es/components/extraFile/commit/index.d.ts @@ -12,7 +12,7 @@ declare const _default: > | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; +declare const _default: (import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; export default _default; diff --git a/es/triggers/toDo.d.ts b/es/triggers/toDo.d.ts index 3c8646ad8..95d028df6 100644 --- a/es/triggers/toDo.d.ts +++ b/es/triggers/toDo.d.ts @@ -12,7 +12,7 @@ export declare function createToDo; +}, userIds?: string[]): Promise<1 | 0>; /** * 完成todo例程,当在entity对象上进行action操作时(操作条件是filter),将对应的todo完成 * 必须在entity的action的后trigger中调用 diff --git a/lib/aspects/token.js b/lib/aspects/token.js index fbb122fb8..56e3d0ebd 100644 --- a/lib/aspects/token.js +++ b/lib/aspects/token.js @@ -136,15 +136,15 @@ async function dealWithUserState(user, context, tokenData) { * @return tokenId */ async function setUpTokenAndUser(env, context, entity, // 支持更多的登录渠道使用此函数创建token - entityId, // 如果是现有对象传id,如果没有对象传createData - createData, user) { +entityId, // 如果是现有对象传id,如果没有对象传createData +createData, user) { const currentToken = context.getToken(true); const schema = context.getSchema(); (0, assert_1.assert)(schema.hasOwnProperty(entity), `${entity}必须是有效的对象名 `); (0, assert_1.assert)(schema.token.attributes.entity.ref.includes(entity), `${entity}必须是token的有效关联对象`); (0, assert_1.assert)(schema[entity].attributes.hasOwnProperty('userId') && schema[entity].attributes.userId.ref === - 'user', `${entity}必须有指向user的userId属性`); + 'user', `${entity}必须有指向user的userId属性`); if (currentToken) { (0, assert_1.assert)(currentToken.id); (0, assert_1.assert)(currentToken.userId); @@ -656,7 +656,7 @@ async function tryRefreshWechatPublicUserInfo(wechatUserId, context) { const { nickname, gender, avatar } = await wechatInstance.getUserInfo(accessToken, openId); await setUserInfoFromWechat(user, { nickname, gender: gender, avatar }, context); } -async function refreshWechatPublicUserInfo({ }, context) { +async function refreshWechatPublicUserInfo({}, context) { const tokenValue = context.getTokenValue(); const [token] = await context.select('token', { data: { @@ -1225,7 +1225,7 @@ async function getWechatMpUserPhoneNumber({ code, env }, context) { return reuslt; } exports.getWechatMpUserPhoneNumber = getWechatMpUserPhoneNumber; -async function logout({ }, context) { +async function logout({}, context) { const tokenId = context.getTokenValue(); if (tokenId) { const closeRootMode = context.openRootMode(); diff --git a/lib/checkers/index.d.ts b/lib/checkers/index.d.ts index 1c141fe16..46b6c8266 100644 --- a/lib/checkers/index.d.ts +++ b/lib/checkers/index.d.ts @@ -1,2 +1,2 @@ -declare const checkers: (import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker)[]; +declare const checkers: (import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker)[]; export default checkers; diff --git a/lib/features/extraFile.js b/lib/features/extraFile.js index 42845cdb2..1b6af527a 100644 --- a/lib/features/extraFile.js +++ b/lib/features/extraFile.js @@ -195,6 +195,21 @@ class ExtraFile extends oak_frontend_base_1.Feature { try { const cos = (0, cos_1.getCos)(newExtraFile.origin); await cos.upload(newExtraFile, up.uploadFile, file, this.uploadToAspect.bind(this)); + if (!cos.autoInform()) { + await this.cache.exec('operate', { + entity: 'extraFile', + operation: { + id: await (0, uuid_1.generateNewIdAsync)(), + action: 'update', + data: { + uploadState: 'success', + }, + filter: { + id: extraFileId, + }, + }, + }); + } this.publish(); return this.getUrl(newExtraFile); } diff --git a/lib/triggers/index.d.ts b/lib/triggers/index.d.ts index 0770eae70..6fb3c0b29 100644 --- a/lib/triggers/index.d.ts +++ b/lib/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; +declare const _default: (import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; export default _default; diff --git a/lib/triggers/toDo.d.ts b/lib/triggers/toDo.d.ts index 3c8646ad8..95d028df6 100644 --- a/lib/triggers/toDo.d.ts +++ b/lib/triggers/toDo.d.ts @@ -12,7 +12,7 @@ export declare function createToDo; +}, userIds?: string[]): Promise<1 | 0>; /** * 完成todo例程,当在entity对象上进行action操作时(操作条件是filter),将对应的todo完成 * 必须在entity的action的后trigger中调用