From 9f64eed1acd1dab96b8859aac07f3227299b5295 Mon Sep 17 00:00:00 2001
From: Zhanying <2446962908@qq.com>
Date: Mon, 6 Jan 2025 10:22:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20fvs=E8=A1=A8=E6=A0=BC-=E8=B6=85?=
 =?UTF-8?q?=E9=93=BE-=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81get=20post=E8=AE=BE=E7=BD=AE=20#REPORT-145535?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hyperlink/popup/ContentSettingPane.java   | 40 +++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java
index 848ac9e57c..6ecd6c1865 100644
--- a/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java
@@ -3,6 +3,7 @@ package com.fr.design.hyperlink.popup;
 import com.fr.base.BaseFormula;
 import com.fr.base.BaseUtils;
 import com.fr.base.Parameter;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.formula.TinyFormulaPane;
@@ -10,6 +11,7 @@ import com.fr.design.gui.frpane.ReportletParameterViewPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.itableeditorpane.UITableEditAction;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.gui.itree.filetree.ReportletPane;
@@ -25,8 +27,14 @@ import com.fr.stable.FormulaProvider;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.List;
@@ -44,6 +52,7 @@ public class ContentSettingPane extends AbstractHyperLinkPane<MobilePopupHyperli
     private JPanel textSettingPanel;
     private TinyFormulaPane textContentPane;
     private CustomFontPane fontPane;
+    private UIComboBox postComboBox;
 
     public ContentSettingPane() {
         super();
@@ -112,7 +121,15 @@ public class ContentSettingPane extends AbstractHyperLinkPane<MobilePopupHyperli
         JPanel templateContentPane = new JPanel();
         templateContentPane.setLayout(new BorderLayout(0,8));
 
-        templateContentPane.add(this.createTemplateSelectPanel(), BorderLayout.NORTH);
+        if (DesignModeContext.isDuchampMode()) {
+            JPanel jPanel = new JPanel(new BorderLayout(0, 5));
+            jPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+            jPanel.add(this.createTemplateSelectPanel(), BorderLayout.NORTH);
+            jPanel.add(this.createPostComboPanel(), BorderLayout.SOUTH);
+            templateContentPane.add(jPanel, BorderLayout.NORTH);
+        } else {
+            templateContentPane.add(this.createTemplateSelectPanel(), BorderLayout.NORTH);
+        }
 
         parameterViewPane = this.createReportletParameterViewPane();
         templateContentPane.add(parameterViewPane, BorderLayout.CENTER);
@@ -152,6 +169,15 @@ public class ContentSettingPane extends AbstractHyperLinkPane<MobilePopupHyperli
         return MobilePopupUIUtils.createLeftTileRightContentPanel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Template"), templatePanel);
     }
 
