From d72f5432f24795d26dcd8a6e4fd164f92a210078 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 4 Jul 2022 15:01:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20Tab?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=80=89=E6=8B=A9=E8=A7=86=E5=9B=BE=E6=97=B6?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E8=A7=86=E5=9B=BE=E7=BB=84=E4=BB=B6=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=98=BE=E7=A4=BA=E5=9B=BE=E6=A0=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/dto/authModel/VAuthModelDTO.java |  2 ++
 .../io/dataease/ext/ExtVAuthModelMapper.xml   |  4 ++-
 .../main/resources/db/migration/V37__1.12.sql | 30 +++++++++++++++++++
 .../panel/ViewSelect/index-with-drag.vue      |  2 +-
 frontend/src/views/panel/ViewSelect/index.vue |  2 +-
 .../panel/ViewSelect/multiplexingView.vue     |  2 +-
 6 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java b/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java
index e832c7c1fe..2a0fc35736 100644
--- a/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java
+++ b/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java
@@ -22,6 +22,8 @@ public class VAuthModelDTO extends VAuthModelWithBLOBs implements ITreeBase<VAut
 
     private String innerId;
 
+    private Boolean isPlugin = false;
+
     public String toString(){
         return this.getName();
     }
diff --git a/backend/src/main/java/io/dataease/ext/ExtVAuthModelMapper.xml b/backend/src/main/java/io/dataease/ext/ExtVAuthModelMapper.xml
index 161095e7ee..9363041cda 100644
--- a/backend/src/main/java/io/dataease/ext/ExtVAuthModelMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtVAuthModelMapper.xml
@@ -5,6 +5,7 @@
                type="io.dataease.dto.authModel.VAuthModelDTO">
         <result column="privileges" jdbcType="VARCHAR" property="privileges"/>
         <result column="inner_id" jdbcType="VARCHAR" property="innerId"/>
+        <result column="is_plugin" jdbcType="VARCHAR" property="isPlugin"/>
     </resultMap>
 
     <select id="queryAuthModel" resultMap="ExtResultMap">
@@ -117,7 +118,8 @@
         panel_view.panel_id AS pid,
         chart_view.type as 'model_inner_type',
         'leaf' AS node_type,
-        'view' AS model_type
+        'view' AS model_type,
+        chart_view.is_plugin as 'is_plugin'
         FROM
         chart_view
         LEFT JOIN panel_view ON panel_view.chart_view_id = chart_view.id
