Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/design into release/10.0

designer-base/src/main/java/com/fr/design/gui/itextfield/UIAutoCompletionField.java

@@ -1,11 +1,9 @@
 package com.fr.design.gui.itextfield;
 
 import com.fr.design.gui.imenu.UIListPopup;
-import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
-import com.fr.stable.OperatingSystem;
+import javax.swing.JList;
-
+import javax.swing.UIManager;
-import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.event.ListSelectionEvent;
@@ -13,10 +11,12 @@ import javax.swing.event.ListSelectionListener;
 import javax.swing.text.AbstractDocument;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
-
+import java.awt.event.ActionEvent;
-import java.awt.Dimension;
+import java.awt.event.ActionListener;
-import java.awt.LayoutManager;
+import java.awt.event.KeyEvent;
-import java.awt.event.*;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.util.ArrayList;
 
 public class UIAutoCompletionField extends UITextField implements DocumentListener, MouseListener, ListSelectionListener, ActionListener, KeyListener {
@@ -82,9 +82,6 @@ public class UIAutoCompletionField extends UITextField implements DocumentListen
     }
 
     private void textChanged() {
-        if (OperatingSystem.isMacOS()) {
-            return;
-        }
         if (!popup.isVisible()) {
             showPopup();
             requestFocus();

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileStyleDefinePane.java

@@ -7,7 +7,10 @@ import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.general.FRFont;
 import com.fr.general.cardtag.mobile.DefaultMobileTemplateStyle;
 import com.fr.general.cardtag.mobile.MobileTemplateStyle;
+import com.fr.general.cardtag.mobile.TabFontConfig;
+
 import java.awt.BasicStroke;
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
@@ -41,17 +44,17 @@ public class DefaultMobileStyleDefinePane extends MobileTemplateStyleDefinePane
 
     @Override
     public MobileTemplateStyle updateBean() {
-        return new DefaultMobileTemplateStyle();
+        return getDefaultTemplateStyle();
     }
 
     public MobileTemplateStyle updateConfig(){
-        return new DefaultMobileTemplateStyle();
+        return getDefaultTemplateStyle();
     }
 
 
     @Override
     protected MobileTemplateStyle getDefaultTemplateStyle() {
-        return new DefaultMobileTemplateStyle();
+        return new DefaultMobileTemplateStyle(new TabFontConfig(getTagLayout().getTitleFont()));
     }
 
     @Override
@@ -74,6 +77,10 @@ public class DefaultMobileStyleDefinePane extends MobileTemplateStyleDefinePane
             this.setBackground(DefaultMobileTemplateStyle.DEFAULT_INITIAL_COLOR);
         }
 
+        public Color getInitialColor() {
+            return DefaultMobileTemplateStyle.DEFAULT_INITIAL_COLOR;
+        }
+
         public void repaint() {
             super.repaint();
         }
@@ -94,11 +101,13 @@ public class DefaultMobileStyleDefinePane extends MobileTemplateStyleDefinePane
             int fontHeight = fm.getHeight();
             int ascentHeight = fm.getAscent();
             for (int i = 0; i < cardTagLayout.getWidgetCount(); i++) {
+                g2d.setColor(frFont.getForeground());
                 CardSwitchButton cardSwitchButton = cardTagLayout.getSwitchButton(i);
                 String displayName = calculateDisplayName(cardSwitchButton.getText(), fm, eachWidth);
                 int width = fm.stringWidth(displayName);
                 g2d.drawString(displayName, (eachWidth - width) / 2, (panelHeight - fontHeight) / 2 + ascentHeight);
                 if (i == 0) {
+                    g2d.setColor(Color.BLACK);
                     g2d.setStroke(new BasicStroke(2.0f));
                     g2d.drawLine(0, panelHeight - 1, eachWidth, panelHeight - 1);
                 }

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/TemplateStyleDefinePaneFactory.java

@@ -24,9 +24,10 @@ public class TemplateStyleDefinePaneFactory {
 
     public static BasicBeanPane<MobileTemplateStyle> createDefinePane(String style, WCardTagLayout tagLayout) {
         StyleDefinePaneUI styleDefinePaneUI = defineMap.get(style);
-        Class<? extends BasicBeanPane<MobileTemplateStyle>> clazz = styleDefinePaneUI.getaClass();
+        if(styleDefinePaneUI == null){
-        if (clazz == null) {
+            styleDefinePaneUI = defineMap.get(DefaultMobileTemplateStyle.STYLE_NAME);
         }
+        Class<? extends BasicBeanPane<MobileTemplateStyle>> clazz = styleDefinePaneUI.getaClass();
         BasicBeanPane<MobileTemplateStyle> quickPane = null;
         try {
             quickPane = Reflect.on(clazz).create(tagLayout).get();

designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java

@@ -8,11 +8,16 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
 
-
+import javax.swing.BorderFactory;
-import javax.swing.*;
+import javax.swing.Box;
+import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
@@ -92,11 +97,15 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
         centerPane.add(Box.createVerticalStrut(1));
 
         // mod by anchore 16/11/16
-        UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_More_Color"));
+        final UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_More_Color"));
 
-        customButton.addActionListener(new ActionListener() {
+        // 不能使用 ActionListener，否则设计器工具栏中的"更多颜色"按钮会有问题（REPORT-13654）
+        customButton.addMouseListener(new MouseAdapter() {
             @Override
-            public void actionPerformed(ActionEvent e) {
+            public void mousePressed(MouseEvent e) {
+                if (!customButton.isEnabled()) {
+                    return;
+                }
                 customButtonPressed();
             }
         });

designer-base/src/main/java/com/fr/design/style/color/PickColorButtonFactory.java

@@ -4,11 +4,15 @@ import com.fr.base.BaseUtils;
 import com.fr.design.gui.ibutton.SpecialUIButton;
 import com.fr.design.gui.ibutton.UIBasicButtonUI;
 
-import javax.swing.*;
+import javax.swing.JButton;
-import javax.swing.plaf.ButtonUI;
+import javax.swing.JComponent;
-import javax.swing.plaf.basic.BasicButtonUI;
+import java.awt.Color;
-import java.awt.*;
+import java.awt.Cursor;
-import java.awt.event.*;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
 /**
  * Created by plough on 2016/12/22.
@@ -28,7 +32,7 @@ class PickColorButtonFactory {
      * @return SpecialUIButton 屏幕取色按钮
      */
     static JButton getPickColorButton(final ColorSelectable colorSelectable, IconType iconType, final boolean setColorRealTime) {
-        SpecialUIButton pickColorButton = new SpecialUIButton(new WhiteButtonUI());
+        final SpecialUIButton pickColorButton = new SpecialUIButton(new WhiteButtonUI());
         PickColorButtonFactory.iconType = iconType;
 
         if (iconType == IconType.ICON16) {
@@ -42,9 +46,13 @@ class PickColorButtonFactory {
         pickColorButton.setPreferredSize(new Dimension(iconSize, iconSize));
         pickColorButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
 
-        pickColorButton.addActionListener(new ActionListener() {
+        // 不能使用 ActionListener，否则设计器工具栏中的取色按钮会有问题（REPORT-13654）
+        pickColorButton.addMouseListener(new MouseAdapter() {
             @Override
-            public void actionPerformed(ActionEvent e) {
+            public void mousePressed(MouseEvent e) {
+                if (!pickColorButton.isEnabled()) {
+                    return;
+                }
                 new ColorPicker(colorSelectable, setColorRealTime);
             }
         });

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkNorthPane.java

@@ -110,12 +110,14 @@ public class FormHyperlinkNorthPane extends BasicBeanPane<FormHyperlinkProvider>
         }
         String editorName = formHyperlink.getRelateEditorName();
         //防止初始的时候有空白选项
-        if (editorName == null) {
+        String[] formHyperlinkEditNames = getFormHyperlinkEditNames();
-            return;
+        if (editorName == null && formHyperlinkEditNames.length > 0) {
+            editorName = formHyperlinkEditNames[0];
+            formHyperlink.setRelateEditorName(editorName);
         }
         if (targetFrameComboBox != null) {
             //noinspection unchecked
-            targetFrameComboBox.setModel(new DefaultComboBoxModel(getFormHyperlinkEditNames()));
+            targetFrameComboBox.setModel(new DefaultComboBoxModel(formHyperlinkEditNames));
             targetFrameComboBox.setSelectedItem(editorName);
         }
     }

designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelSeriesPane.java

@@ -44,7 +44,7 @@ public class VanChartFunnelSeriesPane extends VanChartAbstractPlotSeriesPane {
     //设置色彩面板内容
     protected void setColorPaneContent (JPanel panel) {
         if (stylePane != null) {
-            panel.add(createStylePane(), BorderLayout.CENTER);
+            panel.add(stylePane, BorderLayout.CENTER);
         }
         panel.add(createAlphaPane(), BorderLayout.SOUTH);
     }

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

@@ -68,7 +68,9 @@ public class XNameWidget extends XWidgetCreator {
 			Widget widget;
 			if (wc != null && (widget= wc.toWidget()) != null) {
 				editor = XCreatorUtils.createXCreator(widget);
-				toData().setVisible(widget.isVisible());
+				Widget currentWidget = toData();
+				currentWidget.setVisible(widget.isVisible());
+				currentWidget.setEnabled(widget.isEnabled());
 				this.setBorder(null);
 			} else {
 				this.setBorder(DEFALUTBORDER);

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

@@ -106,6 +106,16 @@ public class XWCardLayout extends XLayoutContainer {
         return new Dimension(500, 300);
     }
 
+    /**
+     * 重置组件的名称
+     * @param name 名称
+     */
+    public void resetCreatorName(String name) {
+        super.resetCreatorName(name);
+        changeRelateSwitchCardName(name);
+    }
+
+
     @Override
     protected void initLayoutManager() {
         cardLayout = new FRCardLayout(toData().getHgap(), toData().getVgap());

designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java

@@ -14,12 +14,11 @@ import com.fr.design.designer.creator.XWScaleLayout;
 import com.fr.design.designer.creator.XWTitleLayout;
 import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
 import com.fr.design.utils.ComponentUtils;
+import com.fr.form.main.Form;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WTitleLayout;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
-
-
 import java.awt.Component;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -97,8 +96,7 @@ public class FormSelectionUtils {
         Rectangle rec = clipboard.getSelctionBounds();
         for (XCreator creator : clipboard.getSelectedCreators()) {
             try {
-                Widget copied = copyWidget(designer, creator);
+                XCreator copiedCreator = copyXcreator(designer.getTarget(), creator);
-                XCreator copiedCreator = XCreatorUtils.createXCreator(copied, creator.getSize());
                 // 获取位置
                 Point point = getPasteLocation((AbstractLayoutAdapter) adapter,
                         copiedCreator,
@@ -181,8 +179,7 @@ public class FormSelectionUtils {
 
     private static void relativePasteXCreator(FormDesigner designer, XCreator creator, LayoutAdapter adapter, Rectangle tabContainerRect, int x, int y) {
         try {
-            Widget copied = copyWidget(designer, creator);
+            XCreator copiedXCreator = copyXcreator(designer.getTarget(), creator);
-            XCreator copiedXCreator = XCreatorUtils.createXCreator(copied, creator.getSize());
             if (adapter.getClass().equals(FRTabFitLayoutAdapter.class)) {
                 if (!adapter.accept(copiedXCreator, x - tabContainerRect.x, y - tabContainerRect.y)) {
                     designer.showMessageDialog(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Too_Small_To_Paste"));
@@ -235,33 +232,52 @@ public class FormSelectionUtils {
         return new Point(x, y);
     }
 
-
     /**
      * 拷贝组件
+     * @param form 当前表单
+     * @param xCreator 待拷贝的组件
+     * @return XCreator 拷贝的组件
      */
-    private static Widget copyWidget(FormDesigner formDesigner, XCreator xCreator) throws
+    public static XCreator copyXcreator(Form form, XCreator xCreator) throws CloneNotSupportedException{
-            CloneNotSupportedException {
-        ArrayList<String> nameSpace = new ArrayList<>();
         Widget copied = (Widget) xCreator.toData().clone();
-        //重命名拷贝的组件
+        XCreator copiedCreator = XCreatorUtils.createXCreator(copied, xCreator.getSize());
-        String name = getCopiedName(formDesigner, copied, nameSpace);
+        ArrayList<String> nameSpace = new ArrayList<>();
-        if (copied instanceof WTitleLayout) {
+        copyWidgetName(form, nameSpace, copiedCreator);
-            XWTitleLayout xwTitleLayout = new XWTitleLayout((WTitleLayout) copied, xCreator.getSize());
+        return copiedCreator;
-            xwTitleLayout.resetCreatorName(name);
+    }
-        } else {
+
-            copied.setWidgetName(name);
+    /**
+     * 拷贝组件
+     * @param form 当前表单
+     * @param nameSpace 命名空间
+     * @param xCreator 拷贝的组件
+     */
+    private static void copyWidgetName(Form form, ArrayList<String> nameSpace, XCreator xCreator){
+        String copyName = FormSelectionUtils.getCopiedName(form, xCreator.toData(), nameSpace);
+        if (xCreator.toData() instanceof WTitleLayout) {
+            XWTitleLayout xwTitleLayout = new XWTitleLayout((WTitleLayout) xCreator.toData(), xCreator.getSize());
+            xwTitleLayout.resetCreatorName(copyName);
+            return;
+        }
+        xCreator.resetCreatorName(copyName);
+        int count = xCreator.getComponentCount();
+        for(int a = 0; a <count; a++){
+            if(xCreator.getComponent(a) instanceof XCreator){
+                XCreator child = (XCreator)xCreator.getComponent(a);
+                copyWidgetName(form, nameSpace, child);
+            }
+
         }
-        return copied;
     }
 
     /**
      * 组件拷贝命名规则
      */
-    private static String getCopiedName(FormDesigner formDesigner, Widget copied, ArrayList<String> nameSpace) {
+    private static String getCopiedName(Form form, Widget copied, ArrayList<String> nameSpace) {
         StringBuilder name = new StringBuilder(copied.getWidgetName());
         do {
             name.append(POSTFIX);
-        } while (formDesigner.getTarget().isNameExist(name.toString()) || nameSpace.contains(name.toString()));
+        } while (form.isNameExist(name.toString()) || nameSpace.contains(name.toString()));
         nameSpace.add(name.toString());
         return name.toString();
     }
@@ -308,4 +324,4 @@ public class FormSelectionUtils {
             }
         }
     }
-}
+}

designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/WCardTagLayoutDefinePane.java

@@ -115,6 +115,7 @@ public class WCardTagLayoutDefinePane extends AbstractDataModify<WCardTagLayout>
         templateStyleEditor.setValue(ob.getTemplateStyle());
         FRFont frFont = layoutBorderStyle.getTitle().getFrFont();
         if (frFont != null) {
+            ob.setTitleFont(frFont);
             frFontPane.populateBean(frFont);
         }
     }
@@ -126,8 +127,10 @@ public class WCardTagLayoutDefinePane extends AbstractDataModify<WCardTagLayout>
         XWCardLayout xCardLayout = ((XWCardMainBorderLayout) topLayout).getCardPart();
         LayoutBorderStyle layoutBorderStyle = xCardLayout.toData().getBorderStyle();
         FRFont frFont = layoutBorderStyle.getTitle().getFrFont() == null ? FRFont.getInstance() : layoutBorderStyle.getTitle().getFrFont();
-        layoutBorderStyle.getTitle().setFrFont(frFontPane.update(frFont));
+        FRFont titleFont = frFontPane.update(frFont);
+        layoutBorderStyle.getTitle().setFrFont(titleFont);
         WCardTagLayout layout = (WCardTagLayout) creator.toData();
+        layout.setTitleFont(titleFont);
         boolean isHori = displayPositionGroup.getSelectedIndex() == WTabDisplayPosition.TOP_POSITION.getType() || displayPositionGroup.getSelectedIndex() == WTabDisplayPosition.BOTTOM_POSITION.getType();
         if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Tab_Style_Template"))) {
             layout.setDisplayPosition(WTabDisplayPosition.parse(displayPositionGroup.getSelectedIndex()));

designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java

@@ -508,6 +508,10 @@ public class CellSelection extends Selection {
         popup.add(DeprecatedActionManager.getInsertMenu(ePane));
         popup.add(DeprecatedActionManager.getDeleteMenu(ePane));
         popup.add(DeprecatedActionManager.getClearMenu(ePane));
+
+        popup.addSeparator();
+
+        addExtraMenu(ePane, popup);
         return popup;
     }
 

designer-realize/src/main/java/com/fr/grid/selection/FloatSelection.java

@@ -1,6 +1,5 @@
 package com.fr.grid.selection;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.actions.cell.CleanAuthorityAction;
@@ -27,7 +26,6 @@ import com.fr.design.mainframe.ElementCasePane.Clear;
 import com.fr.design.selection.QuickEditor;
 import com.fr.design.utils.DesignUtils;
 import com.fr.general.ComparatorUtils;
-
 import com.fr.report.cell.FloatElement;
 import com.fr.report.elementcase.TemplateElementCase;
 import com.fr.stable.ColumnRow;
@@ -149,6 +147,10 @@ public class FloatSelection extends Selection {
 
         popup.add(new EditFloatElementNameAction(ePane).createMenuItem());
 
+        popup.addSeparator();
+
+        addExtraMenu(ePane, popup);
+
         return popup;
     }