ztree插件

.gitignore

@@ -0,0 +1,6 @@
+*.iml
+.idea/
+.DS_Store
+.classpath
+target/
+lib/report/*.jar

pom.xml

@@ -12,9 +12,18 @@
 
     <packaging>jar</packaging>
     <artifactId>plugin-ztree</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.fanruan.api</groupId>
+            <artifactId>finekit</artifactId>
+            <version>10.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/finekit-10.0.jar</systemPath>
+        </dependency>
+    </dependencies>
     <build>
         <!---如果要更改调试插件，改这里的配置就可以了-->
-        <outputDirectory>../../../webroot/WEB-INF/plugins/plugin-com.fr.solution.plugin.design.formula.script-1.0/classes</outputDirectory>
+        <outputDirectory>${project.basedir}/../webroot/WEB-INF/plugins/plugin-com.fr.plugin.widget.ztree-1.0/classes</outputDirectory>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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

@@ -1,28 +1,25 @@
 package com.fr.plugin.widget.ztree.core;
 
-import com.fanruan.api.design.DesignKit;
+import com.fanruan.api.i18n.I18nKit;
+import com.fanruan.api.json.JSONKit;
 import com.fanruan.api.net.NetworkKit;
 import com.fanruan.api.report.form.CustomWriteAbleRepeatEditor;
 import com.fanruan.api.runtime.PluginKit;
 import com.fanruan.api.xml.XmlKit;
-
+import com.fr.form.ui.DataControl;
-
-import com.fr.record.analyzer.EnableMetrics;
-import com.fr.general.ModuleContext;
-
 import com.fr.form.ui.WidgetValue;
+import com.fr.intelli.record.Focus;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONException;
 import com.fr.json.JSONObject;
+import com.fr.record.analyzer.EnableMetrics;
+import com.fr.script.Calculator;
 import com.fr.stable.core.NodeVisitor;
-import com.fr.web.core.TemplateSessionIDInfo;
+import com.fr.stable.web.Repository;
-
+import com.fr.stable.web.SessionProvider;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLableReader;
-import com.fr.script.Calculator;
-import com.fr.stable.web.Repository;
 
-import com.fr.form.ui.DataControl;
 import javax.servlet.http.HttpServletRequest;
 
 /**
@@ -117,6 +114,7 @@ public class ZTree extends CustomWriteAbleRepeatEditor 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);
         if (treeAttr != null) {
@@ -126,12 +124,11 @@ public class ZTree extends CustomWriteAbleRepeatEditor implements DataControl {
     }
 
     @Override
-    public JSONArray createJSONData(TemplateSessionIDInfo sessionIDInfor, Calculator c, HttpServletRequest req) throws Exception {
+    public JSONArray createJSONData(SessionProvider sessionIDInfor, Calculator c, HttpServletRequest req) {
         if (treeNode == null) {
-            return new JSONArray();
+            return JSONKit.createJSONArray();
         }
-//        PluginLicense pluginLicense = PluginLicenseManager.getInstance().getPluginLicenseByID(ZTreeConstants.PLUGIN_ID);
+        if ((PluginKit.isCurrentPluginAvailable())) {
-        if ((PluginKit.isCurrentPluginAvailable() || isDesign())) {
             String pv = NetworkKit.getHTTPRequestParameter(req, "pv");
             int level = NetworkKit.getHTTPRequestIntParameter(req, "level", ZTreeNode.ROOT_LEVEL);
             String text = NetworkKit.getHTTPRequestParameter(req, "text");
@@ -144,18 +141,12 @@ public class ZTree extends CustomWriteAbleRepeatEditor implements DataControl {
                 return new JSONArray();
             }
         } else {
-            JSONArray errorMsg = new JSONArray();
+            JSONArray errorMsg = JSONKit.createJSONArray();
-            errorMsg.put(new JSONObject().put("text", DesignKit.i18nText("Plugin-ZTree_License_Expired")).put("value", DesignKit.i18nText("Plugin-ZTree_License_Expired")));
+            errorMsg.put(JSONKit.create().put("text", I18nKit.getLocText("Plugin-ZTree_License_Expired")).put("value", I18nKit.getLocText("Plugin-ZTree_License_Expired")));
             return errorMsg;
         }
     }
 
-
-    private boolean isDesign() {
-        return ModuleContext.isModuleStarted("com.fr.design.module.DesignerModule");
-    }
-
-
     @Override
     public void readXML(XMLableReader reader) {
         super.readXML(reader);

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

@@ -1,16 +1,15 @@
 package com.fr.plugin.widget.ztree.ui;
 
+import com.fanruan.api.design.DesignKit;
 import com.fanruan.api.design.ui.component.UITextField;
-
 import com.fanruan.api.design.util.GUICoreKit;
 import com.fanruan.api.design.work.form.creator.XFieldEditor;
 import com.fanruan.api.design.work.form.editor.WidgetValueEditor;
 import com.fanruan.api.design.work.form.macro.XCreatorConstants;
-import com.fanruan.api.i18n.I18nKit;
 import com.fanruan.api.util.ArrayKit;
+import com.fr.design.designer.creator.CRPropertyDescriptor;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWScaleLayout;
-
 import com.fr.plugin.widget.ztree.core.ZTree;
 import com.fr.plugin.widget.ztree.ui.editor.ZTreeCascadeEditor;
 import com.fr.plugin.widget.ztree.ui.editor.ZTreeModelEditor;
@@ -19,8 +18,6 @@ import com.fr.plugin.widget.ztree.ui.renderer.ZTreeCascadeRenderer;
 import com.fr.plugin.widget.ztree.ui.renderer.ZTreeModelRenderer;
 import com.fr.plugin.widget.ztree.ui.renderer.ZTreeStyleRenderer;
 
-import com.fr.design.designer.creator.CRPropertyDescriptor;
-
 import javax.swing.*;
 import java.awt.*;
 import java.beans.IntrospectionException;
@@ -40,25 +37,25 @@ public class XZTree extends XFieldEditor {
     public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
         CRPropertyDescriptor[] crp = new CRPropertyDescriptor[]{
                 new CRPropertyDescriptor("widgetValue", this.toData().getClass()).setI18NName(
-                        I18nKit.getLocText("Plugin-ZTree_Widget_Value")).setEditorClass(WidgetValueEditor.class),
+                        DesignKit.i18nText("Plugin-ZTree_Widget_Value")).setEditorClass(WidgetValueEditor.class),
                 new CRPropertyDescriptor("treeNode", this.toData().getClass()).setI18NName(
-                        I18nKit.getLocText("Plugin-ZTree_Widget_Data")).setEditorClass(ZTreeModelEditor.class).setRendererClass(
+                        DesignKit.i18nText("Plugin-ZTree_Widget_Data")).setEditorClass(ZTreeModelEditor.class).setRendererClass(
                         ZTreeModelRenderer.class),
                 new CRPropertyDescriptor("popupHeight", this.data.getClass())
-                        .setI18NName(I18nKit.getLocText("Plugin-ZTree_Widget_Popup_Height"))
+                        .setI18NName(DesignKit.i18nText("Plugin-ZTree_Widget_Popup_Height"))
                         .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                 new CRPropertyDescriptor("selectStyle", this.toData().getClass())
-                        .setI18NName(I18nKit.getLocText("Plugin-ZTree_Mode"))
+                        .setI18NName(DesignKit.i18nText("Plugin-ZTree_Mode"))
                         .setEditorClass(ZTreeStyleEditor.class)
                         .setRendererClass(ZTreeStyleRenderer.class)
                         .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                 new CRPropertyDescriptor("cascade", this.data.getClass())
-                        .setI18NName(I18nKit.getLocText("Plugin-ZTree_Cascade"))
+                        .setI18NName(DesignKit.i18nText("Plugin-ZTree_Cascade"))
                         .setEditorClass(ZTreeCascadeEditor.class)
                         .setRendererClass(ZTreeCascadeRenderer.class)
                         .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
         };
-        return (CRPropertyDescriptor[]) ArrayKit.addAll(super.supportedDescriptor(), crp);
+        return ArrayKit.addAll(super.supportedDescriptor(), crp);
     }
 
     protected JComponent initEditor() {
@@ -88,6 +85,7 @@ public class XZTree extends XFieldEditor {
 
     /**
      * 控件的预定义大小
+     *
      * @return 控件的预定义大小
      */
     @Override
