REPORT-111995 【UI翻新】西区拖拽面板处理/网格色处理

designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java

@@ -7,7 +7,6 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
 import com.fr.base.BaseFormula;
 import com.fr.base.DynamicUnitList;
 import com.fr.base.Formula;
-import com.fr.base.NameStyle;
 import com.fr.base.Style;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignState;
@@ -97,7 +96,6 @@ import com.fr.page.PageAttributeGetter;
 import com.fr.page.ReportPageAttrProvider;
 import com.fr.poly.creator.PolyElementCasePane;
 import com.fr.report.ReportHelper;
-import com.fr.report.cell.CellElement;
 import com.fr.report.cell.FloatElement;
 import com.fr.report.cell.TemplateCellElement;
 import com.fr.report.cell.cellattr.core.RichText;
@@ -134,7 +132,6 @@ import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.lang.reflect.Constructor;
-import java.util.Iterator;
 import java.util.Set;
 
 import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
@@ -412,8 +409,9 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
         grid.setDefaultFloatEditor(CellImagePainter.class, new ImageFloatEditor());
 
         DesignerEnvManager designerEnvManager = DesignerEnvManager.getEnvManager();
-        grid.setGridLineColor(designerEnvManager.getGridLineColor());
-        grid.setPaginationLineColor(designerEnvManager.getPaginationLineColor());
+        // todo: 主题化与env.xml内定义的属性优先级问题
+        grid.setGridLineColor(FlatUIUtils.getUIColor("Center.ZoneBorderColor", designerEnvManager.getGridLineColor()));
+        grid.setPaginationLineColor(FlatUIUtils.getUIColor("Center.PageLineColor", designerEnvManager.getPaginationLineColor()));
     }
 
     private void addExtraCellEditor(Grid grid) {