From c15b098d46a359619f5f5af182e8460172b57044 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Sun, 18 Feb 2024 14:38:51 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F=E9=A1=B5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=B4=E6=8E=A5=E5=8F=96=E6=B6=88=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/VisualizationStoreManage.java | 2 +- .../src/assets/svg/icon_cancel_store.svg | 1 + .../src/views/workbranch/ShortcutTable.vue | 26 ++++++++++++++++++- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 core/core-frontend/src/assets/svg/icon_cancel_store.svg diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java b/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java index 730939dc3a..31fd4340ba 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java @@ -88,7 +88,7 @@ public class VisualizationStoreManage { return pos.stream().map(po -> new VisualizationStoreVO( po.getStoreId(), po.getResourceId(), po.getName(), - po.getType(), po.getCreator().toString(), ObjectUtils.isEmpty(po.getEditor()) ? null : po.getEditor().toString(), + po.getType(), String.valueOf(po.getCreator()), ObjectUtils.isEmpty(po.getEditor()) ? null : String.valueOf(po.getEditor()), po.getEditTime(), 9)).toList(); } diff --git a/core/core-frontend/src/assets/svg/icon_cancel_store.svg b/core/core-frontend/src/assets/svg/icon_cancel_store.svg new file mode 100644 index 0000000000..f14c04f255 --- /dev/null +++ b/core/core-frontend/src/assets/svg/icon_cancel_store.svg @@ -0,0 +1 @@ + diff --git a/core/core-frontend/src/views/workbranch/ShortcutTable.vue b/core/core-frontend/src/views/workbranch/ShortcutTable.vue index 16fbb211c3..89a45514f6 100644 --- a/core/core-frontend/src/views/workbranch/ShortcutTable.vue +++ b/core/core-frontend/src/views/workbranch/ShortcutTable.vue @@ -161,6 +161,17 @@ const executeStore = rowInfo => { rowInfo.favorite = !rowInfo.favorite }) } + +const executeCancelStore = rowInfo => { + const param = { + id: rowInfo.resourceId, + type: rowInfo.type === 'dataV' ? 'screen' : 'panel' + } + storeApi(param).then(() => { + loadTableData() + }) +} + const imgType = ref() const emptyDesc = ref('') const getEmptyImg = (): string => { @@ -297,7 +308,7 @@ const getEmptyDesc = (): string => { - +