diff --git a/README.md b/README.md
index c801ca9..0bd70c8 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
# demo-present-kind-provider
-形态扩展接口demo
\ No newline at end of file
+形态扩展接口demo\
+demo生效后,会单元格形态会增加“Demo Present”类型。\
+可以选择txt和img两种类型。\
+选txt时,最终值会变为 原值 + Hello World \
+否则值将会以图片的形式显示
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..3d3e2c4
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,124 @@
+
+apply plugin: 'java'
+
+[compileJava,compileTestJava]*.options*.encoding = 'UTF-8'
+
+ext {
+ /**
+ * 项目中依赖的jar的路径
+ * 1.如果依赖的jar需要打包到zip中,放置在lib根目录下
+ * 2.如果依赖的jar仅仅是编译时需要,防止在lib下子目录下即可
+ */
+ libPath = "$projectDir/../webroot/WEB-INF/lib"
+
+ /**
+ * 是否对插件的class进行加密保护,防止反编译
+ */
+ guard = false
+
+ def pluginInfo = getPluginInfo()
+ pluginPre = "fine-plugin"
+ pluginName = pluginInfo.id
+ pluginVersion = pluginInfo.version
+
+ outputPath = "$projectDir/../webroot/WEB-INF/plugins/plugin-" + pluginName + "-1.0/classes"
+}
+
+group = 'com.fr.plugin'
+version = '10.0'
+sourceCompatibility = '8'
+
+sourceSets {
+ main {
+ java.outputDir = file(outputPath)
+ output.resourcesDir = file(outputPath)
+ }
+}
+
+ant.importBuild("encrypt.xml")
+//定义ant变量
+ant.projectDir = projectDir
+ant.references["compile.classpath"] = ant.path {
+ fileset(dir: libPath, includes: '**/*.jar')
+ fileset(dir: ".",includes:"**/*.jar" )
+}
+
+classes.dependsOn('clean')
+
+task copyFiles(type: Copy,dependsOn: 'classes'){
+ from outputPath
+ into "$projectDir/classes"
+}
+
+task preJar(type:Copy,dependsOn: guard ? 'compile_encrypt_javas' : 'compile_plain_javas'){
+ from "$projectDir/classes"
+ into "$projectDir/transform-classes"
+ include "**/*.*"
+}
+jar.dependsOn("preJar")
+
+task makeJar(type: Jar,dependsOn: preJar){
+ from fileTree(dir: "$projectDir/transform-classes")
+ baseName pluginPre
+ appendix pluginName
+ version pluginVersion
+ destinationDir = file("$buildDir/libs")
+
+ doLast(){
+ delete file("$projectDir/classes")
+ delete file("$projectDir/transform-classes")
+ }
+}
+
+task copyFile(type: Copy,dependsOn: ["makeJar"]){
+ from "$buildDir/libs"
+ from("$projectDir/lib") {
+ include "*.jar"
+ }
+ from "$projectDir/plugin.xml"
+ into file("$buildDir/temp/plugin")
+}
+
+task zip(type:Zip,dependsOn:["copyFile"]){
+ from "$buildDir/temp/plugin"
+ destinationDir file("$buildDir/install")
+ baseName pluginPre
+ appendix pluginName
+ version pluginVersion
+}
+
+//控制build时包含哪些文件,排除哪些文件
+processResources {
+// exclude everything
+// 用*.css没效果
+// exclude '**/*.css'
+// except this file
+// include 'xx.xml'
+}
+
+/*读取plugin.xml中的version*/
+def getPluginInfo(){
+ def xmlFile = file("plugin.xml")
+ if (!xmlFile.exists()) {
+ return ["id":"none", "version":"1.0.0"]
+ }
+ def plugin = new XmlParser().parse(xmlFile)
+ def version = plugin.version[0].text()
+ def id = plugin.id[0].text()
+ return ["id":id,"version":version]
+}
+
+repositories {
+ mavenLocal()
+ maven {
+ url = uri('http://mvn.finedevelop.com/repository/maven-public/')
+ }
+}
+
+dependencies {
+ //使用本地jar
+ implementation fileTree(dir: 'lib', include: ['**/*.jar'])
+ implementation fileTree(dir: libPath, include: ['**/*.jar'])
+}
+
+
diff --git a/encrypt.xml b/encrypt.xml
new file mode 100644
index 0000000..1401cd1
--- /dev/null
+++ b/encrypt.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/lib/common-kit-10.0-20210309.jar b/lib/common-kit-10.0-20210309.jar
new file mode 100644
index 0000000..7027142
Binary files /dev/null and b/lib/common-kit-10.0-20210309.jar differ
diff --git a/lib/finekit-10.0-20210309.jar b/lib/finekit-10.0-20210309.jar
new file mode 100644
index 0000000..2d3b5b4
Binary files /dev/null and b/lib/finekit-10.0-20210309.jar differ
diff --git a/plugin.xml b/plugin.xml
new file mode 100644
index 0000000..ee78700
--- /dev/null
+++ b/plugin.xml
@@ -0,0 +1,16 @@
+
+ com.tptj.demo.hg.present.kind.provider.v10
+
+ yes
+ 1.0
+ 10.0
+ tptj
+ 2019-07-18
+
+
+ com.tptj.demo.hg.present.kind.provider
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/tptj/demo/hg/present/kind/provider/Demo.java b/src/main/java/com/tptj/demo/hg/present/kind/provider/Demo.java
new file mode 100644
index 0000000..f66dc62
--- /dev/null
+++ b/src/main/java/com/tptj/demo/hg/present/kind/provider/Demo.java
@@ -0,0 +1,32 @@
+package com.tptj.demo.hg.present.kind.provider;
+
+import com.fr.base.present.Present;
+import com.fr.design.beans.FurtherBasicBeanPane;
+import com.fr.design.fun.impl.AbstractPresentKindProvider;
+
+/**
+ * @author 秃破天际
+ * @version 10.0
+ * Created by 秃破天际 on 2021-04-29
+ **/
+public class Demo extends AbstractPresentKindProvider {
+ @Override
+ public FurtherBasicBeanPane extends Present> appearanceForPresent() {
+ return new DemoPane();
+ }
+
+ @Override
+ public String title() {
+ return "Demo Present";
+ }
+
+ @Override
+ public Class extends Present> kindOfPresent() {
+ return DemoPresent.class;
+ }
+
+ @Override
+ public char mnemonic() {
+ return 'D';
+ }
+}
diff --git a/src/main/java/com/tptj/demo/hg/present/kind/provider/DemoPainter.java b/src/main/java/com/tptj/demo/hg/present/kind/provider/DemoPainter.java
new file mode 100644
index 0000000..2a62f75
--- /dev/null
+++ b/src/main/java/com/tptj/demo/hg/present/kind/provider/DemoPainter.java
@@ -0,0 +1,47 @@
+package com.tptj.demo.hg.present.kind.provider;
+
+import com.fr.base.AbstractPainter;
+import com.fr.base.Style;
+import com.fr.general.ImageWithSuffix;
+import com.fr.report.cell.cellattr.core.CellUtils;
+import com.fr.stable.CoreGraphHelper;
+import com.fr.stable.html.Tag;
+import com.fr.stable.web.Repository;
+import com.fr.web.BaseHTMLWriterUtils;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+
+/**
+ * @author 秃破天际
+ * @version 10.0
+ * Created by 秃破天际 on 2021-04-29
+ **/
+public class DemoPainter extends AbstractPainter {
+ private Object value;
+
+ public DemoPainter(Object value){
+ this.value = value;
+ }
+
+ @Override
+ public void paint(Graphics g, int width, int height, int resolution, Style style) {
+ Graphics2D g2d = (Graphics2D) g;
+ if (value instanceof ImageWithSuffix) {
+ value = ((ImageWithSuffix)value).getImage();
+ }
+ BufferedImage img = CoreGraphHelper.createBufferedImage(width, height, 6);
+ g2d.setPaint(Color.white);
+ Style.paintContent(g2d, value, style, width, height, resolution);
+ img.flush();
+ g2d.dispose();
+ }
+
+ @Override
+ public void paintTag(Repository repo, int width, int height, Style style, Tag tag) {
+ tag.cls("imageCellElement");
+ tag.sub(BaseHTMLWriterUtils.createImageTag4RepoWithCheckVml(
+ CellUtils.value2Image(value, repo.getResolution(), style, width, height), new Dimension(width, height), repo
+ ));
+ }
+}
diff --git a/src/main/java/com/tptj/demo/hg/present/kind/provider/DemoPane.java b/src/main/java/com/tptj/demo/hg/present/kind/provider/DemoPane.java
new file mode 100644
index 0000000..c45ed74
--- /dev/null
+++ b/src/main/java/com/tptj/demo/hg/present/kind/provider/DemoPane.java
@@ -0,0 +1,48 @@
+package com.tptj.demo.hg.present.kind.provider;
+
+import com.fr.design.beans.FurtherBasicBeanPane;
+import com.fr.design.gui.icombobox.UIComboBox;
+
+import java.awt.*;
+
+/**
+ * @author 秃破天际
+ * @version 10.0
+ * Created by 秃破天际 on 2021-04-29
+ **/
+public class DemoPane extends FurtherBasicBeanPane {
+ private UIComboBox w_type;
+
+ public DemoPane(){
+ w_type = new UIComboBox(new String[]{"txt","img"});
+ this.setLayout(new BorderLayout());
+ this.add(w_type, BorderLayout.NORTH);
+ }
+
+ @Override
+ public boolean accept(Object o) {
+ return o instanceof DemoPresent;
+ }
+
+ @Override
+ public void reset() {
+ populateBean( new DemoPresent() );
+ }
+
+ @Override
+ public String title4PopupWindow() {
+ return "Demo Present";
+ }
+
+ @Override
+ public void populateBean( DemoPresent obj ) {
+ w_type.setSelectedItem( obj.getType() );
+ }
+
+ @Override
+ public DemoPresent updateBean() {
+ DemoPresent obj = new DemoPresent();
+ obj.setType( (String) w_type.getSelectedItem() );
+ return obj;
+ }
+}
diff --git a/src/main/java/com/tptj/demo/hg/present/kind/provider/DemoPresent.java b/src/main/java/com/tptj/demo/hg/present/kind/provider/DemoPresent.java
new file mode 100644
index 0000000..1224fa4
--- /dev/null
+++ b/src/main/java/com/tptj/demo/hg/present/kind/provider/DemoPresent.java
@@ -0,0 +1,57 @@
+package com.tptj.demo.hg.present.kind.provider;
+
+import com.fr.base.present.AbstractPresent;
+import com.fr.intelli.record.Focus;
+import com.fr.record.analyzer.EnableMetrics;
+import com.fr.script.Calculator;
+import com.fr.stable.ColumnRow;
+import com.fr.stable.StringUtils;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLableReader;
+
+/**
+ * @author 秃破天际
+ * @version 10.0
+ * Created by 秃破天际 on 2021-04-29
+ **/
+@EnableMetrics
+public class DemoPresent extends AbstractPresent {
+
+ private String type;
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ @Override
+ @Focus(id = "com.tptj.demo.hg.present.kind.provider.v10",text = "PresentKindProvider")
+ public Object present( Object value, Calculator calculator, ColumnRow cr ) {
+ return "txt".equals(type) ? value + " Hello World!" : new DemoPainter(value);
+ }
+
+ private final static String XML_TAG = "DemoPresent";
+
+ @Override
+ public void readXML( XMLableReader reader ) {
+ String name = reader.getTagName();
+ if ( XML_TAG.equals(name) ) {
+ type = reader.getAttrAsString("type", StringUtils.EMPTY);
+ }
+ }
+
+ @Override
+ public void writeXML( XMLPrintWriter writer ) {
+ writer.startTAG(XML_TAG).attr("type",type).end();
+ }
+
+ @Override
+ public Object clone() throws CloneNotSupportedException {
+ DemoPresent obj = (DemoPresent)super.clone();
+ obj.type = type;
+ return obj;
+ }
+}