From 2185496cb52d7a101ea66adde1a34b20229fc835 Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Tue, 12 Apr 2022 11:23:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-68987=20=E6=8A=8A=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=BD=93=E4=BD=9C=E5=8F=AF=E9=80=89=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/javascript/JSContentPane.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java b/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java
index 65bec03a8..c9344f5ca 100644
--- a/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java
+++ b/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java
@@ -63,7 +63,9 @@ public class JSContentPane extends BasicPane {
         initFunctionTitle(args);
 
         JPanel jsParaPane = createJSParaPane();
-        addNewPaneLabel();
+        if (needAdvancedEditor()) {
+            addNewPaneLabel();
+        }
         this.add(jsParaPane, BorderLayout.NORTH);
 
         UIScrollPane sp = createContentTextAreaPanel();
@@ -323,4 +325,8 @@ public class JSContentPane extends BasicPane {
         return provider;
 
     }
+
+    protected boolean needAdvancedEditor() {
+        return true;
+    }
 }
\ No newline at end of file

From bb4279b19c0d109f6e96d87d0b82c3326e0d46c8 Mon Sep 17 00:00:00 2001
From: wtianye <10320502+wtianye@user.noreply.gitee.com>
Date: Tue, 10 May 2022 15:37:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-71207=20=E5=9C=BA=E6=99=AF=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=88=A0=E9=99=A4=E8=B6=85=E9=93=BE=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E7=9A=84=E2=80=9C=E5=8F=96=E6=B6=88=E2=80=9D=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/designer/component/VanChartUIListControlPane.java   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java
index bfa8b43e9..ba66c0392 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java
@@ -173,12 +173,8 @@ public abstract class VanChartUIListControlPane extends UIListControlPane implem
 
             JPanel buttonsPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 10, 0));
             controlPane.add(buttonsPane, BorderLayout.EAST);
-
             //确定
             addOkButton(buttonsPane);
-            //取消
-            addCancelButton(buttonsPane);
-
             controlPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
 
             return controlPane;