From fb42a7efb9cb4d9b31e437e3d94ccc39c5a764b4 Mon Sep 17 00:00:00 2001 From: wangwenchen <920960949@qq.com> Date: Fri, 26 Jan 2024 18:49:50 +0800 Subject: [PATCH] token --- es/components/config/style/platform/index.d.ts | 2 +- es/components/config/upsert/index.d.ts | 2 +- es/components/extraFile/commit/index.d.ts | 6 +++--- es/components/userEntityGrant/claim/ubPicker/index.d.ts | 4 ++-- es/components/userEntityGrant/upsert/index.d.ts | 4 ++-- .../userRelation/upsert/byUserEntityGrant/web.pc.js | 2 +- es/oak-app-domain/Account/Action.js | 2 +- es/oak-app-domain/Email/Action.js | 2 +- es/oak-app-domain/Mobile/Action.js | 2 +- es/oak-app-domain/Session/Storage.js | 2 +- es/oak-app-domain/ToDo/Storage.js | 2 +- es/oak-app-domain/Token/Action.js | 2 +- es/oak-app-domain/WechatLogin/Storage.js | 2 +- es/triggers/toDo.d.ts | 2 +- lib/aspects/wechatMpJump.js | 8 ++++++++ lib/data/userRole.js | 2 ++ src/aspects/wechatMpJump.ts | 8 ++++++++ .../userRelation/upsert/byUserEntityGrant/web.pc.tsx | 2 +- src/data/userRole.ts | 2 ++ 19 files changed, 39 insertions(+), 19 deletions(-) diff --git a/es/components/config/style/platform/index.d.ts b/es/components/config/style/platform/index.d.ts index bd3579c54..0017a6f93 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) => import("react").ReactElement>; diff --git a/es/components/config/upsert/index.d.ts b/es/components/config/upsert/index.d.ts index 6a8e95a3d..26655e31f 100644 --- a/es/components/config/upsert/index.d.ts +++ b/es/components/config/upsert/index.d.ts @@ -1,7 +1,7 @@ import { Config } from '../../../types/Config'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; diff --git a/es/components/extraFile/commit/index.d.ts b/es/components/extraFile/commit/index.d.ts index 2fa2ef7ba..e18ec3149 100644 --- a/es/components/extraFile/commit/index.d.ts +++ b/es/components/extraFile/commit/index.d.ts @@ -12,9 +12,9 @@ declare const _default: & import("react").ButtonHTMLAttributes, "id" | "onMouseUp" | "onMouseDown" | "onTouchStart" | "onTouchEnd"> & { + } & Pick & import("react").ButtonHTMLAttributes, "id" | "onMouseDown" | "onMouseUp" | "onTouchStart" | "onTouchEnd"> & { className?: string | undefined; style?: (import("react").CSSProperties & Partial>) | undefined; tabIndex?: number | undefined; diff --git a/es/components/userEntityGrant/claim/ubPicker/index.d.ts b/es/components/userEntityGrant/claim/ubPicker/index.d.ts index b29d102ca..dbb7f06e5 100644 --- a/es/components/userEntityGrant/claim/ubPicker/index.d.ts +++ b/es/components/userEntityGrant/claim/ubPicker/index.d.ts @@ -4,8 +4,8 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< entity: keyof EntityDict; entityFilter: any; relationIds: string[]; - rule: "single" | "all" | "free"; - ruleOnRow: "single" | "all" | "free"; + rule: "all" | "single" | "free"; + ruleOnRow: "all" | "single" | "free"; onPickRelations: (ids: string[]) => void; onPickRows: (ids: string[]) => void; pickedRowIds: string[] | undefined; diff --git a/es/components/userEntityGrant/upsert/index.d.ts b/es/components/userEntityGrant/upsert/index.d.ts index 960926763..5f8ad2f06 100644 --- a/es/components/userEntityGrant/upsert/index.d.ts +++ b/es/components/userEntityGrant/upsert/index.d.ts @@ -11,7 +11,7 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< claimUrl: string; qrCodeType: QrCodeType; multiple: boolean; - rule: "single" | "all" | "free"; - ruleOnRow: "single" | "all" | "free"; + rule: "all" | "single" | "free"; + ruleOnRow: "all" | "single" | "free"; }>) => import("react").ReactElement>; export default _default; diff --git a/es/components/userRelation/upsert/byUserEntityGrant/web.pc.js b/es/components/userRelation/upsert/byUserEntityGrant/web.pc.js index 91078746e..15db8f1f5 100644 --- a/es/components/userRelation/upsert/byUserEntityGrant/web.pc.js +++ b/es/components/userRelation/upsert/byUserEntityGrant/web.pc.js @@ -25,7 +25,7 @@ export default function render(props) { }} options={relations?.map((ele) => ({ value: ele.id, label: ele.display || - t(`${relationEntity}:r.${ele.name}`), + relationEntity && t(`${relationEntity}:r.${ele.name}`), }))}/> {relationIds?.length > 1 && ( diff --git a/es/oak-app-domain/Account/Action.js b/es/oak-app-domain/Account/Action.js index e6e662154..b63a357e5 100644 --- a/es/oak-app-domain/Account/Action.js +++ b/es/oak-app-domain/Account/Action.js @@ -1,4 +1,4 @@ -import { makeAbleActionDef } from 'oak-domain/lib/actions/action'; +import { makeAbleActionDef } from "oak-domain/lib/actions/action"; export const actions = ["count", "stat", "download", "select", "aggregate", "create", "remove", "update", "enable", "disable", "charge", "withdraw", "cost", "refund", "loan", "repay"]; const AbleActionDef = makeAbleActionDef('enabled'); export const ActionDefDict = { diff --git a/es/oak-app-domain/Email/Action.js b/es/oak-app-domain/Email/Action.js index 9149fe20a..bb8d79f74 100644 --- a/es/oak-app-domain/Email/Action.js +++ b/es/oak-app-domain/Email/Action.js @@ -1,4 +1,4 @@ -import { makeAbleActionDef } from 'oak-domain/lib/actions/action'; +import { makeAbleActionDef } from "oak-domain/lib/actions/action"; export const actions = ["count", "stat", "download", "select", "aggregate", "create", "remove", "update", "enable", "disable"]; const AbleActionDef = makeAbleActionDef('enabled'); export const ActionDefDict = { diff --git a/es/oak-app-domain/Mobile/Action.js b/es/oak-app-domain/Mobile/Action.js index 9149fe20a..bb8d79f74 100644 --- a/es/oak-app-domain/Mobile/Action.js +++ b/es/oak-app-domain/Mobile/Action.js @@ -1,4 +1,4 @@ -import { makeAbleActionDef } from 'oak-domain/lib/actions/action'; +import { makeAbleActionDef } from "oak-domain/lib/actions/action"; export const actions = ["count", "stat", "download", "select", "aggregate", "create", "remove", "update", "enable", "disable"]; const AbleActionDef = makeAbleActionDef('enabled'); export const ActionDefDict = { diff --git a/es/oak-app-domain/Session/Storage.js b/es/oak-app-domain/Session/Storage.js index a80134c4b..c84295a39 100644 --- a/es/oak-app-domain/Session/Storage.js +++ b/es/oak-app-domain/Session/Storage.js @@ -32,5 +32,5 @@ export const desc = { }, actionType: "crud", actions, - relation: ['partner'] + relation: ["partner"] }; diff --git a/es/oak-app-domain/ToDo/Storage.js b/es/oak-app-domain/ToDo/Storage.js index 62bc127af..9034db347 100644 --- a/es/oak-app-domain/ToDo/Storage.js +++ b/es/oak-app-domain/ToDo/Storage.js @@ -51,5 +51,5 @@ export const desc = { }, actionType: "crud", actions, - relation: ['collaborator'] + relation: ["collaborator"] }; diff --git a/es/oak-app-domain/Token/Action.js b/es/oak-app-domain/Token/Action.js index 9149fe20a..bb8d79f74 100644 --- a/es/oak-app-domain/Token/Action.js +++ b/es/oak-app-domain/Token/Action.js @@ -1,4 +1,4 @@ -import { makeAbleActionDef } from 'oak-domain/lib/actions/action'; +import { makeAbleActionDef } from "oak-domain/lib/actions/action"; export const actions = ["count", "stat", "download", "select", "aggregate", "create", "remove", "update", "enable", "disable"]; const AbleActionDef = makeAbleActionDef('enabled'); export const ActionDefDict = { diff --git a/es/oak-app-domain/WechatLogin/Storage.js b/es/oak-app-domain/WechatLogin/Storage.js index fa5485ccd..199ccec95 100644 --- a/es/oak-app-domain/WechatLogin/Storage.js +++ b/es/oak-app-domain/WechatLogin/Storage.js @@ -20,7 +20,7 @@ export const desc = { qrCodeType: { notNull: true, type: "enum", - enumeration: ["wechatMpDomainUrl", "wechatMpWxaCode", "wechatPublic", "wechatPublicForMp", "webForWechatPublic"] + enumeration: ["wechatPublic", "wechatMpDomainUrl", "wechatMpWxaCode", "wechatPublicForMp", "webForWechatPublic"] }, expiresAt: { type: "datetime" diff --git a/es/triggers/toDo.d.ts b/es/triggers/toDo.d.ts index 6605371ec..c343874f5 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/wechatMpJump.js b/lib/aspects/wechatMpJump.js index fe05caebe..fe64522ad 100644 --- a/lib/aspects/wechatMpJump.js +++ b/lib/aspects/wechatMpJump.js @@ -7,6 +7,14 @@ const assert_1 = require("oak-domain/lib/utils/assert"); const oak_external_sdk_1 = require("oak-external-sdk"); async function wechatMpJump(params, context) { const { applicationId, jump_wxa, expireType, expiresAt, expireInterval } = params; + const envVersionVersionDict = { + development: 'develop', + staging: 'trial', + production: 'release', + }; + Object.assign(jump_wxa, { + env_version: envVersionVersionDict[process.env.NODE_ENV], + }); (0, assert_1.assert)(applicationId); const [application] = await context.select('application', { data: (0, lodash_1.cloneDeep)(Projection_1.applicationProjection), diff --git a/lib/data/userRole.js b/lib/data/userRole.js index 7742ebf9b..2a16757ab 100644 --- a/lib/data/userRole.js +++ b/lib/data/userRole.js @@ -30,5 +30,7 @@ exports.tokens = [ }, userId: constants_1.ROOT_USER_ID, playerId: constants_1.ROOT_USER_ID, + refreshedAt: Date.now(), + value:constants_1.ROOT_TOKEN_ID, } ]; diff --git a/src/aspects/wechatMpJump.ts b/src/aspects/wechatMpJump.ts index 409f70cb2..e342ca8e9 100644 --- a/src/aspects/wechatMpJump.ts +++ b/src/aspects/wechatMpJump.ts @@ -29,6 +29,14 @@ export async function wechatMpJump< context: Cxt ): Promise { const { applicationId, jump_wxa, expireType, expiresAt, expireInterval } = params; + const envVersionVersionDict = { + development: 'develop', + staging: 'trial', + production: 'release', + }; + Object.assign(jump_wxa, { + env_version: envVersionVersionDict[process.env.NODE_ENV as keyof typeof envVersionVersionDict], + }); assert(applicationId); const [application] = await context.select( 'application', diff --git a/src/components/userRelation/upsert/byUserEntityGrant/web.pc.tsx b/src/components/userRelation/upsert/byUserEntityGrant/web.pc.tsx index 79d547308..ce305076f 100644 --- a/src/components/userRelation/upsert/byUserEntityGrant/web.pc.tsx +++ b/src/components/userRelation/upsert/byUserEntityGrant/web.pc.tsx @@ -93,7 +93,7 @@ export default function render( value: ele.id, label: ele.display || - t(`${relationEntity as string}:r.${ele.name}`), + relationEntity && t(`${relationEntity as string}:r.${ele.name}`), }))} /> diff --git a/src/data/userRole.ts b/src/data/userRole.ts index 6cf6b95ee..a17930fbc 100644 --- a/src/data/userRole.ts +++ b/src/data/userRole.ts @@ -33,5 +33,7 @@ export const tokens: Array = [ }, userId: ROOT_USER_ID, playerId: ROOT_USER_ID, + refreshedAt: Date.now(), + value: ROOT_TOKEN_ID, } ]