diff --git a/backend/src/main/resources/db/migration/V37__1.12.sql b/backend/src/main/resources/db/migration/V37__1.12.sql
index 6d5cfe6a31..4fd4d7febe 100644
--- a/backend/src/main/resources/db/migration/V37__1.12.sql
+++ b/backend/src/main/resources/db/migration/V37__1.12.sql
@@ -65,3 +65,33 @@ CREATE TABLE `sys_user_assist` (
    `need_first_noti` bit(1) DEFAULT NULL COMMENT '是否需要首登提示',
    PRIMARY KEY (`user_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci;
+
+CREATE
+OR REPLACE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `v_history_chart_view` AS SELECT
+                                                                                         `chart_group`.`id` AS `id`,
+                                                                                         `chart_group`.`id` AS `inner_id`,
+                                                                                         `chart_group`.`name` AS `NAME`,
+                                                                                         `chart_group`.`name` AS `label`,
+                                                                                         `chart_group`.`pid` AS `pid`,
+                                                                                         `chart_group`.`type` AS `model_inner_type`,
+                                                                                         'spine' AS `node_type`,
+                                                                                         'view' AS `model_type`,
+                                                                                         1 AS `mode`,
+                                                                                         0 AS `is_plugin`
+                                                                                     FROM
+                                                                                         `chart_group` UNION ALL
+                                                                                     SELECT DISTINCT
+                                                                                         `chart_view`.`id` AS `id`,
+                                                                                         `chart_view`.`id` AS `inner_id`,
+                                                                                         `chart_view`.`name` AS `NAME`,
+                                                                                         `chart_view`.`name` AS `label`,
+                                                                                         `chart_view`.`scene_id` AS `pid`,
+                                                                                         `chart_view`.`type` AS `model_inner_type`,
+                                                                                         'leaf' AS `node_type`,
+                                                                                         'view' AS `model_type`,
+                                                                                         1 AS `mode`,
+                                                                                         `chart_view`.`is_plugin` AS `is_plugin`
+                                                                                     FROM
+                                                                                         `chart_view`
+                                                                                     WHERE
+                                                                                         ( `chart_view`.`chart_type` = 'public' );
diff --git a/frontend/src/views/panel/ViewSelect/index-with-drag.vue b/frontend/src/views/panel/ViewSelect/index-with-drag.vue
index 8b04def9eb..045eb8e95e 100644
--- a/frontend/src/views/panel/ViewSelect/index-with-drag.vue
+++ b/frontend/src/views/panel/ViewSelect/index-with-drag.vue
@@ -42,7 +42,7 @@
                 <svg-icon icon-class="panel" class="ds-icon-scene" />
               </span>
               <span v-else>
-                <svg-icon :icon-class="data.isPlugin && data.type && data.type !== 'buddle-map' ? ('/api/pluginCommon/staticInfo/' + data.modelInnerType + '/svg') : data.modelInnerType" style="width: 14px;height: 14px" />
+                <svg-icon :icon-class="data.isPlugin && data.modelInnerType && data.modelInnerType !== 'buddle-map' ? ('/api/pluginCommon/staticInfo/' + data.modelInnerType + '/svg') : data.modelInnerType" style="width: 14px;height: 14px" />
               </span>
               <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" :title="data.name">{{ data.name }}</span>
             </span>
diff --git a/frontend/src/views/panel/ViewSelect/index.vue b/frontend/src/views/panel/ViewSelect/index.vue
index 7439932e15..14d8f58692 100644
--- a/frontend/src/views/panel/ViewSelect/index.vue
+++ b/frontend/src/views/panel/ViewSelect/index.vue
@@ -46,7 +46,7 @@
                 <svg-icon icon-class="panel" class="ds-icon-scene" />
               </span>
               <span v-else>
-                <svg-icon :icon-class="data.isPlugin && data.type && data.type !== 'buddle-map' ? ('/api/pluginCommon/staticInfo/' + data.modelInnerType + '/svg') : data.modelInnerType" style="width: 14px;height: 14px" />
+                <svg-icon :icon-class="data.isPlugin && data.modelInnerType && data.modelInnerType !== 'buddle-map' ? ('/api/pluginCommon/staticInfo/' + data.modelInnerType + '/svg') : data.modelInnerType" style="width: 14px;height: 14px" />
               </span>
               <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" :title="data.name">{{ data.name }}</span>
             </span>
diff --git a/frontend/src/views/panel/ViewSelect/multiplexingView.vue b/frontend/src/views/panel/ViewSelect/multiplexingView.vue
index 9811a3a04d..3c3b3b0e12 100644
--- a/frontend/src/views/panel/ViewSelect/multiplexingView.vue
+++ b/frontend/src/views/panel/ViewSelect/multiplexingView.vue
@@ -35,7 +35,7 @@
                 <svg-icon icon-class="panel" class="ds-icon-scene" />
               </span>
               <span v-else>
-                <svg-icon :icon-class="data.isPlugin && data.type && data.type !== 'buddle-map' ? ('/api/pluginCommon/staticInfo/' + data.modelInnerType + '/svg') : data.modelInnerType" style="width: 14px;height: 14px" />
+                <svg-icon :icon-class="data.isPlugin && data.modelInnerType && data.modelInnerType !== 'buddle-map' ? ('/api/pluginCommon/staticInfo/' + data.modelInnerType + '/svg') : data.modelInnerType" style="width: 14px;height: 14px" />
               </span>
               <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" :title="data.name">{{ data.name }}</span>
             </span>