更改

src/main/java/com/fr/plugin/cell/highlight/AlignCellHighlightBridge.java

@@ -1,6 +1,6 @@
 package com.fr.plugin.cell.highlight;
 
-import com.fanruan.api.design.ui.condition.ConditionAttrSingleConditionPane;
+import com.fr.design.condition.ConditionAttrSingleConditionPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.fun.impl.AbstractHighlightProvider;
 import com.fr.plugin.cell.highlight.fun.AlignHighlightAction;

src/main/java/com/fr/plugin/cell/highlight/fun/AlignHighlightAction.java

@@ -5,9 +5,9 @@ import com.fr.base.Style;
 import com.fr.intelli.record.Focus;
 import com.fr.intelli.record.Original;
 import com.fr.record.analyzer.EnableMetrics;
-import com.fanruan.api.report.cell.AbstractStyleHighlightAction;
 import com.fanruan.api.macro.Constants;
 import com.fr.report.cell.CellElement;
+import com.fr.report.cell.cellattr.highlight.AbstractStyleHighlightAction;
 import com.fr.script.Calculator;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLableReader;
@@ -21,7 +21,7 @@ import com.fanruan.api.runtime.PluginKit;
 @EnableMetrics
 public class AlignHighlightAction extends AbstractStyleHighlightAction {
 
-    private int align = Constants.RIGHT;
+    private int align;
 
     public AlignHighlightAction() {
         this(Constants.RIGHT, 0);

src/main/java/com/fr/plugin/cell/highlight/ui/AlignHighlightPane.java

@@ -1,15 +1,13 @@
 package com.fr.plugin.cell.highlight.ui;
 
-import com.fr.design.condition.ConditionAttributesPane;
-import com.fanruan.api.design.ui.condition.ConditionAttrSingleConditionPane;
+import com.fanruan.api.design.DesignKit;
 import com.fanruan.api.design.ui.component.UIComboBox;
 import com.fanruan.api.design.ui.component.UIDictionaryComboBox;
+import com.fanruan.api.macro.Constants;
+import com.fr.design.condition.ConditionAttrSingleConditionPane;
+import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.plugin.cell.highlight.fun.AlignHighlightAction;
 import com.fr.report.cell.cellattr.highlight.HighlightAction;
-import com.fanruan.api.macro.Constants;
-import com.fanruan.api.design.DesignKit;
-
-import javax.swing.*;
 
 /**
  * @author richie
@@ -18,11 +16,11 @@ import javax.swing.*;
  */
 public class AlignHighlightPane extends ConditionAttrSingleConditionPane<HighlightAction> {
     private UIDictionaryComboBox<Integer> alignComboBox;
-    private JComboBox scopeComboBox;
+    private UIComboBox<String> scopeComboBox;
 
     public AlignHighlightPane(ConditionAttributesPane conditionAttributesPane) {
         super(conditionAttributesPane);
-        this.alignComboBox = new UIDictionaryComboBox<Integer>(
+        this.alignComboBox = new UIDictionaryComboBox<>(
                 new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT},
                 new String[]{
                         DesignKit.i18nText("Plugin-Highlight_Align_Left"),
@@ -30,7 +28,7 @@ public class AlignHighlightPane extends ConditionAttrSingleConditionPane<Highlig
                         DesignKit.i18nText("Plugin-Highlight_Align_Right")}
         );
         add(alignComboBox);
-        this.scopeComboBox = new UIComboBox(new String[]{
+        this.scopeComboBox = new UIComboBox<>(new String[]{
                 DesignKit.i18nText("Plugin-Highlight_Align_Current_Cell"),
                 DesignKit.i18nText("Plugin-Highlight_Align_Current_Row"),
                 DesignKit.i18nText("Plugin-Highlight_Align_Current_Column")});