@@ -104,12 +102,8 @@ public class XZTree extends XFieldEditor {
      * 获取当前XCreator的一个封装父容器
      *
      * @param widgetName 当前组件名
-     *
      * @return 封装的父容器
-     *
-     *
      * @date 2014-11-25-下午4:47:23
-     *
      */
     @Override
     protected XLayoutContainer getCreatorWrapper(String widgetName) {
@@ -120,10 +114,7 @@ public class XZTree extends XFieldEditor {
      * 将当前对象添加到父容器中
      *
      * @param parentPanel 父容器组件
-     *
-     *
      * @date 2014-11-25-下午4:57:55
-     *
      */
     @Override
     protected void addToWrapper(XLayoutContainer parentPanel, int width, int minHeight) {

src/main/java/com/fr/plugin/widget/ztree/ui/ZTreeDefinePane.java

@@ -1,8 +1,9 @@
 package com.fr.plugin.widget.ztree.ui;
 
+import com.fanruan.api.design.DesignKit;
 import com.fanruan.api.design.work.form.container.AbstractDataModify;
-import com.fanruan.api.i18n.I18nKit;
 import com.fr.plugin.widget.ztree.core.ZTree;
+
 /**
  * Created by richie on 15/11/17.
  */
@@ -19,6 +20,6 @@ public class ZTreeDefinePane extends AbstractDataModify<ZTree> {
 
     @Override
     protected String title4PopupWindow() {
-        return I18nKit.getLocText("Plugin-ZTree_Widget_Name");
+        return DesignKit.i18nText("Plugin-ZTree_Widget_Name");
     }
 }

src/main/java/com/fr/plugin/widget/ztree/ui/control/ZTreeControlPane.java

@@ -2,17 +2,13 @@ package com.fr.plugin.widget.ztree.ui.control;
 
 import com.fanruan.api.design.ui.action.UpdateAction;
 import com.fanruan.api.design.ui.component.UIList;
+import com.fanruan.api.design.ui.component.UIToolbar;
 import com.fanruan.api.design.ui.toolbar.ToolBarDef;
 import com.fanruan.api.design.util.GUICoreKit;
 import com.fanruan.api.i18n.I18nKit;
 import com.fanruan.api.util.IOKit;
-
-import com.fr.plugin.widget.ztree.core.ZTreeNode;
-
-
 import com.fr.design.dialog.BasicPane;
-
+import com.fr.plugin.widget.ztree.core.ZTreeNode;
-import com.fr.design.gui.itoolbar.UIToolbar;
 
 import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;

src/main/java/com/fr/plugin/widget/ztree/ui/editor/ZTreeCascadeWrapper.java

@@ -1,8 +1,6 @@
 package com.fr.plugin.widget.ztree.ui.editor;
 
 
-import com.fr.design.Exception.ValidationException;
-
 import com.fr.design.designer.properties.Decoder;
 import com.fr.design.designer.properties.Encoder;
 import com.fr.plugin.widget.ztree.core.ZTreeCascade;
@@ -17,7 +15,7 @@ public class ZTreeCascadeWrapper implements Encoder<ZTreeCascade>, Decoder<ZTree
     }
 
     @Override
-    public void validate(String txt) throws ValidationException {
+    public void validate(String txt)  {
 
     }
 

src/main/java/com/fr/plugin/widget/ztree/ui/editor/ZTreeStyleWrapper.java

@@ -5,9 +5,6 @@ import com.fr.design.designer.properties.Decoder;
 import com.fr.design.designer.properties.Encoder;
 import com.fr.plugin.widget.ztree.core.ZTreeStyle;
 
-
-import com.fr.design.Exception.ValidationException;
-
 /**
  * Created by richie on 15/11/18.
  */
@@ -24,7 +21,7 @@ public class ZTreeStyleWrapper implements Encoder<ZTreeStyle>, Decoder<ZTreeStyl
     }
 
     @Override
-    public void validate(String txt) throws ValidationException {
+    public void validate(String txt)  {
 
     }
 }