KERNEL-1161 根据fineKit变化修改，同时修复之前图片加载路径问题

readme.md

@@ -7,7 +7,7 @@
 
 三种类型的截图如下
 
-![widget](src/main/resource/screenshots/styles.png)
+![widget](src/main/resources/com/fr/plugin/widget/ztree/screenshots/styles.png)
 
 ## 控件数据设置方式
 **注意:**该控件仅支持手动添加层级的方式作为树的数据
@@ -19,14 +19,14 @@
 ## 使用方式(示例模板见reportlets目录下的ztree.cpt)
 1. 安装插件(安装了插件才能打开ztree.cpt,否则打开会报错,如果要查看使用数据查询的实例,查看ztree4db.cpt,所使用的数据结构在tree.sql中)
 2. 打开报表参数界面,可以看到多了一个"ZTree的下拉树"控件 
-![widget](src/main/resource/screenshots/widget.png)
+![widget](src/main/resources/com/fr/plugin/widget/ztree/screenshots/widget.png)
 3. 将控件拖到参数界面上,选中该控件可以看到该控件的各种属性,如果需要多选树,把模式属性更改为"多选"即可
-![widget](src/main/resource/screenshots/properties.png)
+![widget](src/main/resources/com/fr/plugin/widget/ztree/screenshots/properties.png)
 4. 点击"数据"项,可以看到点击数据设置的地方
-![widget](src/main/resource/screenshots/data_set.png)
+![widget](src/main/resources/com/fr/plugin/widget/ztree/screenshots/data_set.png)
 5. 点击上图圆圈的地方,会弹出树控件的数据设置界面,默认会添加一个层级,选择适合的数据字典类型
-![widget](src/main/resource/screenshots/data_ui.png)
+![widget](src/main/resources/com/fr/plugin/widget/ztree/screenshots/data_ui.png)
 6. 需要添加多层级的时候,点击工具栏上的"添加"图标,如下图示例,添加了4层的树
-![widget](src/main/resource/screenshots/data_result.png)
+![widget](src/main/resources/com/fr/plugin/widget/ztree/screenshots/data_result.png)
 7. 预览该报表就可以看到下拉树的效果了
-![widget](src/main/resource/screenshots/web_ui.png)
+![widget](src/main/resources/com/fr/plugin/widget/ztree/screenshots/web_ui.png)

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

@@ -1,8 +1,8 @@
 package com.fr.plugin.widget.ztree.core;
 
 import com.fanruan.api.design.DesignKit;
-import com.fanruan.api.design.ui.editor.CustomWriteAbleRepeatEditor;
 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;
 

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

