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

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

@@ -97,6 +97,8 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
                 EastRegionContainerPane.getInstance().replaceCellElementPane(QuickEditorRegion.getInstance());
                 EastRegionContainerPane.getInstance().replaceConditionAttrPane(conditionAttributesGroupPane);
                 EastRegionContainerPane.getInstance().replaceWidgetSettingsPane(CellWidgetPropertyPane.getInstance());
+
+                EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
             }
             EastRegionContainerPane.getInstance().replaceHyperlinkPane(hyperlinkGroupPane);
             EastRegionContainerPane.getInstance().removeParameterPane();

designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java

@@ -46,7 +46,7 @@ public class FormElementCasePaneDelegate extends ElementCasePane<FormElementCase
                 ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
                 conditionAttributesGroupPane.populate(FormElementCasePaneDelegate.this);
 
-//                populateHyperLinkGroupPane();
+                EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
             }
         });
         this.addTargetModifiedListener(new TargetModifiedListener() {

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

@@ -157,6 +157,8 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
             EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance());
             EastRegionContainerPane.getInstance().replaceCellElementPane(QuickEditorRegion.getInstance());
             EastRegionContainerPane.getInstance().replaceWidgetSettingsPane(CellWidgetPropertyPane.getInstance());
+
+            EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
         }
 
         EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance());
@@ -169,4 +171,13 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
         ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
         conditionAttributesGroupPane.populate(editComponent);
     }
+
+    private boolean isSelectedOneCell() {
+        JTemplate jTemplate = DesignerContext.getDesignerFrame().getSelectedJTemplate();
+        if (jTemplate == null) {
+            return false;
+        }
+        ElementCasePane ePane = (ElementCasePane)jTemplate.getCurrentElementCasePane();
+        return ePane != null && ePane.isSelectedOneCell();
+    }
 }

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -117,6 +117,7 @@ FR-Designer_Forum=\u8BBA\u575B
 FR-Designer_Get-Cube=\u6B63\u5728\u83B7\u53D6cube
 FR-Designer_Help=\u5E2E\u52A9
 FR-Designer_Hide=\u9690\u85CF
+FR-Designer_Show=\u663E\u793A
 FR-Designer_Hyperlink=\u8D85\u7EA7\u94FE\u63A5
 FR-Designer_Hyperlink-Form_link=\u5F53\u524D\u8868\u5355\u5BF9\u8C61
 FR-Designer_IDCard=\u8EAB\u4EFD\u8BC1

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

@@ -153,6 +153,24 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         return defaultPane;
     }
 
