From dab778b109fa5e55768d90bdeef8188a8800fa96 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 23 Aug 2021 14:46:46 +0800
Subject: [PATCH 01/11] =?UTF-8?q?refactor:=E7=BC=96=E8=BE=91=E6=97=B6?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E7=9A=84=E8=AE=BE=E7=BD=AE=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=B0=B8=E8=BF=9C=E5=9C=A8=E6=9C=80=E4=B8=8A=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/DeDrag/index.vue                   | 3 ++-
 frontend/src/components/canvas/components/Editor/index.vue | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index 300e8c53c3..eefbe0ffc2 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -20,7 +20,7 @@
     @mouseenter="enter"
     @mouseleave="leave"
   >
-    <edit-bar v-if="active||linkageSettingStatus" :active-model="'edit'" :element="element" @showViewDetails="showViewDetails" />
+    <edit-bar style="transform: translateZ(10px)" v-if="active||linkageSettingStatus" :active-model="'edit'" :element="element" @showViewDetails="showViewDetails" />
     <div
       v-for="(handlei, indexi) in actualHandles"
       :key="indexi"
@@ -1566,6 +1566,7 @@ export default {
 .vdr {
   touch-action: none;
   position: absolute;
+  transform-style:preserve-3d;
   border: 1px
 }
 
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 57b2a8de21..efc45fe8b8 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -637,6 +637,7 @@ export default {
     /*background: #fff;*/
     margin: auto;
     background-size:100% 100% !important;
+    transform-style:preserve-3d;
 
     .lock {
         opacity: .5;

From 9d0951bca380a7465bae3fe927c66a1da5b5d37b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 23 Aug 2021 15:10:13 +0800
Subject: [PATCH 02/11] =?UTF-8?q?refactor:=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=B8=85=E9=99=A4=E8=81=94=E5=8A=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=8D=E9=9C=80=E8=A6=81=E5=86=8D=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/store/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index b9b876dea1..46370c74d9 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -243,7 +243,7 @@ const data = {
           item.linkageFilters.splice(0, item.linkageFilters.length)
         }
       })
-      state.styleChangeTimes++
+      // state.styleChangeTimes++
     }
   },
   modules: {

From 523ff395f5a869b4fa246a86222a6bfed428737e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 23 Aug 2021 15:51:19 +0800
Subject: [PATCH 03/11] =?UTF-8?q?refactor:=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=E6=94=BE=E7=9D=80transfrom=E4=BD=BFz-index?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/Editor/index.vue           | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index efc45fe8b8..a8b3e2af37 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -3,7 +3,12 @@
     v-if="showDrag"
     id="editor"
     class="editor"
-    :class="{ edit: isEdit }"
+    :class="[
+      {
+        ['edit']: isEdit ,
+        ['parent_transform']:!chartDetailsVisible
+      }
+    ]"
     :style="customStyle"
     @mousedown="handleMouseDown"
   >
