From 9124a9213d7aca1044d1c7c5b6d834d335ea4e48 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 18 May 2021 17:18:47 +0800
Subject: [PATCH] feat(backend):fix

---
 .../io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml  | 2 +-
 frontend/src/views/panel/list/PanelList.vue                | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml
index 9cffbcf462..05fca63f7a 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml
@@ -10,7 +10,7 @@
 
     <select id="search" resultMap="BaseResultMapDTO">
         select
-        id, `name`, scene_id, data_source_id, `type`, `mode`, create_by, create_time,
+        id, `name`, scene_id, data_source_id, `type`, `mode`,`info`, create_by, create_time,
         get_auths(id,'dataset',#{userId}) as `privileges`
         from dataset_table
         <where>
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index f410ebb3e9..4ab187586f 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -30,7 +30,10 @@
       <el-row>
         <span class="header-title">
           {{ $t('panel.panel') }}
-          <el-button style="float: right;padding-right: 7px;" type="text" icon="el-icon-circle-plus" @click="showEditPanel(newFolder)" />
+          <!--          <el-button style="float: right;padding-right: 7px;" type="text" @click="showEditPanel(newFolder)" />-->
+          <el-button style="float: right;" type="primary" size="mini" @click="showEditPanel(newFolder)">
+            {{ $t('panel.groupAdd') }}
+          </el-button>
         </span>
       </el-row>
       <el-col class="custom-tree-container">
@@ -331,12 +334,14 @@ export default {
           this.editPanel.panelInfo.name = this.$t('panel.panelAdd')
           this.editPanel.panelInfo.pid = param.data.id
           this.editPanel.panelInfo.level = param.data.level + 1
+          this.editPanel.panelInfo.panelType = 'self'
           break
         case 'newFirstFolder':
           this.editPanel.titlePre = this.$t('commons.create')
           this.editPanel.panelInfo.name = ''
           this.editPanel.panelInfo.pid = null
           this.editPanel.panelInfo.level = 0
+          this.editPanel.panelInfo.panelType = 'self'
           break
         case 'edit':
         case 'rename':