From 57c0f2d74514f17f1195a674b03e5f6081847e2c Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 15 Feb 2022 17:07:40 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E5=88=97=E8=A1=A8=E5=9B=BE=E6=A0=87=EF=BC=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=AD=A3=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=AD=98=E9=87=8F=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E5=88=97=E8=A1=A8=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtVAuthModelMapper.xml         | 11 ++++++-----
 .../src/main/resources/db/migration/V32__1.8.sql    |  2 +-
 frontend/src/views/panel/ViewSelect/index.vue       | 13 ++++++++-----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml
index c99b4a0d0e..133ca26079 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml
@@ -119,8 +119,8 @@
         'leaf' AS node_type,
         'view' AS model_type
         FROM
-        panel_view
-        LEFT JOIN chart_view ON panel_view.chart_view_id = chart_view.id
+        chart_view
+        LEFT JOIN panel_view ON panel_view.chart_view_id = chart_view.id
         <where>
 
             <if test="record.pids != null and record.pids.size() > 0">
@@ -151,7 +151,8 @@
             UNION ALL
 
         SELECT
-            panel_view.id,
+            distinct
+            chart_view.id,
             chart_view.id AS 'inner_id',
             chart_view.NAME,
             chart_view.NAME AS 'label',
@@ -160,8 +161,8 @@
             'leaf' AS node_type,
             'view' AS model_type
         FROM
-            panel_view
-            LEFT JOIN chart_view ON panel_view.chart_view_id = chart_view.id
+            chart_view
+            LEFT JOIN panel_view ON panel_view.chart_view_id = chart_view.id
         <where>
             chart_view.chart_type ='public'
             <if test="record.pids != null and record.pids.size() > 0">
diff --git a/backend/src/main/resources/db/migration/V32__1.8.sql b/backend/src/main/resources/db/migration/V32__1.8.sql
index 2e33e1ab09..26059ceef2 100644
--- a/backend/src/main/resources/db/migration/V32__1.8.sql
+++ b/backend/src/main/resources/db/migration/V32__1.8.sql
@@ -2,7 +2,7 @@ ALTER TABLE `chart_view` ADD COLUMN `x_axis_ext` LONGTEXT COMMENT 'table-row' AF
 UPDATE `chart_view` SET `x_axis_ext` = '[]';
 
 
-INSERT INTO `chart_group` (`id`, `name`, `pid`, `level`, `type`, `create_by`, `create_time`) VALUES ('0', 'i18n_public_chart', 'public_chart', -1, 'group', 'admin', NULL);
+INSERT INTO `chart_group` (`id`, `name`, `pid`, `level`, `type`, `create_by`, `create_time`) VALUES ('0', 'i18n_public_chart', 'public_chart', -1, 'history', 'admin', NULL);
 
 ALTER TABLE `chart_view`
 MODIFY COLUMN `scene_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '场景ID chart_type为privat的时候 是仪表板id' AFTER `title`,
diff --git a/frontend/src/views/panel/ViewSelect/index.vue b/frontend/src/views/panel/ViewSelect/index.vue
index dbfa684887..c246762728 100644
--- a/frontend/src/views/panel/ViewSelect/index.vue
+++ b/frontend/src/views/panel/ViewSelect/index.vue
@@ -36,11 +36,14 @@
         >
           <span slot-scope="{ node, data }" class="custom-tree-node">
             <span>
-              <span v-if="data.modelType==='panel'|| data.nodeType === 'spine'">
-                <el-button
-                  icon="el-icon-folder"
-                  type="text"
-                />
+              <span v-if="data.modelInnerType==='history'">
+                <i class="el-icon-collection" />
+              </span>
+              <span v-else-if="data.nodeType === 'spine'">
+                <i class="el-icon-folder" />
+              </span>
+              <span v-else-if="data.modelType==='panel'&& data.nodeType === 'leaf'">
+                <svg-icon icon-class="panel" class="ds-icon-scene" />
               </span>
               <span v-else>
                 <svg-icon :icon-class="data.modelInnerType" style="width: 14px;height: 14px" />