@@ -167,6 +172,7 @@ export default {
   props: {
     isEdit: {
       type: Boolean,
+      require: false,
       default: true
     },
 
@@ -637,12 +643,16 @@ export default {
     /*background: #fff;*/
     margin: auto;
     background-size:100% 100% !important;
-    transform-style:preserve-3d;
-
+    /*transform-style:preserve-3d;*/
     .lock {
         opacity: .5;
     }
 }
+.parent_transform {
+  //transform transform 会使z-index 失效；为了使编辑仪表板时 按钮一直在上面 采用transform-style 的方式
+  // transform-style 会导致 dialog 遮罩有问题 此处暂时用这个样式做控制
+  transform-style:preserve-3d;
+}
 .edit {
     outline: 1px solid gainsboro;
     .component {

From 4eaaf2273e5f43efb565fdbcf4522e14d2ea4a48 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 23 Aug 2021 16:27:05 +0800
Subject: [PATCH 04/11] =?UTF-8?q?feat:=20=E6=A0=A1=E9=AA=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E7=8A=B6=E6=80=81=E6=97=B6=EF=BC=8C=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6=E5=88=B7=E6=96=B0=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AD=E6=95=B0=E6=8D=AE=E6=BA=90=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DatasourceController.java      |  8 ++++++
 .../datasource/service/DatasourceService.java | 21 ++++++++++----
 frontend/src/api/system/datasource.js         |  8 ++++++
 frontend/src/views/system/datasource/form.vue | 28 ++++++++++++++++---
 4 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java b/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java
index 6e5e6ba63e..9a1c734a7e 100644
--- a/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java
+++ b/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java
@@ -7,6 +7,7 @@ import io.dataease.base.domain.Datasource;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.PageUtils;
 import io.dataease.commons.utils.Pager;
+import io.dataease.controller.ResultHolder;
 import io.dataease.controller.request.DatasourceUnionRequest;
 import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.datasource.dto.DBTableDTO;
@@ -41,6 +42,13 @@ public class DatasourceController {
         datasourceService.validate(datasource);
     }
 
+    @ApiOperation("验证数据源")
+    @GetMapping("/validate/{datasourceId}")
+    public ResultHolder validate(@PathVariable String datasourceId) {
+        return datasourceService.validate(datasourceId);
+    }
+
+
     @ApiOperation("查询当前用户数据源")
     @GetMapping("/list")
     public List<DatasourceDTO> getDatasourceList() throws Exception {
diff --git a/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java b/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java
index 18b54e7a02..5802ef3d8b 100644
--- a/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java
+++ b/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java
@@ -9,6 +9,7 @@ import io.dataease.commons.exception.DEException;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.CommonThreadPool;
 import io.dataease.commons.utils.LogUtil;
+import io.dataease.controller.ResultHolder;
 import io.dataease.controller.request.DatasourceUnionRequest;
 import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.controller.sys.base.ConditionEntity;
@@ -126,13 +127,23 @@ public class DatasourceService {
         datasourceProvider.checkStatus(datasourceRequest);
     }
 
-    public void validate(String datasourceId) throws Exception {
-        if(StringUtils.isEmpty(datasourceId)){
-            return;
-        }
+    public ResultHolder validate(String datasourceId) {
         Datasource datasource = datasourceMapper.selectByPrimaryKey(datasourceId);
-        validate(datasource);
+        if(datasource == null){
+            return ResultHolder.error("Can not find datasource: "+ datasourceId);
+        }
+        try {
+            validate(datasource);
+            datasource.setStatus("Success");
+            return ResultHolder.success("Success");
+        }catch (Exception e){
+            datasource.setStatus("Error");
+            return ResultHolder.error("Datasource is invalid: " + e.getMessage());
+        }finally {
+            datasourceMapper.updateByPrimaryKey(datasource);
+        }
     }
+
     public List<String> getSchema(Datasource datasource) throws Exception {
         DatasourceProvider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
         DatasourceRequest datasourceRequest = new DatasourceRequest();
diff --git a/frontend/src/api/system/datasource.js b/frontend/src/api/system/datasource.js
index 2f069d430d..2cea64d8ff 100644
--- a/frontend/src/api/system/datasource.js
+++ b/frontend/src/api/system/datasource.js
@@ -50,6 +50,14 @@ export function validateDs(data) {
   })
 }
 
+export function validateDsById(datasourceId) {
+  return request({
+    url: 'datasource/validate/' + datasourceId,
+    method: 'get',
+    loading: true
+  })
+}
+
 export function getSchema(data) {
   return request({
     url: 'datasource/getSchema/',
diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue
index aa53f162ec..591b3bb2ca 100644
--- a/frontend/src/views/system/datasource/form.vue
+++ b/frontend/src/views/system/datasource/form.vue
@@ -100,7 +100,7 @@
 
 <script>
 import LayoutContent from '@/components/business/LayoutContent'
-import { addDs, editDs, getSchema, validateDs } from '@/api/system/datasource'
+import { addDs, editDs, getSchema, validateDs, validateDsById } from '@/api/system/datasource'
 import { $confirm } from '@/utils/message'
 
 export default {
@@ -276,9 +276,29 @@ export default {
         if (valid) {
           const data = JSON.parse(JSON.stringify(this.form))
           data.configuration = JSON.stringify(data.configuration)
-          validateDs(data).then(res => {
-            this.$success(this.$t('datasource.validate_success'))
-          })
+          if(data.showModel === 'show' && !this.canEdit){
+            validateDsById(data.id).then(res => {
+              if(res.success === 'true'){
+                this.$success(this.$t('datasource.validate_success'))
+              }else {
+                this.$error(this.$t(res.message))
+              }
+              this.refreshTree()
+            }).catch(res => {
+              this.$error(res.message)
+            })
+
+          }else {
+            validateDs(data).then(res => {
+              if(res.success === 'true'){
+                this.$success(this.$t('datasource.validate_success'))
+              }else {
+                this.$error(this.$t(res.message))
+              }
+            }).catch(res => {
+              this.$error(res.message)
+            })
+          }
         } else {
           return false
         }

From f26adc38c9c978d9d078e12ec0fce0ff0ec6e84a Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 23 Aug 2021 17:23:11 +0800
Subject: [PATCH 05/11] =?UTF-8?q?fix:=20=E5=85=AC=E5=85=B1=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=BC=B9=E5=87=BA=E7=99=BB=E5=BD=95=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/service/impl/ShiroServiceImpl.java   |  3 +-
 frontend/src/lang/en.js                       |  3 +-
 frontend/src/lang/tw.js                       | 38 ++++++++++---------
 frontend/src/lang/zh.js                       |  3 +-
 .../views/chart/components/ChartComponent.vue |  5 +++
 5 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
index 8ebf604a00..0e9361b330 100644
--- a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
+++ b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
@@ -63,12 +63,13 @@ public class ShiroServiceImpl implements ShiroService {
         filterChainDefinitionMap.put("/tokenExpired", ANON);
         filterChainDefinitionMap.put("/downline", ANON);
         filterChainDefinitionMap.put("/common-files/**", ANON);
-
+        filterChainDefinitionMap.put("/linkage/getPanelAllLinkageInfo/**", ANON);
         filterChainDefinitionMap.put("/api/auth/logout", "logout");
 
         filterChainDefinitionMap.put("/api/link/resourceDetail/**", "link");
         filterChainDefinitionMap.put("/api/link/viewDetail/**", "link");
 
+
         filterChainDefinitionMap.put("/**", "authc");
 
         filterChainDefinitionMap.put("/**", "jwt");
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index d93a7b477c..97b552de8f 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1217,7 +1217,8 @@ export default {
     remove_all_linkage: 'Remove All Linkage',
     exit_un_march_linkage_field: 'Exit Un March Linkage Field',
     details: 'Details',
-    setting: 'Setting'
+    setting: 'Setting',
+    no_drill_field: 'Miss relation field'
   },
   plugin: {
     local_install: 'Local installation',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index a0006686ce..79a40eaef3 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -717,8 +717,8 @@ export default {
     area_mode: '面積',
     rose_radius: '園角',
     view_name: '視圖標題',
-    belong_group: '所属分组',
-    select_group: '选择分组',
+    belong_group: '所屬分組',
+    select_group: '選擇分組',
     name_can_not_empty: '名稱不能為空',
     template_can_not_empty: '請選擇儀表板',
     custom_count: '記錄數',
@@ -812,8 +812,8 @@ export default {
     color_red: '火紅',
     color_fast: '輕快',
     color_spiritual: '靈動',
-    chart_details: '视图明细',
-    export_details: '导出明细',
+    chart_details: '視圖明細',
+    export_details: '導出明細',
     chart_data: '數據',
     chart_style: '樣式',
     drag_block_type_axis: '類別軸',
@@ -846,7 +846,7 @@ export default {
     height: '高度',
     system_case: '系統方案',
     custom_case: '自定義',
-    last_layer: '当前已经是最后一级'
+    last_layer: '當前已經是最後一級'
   },
   dataset: {
     sheet_warn: '有多個sheet頁面，默認抽取第一個',
@@ -988,7 +988,7 @@ export default {
       dataset: '數據集',
       search_by_name: '根據名稱搜索',
       underway: '等待執行',
-      stopped: '執行结束',
+      stopped: '執行結束',
       pending: '暫停',
       exec: '執行一次',
       confirm_exec: '手動觸發執行？',
@@ -1003,7 +1003,7 @@ export default {
     can_not_union_diff_datasource: '被關聯數據集必須與當前數據集的數據源一致',
     operator: '操作',
     d_q_trans: '維度/指標轉換',
-    add_calc_field: '新建计算字段',
+    add_calc_field: '新建計算字段',
     input_name: '請輸入名稱',
     field_exp: '字段表達式',
     data_type: '數據類型',
@@ -1168,7 +1168,7 @@ export default {
     bottomComponent: '置底',
     upComponent: '上移',
     downComponent: '下移',
-    linkage_setting: '联动设置',
+    linkage_setting: '聯動設置',
     open_aided_design: '打開組件輔助設計',
     close_aided_design: '關閉組件輔助設計',
     open_style_design: '打開樣式設計',
@@ -1206,17 +1206,18 @@ export default {
     source_panel_name: '原儀表板名稱',
     content_style: '內容樣式',
     canvas_self_adaption: '自適應畫布區域',
-    panel_save_tips: '仪表板已变动，是否保存？',
-    panel_save_warn_tips: '如果未保存，你对仪表板做的变更将会丢失！',
+    panel_save_tips: '儀表板已變動，是否保存？',
+    panel_save_warn_tips: '如果未保存，你對儀表板做的變更將會丟失！',
     do_not_save: '不保存',
     save: '保存',
-    drill: '下钻',
-    linkage: '联动',
-    cancel_linkage: '取消联动',
-    remove_all_linkage: '清除所有联动',
-    exit_un_march_linkage_field: '存在未匹配联动关系的字段',
-    details: '详情',
-    setting: '设置'
+    drill: '下鑽',
+    linkage: '聯動',
+    cancel_linkage: '取消聯動',
+    remove_all_linkage: '清除所有聯動',
+    exit_un_march_linkage_field: '存在未匹配聯動關系的字段',
+    details: '詳情',
+    setting: '設置',
+    no_drill_field: '缺少關聯字段'
   },
   plugin: {
     local_install: '本地安裝',
@@ -1323,7 +1324,7 @@ export default {
     week_start: '從星期',
     week_end: '至星期',
     every_year: '每年',
-    week_tips: '说明：1-7 分别对应 周日-周六',
+    week_tips: '說明：1-7 分別對應 周日-周六',
     minute_limit: '分鐘不能小於1，大於59',
     hour_limit: '小時不能小於1，大於523',
     day_limit: '天不能小於1，大於531'
@@ -1408,3 +1409,4 @@ export default {
     placeholder: '請選擇年份'
   }
 }
+
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index ba6d5cd0b2..56d071bb02 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1218,7 +1218,8 @@ export default {
     remove_all_linkage: '清除所有联动',
     exit_un_march_linkage_field: '存在未匹配联动关系的字段',
     details: '详情',
-    setting: '设置'
+    setting: '设置',
+    no_drill_field: '缺少关联字段'
   },
   plugin: {
     local_install: '本地安装',
diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue
index 5e673dc7ea..7c81e1e8a0 100644
--- a/frontend/src/views/chart/components/ChartComponent.vue
+++ b/frontend/src/views/chart/components/ChartComponent.vue
@@ -216,6 +216,11 @@ export default {
       chart.resize()
     },
     trackClick(trackAction) {
+      const param = this.pointParam
+      if (!param || !param.data || !param.data.dimensionList) {
+        this.$warning(this.$t('panel.no_drill_field'))
+        return
+      }
       const linkageParam = {
         viewId: this.chart.id,
         dimensionList: this.pointParam.data.dimensionList,

From c79ea5d87b2a0bc6cdb525ca21c647585389357b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 23 Aug 2021 17:34:43 +0800
Subject: [PATCH 06/11] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=A7=92=E8=89=B2=E5=88=97=E8=A1=A8=E9=81=AE=E7=BD=A9?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/user/form.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/views/system/user/form.vue b/frontend/src/views/system/user/form.vue
index 72d71aec53..20ee51390e 100644
--- a/frontend/src/views/system/user/form.vue
+++ b/frontend/src/views/system/user/form.vue
@@ -45,6 +45,7 @@
       </el-form-item>
       <el-form-item :label="$t('commons.role')" prop="roleIds">
         <el-select
+          ref="roleSelect"
           v-model="form.roleIds"
           style="width: 100%"
           :disabled="formType !== 'add' && form.isAdmin"
@@ -298,6 +299,7 @@ export default {
       this.$router.push({ name: 'system-user' })
     },
     filterData(instanceId) {
+      this.$refs.roleSelect && this.$refs.roleSelect.blur && this.$refs.roleSelect.blur()
       if (!this.depts) {
         return
       }

From 7adf045701a39dd50ba12d4c08104a2e08c06c47 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 24 Aug 2021 11:52:42 +0800
Subject: [PATCH 07/11] =?UTF-8?q?fix:=20=E6=97=B6=E9=97=B4=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/dataset/ExtractDataService.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index 619587a1be..5df363f22e 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -464,6 +464,7 @@ public class ExtractDataService {
                     Column_Fields = Column_Fields + "varchar(lenth)".replace("lenth", String.valueOf(size)) + ",`";
                     break;
                 case 1:
+                    size  = size < 50? 50 : size;
                     Column_Fields = Column_Fields + "varchar(lenth)".replace("lenth", String.valueOf(size)) + ",`";
                     break;
                 case 2:

From e97c0d8e36d704d005751417309587ff8e794fa9 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 24 Aug 2021 12:02:33 +0800
Subject: [PATCH 08/11] =?UTF-8?q?feat:=20=E9=9B=B7=E8=BE=BE=E5=9B=BE?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                                       | 3 ++-
 frontend/src/lang/tw.js                                       | 3 ++-
 frontend/src/lang/zh.js                                       | 3 ++-
 frontend/src/views/chart/chart/chart.js                       | 1 +
 frontend/src/views/chart/chart/radar/radar.js                 | 1 +
 .../src/views/chart/components/shape-attr/SizeSelector.vue    | 4 ++++
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 97b552de8f..8532718ef6 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -847,7 +847,8 @@ export default {
     height: 'Height',
     system_case: 'System',
     custom_case: 'Custom',
-    last_layer: 'This Is The Last Layer'
+    last_layer: 'This Is The Last Layer',
+    radar_size: 'Size'
   },
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 79a40eaef3..16e2f4543b 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -846,7 +846,8 @@ export default {
     height: '高度',
     system_case: '系統方案',
     custom_case: '自定義',
-    last_layer: '當前已經是最後一級'
+    last_layer: '當前已經是最後一級',
+    radar_size: '大小'
   },
   dataset: {
     sheet_warn: '有多個sheet頁面，默認抽取第一個',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 56d071bb02..e2d201ea11 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -846,7 +846,8 @@ export default {
     height: '高度',
     system_case: '系统方案',
     custom_case: '自定义',
-    last_layer: '当前已经是最后一级'
+    last_layer: '当前已经是最后一级',
+    radar_size: '大小'
   },
   dataset: {
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',
diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index df765c00f0..fecf05878d 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -25,6 +25,7 @@ export const DEFAULT_SIZE = {
   pieRoseRadius: 5,
   funnelWidth: 80,
   radarShape: 'polygon',
+  radarSize: 80,
   tableTitleFontSize: 12,
   tableItemFontSize: 12,
   tableTitleHeight: 36,
diff --git a/frontend/src/views/chart/chart/radar/radar.js b/frontend/src/views/chart/chart/radar/radar.js
index cf1e9b37a1..56e6ec55d1 100644
--- a/frontend/src/views/chart/chart/radar/radar.js
+++ b/frontend/src/views/chart/chart/radar/radar.js
@@ -12,6 +12,7 @@ export function baseRadarOption(chart_option, chart) {
     // size
     if (customAttr.size) {
       chart_option.radar.shape = customAttr.size.radarShape
+      chart_option.radar.radius = (customAttr.size.radarSize ? customAttr.size.radarSize : 80) + '%'
     }
     // tooltip
     if (customAttr.tooltip) {
diff --git a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
index 1dd5a77237..e39a28e73b 100644
--- a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
@@ -78,6 +78,9 @@
             <el-radio-button label="circle">{{ $t('chart.circle') }}</el-radio-button>
           </el-radio-group>
         </el-form-item>
+        <el-form-item :label="$t('chart.radar_size')" class="form-item form-item-slider">
+          <el-slider v-model="sizeForm.radarSize" show-input :show-input-controls="false" input-size="mini" :min="0" :max="100" @change="changeBarSizeCase" />
+        </el-form-item>
       </el-form>
 
       <el-form v-show="chart.type && chart.type.includes('table')" ref="sizeFormPie" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="100px" size="mini">
@@ -220,6 +223,7 @@ export default {
           this.sizeForm = customAttr.size
           this.sizeForm.treemapWidth = this.sizeForm.treemapWidth ? this.sizeForm.treemapWidth : 80
           this.sizeForm.treemapHeight = this.sizeForm.treemapHeight ? this.sizeForm.treemapHeight : 80
+          this.sizeForm.radarSize = this.sizeForm.radarSize ? this.sizeForm.radarSize : 80
         }
       }
     },

From 407bdb52c4a27fdda3142b12ae466be48919c988 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 24 Aug 2021 13:45:45 +0800
Subject: [PATCH 09/11] =?UTF-8?q?refactor:=E4=BB=AA=E8=A1=A8=E7=89=88?=
 =?UTF-8?q?=E9=A6=96=E6=AC=A1=E5=88=B7=E7=BA=BF=E8=AE=BE=E7=BD=AE=E4=B8=BA?=
 =?UTF-8?q?5=E5=88=86=E9=92=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/components/Editor/Preview.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index d40a4ae3ed..488dd6381c 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -84,7 +84,7 @@ export default {
       componentDataShow: [],
       mainWidth: '100%',
       mainHeight: '100%',
-      searchCount: -1,
+      searchCount: 0,
       chartDetailsVisible: false,
       showChartInfo: {},
       showChartTableInfo: {}

From e83510f4b76babd70da5f0a94c9b99a7aea8d4e1 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 24 Aug 2021 15:03:17 +0800
Subject: [PATCH 10/11] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DatasourceController.java      |  4 ++--
 .../datasource/service/DatasourceService.java | 21 +++++++++++++------
 .../service/dataset/ExtractDataService.java   |  4 +++-
 frontend/src/views/system/datasource/form.vue |  4 ++--
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java b/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java
index 9a1c734a7e..6836c86526 100644
--- a/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java
+++ b/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java
@@ -38,8 +38,8 @@ public class DatasourceController {
 
     @ApiOperation("验证数据源")
     @PostMapping("/validate")
-    public void validate(@RequestBody Datasource datasource) throws Exception {
-        datasourceService.validate(datasource);
+    public ResultHolder validate(@RequestBody Datasource datasource) throws Exception {
+        return datasourceService.validate(datasource);
     }
 
     @ApiOperation("验证数据源")
diff --git a/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java b/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java
index 5802ef3d8b..aabe5cc7f5 100644
--- a/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java
+++ b/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java
@@ -120,11 +120,17 @@ public class DatasourceService {
         checkAndUpdateDatasourceStatus(datasource);
     }
 
-    public void validate(Datasource datasource) throws Exception {
-        DatasourceProvider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
-        DatasourceRequest datasourceRequest = new DatasourceRequest();
-        datasourceRequest.setDatasource(datasource);
-        datasourceProvider.checkStatus(datasourceRequest);
+    public ResultHolder validate(Datasource datasource) throws Exception {
+        try {
+            DatasourceProvider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
+            DatasourceRequest datasourceRequest = new DatasourceRequest();
+            datasourceRequest.setDatasource(datasource);
+            datasourceProvider.checkStatus(datasourceRequest);
+            return ResultHolder.success("Success");
+        }catch (Exception e){
+            return ResultHolder.error("Datasource is invalid: " + e.getMessage());
+        }
+
     }
 
     public ResultHolder validate(String datasourceId) {
@@ -133,7 +139,10 @@ public class DatasourceService {
             return ResultHolder.error("Can not find datasource: "+ datasourceId);
         }
         try {
-            validate(datasource);
+            DatasourceProvider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
+            DatasourceRequest datasourceRequest = new DatasourceRequest();
+            datasourceRequest.setDatasource(datasource);
+            datasourceProvider.checkStatus(datasourceRequest);
             datasource.setStatus("Success");
             return ResultHolder.success("Success");
         }catch (Exception e){
diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index 5df363f22e..04488064cf 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -572,7 +572,9 @@ public class ExtractDataService {
     }
 
     private void extractData(DatasetTable datasetTable, String extractType) throws Exception {
-        datasourceService.validate(datasetTable.getDataSourceId());
+        if(StringUtils.isNotEmpty(datasetTable.getDataSourceId())){
+            datasourceService.validate(datasetTable.getDataSourceId());
+        }
         KettleFileRepository repository = CommonBeanFactory.getBean(KettleFileRepository.class);
         RepositoryDirectoryInterface repositoryDirectoryInterface = repository.loadRepositoryDirectoryTree();
         TransMeta transMeta = null;
diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue
index 591b3bb2ca..36b96dbd17 100644
--- a/frontend/src/views/system/datasource/form.vue
+++ b/frontend/src/views/system/datasource/form.vue
@@ -278,7 +278,7 @@ export default {
           data.configuration = JSON.stringify(data.configuration)
           if(data.showModel === 'show' && !this.canEdit){
             validateDsById(data.id).then(res => {
-              if(res.success === 'true'){
+              if(res.success){
                 this.$success(this.$t('datasource.validate_success'))
               }else {
                 this.$error(this.$t(res.message))
@@ -290,7 +290,7 @@ export default {
 
           }else {
             validateDs(data).then(res => {
-              if(res.success === 'true'){
+              if(res.success){
                 this.$success(this.$t('datasource.validate_success'))
               }else {
                 this.$error(this.$t(res.message))

From 8d6d49eb14af3b473999f09f14e54915d9e63f88 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 24 Aug 2021 16:51:09 +0800
Subject: [PATCH 11/11] =?UTF-8?q?refactor:=E4=BC=98=E5=8C=96=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=9F=A5=E8=AF=A2=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtChartGroupMapper.xml   | 33 ++++++++-
 .../base/mapper/ext/ExtChartViewMapper.xml    | 33 ++++++++-
 .../base/mapper/ext/ExtDataSetGroupMapper.xml | 33 ++++++++-
 .../base/mapper/ext/ExtDataSetTableMapper.xml | 33 ++++++++-
 .../base/mapper/ext/ExtDataSourceMapper.xml   | 66 ++++++++++++++++-
 .../base/mapper/ext/ExtPanelGroupMapper.xml   | 72 +++++++++++++++++--
 6 files changed, 259 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartGroupMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartGroupMapper.xml
index dfe3e343ed..92b95a8832 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartGroupMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartGroupMapper.xml
@@ -12,8 +12,39 @@
     <select id="search" resultMap="BaseResultMapDTO">
         select
         id, `name`, ifnull(pid,0) as pid, `level`, `type`, create_by, create_time,`name` as label,
-        get_auths(id,'chart',#{userId}) as `privileges`
+        authInfo.privileges as `privileges`
         from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'chart') cids) t,chart_group
+        left join (
+        SELECT
+        auth_source,
+        group_concat( DISTINCT sys_auth_detail.privilege_extend ) as `privileges`
+        FROM
+        (
+        `sys_auth`
+        LEFT JOIN `sys_auth_detail` ON ((
+        `sys_auth`.`id` = `sys_auth_detail`.`auth_id`
+        )))
+        WHERE
+        sys_auth_detail.privilege_value = 1
+        AND sys_auth.auth_source_type = 'chart'
+        AND (
+        (
+        sys_auth.auth_target_type = 'dept'
+        AND sys_auth.auth_target IN ( SELECT dept_id FROM sys_user WHERE user_id = #{userId} )
+        )
+        OR (
+        sys_auth.auth_target_type = 'user'
+        AND sys_auth.auth_target = #{userId}
+        )
+        OR (
+        sys_auth.auth_target_type = 'role'
+        AND sys_auth.auth_target IN ( SELECT role_id FROM sys_users_roles WHERE user_id = #{userId} )
+        )
+        )
+        GROUP BY
+        `sys_auth`.`auth_source`
+        ) authInfo
+        on chart_group.id = authInfo.auth_source
         <where>
             FIND_IN_SET(chart_group.id,cids)
             <if test="id != null">
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
index 66f0e6cb9b..772f9ede85 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
@@ -32,8 +32,39 @@
         select
         id, `name`, scene_id, table_id, `type`, title, create_by, create_time, update_time,
         style_priority,x_axis, y_axis, custom_attr, custom_style, custom_filter, snapshot,
-        get_auths(id,'chart',#{userId}) as `privileges`
+        authInfo.privileges as `privileges`
         from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'chart') cids) t,chart_view
+        left join (
+        SELECT
+        auth_source,
+        group_concat( DISTINCT sys_auth_detail.privilege_extend ) as `privileges`
+        FROM
+        (
+        `sys_auth`
+        LEFT JOIN `sys_auth_detail` ON ((
+        `sys_auth`.`id` = `sys_auth_detail`.`auth_id`
+        )))
+        WHERE
+        sys_auth_detail.privilege_value = 1
+        AND sys_auth.auth_source_type = 'chart'
+        AND (
+        (
+        sys_auth.auth_target_type = 'dept'
+        AND sys_auth.auth_target IN ( SELECT dept_id FROM sys_user WHERE user_id = #{userId} )
+        )
+        OR (
+        sys_auth.auth_target_type = 'user'
+        AND sys_auth.auth_target = #{userId}
+        )
+        OR (
+        sys_auth.auth_target_type = 'role'
+        AND sys_auth.auth_target IN ( SELECT role_id FROM sys_users_roles WHERE user_id = #{userId} )
+        )
+        )
+        GROUP BY
+        `sys_auth`.`auth_source`
+        ) authInfo
+        on chart_view.id = authInfo.auth_source
         <where>
             FIND_IN_SET(chart_view.id,cids)
             <if test="sceneId != null">
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetGroupMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetGroupMapper.xml
index 88ef56c5d3..cd4fe2976d 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetGroupMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetGroupMapper.xml
@@ -12,8 +12,39 @@
     <select id="search" resultMap="BaseResultMapDTO">
         select
         id, `name`, ifnull(pid,0) as pid, `level`, `type`, create_by, create_time,`name` as label,
-        get_auths(id,'dataset',#{userId}) as `privileges`
+        authInfo.privileges as `privileges`
         from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'dataset') cids) t,dataset_group
+        left join (
+        SELECT
+        auth_source,
+        group_concat( DISTINCT sys_auth_detail.privilege_extend ) as `privileges`
+        FROM
+        (
+        `sys_auth`
+        LEFT JOIN `sys_auth_detail` ON ((
+        `sys_auth`.`id` = `sys_auth_detail`.`auth_id`
+        )))
+        WHERE
+        sys_auth_detail.privilege_value = 1
+        AND sys_auth.auth_source_type = 'dataset'
+        AND (
+        (
+        sys_auth.auth_target_type = 'dept'
+        AND sys_auth.auth_target IN ( SELECT dept_id FROM sys_user WHERE user_id = #{userId} )
+        )
+        OR (
+        sys_auth.auth_target_type = 'user'
+        AND sys_auth.auth_target = #{userId}
+        )
+        OR (
+        sys_auth.auth_target_type = 'role'
+        AND sys_auth.auth_target IN ( SELECT role_id FROM sys_users_roles WHERE user_id = #{userId} )
+        )
+        )
+        GROUP BY
+        `sys_auth`.`auth_source`
+        ) authInfo
+        on dataset_group.id = authInfo.auth_source
         <where>
             FIND_IN_SET(dataset_group.id,cids)
             <if test="id != null">
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 be315eb38d..230f89883c 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
@@ -38,8 +38,39 @@
     <select id="search" resultMap="BaseResultMapDTO">
         select
         id, `name`, scene_id, data_source_id, `type`, `mode`,`info`, create_by, create_time,
-        get_auths(id,'dataset',#{userId}) as `privileges`
+        authInfo.privileges as `privileges`
         from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'dataset') cids) t,dataset_table
+        left join (
+        SELECT
+        auth_source,
+        group_concat( DISTINCT sys_auth_detail.privilege_extend ) as `privileges`
+        FROM
+        (
+        `sys_auth`
+        LEFT JOIN `sys_auth_detail` ON ((
+        `sys_auth`.`id` = `sys_auth_detail`.`auth_id`
+        )))
+        WHERE
+        sys_auth_detail.privilege_value = 1
+        AND sys_auth.auth_source_type = 'dataset'
+        AND (
+        (
+        sys_auth.auth_target_type = 'dept'
+        AND sys_auth.auth_target IN ( SELECT dept_id FROM sys_user WHERE user_id = #{userId} )
+        )
+        OR (
+        sys_auth.auth_target_type = 'user'
+        AND sys_auth.auth_target = #{userId}
+        )
+        OR (
+        sys_auth.auth_target_type = 'role'
+        AND sys_auth.auth_target IN ( SELECT role_id FROM sys_users_roles WHERE user_id = #{userId} )
+        )
+        )
+        GROUP BY
+        `sys_auth`.`auth_source`
+        ) authInfo
+        on dataset_table.id = authInfo.auth_source
         <where>
             FIND_IN_SET(dataset_table.id,cids)
             <if test="sceneId != null">
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml
index 21ae6ae243..44d2c1e2c5 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml
@@ -9,8 +9,39 @@
 
     <select id="query" parameterType="io.dataease.base.mapper.ext.query.GridExample" resultMap="BaseResultMapDTO">
         select id , name , `desc` ,`type` , configuration ,create_time ,update_time,
-        get_auths(id,'link',#{extendCondition}) as `privileges`
+        authInfo.privileges as `privileges`
          from (select GET_V_AUTH_MODEL_ID_P_USE (#{extendCondition}, 'link') cids) t,datasource
+        left join (
+        SELECT
+        auth_source,
+        group_concat( DISTINCT sys_auth_detail.privilege_extend ) as `privileges`
+        FROM
+        (
+        `sys_auth`
+        LEFT JOIN `sys_auth_detail` ON ((
+        `sys_auth`.`id` = `sys_auth_detail`.`auth_id`
+        )))
+        WHERE
+        sys_auth_detail.privilege_value = 1
+        AND sys_auth.auth_source_type = 'link'
+        AND (
+        (
+        sys_auth.auth_target_type = 'dept'
+        AND sys_auth.auth_target IN ( SELECT dept_id FROM sys_user WHERE user_id = #{extendCondition} )
+        )
+        OR (
+        sys_auth.auth_target_type = 'user'
+        AND sys_auth.auth_target = #{extendCondition}
+        )
+        OR (
+        sys_auth.auth_target_type = 'role'
+        AND sys_auth.auth_target IN ( SELECT role_id FROM sys_users_roles WHERE user_id = #{extendCondition} )
+        )
+        )
+        GROUP BY
+        `sys_auth`.`auth_source`
+        ) authInfo
+        on datasource.id = authInfo.auth_source
         <if test="_parameter != null">
             <include refid="io.dataease.base.mapper.ext.query.GridSql.gridCondition" />
         </if>
@@ -25,8 +56,39 @@
 
     <select id="queryUnion"  resultMap="BaseResultMapDTO">
         select id , name , `desc` ,`type` , configuration ,create_time ,update_time, status,
-        get_auths(id,'link',#{userId}) as `privileges`
+        authInfo.privileges as `privileges`
         from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'link') cids) t,datasource
+        left join (
+        SELECT
+        auth_source,
+        group_concat( DISTINCT sys_auth_detail.privilege_extend ) as `privileges`
+        FROM
+        (
+        `sys_auth`
+        LEFT JOIN `sys_auth_detail` ON ((
+        `sys_auth`.`id` = `sys_auth_detail`.`auth_id`
+        )))
+        WHERE
+        sys_auth_detail.privilege_value = 1
+        AND sys_auth.auth_source_type = 'chart'
+        AND (
+        (
+        sys_auth.auth_target_type = 'dept'
+        AND sys_auth.auth_target IN ( SELECT dept_id FROM sys_user WHERE user_id = #{userId} )
+        )
+        OR (
+        sys_auth.auth_target_type = 'user'
+        AND sys_auth.auth_target = #{userId}
+        )
+        OR (
+        sys_auth.auth_target_type = 'role'
+        AND sys_auth.auth_target IN ( SELECT role_id FROM sys_users_roles WHERE user_id = #{userId} )
+        )
+        )
+        GROUP BY
+        `sys_auth`.`auth_source`
+        ) authInfo
+        on datasource.id = authInfo.auth_source
         <where>
             FIND_IN_SET(datasource.id,cids)
         <if test="id != null">
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
index 8285cd02a4..bbb583c1e9 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
@@ -30,10 +30,41 @@
         panel_group.`source`,
         panel_group.`panel_type`,
         sourcePanelGroup.`name` as source_panel_name,
-        get_auths(panel_group.id,'panel',#{userId}) as `privileges`
+        authInfo.privileges as `privileges`
         from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'panel') cids) t,panel_group
-        LEFT JOIN (select id,`name` from panel_group) sourcePanelGroup
+        LEFT JOIN panel_group sourcePanelGroup
         on sourcePanelGroup.id=panel_group.source
+        left join (
+            SELECT
+            auth_source,
+            group_concat( DISTINCT sys_auth_detail.privilege_extend ) as `privileges`
+            FROM
+            (
+            `sys_auth`
+            LEFT JOIN `sys_auth_detail` ON ((
+            `sys_auth`.`id` = `sys_auth_detail`.`auth_id`
+            )))
+            WHERE
+            sys_auth_detail.privilege_value = 1
+            AND sys_auth.auth_source_type = 'panel'
+            AND (
+            (
+            sys_auth.auth_target_type = 'dept'
+            AND sys_auth.auth_target IN ( SELECT dept_id FROM sys_user WHERE user_id = #{userId} )
+            )
+            OR (
+            sys_auth.auth_target_type = 'user'
+            AND sys_auth.auth_target = #{userId}
+            )
+            OR (
+            sys_auth.auth_target_type = 'role'
+            AND sys_auth.auth_target IN ( SELECT role_id FROM sys_users_roles WHERE user_id = #{userId} )
+            )
+            )
+            GROUP BY
+            `sys_auth`.`auth_source`
+        ) authInfo
+        on panel_group.id = authInfo.auth_source
         <where>
             FIND_IN_SET(panel_group.id,cids)
             <if test="name != null">
@@ -78,10 +109,41 @@
         (case when ISNULL(defaultPanelGroup.id) then false else true end) is_default,
         defaultPanelGroup.id as default_panel_id,
         defaultPanelGroup.`name` as default_panel_name,
-        get_auths(panel_group.id,'panel',#{userId}) as `privileges`
+        authInfo.privileges as `privileges`
         from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'panel') cids) t,panel_group
-        LEFT JOIN (select source,id,`name` from panel_group where source is not null) defaultPanelGroup
-        on defaultPanelGroup.source=panel_group.id
+        LEFT JOIN panel_group defaultPanelGroup
+        on defaultPanelGroup.source=panel_group.id and defaultPanelGroup.source is not null
+        left join (
+            SELECT
+            auth_source,
+            group_concat( DISTINCT sys_auth_detail.privilege_extend ) as `privileges`
+            FROM
+            (
+            `sys_auth`
+            LEFT JOIN `sys_auth_detail` ON ((
+            `sys_auth`.`id` = `sys_auth_detail`.`auth_id`
+            )))
+            WHERE
+            sys_auth_detail.privilege_value = 1
+            AND sys_auth.auth_source_type = 'panel'
+            AND (
+            (
+            sys_auth.auth_target_type = 'dept'
+            AND sys_auth.auth_target IN ( SELECT dept_id FROM sys_user WHERE user_id = #{userId} )
+            )
+            OR (
+            sys_auth.auth_target_type = 'user'
+            AND sys_auth.auth_target = #{userId}
+            )
+            OR (
+            sys_auth.auth_target_type = 'role'
+            AND sys_auth.auth_target IN ( SELECT role_id FROM sys_users_roles WHERE user_id = #{userId} )
+            )
+            )
+            GROUP BY
+            `sys_auth`.`auth_source`
+        ) authInfo
+        on panel_group.id = authInfo.auth_source
         <where>
             FIND_IN_SET(panel_group.id,cids)
             <if test="name != null">