From 88ab9e326aa8e746b83e914ff3a72c139fa49da0 Mon Sep 17 00:00:00 2001
From: "yaoh.wu" <yaoh.wu@fanruan.com>
Date: Tue, 20 Nov 2018 10:15:42 +0800
Subject: [PATCH 1/3] =?UTF-8?q?REPORT-12788=20=E7=BD=91=E7=BB=9C=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=A0=87=E9=A2=98=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=92=8C=E5=85=AC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hyperlink/ReportletHyperNorthPane.java      | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
index 5d67800b7..c1ebb6232 100644
--- a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
@@ -23,6 +23,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.IOUtils;
 import com.fr.js.ReportletHyperlink;
 import com.fr.js.ReportletHyperlinkDialogAttr;
+import com.fr.stable.CommonUtils;
 import com.fr.stable.FormulaProvider;
 import com.fr.stable.StringUtils;
 
@@ -191,8 +192,13 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         topLocation.setText(StringUtils.EMPTY);
         center.setSelected(true);
         if (attr != null) {
-            FormulaProvider title = attr.getTitleFormula();
-            String titleContent = title == null ? StringUtils.EMPTY : title.getPureContent();
+            Object title = attr.getTitle();
+            String titleContent;
+            if (title instanceof FormulaProvider) {
+                titleContent = ((FormulaProvider) title).getContent();
+            } else {
+                titleContent = title == null ? StringUtils.EMPTY : title.toString();
+            }
             titleFiled.setFormulaText(titleContent);
             boolean isCenter = attr.isCenter();
             if (!isCenter) {
@@ -222,7 +228,12 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         reportletHyperlink.setByPost(postComboBox.getSelectedIndex() == 1);
 
         ReportletHyperlinkDialogAttr attr = new ReportletHyperlinkDialogAttr();
-        attr.setTitleFormula(BaseFormula.createFormulaBuilder().build(titleFiled.getFormulaText()));
+        String title = titleFiled.getFormulaText();
+        if (CommonUtils.maybeFormula(title)) {
+            attr.setTitle(BaseFormula.createFormulaBuilder().build(titleFiled.getFormulaText()));
+        } else {
+            attr.setTitle(title);
+        }
         attr.setCenter(center.isSelected());
         if (!attr.isCenter()) {
             attr.setLeft((int) leftLocation.getValue());

From 946ad7149e5ba67aeeda88ee5fdcf34639ff4be2 Mon Sep 17 00:00:00 2001
From: "yaoh.wu" <yaoh.wu@fanruan.com>
Date: Tue, 20 Nov 2018 10:44:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=99=90=E5=88=B6=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E8=B4=9F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/hyperlink/ReportletHyperNorthPane.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
index c1ebb6232..d6a50a84c 100644
--- a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
@@ -370,6 +370,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         heightLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10));
         sizeJPanel.add(heightLabel);
         UINumberField heightTextFiled = new UINumberField();
+        heightTextFiled.setMinValue(0);
         heightTextFiled.setText(String.valueOf(DEFAULT_H_VALUE));
         heightTextFiled.setPreferredSize(new Dimension(40, 20));
         sizeJPanel.add(heightTextFiled);
@@ -378,6 +379,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         widthLabel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
         sizeJPanel.add(widthLabel);
         UINumberField widthTextFiled = new UINumberField();
+        widthTextFiled.setMinValue(0);
         widthTextFiled.setText(String.valueOf(DEFAULT_V_VALUE));
         widthTextFiled.setPreferredSize(new Dimension(40, 20));
         sizeJPanel.add(widthTextFiled);
@@ -406,11 +408,13 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         final UILabel leftLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Position_Left"));
         leftLabel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 10));
         leftLocation = new UINumberField();
+        leftLocation.setMinValue(0);
         leftLocation.setPreferredSize(new Dimension(40, 20));
         // 位置 距上
         final UILabel topLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Position_Top"));
         topLabel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
         topLocation = new UINumberField();
+        topLocation.setMinValue(0);
         topLocation.setPreferredSize(new Dimension(40, 20));
 
         locationPanel.add(leftLabel);

From 1c2a3684b1c4ceb391a42f09712ea485f5bbce14 Mon Sep 17 00:00:00 2001
From: "yaoh.wu" <yaoh.wu@fanruan.com>
Date: Wed, 21 Nov 2018 18:42:49 +0800
Subject: [PATCH 3/3] TinyFormulaPane

---
 .../hyperlink/ReportletHyperNorthPane.java    | 90 ++-----------------
 1 file changed, 8 insertions(+), 82 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
index d6a50a84c..c1e454f1b 100644
--- a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
@@ -4,10 +4,7 @@ import com.fr.base.BaseFormula;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
-import com.fr.design.event.UIObserverListener;
-import com.fr.design.formula.FormulaFactory;
-import com.fr.design.formula.UIFormula;
-import com.fr.design.formula.VariableResolver;
+import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
@@ -20,7 +17,6 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.IOUtils;
 import com.fr.js.ReportletHyperlink;
 import com.fr.js.ReportletHyperlinkDialogAttr;
 import com.fr.stable.CommonUtils;
