Merge pull request #1869 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit '80e2c9bd167d06b092b42f42ee29b5ceed697213': REPORT-35692 国际化-页面设置-单位改为INCH，显示不全方法替换 REPORT-34878 && REPORT-34936 linux下条件属性和超链保存问题 REPORT-35692 国际化-页面设置-单位改为INCH，显示不全撤销一些代码 REPORT-35692 国际化-页面设置-单位改为INCH，显示不全调整格式 REPORT-35692 国际化-页面设置-单位改为INCH，显示不全 REPORT-34996 && REPORT-34636 REPORT-34907 linux设计器-纸张背景-渐变色，右边的游标不能拖动无 REPORT-35455 赶这一波发布 REPORT-35699 国际化修改对报表下拉框产生影响添加import REPORT-35699 国际化修改对报表下拉框产生影响 REPORT-35699 国际化修改对报表下拉框产生影响添加import REPORT-35699 国际化修改对报表下拉框产生影响
4 years ago · 55825ecc7b
9 changed files with 105 additions and 42 deletions
--- a/designer-base/src/main/java/com/fr/design/actions/UpdateAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/UpdateAction.java
@ -17,6 +17,7 @@ import com.fr.design.mainframe.toolbar.UpdateActionManager;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.selection.SelectionListener;
 import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.stable.pinyin.PinyinFormat;
 import com.fr.stable.pinyin.PinyinHelper;
@ -562,7 +563,12 @@ public abstract class UpdateAction extends ShortCut implements Action {
 		for (int i = 0; i < component.getTabCount(); i++) {
 			String title = component.getTitleAt(i);
 			handleSearchText(separator, text, pinyin, shortPinyin, title);
-			Component tabComponent = component.getComponentAt(i);
+			Component tabComponent = null;
+			try {
+				tabComponent = component.getComponentAt(i);
+			} catch (Exception ignore) {
+				FineLoggerFactory.getLogger().info("AlphaFine index tabPane end");
+			}
            if (tabComponent instanceof JPanel) {
                getComponentTexts((JPanel) tabComponent, separator, text, pinyin, shortPinyin);
            } else if (tabComponent instanceof JTabbedPane) {
--- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java
@ -9,12 +9,14 @@ import com.fr.design.gui.itoolbar.UIToolbar;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.menu.ShortCut;
+import com.fr.design.os.impl.PopupDialogSaveAction;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.invoke.Reflect;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.os.OperatingSystem;
+import com.fr.stable.os.support.OSSupportCenter;

 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
@ -273,6 +275,8 @@ abstract class UIControlPane extends JControlPane {
            }
            saveSettings();
            setVisible(false);
+            PopupDialogSaveAction saveAction = OSSupportCenter.getAction(PopupDialogSaveAction.class);
+            saveAction.unregister();
        }

        private void initListener() {
--- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java
@ -7,9 +7,11 @@ import com.fr.design.gui.ilist.JNameEdList;
 import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.design.gui.ilist.UINameEdList;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.os.impl.PopupDialogSaveAction;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
+import com.fr.stable.os.support.OSSupportCenter;

 import javax.swing.DefaultListModel;
 import javax.swing.JList;
@ -216,6 +218,8 @@ public abstract class UIListControlPane extends UIControlPane implements ListCon
                ((PopupEditDialog)popupEditDialog).setTitle(getSelectedName());
            }
            popupEditDialog.setVisible(true);
+            PopupDialogSaveAction osBasedAction = OSSupportCenter.getAction(PopupDialogSaveAction.class);
+            osBasedAction.execute(this, popupEditDialog);
        }
    }

