From 0e20267cbbcdc1a7f152793b7b4df2c7784a14d3 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 30 Jan 2023 15:33:33 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BB=8E=E6=A8=A1=E6=9D=BF=E6=96=B0=E5=BB=BA=E7=9A=84=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E7=BB=84=E4=BB=B6=E5=9C=A8=E6=B2=A1=E6=9C=89=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E5=85=B3=E8=81=94=E6=95=B0=E6=8D=AE=E9=9B=86=E5=89=8D?=
 =?UTF-8?q?=E5=BF=BD=E7=95=A5=E6=9D=83=E9=99=90=E6=A3=80=E6=9F=A5,?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=8A=A5=E6=97=A0=E6=9D=83=E9=99=90=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/panel/PanelGroupService.java | 3 +++
 frontend/src/api/dataset/dataset.js                       | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index 665a9c0609..125abb63c0 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -509,6 +509,9 @@ public class PanelGroupService {
             if (dynamicDataMap == null) {
                 DataEaseException.throwException("Please use the template after v1.9");
             }
+            //custom组件替换.tableId 和 parentFieldId 追加识别标识
+            templateData = templateData.replaceAll("\"tableId\":\"", "\"tableId\":\"no_auth");
+            templateData = templateData.replaceAll("\"fieldsParent\":\\{\"id\":\"", "\"fieldsParent\":\\{\"id\":\"no_auth");
 
             List<PanelViewInsertDTO> panelViews = new ArrayList<>();
             List<PanelGroupExtendDataDTO> viewsData = new ArrayList<>();
diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js
index a194700c45..359eb9f340 100644
--- a/frontend/src/api/dataset/dataset.js
+++ b/frontend/src/api/dataset/dataset.js
@@ -138,6 +138,14 @@ export function fieldList(id, showLoading = true) {
 }
 
 export function fieldListWithPermission(id, showLoading = true) {
+  //初始模板中的过滤组件无需走后台
+  if (id.indexOf('no_auth') > -1) {
+    return new Promise(function(resolve) {
+      resolve({
+        data: []
+      })
+    })
+  }
   return request({
     url: '/dataset/field/listWithPermission/' + id,
     loading: showLoading,