Merge pull request #108 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0

* commit '0e6cbfbb0c371ee8dd418b5542464b9895254e92':
  REPORT-8355 9.0之前开发的功能与bug patch到10.0（部分）

designer-base/src/com/fr/design/actions/help/AboutPane.java

@@ -68,28 +68,36 @@ public class AboutPane extends JPanel {
                         Inter.getLocText("FR-Designer-Basic_Activation_Key_Copy_OK")
                 }));
 
-        if (shouldShowPhoneAndQQ()) {
+        addPhoneAndQQPane(contentPane);
-            if (ComparatorUtils.equals(ProductConstants.APP_NAME, FINEREPORT)) {
+
-                boxCenterAlignmentPane = new BoxCenterAligmentPane(Inter.getLocText("FR-Designer_Service_Phone") + ProductConstants.COMPARE_TELEPHONE);
+        // 官网
-                contentPane.add(boxCenterAlignmentPane);
+        JPanel urlActionPane = getURLActionPane(Inter.getLocText("FR-Designer_Official_Website"), SiteCenter.getInstance().acquireUrlByKind("website." + FRContext.getLocale(), ProductConstants.WEBSITE_URL));
-            }
-            boxCenterAlignmentPane = new BoxCenterAligmentPane("QQ:" + SiteCenter.getInstance().acquireUrlByKind("help.qq"));
-            contentPane.add(boxCenterAlignmentPane);
-        }
 
-        BoxCenterAligmentPane actionLabel = getURLActionLabel(SiteCenter.getInstance().acquireUrlByKind("website." + FRContext.getLocale(), ProductConstants.WEBSITE_URL));
+        // 支持邮箱
-        BoxCenterAligmentPane emailLabel = getEmailActionLabel(SiteCenter.getInstance().acquireUrlByKind("support.email", ProductConstants.SUPPORT_EMAIL));
+        String defaultEmail = SiteCenter.getInstance().acquireUrlByKind("support.email", ProductConstants.SUPPORT_EMAIL);
+        JPanel emailPane = getEmailActionPane(Inter.getLocText("FR-Designer_Support_Email"),SiteCenter.getInstance().acquireUrlByKind("support.email." + FRContext.getLocale(), defaultEmail));
 
-        contentPane.add(actionLabel);
+        contentPane.add(urlActionPane);
-        contentPane.add(emailLabel);
+        contentPane.add(emailPane);
         if (shouldShowThanks()) {
             addThankPane(contentPane);
         }
     }
 
-    // 是否显示服务电话和 qq
+    private void addPhoneAndQQPane(JPanel contentPane) {
-    private boolean shouldShowPhoneAndQQ() {
+        BoxCenterAligmentPane boxCenterAlignmentPane;
-        return !FRContext.getLocale().equals(Locale.US);
+        // 英文版不显示服务电话和QQ
+        if (FRContext.getLocale().equals(Locale.US)) {
+            return;
+        }
+        boxCenterAlignmentPane = new BoxCenterAligmentPane(Inter.getLocText("FR-Designer_Service_Phone") + SiteCenter.getInstance().acquireUrlByKind("service.phone." + FRContext.getLocale(), ProductConstants.COMPARE_TELEPHONE));
+        contentPane.add(boxCenterAlignmentPane);
+        // 繁体版不显示QQ
+        if (FRContext.getLocale().equals(Locale.TAIWAN)) {
+            return;
+        }
+        boxCenterAlignmentPane = new BoxCenterAligmentPane("QQ: " + SiteCenter.getInstance().acquireUrlByKind("help.qq"));
+        contentPane.add(boxCenterAlignmentPane);
     }
 
     // 是否显示鸣谢面板
@@ -133,7 +141,7 @@ public class AboutPane extends JPanel {
                 StringUtils.BLANK, ProductConstants.RELEASE_VERSION, BUILD_PREFIX);
     }
 