+    public void updateCellElementState(boolean isSelectedOneCell) {
+        if (isSelectedOneCell) {
+            enableCellElementPane();
+        } else {  // 如果选中多个单元格，禁用单元格元素 tab
+            disableCellElementPane();
+            refreshRightPane();
+        }
+    }
+
+    // 禁用单元格元素tab
+    private void disableCellElementPane() {
+        propertyItemMap.get(KEY_CELL_ELEMENT).setEnabled(false);
+    }
+    // 禁用单元格元素tab
+    private void enableCellElementPane() {
+        propertyItemMap.get(KEY_CELL_ELEMENT).setEnabled(true);
+    }
+
     private void initContentPane() {
         initRightPane();
         initLeftPane();

designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java

@@ -30,6 +30,9 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
     private static final int WIDTH = 100;
     private static final int MIN_TIME = 0;
     private static final int MAX_TIME = Integer.MAX_VALUE;
+    private static final int CONSTANT_TEN = 10;
+    private static final int CONSTANT_THIRTY = 30;
+    private static final int CONSTANT_ZERO = 0;
     private JPanel contentPane;
     //配置方式按钮
     private UIButtonGroup<Integer> configStyleButton;
@@ -43,14 +46,15 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
     //轮播切换方式配置接界面
     private JPanel carouselConfigPane;
     protected UISpinner timeInterval;
-    protected UICheckBox arrowCheckbox;
     private ColorSelectBoxWithOutTransparent colorSelectBox4carousel;
+    private UIButtonGroup switchStyleGroup;
+
 
     public ChangeConfigPane(){
         initButtonGroup();
         configPane = createConfigPane();
         contentPane = createContentPane();
-        contentPane.setBorder(BorderFactory.createEmptyBorder(10, 30, 10, 30));
+        contentPane.setBorder(BorderFactory.createEmptyBorder(CONSTANT_TEN, CONSTANT_THIRTY, CONSTANT_TEN, CONSTANT_THIRTY));
         this.add(contentPane, BorderLayout.CENTER);
     }
 
@@ -74,7 +78,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
         JPanel panel = new JPanel(new CardLayout()){
             @Override
             public Dimension getPreferredSize() {
-                if(configStyleButton.getSelectedIndex() == 0){
+                if (configStyleButton.getSelectedIndex() == 0){
                     return buttonConfigPane.getPreferredSize();
                 } else{
                     return carouselConfigPane.getPreferredSize();
@@ -85,7 +89,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
         panel.add(buttonConfigPane, "button");
         panel.add(carouselConfigPane, "carousel");
 
-        panel.setBorder(BorderFactory.createEmptyBorder(0,10,0,0));
+        panel.setBorder(BorderFactory.createEmptyBorder(CONSTANT_ZERO, CONSTANT_TEN, CONSTANT_ZERO, CONSTANT_ZERO));
 
         return panel;
     }
@@ -94,17 +98,18 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double[] columnSize = {p, f};
-        double[] rowSize = {p,p,p};
+        double[] rowSize = {p, p, p};
         timeInterval = new UISpinner(MIN_TIME, MAX_TIME, 1, 0);
         colorSelectBox4carousel = new ColorSelectBoxWithOutTransparent(WIDTH);
-        arrowCheckbox = new UICheckBox(Inter.getLocText("FR-Base_TurnOn"));
+        switchStyleGroup = new UIButtonGroup(new String[]{Inter.getLocText("FR-Designer_Show"), Inter.getLocText("FR-Designer_Hide")});
+
         Component[][] components = new Component[][]{
+                new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Arrow_Style")), switchStyleGroup},
                 new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Interval")), timeInterval},
-                new Component[]{new UILabel(Inter.getLocText("Background")),colorSelectBox4carousel},
+                new Component[]{new UILabel(Inter.getLocText("Background")),colorSelectBox4carousel}
-                new Component[] {new UILabel(Inter.getLocText("Plugin-ChartF_Arrow_Style")), arrowCheckbox}
         };
 
-        return TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize);
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
     }
 
     private JPanel createTitleStylePane(){
@@ -136,7 +141,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
                 new Component[]{createButtonBackgroundColorPane(),null},
         };
 
-        return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
+        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
     }
 
     private void initButtonGroup() {
@@ -178,7 +183,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
         //轮播切换界面
         timeInterval.setValue(changeConfigAttr.getTimeInterval());
         colorSelectBox4carousel.setSelectObject(changeConfigAttr.getCarouselColor());
-        arrowCheckbox.setSelected(changeConfigAttr.isShowArrow());
+        switchStyleGroup.setSelectedIndex(changeConfigAttr.isShowArrow() ? 0 : 1);
 
         checkCardPane();
 
@@ -202,7 +207,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
         changeConfigAttr.setButtonColor(colorSelectBox4button.getSelectObject());
         changeConfigAttr.setTimeInterval((int) timeInterval.getValue());
         changeConfigAttr.setCarouselColor(colorSelectBox4carousel.getSelectObject());
-        changeConfigAttr.setShowArrow(arrowCheckbox.isSelected());
+        changeConfigAttr.setShowArrow(switchStyleGroup.getSelectedIndex() == 0);
     }
 
     @Override

designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java

@@ -83,7 +83,7 @@ public class ParameterPropertyPane extends JPanel{
 	}
 
     public void setAddParaPaneVisible(boolean isVisible) {
-        if (isVisible == addParaPane.isVisible()) {
+        if (isVisible == addParaPane.isVisible() || formHierarchyTreePaneWrapper == null) {
             return;
         }
         if (isVisible && toolbarPane.hasSelectedLabelItem()) {