Merge pull request #13357 in DESIGN/design from bugfix/11.0 to feature/x

* commit '8407482254eec9b6727943c03c8f41f34c0db957':
  REPORT-111279 全局查找与替换，复杂frm搜索失败
  REPORT-111279 全局查找与替换，复杂frm搜索失败
  格式化，优化import
  去掉背景色配置面板判空，用不着
  调整实现，使用组合代替之前的继承，更新的方法签名退回
  REPORT-111562 【控件显示增强】下拉面板色-自定义配置无法持久化

designer-form/src/main/java/com/fr/design/widgettheme/ParaSelectEditorSettingPane.java

@@ -1,9 +1,6 @@
 package com.fr.design.widgettheme;
 
 import com.fr.form.ui.Widget;
-import com.fr.widgettheme.theme.widget.theme.ParaEditorTheme;
-import com.fr.widgettheme.theme.widget.theme.ParaSelectEditorTheme;
-import com.fr.widgettheme.theme.widget.theme.cell.EditorTheme;
 
 import java.util.Arrays;
 
@@ -28,23 +25,7 @@ public class ParaSelectEditorSettingPane<T extends Widget> extends ParaEditorSet
     }
 
     @Override
-    protected void populateEditorBean(EditorTheme editorTheme) {
-        ParaSelectEditorTheme paraSelectEditorTheme= new ParaSelectEditorTheme(editorTheme);
-        if (!editorTheme.isFollowTheme()) {
-            selectBgColorBox.setSelectObject(paraSelectEditorTheme.getSelectBoxBgColor());
-        }
-        super.populateEditorBean(editorTheme);
-    }
-
-    @Override
-    protected void updateEditorStyleBean(EditorTheme editorTheme) {
-        ParaSelectEditorTheme paraSelectEditorTheme= new ParaSelectEditorTheme(editorTheme);
-        paraSelectEditorTheme.setSelectBoxBgColor(selectBgColorBox.getSelectObject());
-        super.updateEditorStyleBean(editorTheme);
-    }
-
-    @Override
-    protected EditorTheme getEditorTheme() {
-        return new ParaSelectEditorTheme();
+    protected String title4PopupWindow() {
+        return "paraSelectEditorSetting";
     }
 }

designer-form/src/main/java/com/fr/design/widgettheme/common/EditorSettingPane.java

@@ -81,6 +81,7 @@ public class EditorSettingPane<T extends Widget> extends BaseStyleSettingPane<T>
             }
             lineComboBox.setSelectedLineStyle(editorTheme.getBorderStyle().getLineType());
             borderRadiusSpinner.setValue(editorTheme.getBorderStyle().getRadius());
+            selectBgColorBox.setSelectObject(editorTheme.getSelectBoxBgColor());
             assignFontSizePane(editorTheme);
         }
         switchCard();
@@ -106,6 +107,7 @@ public class EditorSettingPane<T extends Widget> extends BaseStyleSettingPane<T>
 
     protected void updateEditorStyleBean(EditorTheme editorTheme) {
         editorTheme.setThemeColor(colorSelectBox.getSelectObject());
+        editorTheme.setSelectBoxBgColor(selectBgColorBox.getSelectObject());
         editorTheme.setStyleType(style1.isSelected() ? WidgetThemeDisplayConstants.STYLE_1 : WidgetThemeDisplayConstants.STYLE_2);
         editorTheme.setBorderStyle(new BorderStyle((int) borderRadiusSpinner.getValue(), lineComboBox.getSelectedLineStyle()));
         assignFontSizeStyle(editorTheme);

designer-form/src/main/java/com/fr/design/widgettheme/common/SelectEditorSettingPane.java

@@ -2,11 +2,8 @@ package com.fr.design.widgettheme.common;
 
 import com.fr.design.widgettheme.StyleSetting;
 import com.fr.form.ui.Widget;
-import com.fr.widgettheme.theme.widget.theme.cell.EditorTheme;
-import com.fr.widgettheme.theme.widget.theme.cell.SelectEditTheme;
 
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * 单元格下拉框编辑控件配置面板
@@ -32,25 +29,4 @@ public class SelectEditorSettingPane <T extends Widget> extends EditorSettingPan
     protected String title4PopupWindow() {
         return "selectEditorSetting";
     }
-
-    @Override
-    protected EditorTheme getEditorTheme() {
-        return new SelectEditTheme();
-    }
-
-    @Override
-    protected void populateEditorBean(EditorTheme editorTheme) {
-        SelectEditTheme selectEditTheme = new SelectEditTheme(editorTheme);
-        if (!selectEditTheme.isFollowTheme()) {
-            selectBgColorBox.setSelectObject(selectEditTheme.getSelectBoxBgColor());
-        }
-        super.populateEditorBean(selectEditTheme);
-    }
-
-    @Override
-    protected void updateEditorStyleBean(EditorTheme editorTheme) {
-        SelectEditTheme selectEditTheme = new SelectEditTheme(editorTheme);
-        selectEditTheme.setSelectBoxBgColor(selectBgColorBox.getSelectObject());
-        super.updateEditorStyleBean(selectEditTheme);
-    }
 }

designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchChartJSAction.java

@@ -63,12 +63,15 @@ public class SearchChartJSAction {
         //图表-特效-交互属性-监控刷新
         dealMonitorRefreshJS(conditionContent, chartCollection, jsInfos);
         for (int i = 0; i < chartCollection.getChartCount(); i++) {
+            Chart chart = chartCollection.getChart(i);
+            if (chart != null) {
                 ITContent chartContent = ITContent.copy(content);
-            chartContent.addOtherPos(chartCollection.getChart(i).getChartName());
+                chartContent.addOtherPos(chart.getChartName());
                 //坐标轴
-            searchAxisJS(jsInfos, chartContent, chartCollection.getChart(i));
+                searchAxisJS(jsInfos, chartContent, chart);
                 //组合图表-条件属性-超链特判
-            dealCustomPlot(jsInfos, conditionContent, chartCollection.getChart(i));
+                dealCustomPlot(jsInfos, conditionContent, chart);
+            }
         }
     }