Browse Source

KERNEL-1197 匹配finekit中的变动

pull/1/head
Mars.Ma 5 years ago
parent
commit
8b3f4e5fb1
  1. 4
      src/main/java/com/fr/plugin/present/fun/StarPainter.java
  2. 4
      src/main/java/com/fr/plugin/present/fun/StarPresent.java

4
src/main/java/com/fr/plugin/present/fun/StarPainter.java

@ -3,7 +3,7 @@ package com.fr.plugin.present.fun;
import com.fr.base.AbstractPainter; import com.fr.base.AbstractPainter;
import com.fr.base.Style; import com.fr.base.Style;
import com.fanruan.api.util.IOKit; import com.fanruan.api.util.IOKit;
import com.fanruan.api.util.CellKit; import com.fanruan.api.report.PaintKit;
import com.fr.stable.html.Tag; import com.fr.stable.html.Tag;
import com.fr.stable.web.Repository; import com.fr.stable.web.Repository;
import com.fanruan.api.report.BaseHTMLWriterKit; import com.fanruan.api.report.BaseHTMLWriterKit;
@ -36,7 +36,7 @@ public class StarPainter extends AbstractPainter {
public void paintTag(Repository repo, int width, int height, Style style, Tag tag) { public void paintTag(Repository repo, int width, int height, Style style, Tag tag) {
tag.cls("imageCellElement"); tag.cls("imageCellElement");
tag.sub(BaseHTMLWriterKit.createImageTag4RepoWithCheckVml( tag.sub(BaseHTMLWriterKit.createImageTag4RepoWithCheckVml(
CellKit.value2Image(this, repo.getResolution(), style, width, height), new Dimension(width, height), repo PaintKit.value2Image(this, repo.getResolution(), style, width, height), new Dimension(width, height), repo
)); ));
} }
} }

4
src/main/java/com/fr/plugin/present/fun/StarPresent.java

@ -10,10 +10,10 @@ import com.fr.record.analyzer.EnableMetrics;
import com.fr.script.Calculator; import com.fr.script.Calculator;
import com.fanruan.api.util.AssistKit; import com.fanruan.api.util.AssistKit;
import com.fr.stable.ColumnRow; import com.fr.stable.ColumnRow;
import com.fanruan.api.util.StableKit;
import com.fanruan.api.util.StringKit; import com.fanruan.api.util.StringKit;
import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLPrintWriter;
import com.fr.stable.xml.XMLableReader; import com.fr.stable.xml.XMLableReader;
import com.fanruan.api.cal.FormulaKit;
/** /**
* @author richie * @author richie
@ -37,7 +37,7 @@ public class StarPresent extends AbstractPresent {
@Focus(id = "com.fr.plugin.present.star", text = "", source = Original.PLUGIN) @Focus(id = "com.fr.plugin.present.star", text = "", source = Original.PLUGIN)
public Object present(Object value, Calculator calculator, ColumnRow cr) { public Object present(Object value, Calculator calculator, ColumnRow cr) {
Object result = null; Object result = null;
if (StableKit.canBeFormula(condition)) { if (FormulaKit.canBeFormula(condition)) {
try { try {
result = calculator.evalValue(BaseFormula.createFormulaBuilder().build(condition)); result = calculator.evalValue(BaseFormula.createFormulaBuilder().build(condition));
} catch (Exception e) { } catch (Exception e) {

Loading…
Cancel
Save