diff --git a/.env b/.env index 5187428..3047089 100644 --- a/.env +++ b/.env @@ -2,8 +2,7 @@ VITE_APP_TITLE=Snail Job VITE_APP_DESC=A flexible, reliable, and fast platform for distributed task retry and distributed task scheduling. -VITE_APP_VERSION=1.1.0-beta3 - +VITE_APP_VERSION=1.1.0 VITE_APP_DEFAULT_TOKEN=SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj # the prefix of the icon name diff --git a/src/components/common/job-task-list-table.vue b/src/components/common/job-task-list-table.vue index 87a0db5..a52753b 100644 --- a/src/components/common/job-task-list-table.vue +++ b/src/components/common/job-task-list-table.vue @@ -191,7 +191,7 @@ const { columns, searchParams, columnChecks, data, getData, loading, mobilePagin @@ -255,6 +255,22 @@ const { columns, searchParams, columnChecks, data, getData, loading, mobilePagin ] }); +const clearDoms = () => { + const resultEntries = resultDomMap.value.entries(); + for (const [id, _] of resultEntries) { + const tr = document.querySelector(`#job-task-result-${id}`); + tr?.remove(); + resultDomMap.value.set(id, false); + } + + const argsEntries = argsDomMap.value.entries(); + for (const [id, _] of argsEntries) { + const tr = document.querySelector(`#job-task-args-${id}`); + tr?.remove(); + argsDomMap.value.set(id, false); + } +}; + const onLoad = (row: Record) => { return new Promise((resolve, reject) => { fetchGetJobTaskTree({ @@ -280,10 +296,13 @@ const onExpandedRowKeys = (keys: DataTableRowKey[]) => { const onUpdatePage = (_: number) => { expandedRowKeys.value = []; + clearDoms(); }; async function flushed() { searchParams.taskStatus = undefined; + expandedRowKeys.value = []; + clearDoms(); await getData(); } diff --git a/src/store/modules/theme/index.ts b/src/store/modules/theme/index.ts index 43499a4..8ee2df3 100644 --- a/src/store/modules/theme/index.ts +++ b/src/store/modules/theme/index.ts @@ -60,7 +60,7 @@ export const useThemeStore = defineStore(SetupStoreId.Theme, () => { /** 开启水印 */ function toggleWatermark(visible: boolean = false) { - visible ? setWatermark(settings.value.watermark.text) : clearWatermark(); + visible ? setWatermark(settings.value?.watermark.text) : clearWatermark(); } /** 修改水印文案 */ @@ -69,7 +69,7 @@ export const useThemeStore = defineStore(SetupStoreId.Theme, () => { clearWatermark(); return; } - if (settings.value.watermark.visible) { + if (settings.value.watermark && settings.value.watermark?.visible) { settings.value.watermark.text = text; setWatermark(settings.value.watermark.text); } @@ -194,10 +194,10 @@ export const useThemeStore = defineStore(SetupStoreId.Theme, () => { ); watch( - settings.value.watermark, + settings.value?.watermark, val => { - toggleWatermark(val.visible); - setWatermarkText(val.text); + toggleWatermark(val?.visible); + setWatermarkText(val?.text); }, { immediate: true } );