Browse Source

KERNEL-1118 将能替换为FineKit中的事项,全部替换。

pull/2/head
Mars.Ma 5 years ago
parent
commit
057088ce25
  1. 10
      pom.xml
  2. 4
      src/main/java/com/fr/plugin/cell/highlight/AlignCellHighlightBridge.java
  3. 24
      src/main/java/com/fr/plugin/cell/highlight/fun/AlignHighlightAction.java
  4. 5
      src/main/java/com/fr/plugin/cell/highlight/ui/AlignHighlightPane.java

10
pom.xml

@ -14,5 +14,15 @@
<build>
<!---如果要更改调试插件,改这里的配置就可以了-->
<outputDirectory>${project.basedir}/../webroot/WEB-INF/plugins/plugin-com.fr.plugin.cell.highlight.align.v10-1.0/classes</outputDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

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

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

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

@ -1,19 +1,18 @@
package com.fr.plugin.cell.highlight.fun;
import com.fr.base.Style;
import com.fr.intelli.record.Focus;
import com.fr.intelli.record.Original;
import com.fr.plugin.PluginLicense;
import com.fr.plugin.PluginLicenseManager;
import com.fr.record.analyzer.EnableMetrics;
import com.fr.report.cell.CellElement;
import com.fr.report.cell.cellattr.highlight.AbstractStyleHighlightAction;
import com.fr.script.Calculator;
import com.fr.stable.AssistUtils;
import com.fr.stable.Constants;
import com.fanruan.api.report.cell.AbstractStyleHighlightAction;
import com.fanruan.api.macro.Constants;
import com.fr.stable.xml.XMLPrintWriter;
import com.fr.stable.xml.XMLableReader;
import com.fanruan.api.util.AssistKit;
import com.fanruan.api.runtime.PluginKit;
//import com.fanruan.api.design.ui.layout.Style;
//import com.fanruan.api.design.ui.layout.AbstractStyleHighlightAction;
/**
* @author richie
* @date 2015-03-26
@ -37,16 +36,15 @@ public class AlignHighlightAction extends AbstractStyleHighlightAction {
return align;
}
@Override
public void action(CellElement cellElement, Calculator calculator) {
super.action(cellElement, calculator);
}
// @Override
// public void action(CellElement cellElement, Calculator calculator) {
// super.action(cellElement, calculator);
// }
@Override
@Focus(id = AlignHighlightConstants.PLUGIN_ID, text = "Plugin-Highlight_Align", source = Original.PLUGIN)
protected Style modStyle(Style style) {
PluginLicense pluginLicense = PluginLicenseManager.getInstance().getPluginLicenseByID(AlignHighlightConstants.PLUGIN_ID);
if (pluginLicense != null && pluginLicense.isAvailable()) {
if (PluginKit.isCurrentPluginAvailable()) {
return style.deriveHorizontalAlignment(align);
}
return style;

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

@ -1,7 +1,10 @@
package com.fr.plugin.cell.highlight.ui;
import com.fr.design.condition.ConditionAttrSingleConditionPane;
//import com.fr.design.condition.ConditionAttrSingleConditionPane;
import com.fr.design.condition.ConditionAttributesPane;
import com.fanruan.api.design.ui.condition.ConditionAttrSingleConditionPane;
//import com.fanruan.api.design.ui.condition.ConditionAttributesPane;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.icombobox.UIDictionaryComboBox;
import com.fr.general.Inter;

Loading…
Cancel
Save