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

designer/src/com/fr/poly/creator/ECBlockEditor.java

@@ -161,19 +161,18 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
             EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance());
             EastRegionContainerPane.getInstance().replaceCellElementPane(QuickEditorRegion.getInstance());
             EastRegionContainerPane.getInstance().replaceWidgetSettingsPane(CellWidgetPropertyPane.getInstance());
+            // 条件属性
+            ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
+            conditionAttributesGroupPane.populate(editComponent);
 
             EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
-        }
 
-        EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance());
+        }
 
         // 超级链接
         HyperlinkGroupPane hyperlinkGroupPane = DesignerContext.getDesignerFrame().getSelectedJTemplate()
                 .getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
         hyperlinkGroupPane.populate(editComponent);
-        // 条件属性
-        ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
-        conditionAttributesGroupPane.populate(editComponent);
     }
 
     private boolean isSelectedOneCell() {

designer_base/src/com/fr/design/gui/icombobox/TextFontComboBox.java

@@ -6,10 +6,10 @@ import com.fr.design.gui.icombobox.filter.StartsWithFilter;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.ComboBoxEditor;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import java.awt.*;
+import java.awt.Component;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
@@ -61,7 +61,12 @@ public class TextFontComboBox<T> extends ExtendedComboBox {
         private volatile boolean setting = false;
 
         public FilterComboBoxEditor() {
-            textField = new UITextField(15);
+            textField = new UITextField(15){
+                @Override
+                public boolean shouldResponseChangeListener() {
+                    return false;
+                }
+            };
             textField.getDocument().addDocumentListener(this);
         }
 

designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@@ -441,14 +441,8 @@ public abstract class ToolBarMenuDock {
             shortCuts.add(new VideoAction());
             shortCuts.add(new TutorialAction());
         }
-        shortCuts.add(SeparatorDef.DEFAULT);
-        shortCuts.add(SeparatorDef.DEFAULT);
-        if (ComparatorUtils.equals(ProductConstants.APP_NAME, FINEREPORT)) {
-            shortCuts.add(SeparatorDef.DEFAULT);
-        }
         if (AlphaFineConfigManager.isALPHALicAvailable()) {
             shortCuts.add(new AlphaFineAction());
-            shortCuts.add(SeparatorDef.DEFAULT);
         }
         shortCuts.add(SeparatorDef.DEFAULT);
         shortCuts.add(new AboutAction());

designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java

@@ -23,10 +23,10 @@ import com.fr.general.Inter;
 import com.fr.general.http.HttpClient;
 import com.fr.plugin.chart.base.GisLayer;
 import com.fr.plugin.chart.base.ViewCenter;
-import com.fr.plugin.chart.base.WMSLayer;
 import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
 import com.fr.plugin.chart.drillmap.designer.data.comp.MapDataTree;
 import com.fr.plugin.chart.map.VanChartMapPlot;
+import com.fr.plugin.chart.map.layer.WMSLayer;
 import com.fr.plugin.chart.map.server.CompatibleGEOJSONHelper;
 import com.fr.plugin.chart.map.server.GEOJSONHelper;
 import com.fr.plugin.chart.map.server.MapLayerConfigManager;

designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java

@@ -2,7 +2,14 @@ package com.fr.design.mainframe.widget.ui;
 
 import com.fr.design.data.DataCreatorUI;
 import com.fr.design.designer.beans.events.DesignerEvent;
-import com.fr.design.designer.creator.*;
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XCreatorUtils;
+import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.designer.creator.XWAbsoluteLayout;
+import com.fr.design.designer.creator.XWFitLayout;
+import com.fr.design.designer.creator.XWParameterLayout;
+import com.fr.design.designer.creator.XWScaleLayout;
+import com.fr.design.designer.creator.XWTitleLayout;
 import com.fr.design.dialog.AttrScrollPane;
 import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.foldablepane.UIExpandablePane;
@@ -11,8 +18,8 @@ import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.widget.DataModify;
-import com.fr.design.widget.Operator;
 import com.fr.design.widget.FormWidgetDefinePaneFactoryBase;
+import com.fr.design.widget.Operator;
 import com.fr.design.widget.ui.designer.component.WidgetAbsoluteBoundPane;
 import com.fr.design.widget.ui.designer.component.WidgetBoundPane;
 import com.fr.form.ui.Widget;
@@ -79,14 +86,8 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
     }
 
     public XCreator findXcreator(FormDesigner designer) {
-        int size = designer.getSelectionModel().getSelection().size();
+        XCreator creator = designer.getSelectionModel().getSelection().getSelectedCreator();
-        if (size == 0 || size == 1) {
+        return creator != null ? creator : designer.getRootComponent();
-            XCreator creator = size == 0 ? designer.getRootComponent() : designer.getSelectionModel().getSelection()
-                    .getSelectedCreator();
-            return creator;
-        } else {
-            return null;
-        }
     }
 
     /**
@@ -128,7 +129,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
         this.listener = new AttributeChangeListener() {
             @Override
             public void attributeChange() {
-                if(!isExtraWidget){
+                if (!isExtraWidget) {
                     updateCreator();
                 }
                 updateWidgetBound();
@@ -136,7 +137,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
             }
         };
 
-        if(isExtraWidget){
+        if (isExtraWidget) {
             return;
         }
 
@@ -191,7 +192,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
             innerWidget = crBoundsWidget.getWidget();
         }
         currentEditorDefinePane.populateBean(innerWidget);
-        if(widgetPropertyPane != null){
+        if (widgetPropertyPane != null) {
             widgetPropertyPane.populate(innerWidget);
         }
         reinitAllListeners();
@@ -212,7 +213,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
         fireValueChanged();
     }
 
-    public void updateWidgetBound (){
+    public void updateWidgetBound() {
         if (widgetBoundPane != null && ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Coords_And_Size"))) {
             widgetBoundPane.update();
             designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_RESIZED);