--- a/designer-base/src/main/java/com/fr/design/os/impl/PopupDialogSaveAction.java
+++ b/designer-base/src/main/java/com/fr/design/os/impl/PopupDialogSaveAction.java
@ -0,0 +1,39 @@
+package com.fr.design.os.impl;
+
+import com.fr.design.gui.controlpane.UIListControlPane;
+import com.fr.stable.os.OperatingSystem;
+import com.fr.stable.os.support.OSBasedAction;
+
+import java.awt.*;
+
+/**
+ * linux下超链弹窗等保存问题
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/7/21
+ */
+public class PopupDialogSaveAction implements OSBasedAction {
+
+    private UIListControlPane currentControlPane;
+    private Window popupDialog;
+
+    @Override
+    public void execute(Object... objects) {
+        boolean canSave = OperatingSystem.isLinux() && popupDialog != null && popupDialog.isVisible() && currentControlPane != null;
+        if (canSave) {
+            currentControlPane.saveSettings();
+        }
+    }
+
+    public void register(UIListControlPane currentControlPane, Window popupDialog) {
+        this.currentControlPane = currentControlPane;
+        this.popupDialog = popupDialog;
+    }
+
+    public void unregister() {
+        this.currentControlPane = null;
+        this.popupDialog = null;
+    }
+
+}
--- a/designer-base/src/main/java/com/fr/design/os/impl/UpdateDialogAction.java
+++ b/designer-base/src/main/java/com/fr/design/os/impl/UpdateDialogAction.java
@ -2,8 +2,6 @@ package com.fr.design.os.impl;

 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.update.ui.dialog.UpdateMainDialog;
-import com.fr.design.utils.DesignUtils;
-import com.fr.stable.os.OperatingSystem;
 import com.fr.stable.os.support.OSBasedAction;

 /**
@ -12,14 +10,10 @@ import com.fr.stable.os.support.OSBasedAction;
 * @date 2019/10/9
 */
 public class UpdateDialogAction implements OSBasedAction {
-    private static String UPDATE_ROUTE = "#management/backup";
+    
    @Override
    public void execute(Object... objects) {
-        if(!OperatingSystem.isLinux()) {
-            UpdateMainDialog dialog = new UpdateMainDialog(DesignerContext.getDesignerFrame());
-            dialog.showDialog();
-        }else{
-            DesignUtils.visitEnvServerByParameters( UPDATE_ROUTE,null,null);
-        }
+        UpdateMainDialog dialog = new UpdateMainDialog(DesignerContext.getDesignerFrame());
+        dialog.showDialog();
    }
 }
--- a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBar.java
+++ b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBar.java
@ -11,6 +11,7 @@ import com.fr.design.style.color.ColorSelectDialog;
 import com.fr.design.style.color.ColorSelectable;
 import com.fr.stable.AssistUtils;