@@ -77,7 +73,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
     /**
      * 对话框标题输入框
      */
-    private JFormulaField titleFiled;
+    private TinyFormulaPane titleFiled;
 
 
     /**
@@ -187,7 +183,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         this.postComboBox.setSelectedIndex(link.isByPost() ? 1 : 0);
 
         ReportletHyperlinkDialogAttr attr = link.getAttr();
-        titleFiled.setFormulaText(StringUtils.EMPTY);
+        titleFiled.populateBean(StringUtils.EMPTY);
         leftLocation.setText(StringUtils.EMPTY);
         topLocation.setText(StringUtils.EMPTY);
         center.setSelected(true);
@@ -199,7 +195,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
             } else {
                 titleContent = title == null ? StringUtils.EMPTY : title.toString();
             }
-            titleFiled.setFormulaText(titleContent);
+            titleFiled.populateBean(titleContent);
             boolean isCenter = attr.isCenter();
             if (!isCenter) {
                 int left = attr.getLeft(), top = attr.getTop();
@@ -228,9 +224,9 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         reportletHyperlink.setByPost(postComboBox.getSelectedIndex() == 1);
 
         ReportletHyperlinkDialogAttr attr = new ReportletHyperlinkDialogAttr();
-        String title = titleFiled.getFormulaText();
+        String title = titleFiled.updateBean();
         if (CommonUtils.maybeFormula(title)) {
-            attr.setTitle(BaseFormula.createFormulaBuilder().build(titleFiled.getFormulaText()));
+            attr.setTitle(BaseFormula.createFormulaBuilder().build(titleFiled.updateBean()));
         } else {
             attr.setTitle(title);
         }
@@ -357,7 +353,8 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
 
     private void initTitlePanel(List<Component[]> dialogComponents) {
         // 对话框标题
-        titleFiled = new JFormulaField(15);
+        titleFiled = new TinyFormulaPane();
+        titleFiled.getUITextField().setColumns(15);
         final JPanel titlePanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
         titlePanel.add(titleFiled);
         Component[] titleComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Title") + ":"), titlePanel};
@@ -450,75 +447,4 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         dialogComponents.add(footerComponents);
         othersComponents.add(footerComponents);
     }
-
-    /**
-     * 公式输入框
-     */
-    public class JFormulaField extends JPanel {
-        private UITextField formulaTextField;
-
-        public JFormulaField(int columns) {
-
-            formulaTextField = new UITextField(columns);
-            JPanel textFieldPane = new JPanel(new BorderLayout());
-            textFieldPane.add(formulaTextField, BorderLayout.CENTER);
-            textFieldPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5));
-            UIButton formulaButton = new UIButton(IOUtils.readIcon("/com/fr/design/images/m_insert/formula.png"));
-            formulaButton.setToolTipText(Toolkit.i18nText("Fine-Design_Report_Formula") + "...");
-            formulaButton.setPreferredSize(new Dimension(24, formulaTextField.getPreferredSize().height));
-            formulaButton.addActionListener(formulaButtonActionListener);
-
-            JPanel pane = new JPanel(new BorderLayout());
-            pane.add(textFieldPane, BorderLayout.CENTER);
-            pane.add(formulaButton, BorderLayout.EAST);
-            this.setLayout(new BorderLayout());
-            this.add(pane, BorderLayout.NORTH);
-        }
-
-        public void setFormulaText(String formulaContent) {
-            this.formulaTextField.setText(formulaContent);
-        }
-
-        public String getFormulaText() {
-
-            String text = formulaTextField.getText();
-            if (text == null) {
-                text = StringUtils.EMPTY;
-            }
-            return text;
-        }
-
-        /**
-         * 添加事件监听器
-         *
-         * @param listener 公式文本输入框改动事件监听器
-         */
-        public void addListener(UIObserverListener listener) {
-            this.formulaTextField.registerChangeListener(listener);
-        }
-
-        /**
-         * 取消事件监听器
-         */
-        public void removeListener() {
-            this.formulaTextField.registerChangeListener(null);
-        }
-
-        private ActionListener formulaButtonActionListener = new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent evt) {
-                BaseFormula valueFormula = BaseFormula.createFormulaBuilder().build();
-                valueFormula.setContent(getFormulaText());
-                final UIFormula formulaPane = FormulaFactory.createFormulaPaneWhenReserveFormula();
-                formulaPane.populate(valueFormula, VariableResolver.DEFAULT);
-                formulaPane.showLargeWindow(SwingUtilities.getWindowAncestor(ReportletHyperNorthPane.this), new DialogActionAdapter() {
-                    @Override
-                    public void doOk() {
-                        BaseFormula valueFormula = formulaPane.update();
-                        setFormulaText(valueFormula.getContent());
-                    }
-                }).setVisible(true);
-            }
-        };
-    }
 }