From f0b9d026037f0d30c2a52ab96dabfef94fba6599 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 19 May 2022 17:58:19 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E4=BB=AA?= =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E4=B8=8B=E6=9E=B6=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E7=A6=81=E6=AD=A2=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/dto/panel/PanelShareOutDTO.java | 3 ++ .../io/dataease/dto/panel/PanelSharePo.java | 2 ++ .../io/dataease/dto/panel/PanelStoreDto.java | 2 ++ .../io/dataease/ext/ExtPanelGroupMapper.xml | 12 +++---- .../io/dataease/ext/ExtPanelShareMapper.xml | 11 ++++--- .../io/dataease/ext/ExtPanelStoreMapper.xml | 3 +- .../canvas/components/Editor/Preview.vue | 32 +++++++++++++++++-- frontend/src/icons/svg/unpublished.svg | 2 ++ frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + .../src/views/panel/GrantAuth/shareTree.vue | 4 +-- frontend/src/views/panel/enshrine/index.vue | 2 +- .../src/views/panel/list/PanelViewShow.vue | 12 +++---- 14 files changed, 64 insertions(+), 24 deletions(-) create mode 100644 frontend/src/icons/svg/unpublished.svg diff --git a/backend/src/main/java/io/dataease/dto/panel/PanelShareOutDTO.java b/backend/src/main/java/io/dataease/dto/panel/PanelShareOutDTO.java index 5def152616..2d53c4e9d3 100644 --- a/backend/src/main/java/io/dataease/dto/panel/PanelShareOutDTO.java +++ b/backend/src/main/java/io/dataease/dto/panel/PanelShareOutDTO.java @@ -27,4 +27,7 @@ public class PanelShareOutDTO implements Serializable { @ApiModelProperty("分享时间") private Long createTime; + + @ApiModelProperty("仪表板状态") + private String status; } diff --git a/backend/src/main/java/io/dataease/dto/panel/PanelSharePo.java b/backend/src/main/java/io/dataease/dto/panel/PanelSharePo.java index 04e9481ed3..a75c69d331 100644 --- a/backend/src/main/java/io/dataease/dto/panel/PanelSharePo.java +++ b/backend/src/main/java/io/dataease/dto/panel/PanelSharePo.java @@ -16,5 +16,7 @@ public class PanelSharePo { private String creator; @ApiModelProperty("分享人ID") private Long userId; + @ApiModelProperty("仪表板状态") + private String status; } diff --git a/backend/src/main/java/io/dataease/dto/panel/PanelStoreDto.java b/backend/src/main/java/io/dataease/dto/panel/PanelStoreDto.java index 2f5c3127b9..8959e294e1 100644 --- a/backend/src/main/java/io/dataease/dto/panel/PanelStoreDto.java +++ b/backend/src/main/java/io/dataease/dto/panel/PanelStoreDto.java @@ -13,5 +13,7 @@ public class PanelStoreDto { private String name; @ApiModelProperty("仪表板Id") private String panelGroupId; + @ApiModelProperty("仪表板状态") + private String status; } diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml index ad1952a632..ae3601f748 100644 --- a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml +++ b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml @@ -91,9 +91,9 @@ and panel_group.level = #{level} - - and (panel_group.node_type='folder' or (panel_group.node_type='panel' and panel_group.`status`='publish') or (panel_group.node_type='panel' and panel_group.`status`='unpublished' and authInfo.privileges like '%manage%') ) - + + + ORDER BY CONVERT(panel_group.name using gbk) @@ -170,9 +170,9 @@ and panel_group.level = #{level} - - and (panel_group.node_type='folder' or (panel_group.node_type='panel' and panel_group.`status`='publish') or (panel_group.node_type='panel' and panel_group.`status`='unpublished' and authInfo.privileges like '%manage%') ) - + + + ORDER BY panel_group.node_type desc, CONVERT(panel_group.name using gbk) diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelShareMapper.xml b/backend/src/main/java/io/dataease/ext/ExtPanelShareMapper.xml index 2d382c7a7d..6d777ac368 100644 --- a/backend/src/main/java/io/dataease/ext/ExtPanelShareMapper.xml +++ b/backend/src/main/java/io/dataease/ext/ExtPanelShareMapper.xml @@ -5,6 +5,7 @@ + @@ -20,7 +21,7 @@ INSERT INTO panel_share (panel_group_id,target_id,granter,create_time,type) - VALUES + VALUES (#{share.panelGroupId}, #{share.targetId}, #{userName}, #{share.createTime}, #{share.type}) @@ -35,7 +36,7 @@ - select s.store_id,s.panel_group_id, g.name + select s.store_id,s.panel_group_id, g.name ,g.status from panel_store s inner join panel_group g on g.id = s.panel_group_id diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index 1051b8a3a2..5e693c977d 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -1,7 +1,17 @@