+import com.fr.stable.os.OperatingSystem;
 import javax.swing.JComponent;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@ -124,14 +125,20 @@ public class GradientBar extends JComponent implements UIObserver, ColorSelectab
    protected void addMouseDragListener() {
        this.addMouseMotionListener(new MouseAdapter() {
            public void mouseDragged(MouseEvent e) {
-
+                int oldIndex = index;
                for (int i = 0; i < list.size(); i++) {
                    if (list.get(i).contains(e.getX(), e.getY())) {
                        index = i;
                        break;
                    }
                }
-
+                if(OperatingSystem.isLinux() && AssistUtils.equals(oldIndex,index)){
+                    if(Math.abs(p1.getX() - e.getX()) > Math.abs(p2.getX() - e.getX())){
+                        index = 1;
+                    }else{
+                        index = 0;
+                    }
+                }
                boolean x = e.getX() <= max && e.getX() >= min;
                if (x && e.getY() < MAX_VERTICAL) {
                    list.get(index).setX(e.getX());
--- a/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java
+++ b/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java
@ -27,6 +27,7 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.style.color.ColorCell;
 import com.fr.design.style.color.ColorFactory;
 import com.fr.design.style.color.ColorSelectBox;
@ -387,31 +388,35 @@ public final class GUICoreUtils {
 	 * @param y y坐标
 	 */
 	public static void showPopupMenu(JPopupMenu popup, Component parentComponent, int x, int y) {
-		if (popup == null) {// check null.
-			return;
-		}
-
-		Point point = new Point(x, y);
-		SwingUtilities.convertPointToScreen(point, parentComponent);
-
-		Dimension size = popup.getPreferredSize();
-		Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
-		screen.setSize(screen.getSize().width, screen.height - HEIGHT_GAP);
-
-		int showOnScreenX = Math.min(screen.width, parentComponent.getLocationOnScreen().x + parentComponent.getWidth());
-
-		// peter:调整X的高度.
-		if (point.x + size.width > showOnScreenX && size.width < showOnScreenX) {
-			x += (showOnScreenX - point.x - size.width);
-		}
-
-		// peter:调整y高度.
-		if (point.y + size.height > screen.height && size.height < screen.height) {
-			y -= size.height;
-		}
-
-		popup.show(parentComponent, x, y);
-	}
+        if (popup == null) {// check null.
+            return;
+        }
+
+        Point point = new Point(x, y);
+        SwingUtilities.convertPointToScreen(point, parentComponent);
+
+        Dimension size = popup.getPreferredSize();
+        Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
+        screen.setSize(screen.getSize().width, screen.height - HEIGHT_GAP);
+        //父元素右边界的坐标
+        int parentComponentRightBorderPosition = parentComponent.getLocationOnScreen().x + parentComponent.getWidth();
+        //设计器右边界的坐标
+        Rectangle rectangle = DesignerContext.getDesignerFrame().getBounds();
+        int designerRightBorderPosition = rectangle.x + rectangle.width;
+        rectangle = SwingUtilities.getWindowAncestor(parentComponent).getBounds();
+        designerRightBorderPosition = Math.max(designerRightBorderPosition, rectangle.x + rectangle.width);
+        // peter:调整X的高度.
+        if (point.x + size.width > designerRightBorderPosition && size.width < designerRightBorderPosition) {
+            x += (parentComponentRightBorderPosition - point.x - size.width);
+        }
+
+        // peter:调整y高度.
+        if (point.y + size.height > screen.height && size.height < screen.height) {
+            y -= size.height;
+        }
+
+        popup.show(parentComponent, x, y);
+    }

 	/**
 	 * Set enabled.<br>
--- a/designer-realize/src/main/java/com/fr/design/report/UnitFieldPane.java
+++ b/designer-realize/src/main/java/com/fr/design/report/UnitFieldPane.java
@ -8,6 +8,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UIBasicSpinner;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.stable.Constants;
+import com.fr.stable.GraphDrawHelper;
 import com.fr.stable.OperatingSystem;
 import com.fr.stable.unit.CM;
 import com.fr.stable.unit.INCH;
@ -52,9 +53,9 @@ public class UnitFieldPane extends JPanel {
                this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_MM"));
            }

-            //ajust the heigt of unitLabel.
-            Dimension unitDimension = new Dimension(this.getPreferredSize().width,
-                    preferredHeight);
+            //自适应label宽度
+            int width = GraphDrawHelper.getWidth(this.getText(), this.getFont());
+            Dimension unitDimension = new Dimension(width, preferredHeight);
            this.setMinimumSize(unitDimension);
            this.setMinimumSize(unitDimension);
            this.setSize(unitDimension);
--- a/designer-realize/src/main/java/com/fr/grid/GridMouseAdapter.java
+++ b/designer-realize/src/main/java/com/fr/grid/GridMouseAdapter.java
@ -10,7 +10,7 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.mainframe.JSliderPane;
-import com.fr.design.present.CellWriteAttrPane;
+import com.fr.design.os.impl.PopupDialogSaveAction;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.grid.selection.CellSelection;
 import com.fr.grid.selection.FloatSelection;
@ -26,6 +26,7 @@ import com.fr.report.elementcase.TemplateElementCase;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.ColumnRow;
 import com.fr.stable.StringUtils;
+import com.fr.stable.os.support.OSSupportCenter;
 import com.fr.stable.unit.FU;

 import javax.swing.*;
@ -93,7 +94,9 @@ public class GridMouseAdapter implements MouseListener, MouseWheelListener, Mous
        if (!grid.hasFocus() && grid.isRequestFocusEnabled()) {
            grid.requestFocus();
        }
-
+        // linux下 点击单元格时 失焦之前立即触发保存
+        PopupDialogSaveAction saveAction = OSSupportCenter.getAction(PopupDialogSaveAction.class);
+        saveAction.execute();
        if (SwingUtilities.isRightMouseButton(evt)) {
            doWithRightButtonPressed();
        } else {