From 2f039cdcd6666bf60798fe56d573c563061812a3 Mon Sep 17 00:00:00 2001
From: "Hugh.C" <hugh.c@fanruan.com>
Date: Tue, 29 Dec 2020 17:24:25 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-46102=20=E4=BA=A7=E5=93=81=E6=94=B9?=
 =?UTF-8?q?=E8=BF=9B=EF=BC=8C=E6=B0=B4=E5=8D=B0=E9=9D=A2=E6=9D=BF=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E7=9B=B4=E6=8E=A5=E8=BE=93=E5=85=A5=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=EF=BC=8C=E5=BF=85=E9=A1=BB=E5=9C=A8=E5=BC=B9=E5=87=BA=E7=9A=84?=
 =?UTF-8?q?=E5=85=AC=E5=BC=8F=E9=9D=A2=E6=9D=BF=E4=B8=8B=E6=89=8D=E8=83=BD?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/editor/editor/FormulaEditor.java |  4 ++++
 .../java/com/fr/design/report/WatermarkPane.java   | 14 ++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/FormulaEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/FormulaEditor.java
index 77ac976bc..b8dc5ad8f 100644
--- a/designer-base/src/main/java/com/fr/design/editor/editor/FormulaEditor.java
+++ b/designer-base/src/main/java/com/fr/design/editor/editor/FormulaEditor.java
@@ -99,6 +99,10 @@ public class FormulaEditor extends Editor<BaseFormula> {
         return formula;
     }
 
+    public UITextField getUITextField() {
+        return currentTextField;
+    }
+
     /**
      * Return the value of the CellEditor.
      */
diff --git a/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java b/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java
index 07ec40bfe..588e4601d 100644
--- a/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java
+++ b/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java
@@ -1,14 +1,16 @@
 package com.fr.design.report;
 
+import com.fr.base.BaseFormula;
 import com.fr.base.iofile.attr.WatermarkAttr;
 import com.fr.design.dialog.BasicPane;
-import com.fr.design.formula.TinyFormulaPane;
+import com.fr.design.editor.editor.FormulaEditor;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.gui.ispinner.UnsignedIntUISpinner;
 import com.fr.design.gui.style.FRFontPane;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
@@ -50,7 +52,7 @@ public class WatermarkPane extends BasicPane {
     // 水印预览面板
     private WatermarkPreviewPane watermarkPreviewPane;
     // 文字
-    private TinyFormulaPane formulaPane;
+    private FormulaEditor formulaPane;
     // 字号
     private UIComboBox fontSizeComboBox;
     //横向间距
@@ -119,16 +121,16 @@ public class WatermarkPane extends BasicPane {
         return watermark;
     }
 
-    public TinyFormulaPane getFormulaPane() {
+    public FormulaEditor getFormulaPane() {
         return formulaPane;
     }
 
-    public void setFormulaPane(TinyFormulaPane formulaPane) {
+    public void setFormulaPane(FormulaEditor formulaPane) {
         this.formulaPane = formulaPane;
     }
 
     protected UIScrollPane initRightPane() {
-        formulaPane = new TinyFormulaPane();
+        formulaPane = new FormulaEditor(Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
         fontSizeComboBox = new UIComboBox(FRFontPane.FONT_SIZES);
         fontSizeComboBox.setEditable(true);
         horizontalGapSpinner = new UnsignedIntUISpinner(100, Integer.MAX_VALUE, 1, 200);
@@ -228,7 +230,7 @@ public class WatermarkPane extends BasicPane {
     }
 
     private void populateFourmula(String formula) {
-        this.formulaPane.populateBean(formula);
+        this.formulaPane.setValue(BaseFormula.createFormulaBuilder().build(formula));
         this.formulaPane.getUITextField().getDocument()
                 .addDocumentListener(new DocumentListener() {
                     @Override