diff --git a/src/composables/buildMode.ts b/src/composables/buildMode.ts index 50037c8..9101a07 100644 --- a/src/composables/buildMode.ts +++ b/src/composables/buildMode.ts @@ -3,11 +3,11 @@ export function isDevMode() { } export function isOTAEnabled() { - return import.meta.env.VITE_ENABLE_OTA === 'true'; + return import.meta.env.VITE_ENABLE_OTA === 'true' || false; } export function isTrialMode() { - return import.meta.env.VITE_TRIAL_MODE === "true" + return import.meta.env.VITE_TRIAL_MODE === "true" || false; } export function getTrialDate() { diff --git a/src/stores/dataViewerStore.ts b/src/stores/dataViewerStore.ts index 841228d..5a28993 100644 --- a/src/stores/dataViewerStore.ts +++ b/src/stores/dataViewerStore.ts @@ -448,6 +448,9 @@ export const useDataViewerStore = defineStore('text-viewer', () => { const textPrefixValue = ref("") const textSuffixValue = ref("\\r\\n") + const hasAddedText = computed(() => { + return textPrefixValue.value.length > 0 || textSuffixValue.value.length > 0; + }); const uartBaud = ref(115200); const uartBaudReal = ref(115200); @@ -715,6 +718,7 @@ export const useDataViewerStore = defineStore('text-viewer', () => { softRefreshFilterBuf, textSuffixValue, textPrefixValue, + hasAddedText, clearByteCount, dataBufLength, configPanelTab, diff --git a/src/views/text-data-viewer/textDataMacro.vue b/src/views/text-data-viewer/textDataMacro.vue index 6f24f57..27c869a 100644 --- a/src/views/text-data-viewer/textDataMacro.vue +++ b/src/views/text-data-viewer/textDataMacro.vue @@ -95,8 +95,8 @@ const macroData: Ref = ref([ function onSendClick(val: string) { - if (!val) { - globalNotify("发送框无数据发送") + if (!val && !store.hasAddedText) { + globalNotify("无帧头帧尾、发送框无数据发送") return; } diff --git a/src/views/text-data-viewer/textDataViewer.vue b/src/views/text-data-viewer/textDataViewer.vue index 1b751b0..a9d6d45 100644 --- a/src/views/text-data-viewer/textDataViewer.vue +++ b/src/views/text-data-viewer/textDataViewer.vue @@ -469,8 +469,8 @@ function handleTextboxKeydown(ev: KeyboardEvent) { } function onSendClick() { - if (!uartInputTextBox.value) { - globalNotify("发送框无数据发送") + if (!uartInputTextBox.value && !store.hasAddedText) { + globalNotify("无帧头帧尾、发送框无数据发送") return; }