diff --git a/es/aspects/wechatMpJump.js b/es/aspects/wechatMpJump.js index e3058d9d6..c109464ca 100644 --- a/es/aspects/wechatMpJump.js +++ b/es/aspects/wechatMpJump.js @@ -19,7 +19,6 @@ export async function wechatMpJump(params, context) { const config2 = config; const { appId, appSecret } = config2; const wechatInstance = WechatSDK.getInstance(appId, 'wechatMp', appSecret); - /* const result = await wechatInstance.getURLScheme({ jump_wxa, expireType, expiresAt, expireInterval }); - - return result; */ + const result = await wechatInstance.getURLScheme({ jump_wxa, expireType, expiresAt, expireInterval }); + return result; } 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/config/style/platform/index.d.ts b/es/components/config/style/platform/index.d.ts index bd3579c54..0bf145940 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/extraFile/commit/index.d.ts b/es/components/extraFile/commit/index.d.ts index e18ec3149..c1b76bf51 100644 --- a/es/components/extraFile/commit/index.d.ts +++ b/es/components/extraFile/commit/index.d.ts @@ -12,19 +12,19 @@ declare const _default: ) => unknown) | undefined; - type?: "button" | "submit" | "reset" | undefined; + type?: "button" | "reset" | "submit" | undefined; shape?: "default" | "rounded" | "rectangular" | undefined; children?: import("react").ReactNode; - } & Pick & import("react").ButtonHTMLAttributes, "id" | "onMouseDown" | "onMouseUp" | "onTouchStart" | "onTouchEnd"> & { + } & 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/theme/setting/index.js b/es/components/theme/setting/index.js index 46220f30c..80dd319f4 100644 --- a/es/components/theme/setting/index.js +++ b/es/components/theme/setting/index.js @@ -32,21 +32,21 @@ export default function Render() { const features = useFeatures(); const themeState = features.theme.get(); const [systemTheme, setSystemTheme] = useState(themeState?.systemTheme); - const [theme, setTheme] = useState(themeState?.theme); + const [theme, setTheme] = useState(themeState?.themeMode); const [color, setColor] = useState(themeState?.color); const handleThemeSwitch = (value) => { if (value === ESettingTheme.system) { features.theme.openSystemTheme(); } else { - features.theme.switchTheme(value); + features.theme.switchThemeMode(value); } }; useEffect(() => { const themeUnsub = features.theme.subscribe(() => { const themeState = features.theme.get(); setSystemTheme(themeState.systemTheme); - setTheme(themeState.theme); + setTheme(themeState.themeMode); setColor(themeState.color); }); return () => { diff --git a/es/features/theme.d.ts b/es/features/theme.d.ts index 6b6106a48..38dcb52a3 100644 --- a/es/features/theme.d.ts +++ b/es/features/theme.d.ts @@ -16,9 +16,9 @@ export default class Theme> | 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>)[]; export default _default; diff --git a/es/triggers/wechatMpJump.d.ts b/es/triggers/wechatMpJump.d.ts index 6b8d3efac..ec0b94830 100644 --- a/es/triggers/wechatMpJump.d.ts +++ b/es/triggers/wechatMpJump.d.ts @@ -1,5 +1,5 @@ import { Trigger } from 'oak-domain/lib/types/Trigger'; import { EntityDict } from '../oak-app-domain/EntityDict'; -import { BRC } from '../types/RuntimeCxt'; -declare const triggers: Trigger[]; +import { BackendRuntimeContext } from "../context/BackendRuntimeContext"; +declare const triggers: Trigger>[]; export default triggers; diff --git a/es/triggers/wechatMpJump.js b/es/triggers/wechatMpJump.js index 57b1db51c..c1066c8cd 100644 --- a/es/triggers/wechatMpJump.js +++ b/es/triggers/wechatMpJump.js @@ -1,8 +1,8 @@ import { assert } from 'oak-domain/lib/utils/assert'; -// import { wechatMpJump } from '@project/aspects/wechatMpJump'; +import { wechatMpJump } from '../aspects/wechatMpJump'; const triggers = [ { - name: '当创建WechatMpJump时，尝试为之创建一个wechatQrCode', + name: '当创建WechatMpJump时，生成openlink', entity: 'wechatMpJump', action: 'create', when: 'before', @@ -10,14 +10,13 @@ const triggers = [ const { data, filter } = operation; const fn = async (wechatMpJumpData) => { const { jump_wxa, expiresAt, expireType, expireInterval } = wechatMpJumpData; - Object.assign(wechatMpJumpData, {}); + const applicationId = context.getApplicationId(); + assert(applicationId); + const openlink = await wechatMpJump({ applicationId, jump_wxa: jump_wxa, expiresAt: expiresAt, expireType, expireInterval: expireInterval }, context); + Object.assign(wechatMpJumpData, { + openlink + }); }; - if (data instanceof Array) { - assert('授权不存在一对多的情况'); - } - else { - await fn(data); - } return 0; }, }, diff --git a/es/types/Theme.d.ts b/es/types/Theme.d.ts index 4921caded..fbacf3cd2 100644 --- a/es/types/Theme.d.ts +++ b/es/types/Theme.d.ts @@ -8,7 +8,7 @@ export interface IThemeState { /** * 主题：深色 浅色 */ - theme: ETheme; + themeMode: ETheme; /** * 是否开启跟随系统主题 */ diff --git a/lib/aspects/wechatMpJump.js b/lib/aspects/wechatMpJump.js index 6acc7369e..744905f98 100644 --- a/lib/aspects/wechatMpJump.js +++ b/lib/aspects/wechatMpJump.js @@ -22,8 +22,7 @@ async function wechatMpJump(params, context) { const config2 = config; const { appId, appSecret } = config2; const wechatInstance = oak_external_sdk_1.WechatSDK.getInstance(appId, 'wechatMp', appSecret); - /* const result = await wechatInstance.getURLScheme({ jump_wxa, expireType, expiresAt, expireInterval }); - - return result; */ + const result = await wechatInstance.getURLScheme({ jump_wxa, expireType, expiresAt, expireInterval }); + return result; } exports.wechatMpJump = wechatMpJump; 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/theme.d.ts b/lib/features/theme.d.ts index 6b6106a48..38dcb52a3 100644 --- a/lib/features/theme.d.ts +++ b/lib/features/theme.d.ts @@ -16,9 +16,9 @@ export default class Theme> | 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>)[]; export default _default; diff --git a/lib/triggers/wechatMpJump.d.ts b/lib/triggers/wechatMpJump.d.ts index 6b8d3efac..ec0b94830 100644 --- a/lib/triggers/wechatMpJump.d.ts +++ b/lib/triggers/wechatMpJump.d.ts @@ -1,5 +1,5 @@ import { Trigger } from 'oak-domain/lib/types/Trigger'; import { EntityDict } from '../oak-app-domain/EntityDict'; -import { BRC } from '../types/RuntimeCxt'; -declare const triggers: Trigger[]; +import { BackendRuntimeContext } from "../context/BackendRuntimeContext"; +declare const triggers: Trigger>[]; export default triggers; diff --git a/lib/triggers/wechatMpJump.js b/lib/triggers/wechatMpJump.js index bde779066..80a9ab8ca 100644 --- a/lib/triggers/wechatMpJump.js +++ b/lib/triggers/wechatMpJump.js @@ -1,10 +1,10 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const assert_1 = require("oak-domain/lib/utils/assert"); -// import { wechatMpJump } from '@project/aspects/wechatMpJump'; +const wechatMpJump_1 = require("../aspects/wechatMpJump"); const triggers = [ { - name: '当创建WechatMpJump时，尝试为之创建一个wechatQrCode', + name: '当创建WechatMpJump时，生成openlink', entity: 'wechatMpJump', action: 'create', when: 'before', @@ -12,14 +12,13 @@ const triggers = [ const { data, filter } = operation; const fn = async (wechatMpJumpData) => { const { jump_wxa, expiresAt, expireType, expireInterval } = wechatMpJumpData; - Object.assign(wechatMpJumpData, {}); + const applicationId = context.getApplicationId(); + (0, assert_1.assert)(applicationId); + const openlink = await (0, wechatMpJump_1.wechatMpJump)({ applicationId, jump_wxa: jump_wxa, expiresAt: expiresAt, expireType, expireInterval: expireInterval }, context); + Object.assign(wechatMpJumpData, { + openlink + }); }; - if (data instanceof Array) { - (0, assert_1.assert)('授权不存在一对多的情况'); - } - else { - await fn(data); - } return 0; }, }, diff --git a/lib/types/Theme.d.ts b/lib/types/Theme.d.ts index 4921caded..fbacf3cd2 100644 --- a/lib/types/Theme.d.ts +++ b/lib/types/Theme.d.ts @@ -8,7 +8,7 @@ export interface IThemeState { /** * 主题：深色 浅色 */ - theme: ETheme; + themeMode: ETheme; /** * 是否开启跟随系统主题 */ diff --git a/src/aspects/wechatMpJump.ts b/src/aspects/wechatMpJump.ts index bae8160be..37e9991db 100644 --- a/src/aspects/wechatMpJump.ts +++ b/src/aspects/wechatMpJump.ts @@ -55,7 +55,7 @@ export async function wechatMpJump< appSecret ) as WechatMpInstance; - /* const result = await wechatInstance.getURLScheme({ jump_wxa, expireType, expiresAt, expireInterval }); + const result = await wechatInstance.getURLScheme({ jump_wxa, expireType, expiresAt, expireInterval }); - return result; */ + return result; } diff --git a/src/components/theme/setting/index.tsx b/src/components/theme/setting/index.tsx index ee7dac19c..79eba13c2 100644 --- a/src/components/theme/setting/index.tsx +++ b/src/components/theme/setting/index.tsx @@ -39,7 +39,7 @@ export default function Render(this: any) { const features = useFeatures(); const themeState = features.theme.get(); const [systemTheme, setSystemTheme] = useState(themeState?.systemTheme); - const [theme, setTheme] = useState(themeState?.theme); + const [theme, setTheme] = useState(themeState?.themeMode); const [color, setColor] = useState(themeState?.color); @@ -47,7 +47,7 @@ export default function Render(this: any) { if (value === ESettingTheme.system) { features.theme.openSystemTheme(); } else { - features.theme.switchTheme(value); + features.theme.switchThemeMode(value); } }; @@ -55,10 +55,10 @@ export default function Render(this: any) { const themeUnsub = features.theme.subscribe(() => { const themeState = features.theme.get(); setSystemTheme(themeState.systemTheme); - setTheme(themeState.theme); + setTheme(themeState.themeMode); setColor(themeState.color); }); - + return () => { themeUnsub(); } diff --git a/src/triggers/wechatMpJump.ts b/src/triggers/wechatMpJump.ts new file mode 100644 index 000000000..a8bb06fc7 --- /dev/null +++ b/src/triggers/wechatMpJump.ts @@ -0,0 +1,34 @@ +import { generateNewIdAsync } from 'oak-domain/lib/utils/uuid'; +import { Trigger, CreateTrigger, UpdateTrigger } from 'oak-domain/lib/types/Trigger'; +import { CreateOperationData as CreateWechatMpJumpData } from '../oak-app-domain/WechatMpJump/Schema'; +import { EntityDict } from '../oak-app-domain/EntityDict'; + +import { OakRowInconsistencyException, OakUserException } from 'oak-domain/lib/types'; +import { assert } from 'oak-domain/lib/utils/assert'; +import { RuntimeCxt } from '../types/RuntimeCxt'; +import { wechatMpJump } from '../aspects/wechatMpJump'; +import { BackendRuntimeContext } from "../context/BackendRuntimeContext"; +const triggers: Trigger>[] = [ + { + name: '当创建WechatMpJump时，生成openlink', + entity: 'wechatMpJump', + action: 'create', + when: 'before', + fn: async ({ operation }, context, params) => { + const { data, filter } = operation; + const fn = async ( + wechatMpJumpData: CreateWechatMpJumpData + ) => { + const { jump_wxa, expiresAt, expireType, expireInterval } = wechatMpJumpData; + const applicationId = context.getApplicationId(); + assert(applicationId); + const openlink = await wechatMpJump({ applicationId, jump_wxa: jump_wxa!, expiresAt: expiresAt as number, expireType, expireInterval: expireInterval as number }, context); + Object.assign(wechatMpJumpData, { + openlink + }); + }; + return 0; + }, + } as CreateTrigger>, +]; +export default triggers; \ No newline at end of file