-    private BoxCenterAligmentPane getEmailActionLabel(final String mailTo) {
+    private JPanel getEmailActionPane(final String desc, final String mailTo){
         ActionLabel emailLabel = new ActionLabel(mailTo);
 
         emailLabel.addActionListener(new ActionListener() {
@@ -147,10 +155,13 @@ public class AboutPane extends JPanel {
             }
         });
 
-        return new BoxCenterAligmentPane(emailLabel);
+        JPanel panel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        panel.add(new UILabel(desc));
+        panel.add(emailLabel);
+        return panel;
     }
 
-    private BoxCenterAligmentPane getURLActionLabel(final String url) {
+    private JPanel getURLActionPane(final String desc, final String url){
         ActionLabel actionLabel = new ActionLabel(url);
         actionLabel.addActionListener(new ActionListener() {
             @Override
@@ -163,7 +174,11 @@ public class AboutPane extends JPanel {
             }
         });
 
-        return new BoxCenterAligmentPane(actionLabel);
+        JPanel panel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        panel.add(new UILabel(desc));
+        panel.add(actionLabel);
+
+        return panel;
     }
 
     class UserLabel extends BoldFontTextLabel {

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

@@ -57,6 +57,7 @@ public class FRTreeComboBox extends UIComboBox {
     // richer:下拉展示用的tree
     protected JTree tree;
     private boolean onlyLeafSelectable = true;
+    private Object selectedObject = null;
 
     public FRTreeComboBox() {
         this(new JTree());
@@ -148,7 +149,7 @@ public class FRTreeComboBox extends UIComboBox {
             for (Enumeration e2 = pathnode.children(); e2.hasMoreElements(); ) {
                 TreeNode n2 = (TreeNode) e2.nextElement();
                 TreePath path2 = path.pathByAddingChild(n2);
-                if (pathToString(path2).toUpperCase().startsWith(textField.getText().toUpperCase())) {
+                if (pathToString(path2).toUpperCase().contains(textField.getText().toUpperCase())) {
                     tree.scrollPathToVisible(path2);
                     tree.setSelectionPath(path2);
                     isBreak = true;
@@ -162,6 +163,7 @@ public class FRTreeComboBox extends UIComboBox {
     }
 
     public void setSelectedItem(Object o) {
+        selectedObject = o;
         if (o instanceof String) {
             this.setSelectedItemString((String) o);
             return;
@@ -174,6 +176,10 @@ public class FRTreeComboBox extends UIComboBox {
         }
     }
 
+    public Object getSelectedItemObject() {
+        return selectedObject;
+    }
+
     private boolean validTreePath(String treePath){
         return StringUtils.isNotEmpty(treePath) && treePath.charAt(0) == '[' && treePath.endsWith("]");
     }
@@ -183,12 +189,7 @@ public class FRTreeComboBox extends UIComboBox {
         if (validTreePath(temp)) {
             temp = temp.substring(2, temp.length() - 1);
             String[] selectedtable = temp.split(",");
-            String table = selectedtable[selectedtable.length - 1].trim();
+            return selectedtable[selectedtable.length - 1].trim();
-            if (table.contains(".")) {
-                String[] temp2 = table.split("\\.");
-                table = temp2[temp2.length - 1].trim();
-            }
-            return table;
         }
         return "";
     }

designer-base/src/com/fr/design/gui/ispinner/UISpinner.java

@@ -12,28 +12,14 @@ import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 
-import javax.swing.ButtonModel;
+import javax.swing.*;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.plaf.ButtonUI;
-import java.awt.BorderLayout;
+import java.awt.*;
-import java.awt.Color;
+import java.awt.event.*;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.FocusAdapter;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.awt.event.MouseWheelEvent;
-import java.awt.event.MouseWheelListener;
 
 public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver {
 

designer-base/src/com/fr/design/mainframe/form/FormECDesignerProvider.java

@@ -89,4 +89,5 @@ public interface FormECDesignerProvider {
      */
     BufferedImage getElementCaseImage(Dimension elementCaseContainerSize);
 
+    void refreshPropertyPane();
 }

designer-base/src/com/fr/design/widget/EventCreator.java

@@ -36,11 +36,11 @@ public class EventCreator extends NameableSelfCreator {
 	}
 
 	/*
-	 * richer:国际化事件名称，所有需要国际化的事件都应按格式Event-eventName来进行国际化
+	 * richer:国际化事件名称，所有需要国际化的事件都应按格式FR-Engine_Event_eventName来进行国际化
 	 */
 	public static final String switchLang(String eventName) {
 		try {
-			return Inter.getLocText("Event-" + eventName);
+			return Inter.getLocText("FR-Engine_Event_" + eventName);
 		} catch (Exception e) {
 			FRContext.getLogger().error(e.getMessage(), e);
 			return eventName;

designer-form/src/com/fr/design/designer/beans/models/SelectionModel.java

@@ -65,6 +65,19 @@ public class SelectionModel {
         if (e.getButton() == MouseEvent.BUTTON3 || (!InputEventBaseOnOS.isControlDown(e) && !e.isShiftDown())) {
             // 如果Ctrl或者Shift键盘没有按下，则清除已经选择的组件
             selection.reset();
+        } else {
+            //按下Ctrl或者shift键时鼠标可以进行多选,两次点击同一控件就取消选中
+            XCreator comp = designer.getComponentAt(e);
+            XLayoutContainer topLayout = XCreatorUtils.getHotspotContainer(comp).getTopLayout();
+            if (topLayout != null && !topLayout.isEditable()) {
+                comp = topLayout;
+            }
+            XLayoutContainer container = XCreatorUtils.getParentXLayoutContainer(comp);
+            for (XCreator selected : selection.getSelectedCreators()) {
+                if (selected == comp || XCreatorUtils.getParentXLayoutContainer(selected) != container) {
+                    selection.removeCreator(selected);
+                }
+            }
         }
         // 获取e所在的组件
         XCreator comp = designer.getComponentAt(e);

designer-form/src/com/fr/design/designer/creator/XMultiFileUploader.java

@@ -3,23 +3,24 @@
  */
 package com.fr.design.designer.creator;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.beans.IntrospectionException;
-
-import javax.swing.JComponent;
-import com.fr.design.gui.ilable.UILabel;
-import javax.swing.JPanel;
-
 import com.fr.base.BaseUtils;
+import com.fr.design.designer.properties.mobile.MultiFileUploaderPropertyUI;
+import com.fr.design.form.util.XCreatorConstants;
+import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.form.ui.MultiFileEditor;
-import com.fr.design.form.util.XCreatorConstants;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.beans.IntrospectionException;
+
 /**
  * @author richer
  * @since 6.5.3
@@ -93,4 +94,9 @@ public class XMultiFileUploader extends XFieldEditor {
     protected String getIconName() {
         return "files_up.png";
     }
+
+    @Override
+    public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
+        return new WidgetPropertyUIProvider[]{ new MultiFileUploaderPropertyUI(this)};
+    }
 }

designer-form/src/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java

@@ -5,17 +5,13 @@ import com.fr.design.designer.beans.adapters.layout.FRAbsoluteBodyLayoutAdapter;
 import com.fr.design.designer.properties.mobile.BodyMobilePropertyUI;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.fun.WidgetPropertyUIProvider;
-import com.fr.design.mainframe.widget.editors.PaddingMarginEditor;
 import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor;
-import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer;
-import com.fr.design.mainframe.widget.renderer.PaddingMarginCellRenderer;
-import com.fr.form.ui.LayoutBorderStyle;
 import com.fr.form.ui.container.WAbsoluteBodyLayout;
-import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 import com.fr.stable.core.PropertyChangeAdapter;
 
-import java.awt.*;
+import java.awt.Component;
+import java.awt.Dimension;
 import java.beans.IntrospectionException;
 
 /**
@@ -127,4 +123,11 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {
         return false;
     }
 
+    /**
+     * 是否支持共享-body不支持共享
+     * @return
+     */
+    public boolean isSupportShared() {
+        return false;
+    }
 }

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

@@ -4,6 +4,8 @@
 package com.fr.design.designer.creator.cardlayout;
 
 import com.fr.base.GraphHelper;
+import com.fr.base.iofileattr.SharableAttrMark;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.ComponentAdapter;
 import com.fr.design.designer.beans.LayoutAdapter;
@@ -16,8 +18,10 @@ import com.fr.design.designer.creator.XWBorderLayout;
 import com.fr.design.designer.creator.XWidgetCreator;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.icon.IconPathConstants;
+import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.EditingMouseListener;
 import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.mainframe.WidgetHelpDialog;
 import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.form.event.Listener;
 import com.fr.form.ui.LayoutBorderStyle;
@@ -33,8 +37,10 @@ import com.fr.form.ui.container.cardlayout.WCardTitleLayout;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.IOUtils;
 import com.fr.general.Inter;
+import com.fr.share.ShareConstants;
 import com.fr.stable.Constants;
 
+import javax.swing.Icon;
 import java.awt.AlphaComposite;
 import java.awt.Color;
 import java.awt.Component;
@@ -44,6 +50,7 @@ import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
+import java.awt.RenderingHints;
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
@@ -58,6 +65,7 @@ import java.util.List;
  */
 public class XWCardMainBorderLayout extends XWBorderLayout {
 
+	private Icon controlMode = IOUtils.readIcon(IconPathConstants.TD_EL_SHARE_HELP_ICON_PATH);
 	private static final int CENTER = 1;
 	private static final int NORTH = 0;
 	private static final int TITLE_STYLE = 2;
@@ -358,9 +366,21 @@ public class XWCardMainBorderLayout extends XWBorderLayout {
 			);
 			g2d.setColor(Color.WHITE);
 			//画编辑文字
+			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 			g2d.drawString(Inter.getLocText("FR-Designer_Edit"), x + w / 2 - 2, y + h / 2 + 5);
 			g.setColor(XCreatorConstants.FORM_BORDER_COLOR);
 			GraphHelper.draw(g, new Rectangle(BORDER_WIDTH, BORDER_WIDTH, getWidth() - BORDER_WIDTH * 2, getHeight() - BORDER_WIDTH * 2), Constants.LINE_MEDIUM);
+			paintExtro(g);
+		}
+	}
+
+	public void paintExtro(Graphics g) {
+		if (this.toData().getWidgetAttrMark(SharableAttrMark.XML_TAG) != null) {
+			int width = getWidth() - ShareConstants.SHARE_EL_CONTROL_BUTTON_HW;
+			g.setColor(UIConstants.NORMAL_BACKGROUND);
+			g.fillArc(width, 0, ShareConstants.SHARE_EL_CONTROL_BUTTON_HW, ShareConstants.SHARE_EL_CONTROL_BUTTON_HW,
+					0, 360);
+			controlMode.paintIcon(this, g, width, 0);
 		}
 	}
 
@@ -379,6 +399,11 @@ public class XWCardMainBorderLayout extends XWBorderLayout {
 	 */
 	@Override
 	public void respondClick(EditingMouseListener editingMouseListener, MouseEvent e){
+		//帮助弹窗
+		if (this.isHelpBtnOnFocus()) {
+			new WidgetHelpDialog(DesignerContext.getDesignerFrame(), this.toData().getDescription()).showWindow(e);
+			return;
+		}
 		FormDesigner designer = editingMouseListener.getDesigner();
 		SelectionModel selectionModel = editingMouseListener.getSelectionModel();
 		boolean isEditing = e.getButton() == MouseEvent.BUTTON1 &&
@@ -455,4 +480,12 @@ public class XWCardMainBorderLayout extends XWBorderLayout {
 		return new FRCardMainBorderLayoutAdapter(this);
 	}
 
+	/**
+	 * 是否支持共享-现只支持报表块、图表、tab块、绝对布局
+	 * @return
+	 */
+	public boolean isSupportShared() {
+		return true;
+	}
+
 }

designer-form/src/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java

@@ -6,6 +6,7 @@ import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider;
 import com.fr.design.gui.itable.AbstractPropertyTable;
+import com.fr.design.widget.ui.designer.mobile.BodyMobileDefinePane;
 import com.fr.general.Inter;
 
 /**
@@ -25,12 +26,12 @@ public class BodyMobilePropertyUI extends AbstractWidgetPropertyUIProvider {
 
     @Override
     public AbstractPropertyTable createWidgetAttrTable() {
-        return new BodyAppRelayoutTable(xCreator);
+        return null;
     }
 
     @Override
     public BasicPane createWidgetAttrPane() {
-        return null;
+        return new BodyMobileDefinePane(xCreator);
     }
 
     @Override

designer-form/src/com/fr/design/designer/properties/mobile/MultiFileUploaderPropertyUI.java

@@ -0,0 +1,36 @@
+package com.fr.design.designer.properties.mobile;
+
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XMultiFileUploader;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider;
+import com.fr.design.gui.itable.AbstractPropertyTable;
+import com.fr.design.widget.ui.designer.mobile.MultiFileUploaderDefinePane;
+import com.fr.general.Inter;
+
+/**
+ * Created by plough on 2018/4/19.
+ */
+public class MultiFileUploaderPropertyUI extends AbstractWidgetPropertyUIProvider {
+
+    private XCreator xCreator;
+
+    public MultiFileUploaderPropertyUI(XMultiFileUploader xMultiFileUploader) {
+        this.xCreator = xMultiFileUploader;
+    }
+
+    @Override
+    public AbstractPropertyTable createWidgetAttrTable() {
+        return null;
+    }
+
+    @Override
+    public BasicPane createWidgetAttrPane() {
+        return new MultiFileUploaderDefinePane(xCreator);
+    }
+
+    @Override
+    public String tableTitle() {
+        return Inter.getLocText("FR-Designer_Mobile-Attr");
+    }
+}

designer-form/src/com/fr/design/mainframe/ElementCaseHelpDialog.java

@@ -1,75 +0,0 @@
-package com.fr.design.mainframe;
-
-import com.fr.design.dialog.UIDialog;
-import com.fr.design.gui.icontainer.UIScrollPane;
-import com.fr.design.gui.itextarea.UITextArea;
-import com.fr.general.Inter;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * @author zack
- * @date 2016-10-14
- * @since 8.0
- */
-public class ElementCaseHelpDialog extends UIDialog {
-
-    private static final int OUTER_WIDTH = 190;
-    private static final int OUTER_HEIGHT = 280;
-
-
-    private String helpMsg;
-    private UIScrollPane helpArea;
-
-
-    public ElementCaseHelpDialog(Frame parent, String helpMsg) {
-        super(parent);
-        this.helpMsg = helpMsg;
-        initHelpArea();
-        JPanel panel = (JPanel) getContentPane();
-        initComponents(panel);
-        setSize(new Dimension(OUTER_WIDTH, OUTER_HEIGHT));
-    }
-
-    private void initHelpArea() {
-        UITextArea textArea = new UITextArea(helpMsg);
-        textArea.setEditable(false);
-        textArea.setBorder(null);
-        helpArea = new UIScrollPane(textArea);
-        helpArea.setBounds(0, 0, OUTER_WIDTH, OUTER_HEIGHT);
-        helpArea.setBorder(null);
-    }
-
-    private void initComponents(JPanel contentPane) {
-        contentPane.setLayout(new BorderLayout());
-        add(helpArea, BorderLayout.CENTER);
-        this.applyClosingAction();
-        this.setTitle(Inter.getLocText("FR-Designer_Help"));
-    }
-
-    /**
-     * 打开帮助框
-     */
-    public void showWindow() {
-        this.setResizable(false);
-        setVisible(true);
-    }
-
-    /**
-     * 略
-     */
-    @Override
-    public void checkValid() throws Exception {
-
-    }
-
-    public void setLocationRelativeTo(JFrame c, int x, int y) {
-        int dx = 0, dy = 0;
-        Point compLocation = c.getLocationOnScreen();//获取设计器Jframe坐标作为相对位置原点
-        setLocation(dx + x, dy + y);
-        dx = compLocation.x;
-        dy = compLocation.y + c.getRootPane().getY();//加上底层容器的y坐标(其实就是设计器最上方图标栏的高度)
-        setLocation(dx + x, dy + y);
-    }
-}

designer-realize/src/com/fr/design/mainframe/HyperlinkGroupPaneActionImpl.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe;
 
+import com.fr.base.FRContext;
 import com.fr.base.Style;
 import com.fr.design.actions.utils.ReportActionUtils;
 import com.fr.design.designer.TargetComponent;
@@ -84,7 +85,12 @@ public class HyperlinkGroupPaneActionImpl implements HyperlinkGroupPaneActionPro
                         frFont = frFont.applyUnderline(Constants.LINE_NONE);
                     }
                     editCellElement.setStyle(elementStyle.deriveFRFont(frFont));
-                    editCellElement.setNameHyperlinkGroup(updateNameHyperlinks);
+                    try {
+                        editCellElement.setNameHyperlinkGroup((NameJavaScriptGroup) updateNameHyperlinks.clone());
+                    } catch (CloneNotSupportedException e) {
+                        // this shouldn't happen, since NameJavaScriptGroup are FCloneable
+                        FRContext.getLogger().error("InternalError: " + e.getMessage());
+                    }
                 }
             });
         }

designer-realize/src/com/fr/design/mainframe/form/FormElementCaseDesigner.java

@@ -138,6 +138,14 @@ public class FormElementCaseDesigner<T extends FormElementCaseProvider, E extend
         return image;
     }
 
+    /**
+     * 刷新右侧属性面板
+     */
+    @Override
+    public void refreshPropertyPane() {
+        this.elementCasePane.fireSelectionChangeListener();
+    }
+
     /**
      * 创建正在编辑的状态.
      *

designer-realize/src/com/fr/design/present/ConditionAttributesGroupPane.java

@@ -16,6 +16,7 @@ import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.general.Inter;
 import com.fr.grid.selection.CellSelection;
+import com.fr.grid.selection.Selection;
 import com.fr.report.cell.CellElement;
 import com.fr.report.cell.DefaultTemplateCellElement;
 import com.fr.report.cell.TemplateCellElement;
@@ -29,6 +30,7 @@ import com.fr.stable.Nameable;
 public class ConditionAttributesGroupPane extends UIListControlPane {
 	private static ConditionAttributesGroupPane singleton;
 	private TemplateCellElement editCellElement;  // 当前单元格对象
+	private Selection editSelection;  // 当前编辑对象
 	private ElementCasePane ePane;
 
 	private ConditionAttributesGroupPane() {
@@ -52,12 +54,15 @@ public class ConditionAttributesGroupPane extends UIListControlPane {
 		if (isPopulating) {
 			return;
 		}
-		final CellSelection finalCS = (CellSelection) ePane.getSelection();
 		final TemplateElementCase tplEC = ePane.getEditingElementCase();
-
+		final HighlightGroup highlightGroup = updateHighlightGroup();
-        ReportActionUtils.actionIterateWithCellSelection(finalCS, tplEC, new ReportActionUtils.IterAction() {
+		ReportActionUtils.actionIterateWithCellSelection((CellSelection) editSelection, tplEC, new ReportActionUtils.IterAction() {
 			public void dealWith(CellElement editCellElement) {
-                ((TemplateCellElement)editCellElement).setHighlightGroup(updateHighlightGroup());
+				try {
+					((TemplateCellElement)editCellElement).setHighlightGroup((HighlightGroup) highlightGroup.clone());
+				} catch (CloneNotSupportedException e) {
+					FRContext.getLogger().error("InternalError: " + e.getMessage());
+				}
 			}
 		});
 		DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
@@ -75,6 +80,7 @@ public class ConditionAttributesGroupPane extends UIListControlPane {
 
 	public void populate(ElementCasePane ePane) {
 		this.ePane = ePane;
+		this.editSelection = ePane.getSelection();
 		CellSelection cs = (CellSelection) ePane.getSelection();
 		final TemplateElementCase tplEC = ePane.getEditingElementCase();
 		editCellElement = tplEC.getTemplateCellElement(cs.getColumn(), cs.getRow());

designer-realize/src/com/fr/design/report/UnitFieldPane.java

@@ -17,6 +17,7 @@ import com.fr.design.gui.ispinner.UIBasicSpinner;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.general.Inter;
 import com.fr.stable.Constants;
+import com.fr.stable.OperatingSystem;
 import com.fr.stable.unit.CM;
 import com.fr.stable.unit.INCH;
 import com.fr.stable.unit.MM;
@@ -26,6 +27,9 @@ import com.fr.stable.unit.UNIT;
  * UnitFieldPane
  */
 public class UnitFieldPane extends JPanel {
+    private static final int TEXT_FIELD_COLUMNS = 4;
+    private static final int TEXT_FIELD_COLUMNS_WINDOWS = 6;
+
     private UIBasicSpinner valueSpinner;
     private JFormattedTextField textField;
 
@@ -68,7 +72,7 @@ public class UnitFieldPane extends JPanel {
 
         valueSpinner = new UIBasicSpinner(new SpinnerNumberModel(0.0, 0.0, Double.MAX_VALUE, 1.0));
         textField = ((JSpinner.DefaultEditor) valueSpinner.getEditor()).getTextField();
-        textField.setColumns(4);
+        textField.setColumns(OperatingSystem.isWindows() ? TEXT_FIELD_COLUMNS_WINDOWS : TEXT_FIELD_COLUMNS);
         InputEventBaseOnOS.addBasicEditInputMap(textField);
         this.add(valueSpinner);
         unitLable = new UnitLabel(unitType, valueSpinner.getPreferredSize().height);

designer-realize/src/com/fr/design/webattr/EventPane.java

@@ -29,7 +29,7 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * richer:调用该类并且对事件名字国际化时需要严格按照"Event-事件名"来进行命名
+ * richer:调用该类并且对事件名字国际化时需要严格按照"FR-Engine_Event_事件名"来进行命名
  */
 public class EventPane extends BasicPane {
 	private DefaultListModel listModel;

designer-realize/src/com/fr/design/webattr/WriteWebSettingPane.java

@@ -76,7 +76,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
         unloadCheck = new UICheckBox(Inter.getLocText("FR-Designer_Unload_Check"));
         unloadCheck.setSelected(true);
 
-        showWidgets = new UICheckBox(Inter.getLocText(new String[]{"Event-showWidgets"}));
+        showWidgets = new UICheckBox(Inter.getLocText(new String[]{"FR-Engine_Event_showWidgets"}));
         showWidgets.setSelected(false);
         isAutoStash = new UICheckBox(Inter.getLocText("FR-Designer-Write_Auto_Stash"));
         isAutoStash.setSelected(false);