@@ -31,7 +31,7 @@ public class ZTreeMarkInCell extends AbstractCellWidgetOptionProvider {
 
     @Override
     public String iconPathForWidget() {
-        return "/images/drop_down_tree.png";
+        return "/com/fr/plugin/widget/ztree/images/drop_down_tree.png";
     }
 
     @Override

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

@@ -30,7 +30,7 @@ public class ZTreeMarkInForm extends AbstractFormWidgetOptionProvider implements
 
     @Override
     public String iconPathForWidget() {
-        return "/images/drop_down_tree.png";
+        return "/com/fr/plugin/widget/ztree/images/drop_down_tree.png";
     }
 
     @Override

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

@@ -1,13 +1,13 @@
 package com.fr.plugin.widget.ztree.ui;
 
 import com.fanruan.api.design.ui.component.UITextField;
-import com.fanruan.api.design.ui.editor.WidgetValueEditor;
-import com.fanruan.api.design.ui.editor.XFieldEditor;
 
 //import com.fr.design.designer.creator.*;
 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.design.macro.XCreatorConstants;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWScaleLayout;
 
@@ -99,7 +99,7 @@ public class XZTree extends XFieldEditor {
 
     @Override
     public String getIconPath() {
-        return "/images/drop_down_tree.png";
+        return "/com/fr/plugin/widget/ztree/images/drop_down_tree.png";
     }
 
     /**

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

@@ -1,6 +1,6 @@
 package com.fr.plugin.widget.ztree.ui;
 
-import com.fanruan.api.design.ui.container.AbstractDataModify;
+import com.fanruan.api.design.work.form.container.AbstractDataModify;
 import com.fanruan.api.i18n.I18nKit;
 import com.fr.plugin.widget.ztree.core.ZTree;
 /**

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

@@ -1,7 +1,7 @@
 package com.fr.plugin.widget.ztree.ui.control;
 
 
-import com.fanruan.api.design.ui.container.DictionaryPane;
+import com.fanruan.api.design.ui.component.present.DictionaryPane;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.plugin.widget.ztree.core.ZTreeNode;
 

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

@@ -1,7 +1,7 @@
 package com.fr.plugin.widget.ztree.ui.editor;
 
-import com.fanruan.api.design.ui.editor.UneditableAccessibleEditor;
 
+import com.fanruan.api.design.work.form.basic.UneditableAccessibleEditor;
 import com.fr.plugin.widget.ztree.core.ZTreeNode;
 import com.fr.plugin.widget.ztree.ui.control.ZTreeControlPane;
 

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

@@ -1,7 +1,7 @@
 package com.fr.plugin.widget.ztree.ui.editor;
 
-import com.fanruan.api.design.ui.editor.ItemCellEditor;
+import com.fanruan.api.design.work.form.basic.Item;
-import com.fanruan.api.design.work.Item;
+import com.fanruan.api.design.work.form.basic.ItemCellEditor;
 import com.fanruan.api.i18n.I18nKit;
 import com.fr.plugin.widget.ztree.core.ZTreeCascade;
 

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

@@ -1,6 +1,6 @@
 package com.fr.plugin.widget.ztree.ui.editor;
 
-import com.fanruan.api.design.ui.editor.AccessiblePropertyEditor;
+import com.fanruan.api.design.work.form.basic.AccessiblePropertyEditor;
 
 /**
  * Created by richie on 15/11/18.

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

@@ -1,7 +1,8 @@
 package com.fr.plugin.widget.ztree.ui.editor;
 
-import com.fanruan.api.design.ui.editor.ItemCellEditor;
+
-import com.fanruan.api.design.work.Item;
+import com.fanruan.api.design.work.form.basic.Item;
+import com.fanruan.api.design.work.form.basic.ItemCellEditor;
 import com.fanruan.api.i18n.I18nKit;
 import com.fr.plugin.widget.ztree.core.ZTreeStyle;
 

src/main/java/com/fr/plugin/widget/ztree/ui/renderer/ZTreeCascadeRenderer.java

@@ -1,6 +1,6 @@
 package com.fr.plugin.widget.ztree.ui.renderer;
 
-import com.fanruan.api.design.work.EncoderCellRenderer;
+import com.fanruan.api.design.work.form.basic.EncoderCellRenderer;
 import com.fr.plugin.widget.ztree.ui.editor.ZTreeCascadeWrapper;
 
 /**

src/main/java/com/fr/plugin/widget/ztree/ui/renderer/ZTreeModelRenderer.java

@@ -1,6 +1,6 @@
 package com.fr.plugin.widget.ztree.ui.renderer;
 
-import com.fanruan.api.design.work.EncoderCellRenderer;
+import com.fanruan.api.design.work.form.basic.EncoderCellRenderer;
 import com.fr.plugin.widget.ztree.ui.editor.ZTreeModelWrapper;
 
 /**

src/main/java/com/fr/plugin/widget/ztree/ui/renderer/ZTreeStyleRenderer.java

@@ -1,6 +1,6 @@
 package com.fr.plugin.widget.ztree.ui.renderer;
 
-import com.fanruan.api.design.work.EncoderCellRenderer;
+import com.fanruan.api.design.work.form.basic.EncoderCellRenderer;
 import com.fr.plugin.widget.ztree.ui.editor.ZTreeStyleWrapper;
 
 /**