Browse Source

KERNEL-1117 根据finekit继续修改

pull/2/head
Kalven 5 years ago
parent
commit
75c8ce4a28
  1. 4
      pom.xml
  2. 3
      src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java
  3. 2
      src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/BasicFormulaPane.java

4
pom.xml

@ -20,8 +20,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>6</source>
<target>6</target>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>

3
src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java

@ -6,7 +6,6 @@ import com.fanruan.api.design.DesignKit;
import com.fanruan.api.design.ui.component.*;
import com.fanruan.api.design.ui.container.BasicPane;
import com.fanruan.api.design.ui.action.UpdateAction;
import com.fanruan.api.design.ui.container.HistoryTemplateListPane;
import com.fanruan.api.design.work.ParameterInputPane;
import com.fanruan.api.design.ui.container.UIScrollPane;
import com.fanruan.api.design.ui.component.UIQuickList;
@ -333,7 +332,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis
@Override
public void actionPerformed(ActionEvent e) {
CalculatorProvider calculator = CalculatorKit.createCalculator();
JTemplate<?, ?> template = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
JTemplate<?, ?> template = DesignKit.getCurrentEditingTemplate();
if (template != null) {
TableDataSource file = (TableDataSource) template.getTarget();
calculator.setAttribute(TableDataSource.class, file);

2
src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/BasicFormulaPane.java

@ -80,7 +80,7 @@ public class BasicFormulaPane extends BaseFormulaPane<Formula> {
String[] arr = formula.dependence(calculator);
ParameterProvider[] parameters = new ParameterProvider[arr.length];
for (int i = 0, len = arr.length; i < len; i ++) {
parameters[i] = ParameterKit.createNewParameter(arr[i]);
parameters[i] = ParameterKit.newParameter(arr[i]);
}
return parameters;
}

Loading…
Cancel
Save