Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~tommy/design into release/11.0

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

@@ -161,10 +161,18 @@ public abstract class DesignTableDataManager {
     }
 
     public static String getChangedDsNameByOldDsName(String oldDsName) {
+        String changeName;
+
         if (isDsNameChanged(oldDsName)) {
-            return dsNameChangedMap.get(oldDsName);
+            changeName = dsNameChangedMap.get(oldDsName);
+        } else {
+            changeName = StringUtils.EMPTY;
+        }
+
+        if (StringUtils.isNotEmpty(changeName)) {
+            return getChangedDsNameByOldDsName(changeName);
         } else {
-            return StringUtils.EMPTY;
+            return oldDsName;
         }
     }
 

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

@@ -9,6 +9,7 @@ import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.file.TableDataConfig;
+import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -80,12 +81,13 @@ public class TreeTableDataComboBox extends UIComboBox {
 	}
 
 	public void setSelectedTableDataByName(String name) {
+		refresh();
 		TableDataWrapper tableDataWrapper;
-		if (res_map.get(name) != null) {
+		String changeName = DesignTableDataManager.getChangedDsNameByOldDsName(name);
-			tableDataWrapper = res_map.get(name);
+		if (StringUtils.isNotEmpty(changeName)) {
-		} else {
-			String changeName = DesignTableDataManager.getChangedDsNameByOldDsName(name);
 			tableDataWrapper = res_map.get(changeName);
+		} else {
+			tableDataWrapper = res_map.get(name);
 		}
 		this.getModel().setSelectedItem(tableDataWrapper);
 	}

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

@@ -7,6 +7,7 @@ import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.design.border.UITitledBorder;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.icombobox.UIComboBoxUI;
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ipasswordfield.UIPasswordFieldWithFixedLength;
@@ -32,6 +33,8 @@ import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import javax.swing.plaf.ComboBoxUI;
+import javax.swing.plaf.basic.ComboPopup;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -275,8 +278,9 @@ public class JDBCDefPane extends JPanel {
         }
         dbtypeComboBox.addActionListener(dbtypeActionListener);
         dbtypeComboBox.setMaximumRowCount(10);
-        driverLoaderBox = new UIComboBox();
+        driverLoaderBox = new SpecialUIComboBox();
         refreshDriverLoader();
+        driverLoaderBox.setPreferredSize(new Dimension(200, driverLoaderBox.getPreferredSize().height));
         driverLoaderBox.setEditable(false);
         driverManageBox = new UIComboBox();
         refreshDriverManage(true);
@@ -350,7 +354,7 @@ public class JDBCDefPane extends JPanel {
         odbcTipsPane.add(driverManageLabel);
         odbcTipsPane.add(odbcTipsLink);
         JPanel driverComboBoxAndTips = new JPanel(new BorderLayout());
-        JPanel normalFlowInnerContainer_s_pane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        JPanel normalFlowInnerContainer_s_pane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(0, 5, 0);
         normalFlowInnerContainer_s_pane.add(driverManageBox);
         normalFlowInnerContainer_s_pane.add(driverComboBox);
         normalFlowInnerContainer_s_pane.add(driverLoaderBox);
@@ -717,4 +721,22 @@ public class JDBCDefPane extends JPanel {
         private String driver;
         private String url;
     }
+
+    private static class SpecialUIComboBox extends UIComboBox {
+
+        @Override
+        public ComboBoxUI getUIComboBoxUI() {
+            return new SpecialUIComboBoxUI();
+        }
+    }
+
+    private static class SpecialUIComboBoxUI extends UIComboBoxUI {
+
+        @Override
+        public ComboPopup createPopup() {
+            return createHorizontalNeverUIComboPopUp();
+        }
+
+    }
+
 }

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@@ -19,7 +19,6 @@ import com.fr.design.data.datapane.preview.PreviewTablePane;
 import com.fr.design.data.datapane.preview.sql.PreviewPerformedSqlPane;
 import com.fr.design.data.datapane.sqlpane.SQLEditPane;
 import com.fr.design.data.tabledata.strategy.StrategyConfigHandler;
-import com.fr.design.data.tabledata.tabledatapane.db.DBTableDataSavedHook;
 import com.fr.design.data.tabledata.tabledatapane.db.StrategyConfigFrom;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
@@ -45,6 +44,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.esd.core.strategy.config.StrategyConfig;
 import com.fr.esd.core.strategy.config.StrategyConfigHelper;
 import com.fr.esd.core.strategy.config.service.StrategyConfigService;
+import com.fr.esd.data.db.DBTableDataSavedHook;
 import com.fr.esd.event.DSMapping;
 import com.fr.esd.event.DsNameTarget;
 import com.fr.esd.event.StrategyEventsNotifier;

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/db/DBTableDataSavedHook.java

@@ -1,47 +0,0 @@
-package com.fr.design.data.tabledata.tabledatapane.db;
-
-import com.fr.data.impl.DBTableData;
-import com.fr.esd.event.DSMapping;
-import com.fr.esd.event.DsNameTarget;
-import com.fr.esd.event.StrategyEventsNotifier;
-import com.fr.esd.event.xml.XMLSavedHook;
-import com.fr.stable.StringUtils;
-
-public class DBTableDataSavedHook implements XMLSavedHook<DBTableData> {
-
-    private static final long serialVersionUID = 4925391747683335372L;
-
-    private final String tplPath;
-    private String origName;
-
-    private String origConnection;
-
-    private String origQuery;
-
-    public DBTableDataSavedHook(String tplPath, DBTableData origDBTableData) {
-        this.tplPath = tplPath;
-        this.origName = origDBTableData.getDsName();
-        this.origConnection = origDBTableData.getDatabase().toString();
-        this.origQuery = origDBTableData.getQuery();
-    }
-
-    @Override
-    public void doAfterSaved(DBTableData saved) {
-        String dsName = saved.getDsName();
-        String conn = saved.getDatabase().toString();
-        String query = saved.getQuery();
-
-
-        //检查数据集名称、数据链接和sql是否修改，如果修改需要触发缓存监听事件
-        if (!dsName.equals(origName) || !conn.equals(origConnection) || !query.equals(origQuery)) {
-            if (StringUtils.isNotEmpty(tplPath) && StringUtils.isNotEmpty(origName)) {
-                //新建数据集的origName为null，不用触发
-                StrategyEventsNotifier.modifyDataSet(new DSMapping(tplPath, new DsNameTarget(origName)));
-            }
-        }
-
-        this.origName = dsName;
-        this.origConnection = conn;
-        this.origQuery = query;
-    }
-}

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

@@ -27,13 +27,16 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.stable.StringUtils;
-import java.awt.*;
+
+import javax.swing.JPanel;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.List;
-import javax.swing.*;
-import javax.swing.event.PopupMenuEvent;
-import javax.swing.event.PopupMenuListener;
 
 public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previewable, EditOrNewLabel.Editable {
     private TreeTableDataComboBox treeTableDataComboBox;

designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxUI.java

@@ -10,12 +10,26 @@ import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 import sun.swing.DefaultLookup;
 
-import javax.swing.*;
+import javax.swing.AbstractButton;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ListCellRenderer;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.UIManager;
 import javax.swing.plaf.ButtonUI;
 import javax.swing.plaf.basic.BasicComboBoxUI;
 import javax.swing.plaf.basic.BasicComboPopup;
 import javax.swing.plaf.basic.ComboPopup;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 
@@ -159,6 +173,10 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener {
         return new UIComboPopup(comboBox);
     }
 
+    protected ComboPopup createHorizontalNeverUIComboPopUp() {
+        return new HorizontalNeverUIComboPopup(comboBox);
+    }
+
     private void setRollover(boolean isRollover) {
         if (this.isRollover != isRollover) {
             this.isRollover = isRollover;
@@ -270,4 +288,16 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener {
         }
 
     }
+
+    private class HorizontalNeverUIComboPopup extends UIComboPopup {
+
+        public HorizontalNeverUIComboPopup(JComboBox comboBox) {
+            super(comboBox);
+        }
+
+        @Override
+        protected JScrollPane createScroller() {
+            return new UIScrollPane(list, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+        }
+    }
 }

designer-base/src/main/java/com/fr/design/gui/icontainer/UIScrollPane.java

@@ -3,8 +3,11 @@ package com.fr.design.gui.icontainer;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.iscrollbar.UIScrollBar;
 
-import javax.swing.*;
+import javax.swing.JScrollBar;
-import java.awt.*;
+import javax.swing.JScrollPane;
+import javax.swing.ScrollPaneConstants;
+import java.awt.Color;
+import java.awt.Component;
 
 /**
  * @author zhou
@@ -16,7 +19,11 @@ public class UIScrollPane extends JScrollPane {
     private static final int INCREAMENT = 30;
 
     public UIScrollPane(Component c) {
-        super(c, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        this(c, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+    }
+
+    public UIScrollPane(Component c, int vertical, int horizontal) {
+        super(c, vertical, horizontal);
         this.setHorizontalScrollBar(createHorizontalScrollBar());
         this.getVerticalScrollBar().setUnitIncrement(INCREAMENT);
         this.getVerticalScrollBar().setBlockIncrement(INCREAMENT);

designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java

@@ -117,7 +117,9 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
 
     private JPanel initParamsPane() {
         extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
+        extendParametersCheckBox.setSelected(true);
         parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
+        parameterViewPane.setVisible(false);
         parameterViewPane.addTableEditorListener(new TableModelListener() {
             public void tableChanged(TableModelEvent e) {
                 List<ParameterProvider> list = parameterViewPane.update();
@@ -158,6 +160,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
         customNameRadio = new UIRadioButton(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Filename_Custom"));
         addRadioToGroup(fileNameRadioGroup, defaultNameRadio, customNameRadio);
         fileNameFormulaEditor = new FormulaEditor(Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
+        fileNameFormulaEditor.setEnabled(false);
         fileNameRadioGroup.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -220,10 +223,8 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
             @Override
             public void actionPerformed(ActionEvent e) {
                 if (currentTemplateRadio.isSelected()) {
-                    reportPathTextField.setEnabled(false);
                     browserButton.setEnabled(false);
                 } else {
-                    reportPathTextField.setEnabled(true);
                     browserButton.setEnabled(true);
                 }
             }
@@ -234,11 +235,13 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
         JPanel reportletNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         // 路径输入框
         reportPathTextField = new UITextField(20);
+        reportPathTextField.setEnabled(false);
         reportletNamePane.add(reportPathTextField, BorderLayout.CENTER);
 
         // 选择路径按钮
         browserButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Select"));
         browserButton.setPreferredSize(new Dimension(browserButton.getPreferredSize().width, 20));
+        browserButton.setEnabled(false);
         reportletNamePane.add(browserButton, BorderLayout.EAST);
         browserButton.addActionListener(new ActionListener() {
             @Override
@@ -272,10 +275,8 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
         }
         this.templateRadioGroup.selectIndexButton(ob.isCurrentTemplate() ? 0 : 1);
         if (ob.isCurrentTemplate()) {
-            this.reportPathTextField.setEnabled(false);
             this.browserButton.setEnabled(false);
         } else {
-            this.reportPathTextField.setEnabled(true);
             this.browserButton.setEnabled(true);
             this.reportPathTextField.setText(ob.getTemplatePath());
         }

designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java

@@ -47,12 +47,12 @@ public class FRGUIPaneFactory {
     }
 
     /**
-     * 创建一个靠左的布局，上下间隔为0，左右间隔为常量
+     * 创建一个靠左的布局，上下间隔为0，左右间隔为常量，首间隔为0
      *
      * @return FlowLayout对象
      */
     public static LayoutManager createLeftZeroVgapNormalHgapLayout() {
-        return new FlowLayout(FlowLayout.LEFT, 5, 0);
+        return new FRLeftFlowLayout(0, 5, 0);
     }
 
 

designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java

@@ -783,6 +783,12 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		// 不超过可绘制区域
 		int extraX = Math.min(creatorRightX, formDesignerWidth);
 		int extraY = creatorRightY < 0 ? 0 : Math.min(creatorRightY, formDesignerHeight);
+
+		if (designer.isFormParaDesigner() && extraY + this.getHeight() >= formDesignerHeight) {
+			popup.setVisible(false);
+			return;
+		}
+
 		// 放到事件尾部执行
 		SwingUtilities.invokeLater(new Runnable() {
 			@Override

designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java

@@ -107,17 +107,17 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
         // 移动端弹窗
         MobilePopupPane mobilePopupPane = new MobilePopupPane();
         hyperlinkPane.add(MOBILEPOPUP, mobilePopupPane);
-        // 导出事件
-        if (workbook) {
-            ExportJavaScriptPane exportJavaScriptPane = new ExportJavaScriptPane();
-            hyperlinkPane.add(EXPORT, exportJavaScriptPane);
-            cards.add(exportJavaScriptPane);
-        }
         cards.add(javaScriptPane);
         cards.add(commit2DBJavaScriptPane);
         cards.add(customActionPane);
         cards.add(emailPane);
         cards.add(mobilePopupPane);
+        // 导出事件 这里要按顺序添加
+        if (workbook) {
+            ExportJavaScriptPane exportJavaScriptPane = new ExportJavaScriptPane();
+            hyperlinkPane.add(EXPORT, exportJavaScriptPane);
+            cards.add(exportJavaScriptPane);
+        }
         //其他事件
         addOtherEvent();
         hyperlinkPane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Report_JavaScript_Set")));

designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java

@@ -779,7 +779,7 @@ public class PageSetupPane extends BasicPane {
                     //使用科学计数法显示长度的时候，限制纵向显示长度为9位
                     if (h_str.contains(E)) {
                         String str1 = h_str.substring(h_str.indexOf(E));
-                        String str2 = h_str.substring(0, 9 - str1.length());
+                        String str2 = h_str.substring(0, Math.min(h_str.length(), 9) - str1.length());
                         h_str = str2 + str1;
                     } else if (h_str.indexOf(CoreConstants.DOT) > 0) {
                         h_str = h_str.substring(0, h_str.indexOf(CoreConstants.DOT) + 2);