Merge remote-tracking branch 'origin/release/9.0' into release/9.0

designer/src/com/fr/design/condition/HyperlinkPane.java

@@ -37,7 +37,7 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane<HighlightAct
         hyperlinkButton.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 NameJavaScriptGroup nameHyperlinks = jsGroup;
-                pane = DesignerContext.getDesignerFrame().getSelectedJTemplate().getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
+                pane = DesignerContext.getDesignerFrame().getSelectedJTemplate().getHyperLinkPaneNoPop(HyperlinkGroupPaneActionImpl.getInstance());
                 pane.populate(nameHyperlinks);
                 dialog = pane.showWindow(SwingUtilities.getWindowAncestor(conditionAttributesPane));
                 dialog.addDialogActionListener(new DialogActionAdapter() {

designer/src/com/fr/design/condition/WidgetHighlightPane.java

@@ -6,6 +6,9 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.mainframe.ElementCasePane;
+import com.fr.design.widget.CellWidgetCardPane;
+import com.fr.design.widget.WidgetManageCardPane;
 import com.fr.design.widget.WidgetPane;
 import com.fr.form.ui.*;
 import com.fr.general.Inter;
@@ -35,7 +38,12 @@ public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<Highli
         widgetButton = new UIButton(Inter.getLocText("FR-Designer_Edit"));
         widgetButton.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-                final WidgetPane widgetPane = new WidgetPane();
+                final WidgetPane widgetPane = new WidgetPane() {
+                    @Override
+                    protected CellWidgetCardPane initWidgetCardPane(ElementCasePane pane) {
+                        return new WidgetManageCardPane(pane);
+                    }
+                };
                 widgetPane.populate(widget);
                 BasicDialog dialog = widgetPane.showWindow(
                         SwingUtilities.getWindowAncestor(conditionAttributesPane));

designer/src/com/fr/design/mainframe/JWorkBook.java

@@ -854,6 +854,11 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
         return ReportHyperlinkGroupPane.getInstance(hyperlinkGroupPaneActionProvider);
     }
 
+    @Override
+    public HyperlinkGroupPane getHyperLinkPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
+        return ReportHyperlinkGroupPaneNoPop.getInstance(hyperlinkGroupPaneActionProvider);
+    }
+
     public void setAuthorityMode(boolean isUpMode) {
         centerPane.setAuthorityMode(isUpMode);
     }

designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPane.java

@@ -23,7 +23,8 @@ import java.awt.*;
 public class ReportHyperlinkGroupPane extends HyperlinkGroupPane {
     private static ReportHyperlinkGroupPane singleton;
 
-    private ReportHyperlinkGroupPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
+    // 仅供继承使用，外部通过 getInstance 获取实例
+    protected ReportHyperlinkGroupPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
         super(hyperlinkGroupPaneActionProvider);
     }
 
@@ -35,7 +36,7 @@ public class ReportHyperlinkGroupPane extends HyperlinkGroupPane {
         return singleton;
     }
 