+    private JPanel createPostComboPanel() {
+        JPanel postComboPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        postComboBox = new UIComboBox(new String[]{"GET", "POST"});
+        postComboBox.setPreferredSize(new Dimension(60, 20));
+        postComboBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        postComboPanel.add(postComboBox, BorderLayout.WEST);
+        return MobilePopupUIUtils.createLeftTileRightContentPanel(Toolkit.i18nText("Fine-Design_Basic_Reportlet_Parameter_Type"), postComboPanel);
+    }
+
     private ReportletParameterViewPane createReportletParameterViewPane() {
         ReportletParameterViewPane templateParameterViewPane = new ReportletParameterViewPane(
                 new UITableEditAction[]{
@@ -285,6 +311,10 @@ public class ContentSettingPane extends AbstractHyperLinkPane<MobilePopupHyperli
         ParameterProvider[] parameters =link.getParameters();
         parameterViewPane.populate(parameters);
 
+        if (DesignModeContext.isDuchampMode()) {
+            this.postComboBox.setSelectedIndex(link.isByPost() ? 1 : 0);
+        }
+
         // 继承参数
         extendParametersCheckBox.setSelected(link.isExtendParameters());
     }
@@ -292,6 +322,10 @@ public class ContentSettingPane extends AbstractHyperLinkPane<MobilePopupHyperli
     private void updateTemplateContentBean(MobilePopupHyperlink link) {
         link.setReportletPath(templatePathTextField.getText());
 
+        if (DesignModeContext.isDuchampMode()) {
+            link.setByPost(postComboBox.getSelectedIndex() == 1);
+        }
+
         List<ParameterProvider> parameterList = this.parameterViewPane.update();
         if (!parameterList.isEmpty()) {
             Parameter[] parameters = new Parameter[parameterList.size()];

From b5ce0cb7ffd5811541865ace8bc0e5c9fa32f9d7 Mon Sep 17 00:00:00 2001
From: Zhanying <2446962908@qq.com>
Date: Tue, 7 Jan 2025 17:39:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E9=83=A8=E5=88=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E6=8A=BD=E5=88=B0=E6=8F=92=E4=BB=B6=E4=B8=AD=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=20#REPORT-145535?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fun/DefaultValueAdjustProvider.java       | 18 ++++++++++++++++
 .../hyperlink/popup/ContentSettingPane.java   | 21 +++++++++++++++----
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/fun/DefaultValueAdjustProvider.java b/designer-base/src/main/java/com/fr/design/fun/DefaultValueAdjustProvider.java
index 28a2d6c939..fdeb1edaf3 100644
--- a/designer-base/src/main/java/com/fr/design/fun/DefaultValueAdjustProvider.java
+++ b/designer-base/src/main/java/com/fr/design/fun/DefaultValueAdjustProvider.java
@@ -5,6 +5,7 @@ import com.fr.base.chart.BaseChartCollection;
 import com.fr.chartx.attr.ChartProvider;
 import com.fr.design.style.color.FRColorSelectorStyle;
 import com.fr.general.FRFont;
+import com.fr.js.MobilePopupHyperlink;
 import com.fr.report.cell.CellElement;
 import com.fr.stable.collections.combination.Pair;
 import com.fr.stable.fun.mark.Selectable;
@@ -83,4 +84,21 @@ public interface DefaultValueAdjustProvider extends Selectable {
     default List getColorSelector(){
         return FRColorSelectorStyle.COLOR_CONFIG;
     }
+
+    /**
+     * 移动端弹窗界面是否支持配置POST传参方式
+     *
+     * @return 是否支持
+     */
+    default boolean isNeedPostCombo4MobilePopupPane() {
+        return false;
+    }
+
+    /**
+     * 移动端弹窗配置调整
+     *
+     * @param link MobilePopupHyperlink
+     */
+    default void adjustMobilePopupHyperlinkWhenPopulate(MobilePopupHyperlink link) {
+    }
 }
diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java
index 6ecd6c1865..d1ed4b43ef 100644
--- a/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java
@@ -3,10 +3,10 @@ package com.fr.design.hyperlink.popup;
 import com.fr.base.BaseFormula;
 import com.fr.base.BaseUtils;
 import com.fr.base.Parameter;
-import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.formula.TinyFormulaPane;
+import com.fr.design.fun.DefaultValueAdjustProvider;
 import com.fr.design.gui.frpane.ReportletParameterViewPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIRadioButton;
@@ -20,6 +20,7 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.parameter.ParameterReader;
+import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.js.MobilePopupHyperlink;
 import com.fr.stable.CommonUtils;
@@ -121,7 +122,7 @@ public class ContentSettingPane extends AbstractHyperLinkPane<MobilePopupHyperli
         JPanel templateContentPane = new JPanel();
         templateContentPane.setLayout(new BorderLayout(0,8));
 
-        if (DesignModeContext.isDuchampMode()) {
+        if (isNeedShowPostCombo()) {
             JPanel jPanel = new JPanel(new BorderLayout(0, 5));
             jPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
             jPanel.add(this.createTemplateSelectPanel(), BorderLayout.NORTH);
@@ -140,6 +141,14 @@ public class ContentSettingPane extends AbstractHyperLinkPane<MobilePopupHyperli
         return templateContentPane;
     }
 
+    private boolean isNeedShowPostCombo() {
+        DefaultValueAdjustProvider valueAdjust = DesignUtils.getValueAdjust();
+        if (valueAdjust != null) {
+            return valueAdjust.isNeedPostCombo4MobilePopupPane();
+        }
+        return false;
+    }
+
     private JPanel createTemplateSelectPanel() {
         JPanel templatePanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         // 路径输入框
@@ -216,6 +225,10 @@ public class ContentSettingPane extends AbstractHyperLinkPane<MobilePopupHyperli
 
     @Override
     public void populateBean(MobilePopupHyperlink link) {
+        DefaultValueAdjustProvider valueAdjust = DesignUtils.getValueAdjust();
+        if (valueAdjust != null) {
+            valueAdjust.adjustMobilePopupHyperlinkWhenPopulate(link);
+        }
         this.populatePopupTargetBean(link.getPopupTarget());
         this.populateTemplateContentBean(link);
         this.populateTextContentBean(link);
@@ -311,7 +324,7 @@ public class ContentSettingPane extends AbstractHyperLinkPane<MobilePopupHyperli
         ParameterProvider[] parameters =link.getParameters();
         parameterViewPane.populate(parameters);
 
-        if (DesignModeContext.isDuchampMode()) {
+        if (isNeedShowPostCombo()) {
             this.postComboBox.setSelectedIndex(link.isByPost() ? 1 : 0);
         }
 
@@ -322,7 +335,7 @@ public class ContentSettingPane extends AbstractHyperLinkPane<MobilePopupHyperli
     private void updateTemplateContentBean(MobilePopupHyperlink link) {
         link.setReportletPath(templatePathTextField.getText());
 
-        if (DesignModeContext.isDuchampMode()) {
+        if (isNeedShowPostCombo()) {
             link.setByPost(postComboBox.getSelectedIndex() == 1);
         }
 

From 0434f3503f2cadb1d8969956b479547bbf9ac394 Mon Sep 17 00:00:00 2001
From: Zhanying <2446962908@qq.com>
Date: Wed, 8 Jan 2025 19:04:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E5=BC=B9=E7=AA=97=E9=85=8D=E7=BD=AE=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E7=9A=84=E6=8E=A5=E5=8F=A3=E6=96=B9=E6=B3=95=20#REPOR?=
 =?UTF-8?q?T-145535?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/fun/DefaultValueAdjustProvider.java    | 9 ---------
 .../fr/design/hyperlink/popup/ContentSettingPane.java    | 4 ----
 2 files changed, 13 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/fun/DefaultValueAdjustProvider.java b/designer-base/src/main/java/com/fr/design/fun/DefaultValueAdjustProvider.java
index fdeb1edaf3..0654c69e11 100644
--- a/designer-base/src/main/java/com/fr/design/fun/DefaultValueAdjustProvider.java
+++ b/designer-base/src/main/java/com/fr/design/fun/DefaultValueAdjustProvider.java
@@ -5,7 +5,6 @@ import com.fr.base.chart.BaseChartCollection;
 import com.fr.chartx.attr.ChartProvider;
 import com.fr.design.style.color.FRColorSelectorStyle;
 import com.fr.general.FRFont;
-import com.fr.js.MobilePopupHyperlink;
 import com.fr.report.cell.CellElement;
 import com.fr.stable.collections.combination.Pair;
 import com.fr.stable.fun.mark.Selectable;
@@ -93,12 +92,4 @@ public interface DefaultValueAdjustProvider extends Selectable {
     default boolean isNeedPostCombo4MobilePopupPane() {
         return false;
     }
-
-    /**
-     * 移动端弹窗配置调整
-     *
-     * @param link MobilePopupHyperlink
-     */
-    default void adjustMobilePopupHyperlinkWhenPopulate(MobilePopupHyperlink link) {
-    }
 }
diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java
index d1ed4b43ef..41fda2cd3b 100644
--- a/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java
@@ -225,10 +225,6 @@ public class ContentSettingPane extends AbstractHyperLinkPane<MobilePopupHyperli
 
     @Override
     public void populateBean(MobilePopupHyperlink link) {
-        DefaultValueAdjustProvider valueAdjust = DesignUtils.getValueAdjust();
-        if (valueAdjust != null) {
-            valueAdjust.adjustMobilePopupHyperlinkWhenPopulate(link);
-        }
         this.populatePopupTargetBean(link.getPopupTarget());
         this.populateTemplateContentBean(link);
         this.populateTextContentBean(link);