From a047d7066b9550d1bfc3bbfb65ae1d96d15887dc Mon Sep 17 00:00:00 2001 From: xlsea Date: Sun, 14 Jul 2024 20:02:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix(sj=5F1.1.0=5Fbeta3):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=97=A7=E7=89=88=E6=9C=AC=E6=B0=B4=E5=8D=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/theme/index.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 } ); From 50eec6dc81add3a9e03f1484b5ee8312f9baa024 Mon Sep 17 00:00:00 2001 From: xlsea Date: Sun, 14 Jul 2024 20:10:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix(sj=5F1.1.0=5Fbeta3):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=9F=A5=E7=9C=8B=E7=BB=93=E6=9E=9C=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/job-task-list-table.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/job-task-list-table.vue b/src/components/common/job-task-list-table.vue index 87a0db5..51aa8fe 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 From 080ea1f8b0936fa21730781c9eb75b590f4a44ff Mon Sep 17 00:00:00 2001 From: xlsea Date: Sun, 14 Jul 2024 20:16:46 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix(sj=5F1.1.0=5Fbeta3):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=B7=E6=96=B0=E5=90=8E=E5=B1=95=E5=BC=80=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/job-task-list-table.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/common/job-task-list-table.vue b/src/components/common/job-task-list-table.vue index 51aa8fe..1518b4c 100644 --- a/src/components/common/job-task-list-table.vue +++ b/src/components/common/job-task-list-table.vue @@ -284,6 +284,7 @@ const onUpdatePage = (_: number) => { async function flushed() { searchParams.taskStatus = undefined; + expandedRowKeys.value = []; await getData(); } From 8be0111041305f3e6759d69034f7eaa2d2f30184 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Sun, 14 Jul 2024 20:25:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat(sj=5F1.1.0-beta3):=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.env b/.env index 64239c8..f3303ca 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 From f17773f7c6758b195990c38872aa115ad65d4aff Mon Sep 17 00:00:00 2001 From: xlsea Date: Sun, 14 Jul 2024 20:35:45 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix(sj=5F1.1.0=5Fbeta3):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=B7=E6=96=B0=E5=90=8E=E6=9F=A5=E8=AF=A2=E5=8F=82?= =?UTF-8?q?=E6=95=B0dom=E6=97=A0=E6=B3=95=E9=94=80=E6=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/job-task-list-table.vue | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/components/common/job-task-list-table.vue b/src/components/common/job-task-list-table.vue index 1518b4c..a52753b 100644 --- a/src/components/common/job-task-list-table.vue +++ b/src/components/common/job-task-list-table.vue @@ -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,11 +296,13 @@ const onExpandedRowKeys = (keys: DataTableRowKey[]) => { const onUpdatePage = (_: number) => { expandedRowKeys.value = []; + clearDoms(); }; async function flushed() { searchParams.taskStatus = undefined; expandedRowKeys.value = []; + clearDoms(); await getData(); }