Browse Source

适配新版本FineKit

master
richie 6 years ago
parent
commit
e506498bda
  1. BIN
      lib/finekit-10.0.jar
  2. 17
      src/main/java/com/fr/plugin/widget/ztree/core/ZTree.java
  3. 1
      src/main/java/com/fr/plugin/widget/ztree/core/ZTreeMarkInCell.java
  4. 2
      src/main/java/com/fr/plugin/widget/ztree/ui/XZTree.java

BIN
lib/finekit-10.0.jar

Binary file not shown.

17
src/main/java/com/fr/plugin/widget/ztree/core/ZTree.java

@ -6,16 +6,14 @@ import com.fanruan.api.net.NetworkKit;
import com.fanruan.api.report.form.category.TextWidget; import com.fanruan.api.report.form.category.TextWidget;
import com.fanruan.api.util.ArrayKit; import com.fanruan.api.util.ArrayKit;
import com.fanruan.api.xml.XmlKit; import com.fanruan.api.xml.XmlKit;
import com.fr.data.act.Producer;
import com.fr.form.ui.DataControl; import com.fr.form.ui.DataControl;
import com.fr.form.ui.concept.data.ValueInitializer; import com.fr.form.ui.concept.data.ValueInitializer;
import com.fr.intelli.record.Focus; import com.fr.intelli.record.Focus;
import com.fr.json.JSONArray; import com.fr.json.JSONArray;
import com.fr.json.JSONException;
import com.fr.json.JSONObject; import com.fr.json.JSONObject;
import com.fr.plugin.context.PluginContexts; import com.fr.plugin.context.PluginContexts;
import com.fr.record.analyzer.EnableMetrics; import com.fr.record.analyzer.EnableMetrics;
import com.fr.script.Calculator;
import com.fr.stable.core.NodeVisitor;
import com.fr.stable.script.CalculatorProvider; import com.fr.stable.script.CalculatorProvider;
import com.fr.stable.web.Repository; import com.fr.stable.web.Repository;
import com.fr.stable.web.SessionProvider; import com.fr.stable.web.SessionProvider;
@ -28,7 +26,7 @@ import javax.servlet.http.HttpServletRequest;
* Created by richie on 15/11/17. * Created by richie on 15/11/17.
*/ */
@EnableMetrics @EnableMetrics
public class ZTree extends TextWidget implements DataControl { public class ZTree extends TextWidget implements DataControl, Producer {
private ValueInitializer widgetValue; private ValueInitializer widgetValue;
@ -122,17 +120,10 @@ public class ZTree extends TextWidget implements DataControl {
@Override @Override
@Focus(id = "com.fr.plugin.widget.ztree", text = "Plugin-ZTree") @Focus(id = "com.fr.plugin.widget.ztree", text = "Plugin-ZTree")
public JSONObject createJSONConfig(Repository repo, Calculator c, NodeVisitor toFindChart) throws JSONException { public void mixinJSON(Repository repository, CalculatorProvider calculatorProvider, JSONObject jsonObject) {
JSONObject conf = super.createJSONConfig(repo, c, toFindChart);
if (treeAttr != null) { if (treeAttr != null) {
treeAttr.mixConfig(conf); treeAttr.mixConfig(jsonObject);
}
return conf;
} }
@Override
public void mixinJSON(Repository repository, CalculatorProvider calculatorProvider, JSONObject jsonObject) {
} }
@Override @Override

1
src/main/java/com/fr/plugin/widget/ztree/core/ZTreeMarkInCell.java

@ -1,6 +1,5 @@
package com.fr.plugin.widget.ztree.core; package com.fr.plugin.widget.ztree.core;
import com.fanruan.api.i18n.I18nKit; import com.fanruan.api.i18n.I18nKit;
import com.fr.design.fun.impl.AbstractCellWidgetOptionProvider; import com.fr.design.fun.impl.AbstractCellWidgetOptionProvider;
import com.fr.plugin.widget.ztree.ui.ZTreeDefinePane; import com.fr.plugin.widget.ztree.ui.ZTreeDefinePane;

2
src/main/java/com/fr/plugin/widget/ztree/ui/XZTree.java

@ -6,7 +6,7 @@ import com.fanruan.api.design.util.GUICoreKit;
import com.fanruan.api.design.work.form.creator.Attribute; import com.fanruan.api.design.work.form.creator.Attribute;
import com.fanruan.api.design.work.form.creator.OpacityButton; import com.fanruan.api.design.work.form.creator.OpacityButton;
import com.fanruan.api.design.work.form.creator.XFieldCreator; import com.fanruan.api.design.work.form.creator.XFieldCreator;
import com.fanruan.api.design.work.form.editor.WidgetValueEditor; import com.fanruan.api.design.work.form.editor.impl.WidgetValueEditor;
import com.fanruan.api.design.work.form.macro.XCreatorConstants; import com.fanruan.api.design.work.form.macro.XCreatorConstants;
import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XLayoutContainer;
import com.fr.design.designer.creator.XWScaleLayout; import com.fr.design.designer.creator.XWScaleLayout;

Loading…
Cancel
Save