-    private void refreshPane() {
+    protected void refreshPane() {
         ElementCasePane reportPane = ((JWorkBook)HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()).getEditingElementCasePane();
         if (reportPane == null) {
             return;

designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPaneNoPop.java

@@ -0,0 +1,27 @@
+package com.fr.design.mainframe;
+
+import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider;
+
+/**
+ * Created by plough on 2017/9/4.
+ */
+public class ReportHyperlinkGroupPaneNoPop extends ReportHyperlinkGroupPane{
+    private static ReportHyperlinkGroupPaneNoPop singleton;
+
+    private ReportHyperlinkGroupPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
+        super(hyperlinkGroupPaneActionProvider);
+    }
+
+    public static ReportHyperlinkGroupPaneNoPop getInstance(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
+        if (singleton == null) {
+            singleton = new ReportHyperlinkGroupPaneNoPop(hyperlinkGroupPaneActionProvider);
+        }
+        singleton.refreshPane();
+        return singleton;
+    }
+
+    @Override
+    protected boolean isNewStyle() {
+        return false;
+    }
+}

designer/src/com/fr/design/present/BarCodePane.java

@@ -145,11 +145,13 @@ public class BarCodePane extends FurtherBasicBeanPane<BarcodePresent> {
         barHeightContainer.add(barHeightSpinner);
         UILabel uiLabel = new UILabel(Inter.getLocText("FR-Designer-Tree_Width"), UILabel.RIGHT);
         uiLabel.setPreferredSize(typeSetLabel.getPreferredSize());
+        JPanel drawingTextCheckBoxPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
         drawingTextCheckBox.setBorder(UIConstants.CELL_ATTR_ZEROBORDER);
+        drawingTextCheckBoxPane.add(drawingTextCheckBox);
         Component[][] components_normal = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Barcode_Size"), UILabel.LEFT), barWidthContainer, barHeightContainer},
-                new Component[]{null, new UILabel(Inter.getLocText("FR-Designer-Tree_Width"), UILabel.CENTER), new UILabel(Inter.getLocText("FR-Designer_Height"), UILabel.CENTER)},
-                new Component[]{drawingTextCheckBox, null, null}
+                new Component[]{null, new UILabel(Inter.getLocText("FR-Designer-Tree_Width"), UILabel.CENTER), new UILabel(Inter.getLocText("FR-Designer-Tree_Height"), UILabel.CENTER)},
+                new Component[]{drawingTextCheckBoxPane, null, null}
         };
 
 

designer/src/com/fr/design/widget/WidgetEventPaneNoPop.java

@@ -2,8 +2,6 @@ package com.fr.design.widget;
 
 import com.fr.design.mainframe.ElementCasePane;
 
-import java.awt.*;
-
 /**
  * 没有悬浮弹窗的控件事件编辑面板
  * Created by plough on 2017/8/28.
@@ -17,9 +15,4 @@ public class WidgetEventPaneNoPop extends WidgetEventPane {
     protected boolean isNewStyle() {
         return false;
     }
-
-    @Override
-    protected void popupEditDialog(Point mousePos) {
-        // no pop, do nothing
-    }
 }

designer/src/com/fr/design/widget/ui/TreeComboBoxEditorDefinePane.java

@@ -55,14 +55,14 @@ public class TreeComboBoxEditorDefinePane extends CustomWritableRepeatEditorPane
 
 	@Override
 	protected void populateSubCustomWritableRepeatEditorBean(TreeEditor e) {
-		treeSettingPane.setValue(e.getDictionary());
+		treeSettingPane.setValue(e.getNodeOrDict());
 		treeRootPane.populate(e.getTreeAttr());
 	}
 
 	@Override
 	protected TreeComboBoxEditor updateSubCustomWritableRepeatEditorBean() {
 		TreeComboBoxEditor editor = new TreeComboBoxEditor();
-		editor.setDictionary((Dictionary)treeSettingPane.getValue());
+		editor.setNodeOrDict(treeSettingPane.getValue());
 		editor.setTreeAttr(treeRootPane.update());
 		return editor;
 	}

designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java

@@ -30,7 +30,7 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
 
 	@Override
 	protected void populateSubFieldEditorBean(TreeEditor e) {
-		this.accessibleTreeModelEditor.setValue(e.getDictionary());
+		this.accessibleTreeModelEditor.setValue(e.getNodeOrDict());
 		treeRootPane.populate(e.getTreeAttr());
 		if (this.removeRepeatCheckBox != null) {
 			this.removeRepeatCheckBox.setSelected(e.isRemoveRepeat());
@@ -40,7 +40,7 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
 	@Override
 	protected TreeEditor updateSubFieldEditorBean() {
 		TreeEditor editor = new TreeEditor();
-		editor.setDictionary((Dictionary) accessibleTreeModelEditor.getValue());
+		editor.setNodeOrDict(accessibleTreeModelEditor.getValue());
 		editor.setTreeAttr(treeRootPane.update());
 		if (this.removeRepeatCheckBox != null) {
 			editor.setRemoveRepeat(this.removeRepeatCheckBox.isSelected());

designer/src/com/fr/grid/GridColumnUI.java

@@ -163,11 +163,11 @@ public class GridColumnUI extends ComponentUI {
         float time = (float)resolution/ScreenResolution.getScreenResolution();
 
         double stringWidth = gridColumn.getFont().getStringBounds(columnContent, fontRenderContext).getWidth() * time;
-//        if (stringWidth > tmpIncreaseWidth) {
-//            paintMoreContent(i, g2d, tmpWidth1, size, tmpIncreaseWidth, isSelectedBounds, gridColumn, elementCase, columnContent, stringWidth, fmAscent);
-//        } else {
+        if (stringWidth > tmpIncreaseWidth) {
+            paintMoreContent(i, g2d, tmpWidth1, size, tmpIncreaseWidth, isSelectedBounds, gridColumn, elementCase, columnContent, stringWidth, fmAscent);
+        } else {
             paintNormalContent(i, g2d, tmpWidth1, tmpIncreaseWidth, isSelectedBounds, gridColumn, elementCase, columnContent, stringWidth, fmAscent);
-//        }
+        }
     }
 
 

designer/src/com/fr/grid/GridRowUI.java

@@ -159,20 +159,21 @@ public class GridRowUI extends ComponentUI {
         float fmAscent = GraphHelper.getFontMetrics(gridRow.getFont()).getAscent() * time;
         double stringWidth = gridRow.getFont().getStringBounds(paintText, fontRenderContext).getWidth() * time;
         double stringHeight = gridRow.getFont().getStringBounds(paintText, fontRenderContext).getHeight() * time;
-        if (isSelectedBounds) {
-            g2d.setColor(gridRow.getSelectedForeground());
-        } else {
-            // p:检查eanbled
-            if (gridRow.isEnabled()) {
-                g2d.setColor(gridRow.getForeground());
+        // 如果高度太小了就不画了
+        if (stringHeight <= tmpIncreaseHeight + 2) {
+            if (isSelectedBounds) {
+                g2d.setColor(gridRow.getSelectedForeground());
             } else {
-                g2d.setPaint(UIManager.getColor("controlShadow"));
+                // p:检查eanbled
+                if (gridRow.isEnabled()) {
+                    g2d.setColor(gridRow.getForeground());
+                } else {
+                    g2d.setPaint(UIManager.getColor("controlShadow"));
+                }
             }
-        }
-
-        GraphHelper.drawString(g2d, paintText, (size.width - stringWidth) / 2, tmpHeight1 + (tmpIncreaseHeight - stringHeight) / 2 + GridHeader.SIZE_ADJUST / 2 + fmAscent
-                - 2);
 
+            GraphHelper.drawString(g2d, paintText, (size.width - stringWidth) / 2, tmpHeight1 + (tmpIncreaseHeight - stringHeight) / 2 + GridHeader.SIZE_ADJUST / 2 + fmAscent - 2);
+        }
     }
 
 }

designer_base/src/com/fr/design/condition/LiteConditionPane.java

@@ -167,9 +167,6 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
 
             TreePath selectedTreePath = conditionsTree.getSelectionPath();
             if (selectedTreePath == null) {
-                // 清空编辑框
-                defaultConditionPane.populateBean((T)new ObjectCondition(new Compare(Compare.EQUALS, StringUtils.EMPTY)));
-                formulaTextArea.setText(StringUtils.EMPTY);
                 return;
             }
 
@@ -856,6 +853,10 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
         rootTreeNode.setUserObject(new JoinCondition(DataConstants.AND, new ListCondition()));
         rootTreeNode.removeAllChildren();
 
+        // 清空编辑框
+        defaultConditionPane.populateBean((T)new ObjectCondition(new Compare(Compare.EQUALS, StringUtils.EMPTY)));
+        formulaTextArea.setText(StringUtils.EMPTY);
+
         // peter:需要构建成ListCondition,加入到里面.
         if (liteCondition instanceof ListCondition) {
             ListCondition listCondition = (ListCondition) liteCondition;

designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java

@@ -27,22 +27,17 @@ import java.awt.event.WindowEvent;
 public abstract class UIControlPane extends BasicPane implements UnrepeatedNameHelper {
     protected static final int SHORT_WIDTH = 30; //每加一个short Divider位置加30
     protected JPanel controlUpdatePane;
-
     private ShortCut4JControlPane[] shorts;
     private NameableCreator[] creators;
     private ToolBarDef toolbarDef;
-
     private UIToolbar toolBar;
     private UIToolbar topToolBar;
     protected Window popupEditDialog;
     // peter:这是整体的一个cardLayout Pane
     protected CardLayout cardLayout;
-
     protected JPanel cardPane;
-
     protected BasePlot plot;
 
-
     public UIControlPane() {
         this.initComponentPane();
     }
@@ -128,8 +123,15 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH
             this.add(getLeftPane(), BorderLayout.CENTER);
             this.setBorder(BorderFactory.createEmptyBorder(10, 10, 15, 15));
         } else {
+            // 增加边框
+            JPanel leftPaneWrapper = new JPanel(new BorderLayout());
+            leftPaneWrapper.add(getLeftPane(), BorderLayout.CENTER);
+            leftPaneWrapper.setBorder(BorderFactory.createEmptyBorder(6, 6, 6, 6));
+            JPanel rightPaneWrapper = new JPanel(new BorderLayout());
+            rightPaneWrapper.add(cardPane, BorderLayout.CENTER);
+            rightPaneWrapper.setBorder(BorderFactory.createEmptyBorder(6, 6, 6, 6));
             // SplitPane
-            JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, getLeftPane(), cardPane);
+            JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, leftPaneWrapper, rightPaneWrapper);
             mainSplitPane.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor()));
             mainSplitPane.setOneTouchExpandable(true);
             this.add(mainSplitPane, BorderLayout.CENTER);

designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java

@@ -390,13 +390,15 @@ public abstract class UIListControlPane extends UIControlPane {
         }
     }
 
-    protected void popupEditDialog(Point mousePos) {
-        Rectangle currentCellBounds = nameableList.getCellBounds(editingIndex, editingIndex);
-        if (editingIndex < 0 || !currentCellBounds.contains(mousePos)) {
-            return;
+    private void popupEditDialog(Point mousePos) {
+        if (isNewStyle()) {
+            Rectangle currentCellBounds = nameableList.getCellBounds(editingIndex, editingIndex);
+            if (editingIndex < 0 || !currentCellBounds.contains(mousePos)) {
+                return;
+            }
+            popupEditDialog.setLocation(getPopupDialogLocation());
+            popupEditDialog.setVisible(true);
         }
-        popupEditDialog.setLocation(getPopupDialogLocation());
-        popupEditDialog.setVisible(true);
     }
 
     private Point getPopupDialogLocation() {

designer_base/src/com/fr/design/mainframe/JTemplate.java

@@ -890,6 +890,13 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
      */
     public abstract HyperlinkGroupPane getHyperLinkPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider);
 
+    /**
+     * 返回当前支持的超链界面pane
+     * 没有悬浮弹窗，显示为两列
+     * @return 超链连接界面
+     */
+    public abstract HyperlinkGroupPane getHyperLinkPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider);
+
     /**
      * 是否是图表
      *

designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java

@@ -12,7 +12,7 @@ import com.fr.js.EmailJavaScript;
 public class FormHyperlinkGroupPane extends HyperlinkGroupPane{
 	private static FormHyperlinkGroupPane singleton;
 
-	private FormHyperlinkGroupPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
+	protected FormHyperlinkGroupPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
 		super(hyperlinkGroupPaneActionProvider);
 	}
 

designer_form/src/com/fr/design/gui/xpane/FormHyperlinkGroupPaneNoPop.java

@@ -0,0 +1,26 @@
+package com.fr.design.gui.xpane;
+
+import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider;
+
+/**
+ * Created by plough on 2017/9/5.
+ */
+public class FormHyperlinkGroupPaneNoPop extends FormHyperlinkGroupPane{
+    private static FormHyperlinkGroupPaneNoPop singleton;
+
+    private FormHyperlinkGroupPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
+        super(hyperlinkGroupPaneActionProvider);
+    }
+
+    public static FormHyperlinkGroupPaneNoPop getInstance(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
+        if (singleton == null) {
+            singleton = new FormHyperlinkGroupPaneNoPop(hyperlinkGroupPaneActionProvider);
+        }
+        return singleton;
+    }
+
+    @Override
+    protected boolean isNewStyle() {
+        return false;
+    }
+}

