From a046b4047ed9ac23bf2749344e4bcbd2de3312c9 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Mon, 19 Aug 2024 09:10:19 +0800 Subject: [PATCH] :sparkles: Feature(custom): remove some dev output --- src/renderer/pages/UploaderConfigPage.vue | 14 ++++++------ src/renderer/utils/common.ts | 27 +++++------------------ 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/src/renderer/pages/UploaderConfigPage.vue b/src/renderer/pages/UploaderConfigPage.vue index 63753e2..65db622 100644 --- a/src/renderer/pages/UploaderConfigPage.vue +++ b/src/renderer/pages/UploaderConfigPage.vue @@ -80,13 +80,13 @@ import { saveConfig } from '@/utils/dataSender' import { T as $T } from '@/i18n/index' import { useStore } from '@/hooks/useStore' import { PICBEDS_PAGE, UPLOADER_CONFIG_PAGE } from '@/router/config' +import { sendRPC, triggerRPC } from '@/utils/common' import { IRPCActionType } from '#/types/enum' import { configPaths } from '#/utils/configPaths' -import { sendRPC, triggerRPC } from '@/utils/common' -const $router = useRouter() -const $route = useRoute() +const router = useRouter() +const route = useRoute() const type = ref('') const curConfigList = ref([]) @@ -113,7 +113,7 @@ onBeforeRouteUpdate((to, _, next) => { }) onBeforeMount(() => { - type.value = $route.params.type as string + type.value = route.params.type as string getCurrentConfigList() }) @@ -124,7 +124,7 @@ async function getCurrentConfigList() { } function openEditPage(configId: string) { - $router.push({ + router.push({ name: PICBEDS_PAGE, params: { type: type.value, @@ -137,7 +137,7 @@ function openEditPage(configId: string) { } function formatTime(time: number): string { - return dayjs(time).format('YY/MM/DD HH:mm') + return dayjs(time).format('YY-MM-DD HH:mm') } async function deleteConfig(id: string) { @@ -148,7 +148,7 @@ async function deleteConfig(id: string) { } function addNewConfig() { - $router.push({ + router.push({ name: PICBEDS_PAGE, params: { type: type.value, diff --git a/src/renderer/utils/common.ts b/src/renderer/utils/common.ts index 2a8a5e5..65c2ad5 100644 --- a/src/renderer/utils/common.ts +++ b/src/renderer/utils/common.ts @@ -4,19 +4,14 @@ import { isReactive, isRef, toRaw, unref } from 'vue' import { RPC_ACTIONS, RPC_ACTIONS_INVOKE } from '#/events/constants' import { IRPCActionType } from '#/types/enum' -const isDevelopment = process.env.NODE_ENV !== 'production' - export const handleTalkingDataEvent = (data: ITalkingDataOptions) => { - const { EventId, Label = '', MapKv = {} } = data - MapKv.from = window.location.href try { + const { EventId, Label = '', MapKv = {} } = data + MapKv.from = window.location.href window.TDAPP.onEvent(EventId, Label, MapKv) } catch (e) { console.error(e) } - if (isDevelopment) { - console.log('talkingData', data) - } } /** @@ -41,26 +36,14 @@ export function sendToMain(channel: string, ...args: any[]) { ipcRenderer.send(channel, ...data) } -/** - * send a rpc request & do not need to wait for the response - * - * or the response will be handled by other listener - */ export function sendRPC(action: IRPCActionType, ...args: any[]): void { - const data = getRawData(args) - ipcRenderer.send(RPC_ACTIONS, action, data) + ipcRenderer.send(RPC_ACTIONS, action, getRawData(args)) } export function sendRpcSync(action: IRPCActionType, ...args: any[]) { - const data = getRawData(args) - return ipcRenderer.sendSync(RPC_ACTIONS, action, data) + return ipcRenderer.sendSync(RPC_ACTIONS, action, getRawData(args)) } -/** - * trigger RPC action - * TODO: create an isolate rpc handler - */ export async function triggerRPC(action: IRPCActionType, ...args: any[]): Promise { - const data = getRawData(args) - return await ipcRenderer.invoke(RPC_ACTIONS_INVOKE, action, data) + return await ipcRenderer.invoke(RPC_ACTIONS_INVOKE, action, getRawData(args)) }