From 981b0fbfed170453c7e6d1dc9ca7f8c1137a73b6 Mon Sep 17 00:00:00 2001 From: kerms Date: Sat, 15 Jun 2024 16:56:52 +0800 Subject: [PATCH] minor: cleanup code --- package.json | 1 + src/App.vue | 2 +- src/composables/useDataFlowModule.ts | 2 +- src/stores/dataViewerStore.ts | 12 +++++------- src/stores/useDataFlowStore.ts | 2 +- src/views/Uart.vue | 3 +-- src/views/text-data-viewer/textDataViewer.vue | 2 +- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 725f8de..d6396ed 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "devh": ". ./set_env.sh && vite --host", "build": "run-p type-check \"build-only {@}\" --", "preview": ". ./set_env.sh && vite preview", + "previewh": ". ./set_env.sh && vite preview --host", "build-only": ". ./set_env.sh && vite build", "build:dev": ". ./set_env.sh && vite build --mode development", "type-check": "vue-tsc --build --force", diff --git a/src/App.vue b/src/App.vue index 0ce42d5..dc26df1 100644 --- a/src/App.vue +++ b/src/App.vue @@ -40,7 +40,7 @@ let websocketService: IWebsocketService; onMounted(() => { logHelloMessage(); - let host = ""; + let host: string; if (isDevMode()) { host = import.meta.env.VITE_DEVICE_HOST_NAME || "dap.local"; } else { diff --git a/src/composables/useDataFlowModule.ts b/src/composables/useDataFlowModule.ts index 7735a44..665924c 100644 --- a/src/composables/useDataFlowModule.ts +++ b/src/composables/useDataFlowModule.ts @@ -1,5 +1,5 @@ import {registerModule} from "@/router/msgRouter"; -import {type ApiJsonMsg, ControlEvent, type ControlMsg, ControlMsgType, WtModuleID} from "@/api"; +import {type ApiJsonMsg, type ControlMsg, ControlMsgType, WtModuleID} from "@/api"; import {isDevMode} from "@/composables/buildMode"; import {useDataFlowStore} from "@/stores/useDataFlowStore"; import {type IInstanceList, WtDataFlowCmd} from "@/api/apiDataFlow"; diff --git a/src/stores/dataViewerStore.ts b/src/stores/dataViewerStore.ts index fcaf198..58ca685 100644 --- a/src/stores/dataViewerStore.ts +++ b/src/stores/dataViewerStore.ts @@ -293,7 +293,6 @@ export const useDataViewerStore = defineStore('text-viewer', () => { const appendedLength = frameBreakAfterSequence.value ? frameBreakSequenceNormalized.value.length : 0; /* else after the first match, skip the matchArr at the beginning of array in subsequent match */ const skipLength = frameBreakAfterSequence.value ? 0 : frameBreakSequenceNormalized.value.length; - let remain = false; let startIndex = 0; inputArray.forEach(array => { @@ -314,7 +313,7 @@ export const useDataViewerStore = defineStore('text-viewer', () => { result.push(array.subarray(startIndex, array.length)); } }); - remain = startIndex < inputArray[inputArray.length - 1].length; + const remain = startIndex < inputArray[inputArray.length - 1].length; return {result, remain}; } }, { @@ -343,7 +342,7 @@ export const useDataViewerStore = defineStore('text-viewer', () => { const encoder = new TextEncoder(); input = unescapeString(input); const encodedStr = encoder.encode(input); - addSegment(encodedStr, isRX); + addSegment(encodedStr, isRX, doSend); } function addSegment(input: Uint8Array, isRX: boolean, doSend: boolean = false) { @@ -456,7 +455,6 @@ export const useDataViewerStore = defineStore('text-viewer', () => { return encoder.encode(str); }) - const dataArchive: IDataArchive[] = []; const dataBuf: IDataBuf[] = []; const dataBufLength = ref(0); @@ -477,7 +475,7 @@ export const useDataViewerStore = defineStore('text-viewer', () => { const batchUpdateTime = ref(80); /* ms */ let batchStartIndex: number = 0; - watch(batchUpdateTime, value => { + watch(batchUpdateTime, () => { if (batchDataUpdateIntervalID >= 0) { clearInterval(batchDataUpdateIntervalID); batchDataUpdateIntervalID = -1; @@ -538,7 +536,7 @@ export const useDataViewerStore = defineStore('text-viewer', () => { softRefreshFilterBuf(); } - function softRefreshFilterBuf(delayTime: number = 0) { + function softRefreshFilterBuf() { /* handle filtered buf array */ const totalBufLength = dataBuf.length - batchStartIndex + dataFiltered.length; @@ -605,7 +603,7 @@ export const useDataViewerStore = defineStore('text-viewer', () => { TxByteCountLocal = item.length; } - let str = "" + let str: string; str = decodeUtf8(item); str = escapeHTML(str); str = strToHTML(str); diff --git a/src/stores/useDataFlowStore.ts b/src/stores/useDataFlowStore.ts index ce5a9f3..70b648a 100644 --- a/src/stores/useDataFlowStore.ts +++ b/src/stores/useDataFlowStore.ts @@ -1,6 +1,6 @@ import {defineStore} from "pinia"; import {type Ref, ref} from "vue"; -import type {AttachInfo, InstanceInfo} from "@/api/apiDataFlow"; +import type {InstanceInfo} from "@/api/apiDataFlow"; export const useDataFlowStore = defineStore('data_flow', () => { const instanceList: Ref = ref([]); diff --git a/src/views/Uart.vue b/src/views/Uart.vue index 3841ddf..f5e6a74 100644 --- a/src/views/Uart.vue +++ b/src/views/Uart.vue @@ -61,7 +61,6 @@ import {breakpointsTailwind, useBreakpoints} from '@vueuse/core' import {useDataViewerStore} from '@/stores/dataViewerStore'; import * as api from '@/api'; import {ControlEvent} from '@/api'; -import * as uart from '@/api/apiUart'; import { type IUartMsgBaud, type IUartMsgConfig, @@ -214,7 +213,7 @@ function mouseResize(e: MouseEvent) { function touchResize(e: TouchEvent) { let t = e.touches[0]; - let f = 0; + let f: number; if (layoutMode.value === 'row') { f = t.clientX; diff --git a/src/views/text-data-viewer/textDataViewer.vue b/src/views/text-data-viewer/textDataViewer.vue index 2c0ddb8..2d89e15 100644 --- a/src/views/text-data-viewer/textDataViewer.vue +++ b/src/views/text-data-viewer/textDataViewer.vue @@ -438,7 +438,7 @@ watch(() => store.showVirtualScroll, () => { } }); -const handleScroll = (ev: Event) => { +const handleScroll = () => { if (store.forceToBottom) { if (vuetifyVirtualScrollBarRef.value.scrollTop - lastScrollHeight < 0) { store.forceToBottom = false;