Merge pull request #2669 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit 'bec006acf7cc69360dd36c8d2de804d3e2162877':
  MOBILE-29626 【组件顶部冻结】设计器》chart1设置了组件顶部冻结后，修改chart1的控件名称，再次查看组件顶部冻结设置界面，该组件未选中
  MOBILE-29857【RN】设计器上圆点指示器选中填充色设置后没有生效
  CHART-16330 修改甘特图、框架图条件属性界面

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/other/VanChartGanttConditionPane.java

@@ -13,11 +13,11 @@ import com.fr.plugin.chart.gantt.attr.AttrGanttTooltip;
 import com.fr.plugin.chart.gantt.attr.AttrGanttTooltipContent;
 import com.fr.plugin.chart.type.ConditionKeyType;
 import com.fr.van.chart.designer.PlotFactory;
-import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartSeriesColorConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartTooltipConditionPane;
 import com.fr.van.chart.designer.style.tooltip.VanChartPlotTooltipNoCheckPane;
 import com.fr.van.chart.designer.style.tooltip.VanChartPlotTooltipPane;
+import com.fr.van.chart.gantt.designer.style.label.VanChartGanttLabelConditionPane;
 
 import java.awt.Dimension;
 
@@ -42,7 +42,7 @@ public class VanChartGanttConditionPane extends DataSeriesConditionPane {
         classPaneMap.put(AttrBackground.class, new VanChartSeriesColorConditionPane(this));
         classPaneMap.put(AttrAlpha.class, new LabelAlphaPane(this));
         if (!PlotFactory.largeDataModel(plot)) {
-            classPaneMap.put(AttrGanttLabel.class, new VanChartLabelConditionPane(this, plot));
+            classPaneMap.put(AttrGanttLabel.class, new VanChartGanttLabelConditionPane(this, plot));
         }
         classPaneMap.put(AttrGanttTooltip.class, new VanChartTooltipConditionPane(this, plot) {
 

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/label/VanChartGanttLabelConditionPane.java

@@ -0,0 +1,17 @@
+package com.fr.van.chart.gantt.designer.style.label;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane;
+import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane;
+
+public class VanChartGanttLabelConditionPane extends VanChartLabelConditionPane {
+
+    public VanChartGanttLabelConditionPane(ConditionAttributesPane conditionAttributesPane, Plot plot) {
+        super(conditionAttributesPane, plot);
+    }
+
+    protected VanChartPlotLabelPane createLabelPane() {
+        return new VanChartGanttPlotLabelNoCheckPane(getPlot(), null);
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/label/VanChartGanttPlotLabelNoCheckPane.java

@@ -0,0 +1,25 @@
+package com.fr.van.chart.gantt.designer.style.label;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.plugin.chart.base.AttrLabel;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import java.awt.BorderLayout;
+
+public class VanChartGanttPlotLabelNoCheckPane extends VanChartGanttPlotLabelPane {
+
+    public VanChartGanttPlotLabelNoCheckPane(Plot plot, VanChartStylePane parent) {
+        super(plot, parent);
+    }
+
+    protected void addComponents() {
+        this.setLayout(new BorderLayout());
+        this.add(getLabelPane(), BorderLayout.CENTER);
+    }
+
+    public void populate(AttrLabel attr) {
+        super.populate(attr);
+        getLabelShowCheckBox().setSelected(true);
+        getLabelPane().setVisible(true);
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/other/VanChartStructureConditionPane.java

@@ -11,10 +11,10 @@ import com.fr.plugin.chart.base.AttrTooltip;
 import com.fr.plugin.chart.structure.VanChartStructurePlot;
 import com.fr.plugin.chart.type.ConditionKeyType;
 import com.fr.van.chart.designer.other.condition.item.VanChartFloatColorConditionPane;
-import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartSeriesColorConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartStructureNodeConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartTooltipConditionPane;
+import com.fr.van.chart.structure.desinger.style.VanChartStructureLabelConditionPane;
 
 import java.awt.Dimension;
 
@@ -47,7 +47,7 @@ public class VanChartStructureConditionPane extends DataSeriesConditionPane {
     protected void addBasicAction() {
         classPaneMap.put(AttrBackground.class, new VanChartSeriesColorConditionPane(this));
         classPaneMap.put(AttrTooltip.class, new VanChartTooltipConditionPane(this, plot));
-        classPaneMap.put(AttrLabel.class, new VanChartLabelConditionPane(this, plot));
+        classPaneMap.put(AttrLabel.class, new VanChartStructureLabelConditionPane(this, plot));
         classPaneMap.put(AttrFloatColor.class, new VanChartFloatColorConditionPane(this));
         classPaneMap.put(AttrNode.class, new VanChartStructureNodeConditionPane(this));
     }

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelConditionPane.java

@@ -0,0 +1,17 @@
+package com.fr.van.chart.structure.desinger.style;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane;
+import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane;
+
+public class VanChartStructureLabelConditionPane extends VanChartLabelConditionPane {
+
+    public VanChartStructureLabelConditionPane(ConditionAttributesPane conditionAttributesPane, Plot plot) {
+        super(conditionAttributesPane, plot);
+    }
+
+    protected VanChartPlotLabelPane createLabelPane() {
+        return new VanChartStructurePlotLabelNoCheckPane(getPlot(), null);
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructurePlotLabelNoCheckPane.java

@@ -0,0 +1,25 @@
+package com.fr.van.chart.structure.desinger.style;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.plugin.chart.base.AttrLabel;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import java.awt.BorderLayout;
+
+public class VanChartStructurePlotLabelNoCheckPane extends VanChartStructurePlotLabelPane {
+
+    public VanChartStructurePlotLabelNoCheckPane(Plot plot, VanChartStylePane parent) {
+        super(plot, parent);
+    }
+
+    protected void addComponents() {
+        this.setLayout(new BorderLayout());
+        this.add(getLabelPane(), BorderLayout.CENTER);
+    }
+
+    public void populate(AttrLabel attr) {
+        super.populate(attr);
+        getLabelShowCheckBox().setSelected(true);
+        getLabelPane().setVisible(true);
+    }
+}

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileComponentFrozenPane.java

@@ -92,6 +92,7 @@ public class MobileComponentFrozenPane extends BasicPane {
         WSortLayout wSortLayout = ((WSortLayout) xCreator.toData());
         List<String> all = wSortLayout.getNonContainerWidgetList();
         List<String> selected = wSortLayout.getFrozenWidgets();
+        selected = fixRename(all, selected, wSortLayout);
         Map<Object, Boolean> map = new LinkedHashMap<>();
         for (String value : selected) {
             map.put(value, true);
@@ -103,6 +104,24 @@ public class MobileComponentFrozenPane extends BasicPane {
         uiComboCheckBox.setSelectedValues(map);
     }
 
+    private List<String> fixRename(List<String> all, List<String> selected, WSortLayout wSortLayout) {
+        // 存在重命名
+        if (!selected.isEmpty() && !all.containsAll(selected)) {
+            // 清空原选中的 selected是Unmodifiable的
+            selected = new ArrayList<>();
+            for (String name : all) {
+                Widget widget = FormWidgetHelper.findWidgetWithBound(wSortLayout, name);
+                if (widget != null && widget.getMobileBookMark().isFrozen()) {
+                    // 重新添加
+                    selected.add(name);
+                }
+            }
+            // 同时更新下
+            wSortLayout.updateFrozenWidgets(selected);
+        }
+        return selected;
+    }
+
     private List<String> frozenWidgets() {
         Form form = WidgetPropertyPane.getInstance().getEditingFormDesigner().getTarget();
         WLayout container = form.getContainer();

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTabCommonSettingPane.java

@@ -35,6 +35,7 @@ public class MobileTabCommonSettingPane extends BasicPane {
     private ModeButtonGroup<Integer> buttonGroup;
     private NewColorSelectBox initDotColorBox;
     private NewColorSelectBox selectDotColorBox;
+    private boolean isPopulate;
 
     public MobileTabCommonSettingPane(boolean isTopComponent) {
         initComponent(isTopComponent);
@@ -89,23 +90,27 @@ public class MobileTabCommonSettingPane extends BasicPane {
         initDotColorBox = new NewColorSelectBox(0){
             @Override
             protected void iniListener() {
-            }
+                this.addSelectChangeListener(new ChangeListener() {
-
+                    @Override
-            @Override
+                    public void stateChanged(ChangeEvent e) {
-            public void mouseClicked(MouseEvent e) {
+                        if (!isPopulate) {
-                super.mouseClicked(e);
+                            attributeChange();
-                this.attributeChange();
+                        }
+                    }
+                });
             }
         };
         selectDotColorBox = new NewColorSelectBox(0){
             @Override
             protected void iniListener() {
-            }
+                this.addSelectChangeListener(new ChangeListener() {
-
+                    @Override
-            @Override
+                    public void stateChanged(ChangeEvent e) {
-            public void mouseClicked(MouseEvent e) {
+                        if (!isPopulate) {
-                super.mouseClicked(e);
+                            attributeChange();
-                this.attributeChange();
+                        }
+                    }
+                });
             }
         };
         JPanel initDotColorPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{initColorLabel, initDotColorBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
@@ -189,7 +194,9 @@ public class MobileTabCommonSettingPane extends BasicPane {
             color = defaultColor;
         }
         if (color != colorBox.getSelectObject()) {
+            isPopulate = true;
             colorBox.setSelectObject(color);
+            isPopulate = false;
         }
     }