控件管理/报表填报属性/超级链接/服务器参数

designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java

@@ -1,8 +1,5 @@
 package com.fr.design.data.datapane;
 
-import com.fine.swing.ui.layout.Layouts;
-import com.fine.theme.light.ui.FineRoundBorder;
-import com.fine.theme.utils.FineUIScale;
 import com.fr.base.TableData;
 import com.fr.data.core.DataCoreUtils;
 import com.fr.data.core.db.DBUtils;
@@ -14,7 +11,6 @@ import com.fr.data.impl.DBTableData;
 import com.fr.data.operator.DataOperator;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.border.FineBorderFactory;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.RefreshLabel.Refreshable;
 import com.fr.design.data.datapane.preview.PreviewLabel;
@@ -43,7 +39,6 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.connection.DBConnectAuth;
-import groovy.swing.factory.BoxLayoutFactory;
 
 import javax.swing.JList;
 import javax.swing.JOptionPane;
@@ -59,7 +54,9 @@ import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeCellRenderer;
 import javax.swing.tree.TreePath;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.awt.event.ItemEvent;
@@ -71,10 +68,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CancellationException;
 
-import static com.fine.swing.ui.layout.Layouts.cell;
-import static com.fine.swing.ui.layout.Layouts.row;
-import static com.fine.swing.ui.layout.Layouts.scale;
-
 /**
  * @author zhou
  * @since 2012-7-11下午4:49:39
@@ -246,15 +239,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         JPanel northDSPane = TableLayoutHelper.createTableLayoutPane(coms, new double[]{p}, new double[]{p, f, p, f, p, f, COLUMN_SIZE, COLUMN_SIZE});
-        //JPanel northDSPane = new JPanel(new BorderLayout());
+
-
-        /*northDSPane.add(
-                row(10,
-                    row(5, cell(l1), cell(dsNameComboBox)),
-                    row(5, cell(l2), cell(schemaBox)),
-                    row(5, cell(l3), cell(tableNameComboBox)),
-                    row(5, cell(new RefreshLabel(this)), cell(previewLabel)))
-        .getComponent());*/
         this.add(northDSPane, BorderLayout.CENTER);
 
     }

designer-base/src/main/java/com/fr/design/gui/frpane/ReportletParameterViewPane.java

@@ -49,6 +49,11 @@ public class ReportletParameterViewPane extends BasicPane {
         this(null, useParaType, valueEditorPane, valueRenderPane, null);
     }
 
+    public ReportletParameterViewPane(int useParaType, ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane,
+                                      JPanel otherPane) {
+        this(null, useParaType, valueEditorPane, valueRenderPane, otherPane);
+    }
+
     public ReportletParameterViewPane(UITableEditAction[] actions, int useParaType, ValueEditorPane valueEditorPane,
                                       ValueEditorPane valueRenderPane) {
         this.initComponent(actions, useParaType, valueEditorPane, valueRenderPane, null);

designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java

@@ -50,25 +50,25 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
 
         northPane = new ReportletHyperNorthPane(needRenamePane());
-
+        extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
+        JPanel extendPane = new JPanel();
+        extendPane.add(extendParametersCheckBox);
         parameterViewPane = new ReportletParameterViewPane(
                 new UITableEditAction[]{
                         new HyperlinkParametersAction()
                 },
                 getChartParaType(),
                 getValueEditorPane(),
-                getValueEditorPane()
+                getValueEditorPane(),
+                extendPane
         );
 
         parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Parameter"), null));
 
-        extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
+
-        UIScrollPane scrollPane = new UIScrollPane(extendParametersCheckBox);
-        scrollPane.setBorder(new FineRoundBorder());
         this.add(column(
                 cell(northPane),
-                cell(parameterViewPane).weight(1.0),
+                cell(parameterViewPane).weight(1.0)
-                cell(scrollPane)
         ).getComponent());
     }
 

designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java

@@ -1,10 +1,8 @@
 package com.fr.design.hyperlink;
 
-import com.fine.theme.light.ui.FineRoundBorder;
 import com.fr.base.Parameter;
 import com.fr.design.gui.frpane.ReportletParameterViewPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
-import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.itableeditorpane.ParameterTableModel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -13,14 +11,12 @@ import com.fr.js.WebHyperlink;
 import com.fr.stable.ParameterProvider;
 
 import javax.swing.BorderFactory;
-import java.awt.BorderLayout;
+import javax.swing.JPanel;
-import java.awt.Component;
+
-import java.awt.FlowLayout;
 import java.util.HashMap;
 import java.util.List;
 
 import static com.fine.swing.ui.layout.Layouts.column;
-import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fine.swing.ui.layout.Layouts.cell;
 
 public class WebHyperlinkPane extends AbstractHyperLinkPane<WebHyperlink> {
@@ -44,18 +40,16 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane<WebHyperlink> {
         this.setBorder(BorderFactory.createEmptyBorder(BORDER_WIDTH, BORDER_WIDTH, BORDER_WIDTH, BORDER_WIDTH));
 
         northPane = new WebHyperNorthPane(needRenamePane());
-        //this.add(northPane, BorderLayout.NORTH);
+        extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
-
+        JPanel extendPane = new JPanel();
-        parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
+        extendPane.add(extendParametersCheckBox);
-        //this.add(parameterViewPane, BorderLayout.CENTER);
+        parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(),
+                getValueEditorPane(), extendPane);
         parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Parameters"), null));
 
-        extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
-        //this.add(GUICoreUtils.createFlowPane(new Component[]{extendParametersCheckBox}, FlowLayout.LEFT), BorderLayout.SOUTH);
         this.add(column(
                 cell(northPane),
-                cell(parameterViewPane).weight(1.0),
+                cell(parameterViewPane).weight(1.0)
-                cell(extendParametersCheckBox)
         ).getComponent());
     }
 

designer-base/src/main/java/com/fr/design/hyperlink/popup/StyleSettingPane.java

@@ -7,9 +7,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.VerticalFlowLayout;
 import com.fr.design.style.color.NewColorSelectBox;
-import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.js.MobilePopupHyperlink;
 import com.fr.stable.StringUtils;
 
@@ -81,14 +79,12 @@ public class StyleSettingPane extends BasicBeanPane<MobilePopupHyperlink> {
         borderPane.setLayout(new BorderLayout());
 
         borderType = new LineComboBox(MobilePopupConstants.BORDER_LINE_STYLE_ARRAY);
-        borderType.setPreferredSize(new Dimension(115, 20));
         borderColor = new NewColorSelectBox(100);
         borderRadiusSpinner = new UISpinner(0, maxBorderRadius, 1, 20);
-        borderRadiusSpinner.setPreferredSize(new Dimension(120, 20));
+        UILabel borderLabel = new UILabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Border"));
-        JLabel label = new JLabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Border"));
         borderPane.add(row(40,
                 column(10,
-                        cell(label).weight(0.3),
+                        cell(borderLabel).weight(0.3),
                         flex().weight(0.7)),
                 column(10,
                         cell(MobilePopupUIUtils.createLeftTileRightContentPanel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Line"), borderType, Color.GRAY)),
@@ -106,7 +102,6 @@ public class StyleSettingPane extends BasicBeanPane<MobilePopupHyperlink> {
 
         JPanel transparencyPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         this.numberDragPane = new UINumberDragPane(0,100);
-        this.numberDragPane.setPreferredSize(new Dimension(140, 20));
         transparencyPane.add(numberDragPane, BorderLayout.CENTER);
         transparencyPane.add(new UILabel(" %"), BorderLayout.EAST);
         JLabel bgLabel = new JLabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Background"));