diff --git a/lib/finekit-10.0.jar b/lib/finekit-10.0.jar index f4e30cf..10d776d 100644 Binary files a/lib/finekit-10.0.jar and b/lib/finekit-10.0.jar differ diff --git a/pom.xml b/pom.xml index d864164..7808f51 100644 --- a/pom.xml +++ b/pom.xml @@ -13,13 +13,13 @@ jar plugin-ztree - - com.fanruan.api - finekit - 10.0 - system - ${project.basedir}/lib/finekit-10.0.jar - + + com.fanruan.api + finekit + 10.0 + system + ${project.basedir}/lib/finekit-10.0.jar + diff --git a/src/main/java/com/fr/plugin/widget/ztree/core/ZTree.java b/src/main/java/com/fr/plugin/widget/ztree/core/ZTree.java index ed6fb54..92b21c7 100644 --- a/src/main/java/com/fr/plugin/widget/ztree/core/ZTree.java +++ b/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.util.ArrayKit; import com.fanruan.api.xml.XmlKit; +import com.fr.data.act.Producer; import com.fr.form.ui.DataControl; import com.fr.form.ui.concept.data.ValueInitializer; import com.fr.intelli.record.Focus; import com.fr.json.JSONArray; -import com.fr.json.JSONException; import com.fr.json.JSONObject; import com.fr.plugin.context.PluginContexts; 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.web.Repository; import com.fr.stable.web.SessionProvider; @@ -28,7 +26,7 @@ import javax.servlet.http.HttpServletRequest; * Created by richie on 15/11/17. */ @EnableMetrics -public class ZTree extends TextWidget implements DataControl { +public class ZTree extends TextWidget implements DataControl, Producer { private ValueInitializer widgetValue; @@ -122,17 +120,10 @@ public class ZTree extends TextWidget implements DataControl { @Override @Focus(id = "com.fr.plugin.widget.ztree", text = "Plugin-ZTree") - public JSONObject createJSONConfig(Repository repo, Calculator c, NodeVisitor toFindChart) throws JSONException { - JSONObject conf = super.createJSONConfig(repo, c, toFindChart); + public void mixinJSON(Repository repository, CalculatorProvider calculatorProvider, JSONObject jsonObject) { if (treeAttr != null) { - treeAttr.mixConfig(conf); + treeAttr.mixConfig(jsonObject); } - return conf; - } - - @Override - public void mixinJSON(Repository repository, CalculatorProvider calculatorProvider, JSONObject jsonObject) { - } @Override diff --git a/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeMarkInCell.java b/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeMarkInCell.java index cea26da..0212402 100644 --- a/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeMarkInCell.java +++ b/src/main/java/com/fr/plugin/widget/ztree/core/ZTreeMarkInCell.java @@ -1,6 +1,5 @@ package com.fr.plugin.widget.ztree.core; - import com.fanruan.api.i18n.I18nKit; import com.fr.design.fun.impl.AbstractCellWidgetOptionProvider; import com.fr.plugin.widget.ztree.ui.ZTreeDefinePane; diff --git a/src/main/java/com/fr/plugin/widget/ztree/ui/XZTree.java b/src/main/java/com/fr/plugin/widget/ztree/ui/XZTree.java index e726a7f..3517cd0 100644 --- a/src/main/java/com/fr/plugin/widget/ztree/ui/XZTree.java +++ b/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.OpacityButton; 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.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XWScaleLayout;