From ad0c75eacfa9270aaf1d32d06d8fdb1cef5690a4 Mon Sep 17 00:00:00 2001 From: junjie Date: Tue, 18 May 2021 16:38:24 +0800 Subject: [PATCH] =?UTF-8?q?feat(dashboard):=E4=BB=AA=E8=A1=A8=E7=9B=98=20T?= =?UTF-8?q?able=20Label=E6=94=AF=E6=8C=81=EF=BC=8C=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=EF=BC=9B=E6=94=B6=E8=97=8F=E5=8F=96?= =?UTF-8?q?=E6=B6=88bug=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/panel/api/StoreApi.java | 2 +- .../controller/panel/server/StoreServer.java | 11 +++-- .../dataease/service/panel/StoreService.java | 19 ++++++--- .../canvas/custom-component/UserView.vue | 8 ++-- frontend/src/lang/zh.js | 1 + .../chart/components/normal/LabelNormal.vue | 25 +++++++---- .../chart/components/table/TableNormal.vue | 42 ++++++++++++------- 7 files changed, 72 insertions(+), 36 deletions(-) diff --git a/backend/src/main/java/io/dataease/controller/panel/api/StoreApi.java b/backend/src/main/java/io/dataease/controller/panel/api/StoreApi.java index a4d5873b22..2844f250d3 100644 --- a/backend/src/main/java/io/dataease/controller/panel/api/StoreApi.java +++ b/backend/src/main/java/io/dataease/controller/panel/api/StoreApi.java @@ -31,6 +31,6 @@ public interface StoreApi { @ApiOperation("移除收藏") @PostMapping("/remove/{storeId}") - void remove(@PathVariable("storeId") Long storeId); + void remove(@PathVariable("storeId") String storeId); } diff --git a/backend/src/main/java/io/dataease/controller/panel/server/StoreServer.java b/backend/src/main/java/io/dataease/controller/panel/server/StoreServer.java index 795c2ce866..270c153980 100644 --- a/backend/src/main/java/io/dataease/controller/panel/server/StoreServer.java +++ b/backend/src/main/java/io/dataease/controller/panel/server/StoreServer.java @@ -16,7 +16,7 @@ public class StoreServer implements StoreApi { private StoreService storeService; @Override - public void store( String id) { + public void store(String id) { storeService.save(id); } @@ -26,7 +26,12 @@ public class StoreServer implements StoreApi { } @Override - public void remove( Long storeId) { - storeService.remove(storeId); + public void remove(String storeId) { + try { + Long id = Long.parseLong(storeId); + storeService.remove(id); + } catch (Exception e) { + storeService.removeByPanelId(storeId); + } } } diff --git a/backend/src/main/java/io/dataease/service/panel/StoreService.java b/backend/src/main/java/io/dataease/service/panel/StoreService.java index bdc477ae1e..9d3dbd3bae 100644 --- a/backend/src/main/java/io/dataease/service/panel/StoreService.java +++ b/backend/src/main/java/io/dataease/service/panel/StoreService.java @@ -1,6 +1,7 @@ package io.dataease.service.panel; import io.dataease.base.domain.PanelStore; +import io.dataease.base.domain.PanelStoreExample; import io.dataease.base.mapper.PanelStoreMapper; import io.dataease.base.mapper.ext.ExtPanelStoreMapper; import io.dataease.base.mapper.ext.query.GridExample; @@ -9,6 +10,7 @@ import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.controller.sys.base.ConditionEntity; import io.dataease.dto.panel.PanelStoreDto; import org.springframework.stereotype.Service; + import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -22,7 +24,7 @@ public class StoreService { @Resource private ExtPanelStoreMapper extPanelStoreMapper; - public void save(String panelGroupId){ + public void save(String panelGroupId) { Long userId = AuthUtils.getUser().getUserId(); PanelStore panelStore = new PanelStore(); panelStore.setCreateTime(System.currentTimeMillis()); @@ -31,24 +33,31 @@ public class StoreService { panelStoreMapper.insert(panelStore); } + public void removeByPanelId(String panelId) { + PanelStoreExample panelStoreExample = new PanelStoreExample(); + panelStoreExample.createCriteria().andPanelGroupIdEqualTo(panelId); + panelStoreMapper.deleteByExample(panelStoreExample); + } - - public void remove(Long storeId){ + public void remove(Long storeId) { panelStoreMapper.deleteByPrimaryKey(storeId); } /** * 按照当前用户ID查询收藏仪表板 + * * @param request * @return */ - public List query(BaseGridRequest request){ + public List query(BaseGridRequest request) { Long userId = AuthUtils.getUser().getUserId(); ConditionEntity condition = new ConditionEntity(); condition.setField("s.user_id"); condition.setOperator("eq"); condition.setValue(userId); - request.setConditions(new ArrayList(){{add(condition);}}); + request.setConditions(new ArrayList() {{ + add(condition); + }}); GridExample example = request.convertExample(); List stores = extPanelStoreMapper.query(example); return stores; diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index 47484a844f..44ee1c86cf 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -6,8 +6,9 @@ {{ message }} - - + + + @@ -16,6 +17,7 @@ import { viewData } from '@/api/panel/panel' import ChartComponent from '@/views/chart/components/ChartComponent.vue' import TableNormal from '@/views/chart/components/table/TableNormal' +import LabelNormal from '../../../views/chart/components/normal/LabelNormal' import { mapState } from 'vuex' @@ -33,7 +35,7 @@ import { export default { name: 'UserView', - components: { ChartComponent, TableNormal }, + components: { ChartComponent, TableNormal, LabelNormal }, props: { element: { type: Object diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 552d459159..5fda0b0360 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -87,6 +87,7 @@ export default { password_error: '密码不小于6位' }, commons: { + close: '关闭', icon: '图标', all: '全部', enable: '启用', diff --git a/frontend/src/views/chart/components/normal/LabelNormal.vue b/frontend/src/views/chart/components/normal/LabelNormal.vue index 1835e26941..d18390a8e2 100644 --- a/frontend/src/views/chart/components/normal/LabelNormal.vue +++ b/frontend/src/views/chart/components/normal/LabelNormal.vue @@ -20,6 +20,7 @@