Merge pull request #9004 in DESIGN/design from release/11.0 to bugfix/11.0

* commit '1284176e051fdd54f21a6aca7e9408eab251b871':
  REPORT-71925 条件属性汇总字段值-部分数据情况下条件属性结果不对

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

@@ -81,10 +81,7 @@ public class ChartConditionPane extends LiteConditionPane<CommonCondition> {
                     return this;
                 }
             });
-            Editor<?>[] editors = ValueEditorPaneFactory.allEditors();
+            conditionValuePane = ValueEditorPaneFactory.createAllValueEditorPane();
-            ColSelectedWithSummaryMethodEditor colSelectedWithSummaryMethodEditor = new ColSelectedWithSummaryMethodEditor();
-            Editor<?>[] allEditors = ArrayUtils.add(editors,colSelectedWithSummaryMethodEditor);
-            conditionValuePane = ValueEditorPaneFactory.createValueEditorPane(allEditors,StringUtils.EMPTY,StringUtils.EMPTY);
             conditionKeyComboBox.setPreferredSize(new Dimension(175, conditionKeyComboBox.getPreferredSize().height));
             conditionOPComboBox.setPreferredSize(new Dimension(80, 20));
             Component[][] components = {

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

@@ -38,13 +38,11 @@ public class ColSelectedWithSummaryMethodEditor extends Editor<DSColumnWithSumma
     }
 
     public static void refreshCommonChartFieldNames(Chart chart) {
-        String[] columnNames = ChartDataHelper.getCommonChartFieldNames(chart);
+        //do nothing
-        refreshComboBoxModel(columnNames);
     }
 
     public static void refreshCustomChartTableFieldNames(Chart chart, CustomPlotType plotType) {
-        String[] columnNames = ChartDataHelper.getCustomChartTableFieldNames(chart, plotType);
+        // do nothing
-        refreshComboBoxModel(columnNames);
     }
 
     private static void refreshComboBoxModel(String[] columnNames) {