designer_form/src/com/fr/design/mainframe/JForm.java

@@ -22,6 +22,7 @@ import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.xpane.FormHyperlinkGroupPane;
+import com.fr.design.gui.xpane.FormHyperlinkGroupPaneNoPop;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.actions.EmbeddedFormExportExportAction;
 import com.fr.design.mainframe.actions.FormMobileAttrAction;
@@ -147,10 +148,16 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
      *
      * @return 超链连接界面
      */
+    @Override
     public HyperlinkGroupPane getHyperLinkPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
         return FormHyperlinkGroupPane.getInstance(hyperlinkGroupPaneActionProvider);
     }
 
+    @Override
+    public HyperlinkGroupPane getHyperLinkPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider) {
+        return FormHyperlinkGroupPaneNoPop.getInstance(hyperlinkGroupPaneActionProvider);
+    }
+
     //表单返回 FORM_TAB or ELEMENTCASE_TAB
     public int getEditingReportIndex() {
         return this.index;

designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java

@@ -45,10 +45,8 @@ public class FreeButtonDefinePane extends ButtonDefinePane<FreeButton> {
     public FreeButton updateSubButtonPane() {
         FreeButton freeButton = (FreeButton) creator.toData();
         backgroundCompPane.update(freeButton);
-        FRFont frFont = freeButton.getFont();
-        if(frFont != null){
-            frFontPane.update(frFont);
-        }
+        FRFont frFont = freeButton.getFont() == null ? FRFont.getInstance() : freeButton.getFont();
+        freeButton.setFont(frFontPane.update(frFont));
         return freeButton;
     }
 }

designer_form/src/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java

@@ -69,7 +69,7 @@ public class TreeEditorDefinePane extends CustomWritableRepeatEditorPane<TreeEdi
 
     @Override
     protected void populateSubCustomWritableRepeatEditorBean(TreeEditor e) {
-        accessibleTreeModelEditor.setValue(e.getDictionary());
+        accessibleTreeModelEditor.setValue(e.getNodeOrDict());
         formWidgetValuePane.populate(e);
         treeRootPane.populate(e.getTreeAttr());
         mutiSelect.setSelected(e.isMultipleSelection());
@@ -88,7 +88,7 @@ public class TreeEditorDefinePane extends CustomWritableRepeatEditorPane<TreeEdi
         editor.setAjax(loadAsync.isSelected());
         editor.setSelectLeafOnly(returnLeaf.isSelected());
         editor.setReturnFullPath(returnPath.isSelected());
-        editor.setDictionary((Dictionary) accessibleTreeModelEditor.getValue());
+        editor.setNodeOrDict(accessibleTreeModelEditor.getValue());
         return editor;
     }