diff --git a/README.md b/README.md
index edaf4b9..89e8e25 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
# demo-verify-define-provider
-校验类型扩展demo示例
\ No newline at end of file
+校验类型扩展demo示例\
+demo生效后，填报属性会增加一种新的校验类型”Demo“\
+添加后，除了配置校验公式外，还可以配置一个level数字，（目前只能写1~4 其他会报错）\
+不同的level对于前端在校验提示时会显示不同的颜色\
+可以直接填报预览附件verify.cpt，点击校验即可
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..5231b5d
--- /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/plugin.xml b/plugin.xml
new file mode 100644
index 0000000..4217540
--- /dev/null
+++ b/plugin.xml
@@ -0,0 +1,19 @@
+
+ com.tptj.demo.hg.verify.define.provider.v10
+
+ yes
+ 1.0
+ 10.0
+ tptj
+ 2019-07-18
+
+
+ com.tptj.demo.hg.verify.define.provider
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/tptj/demo/hg/verify/define/provider/Demo.java b/src/main/java/com/tptj/demo/hg/verify/define/provider/Demo.java
new file mode 100644
index 0000000..e50877e
--- /dev/null
+++ b/src/main/java/com/tptj/demo/hg/verify/define/provider/Demo.java
@@ -0,0 +1,33 @@
+package com.tptj.demo.hg.verify.define.provider;
+
+import com.fr.data.Verifier;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.fun.impl.AbstractVerifyDefineProvider;
+import com.fr.report.write.ValueVerifier;
+
+/**
+ * @author 秃破天际
+ * @version 10.0
+ * Created by 秃破天际 on 2021/6/17
+ **/
+public class Demo extends AbstractVerifyDefineProvider {
+ @Override
+ public Class classForVerifier() {
+ return ValueVerifier.class;
+ }
+
+ @Override
+ public Class appearanceForVerifier() {
+ return DemoVerifyPane.class;
+ }
+
+ @Override
+ public String nameForVerifier() {
+ return "Demo";
+ }
+
+ @Override
+ public String iconPath() {
+ return "/com/fr/web/images/verify.png";
+ }
+}
diff --git a/src/main/java/com/tptj/demo/hg/verify/define/provider/DemoResource.java b/src/main/java/com/tptj/demo/hg/verify/define/provider/DemoResource.java
new file mode 100644
index 0000000..86d99b0
--- /dev/null
+++ b/src/main/java/com/tptj/demo/hg/verify/define/provider/DemoResource.java
@@ -0,0 +1,29 @@
+package com.tptj.demo.hg.verify.define.provider;
+
+import com.fr.decision.fun.impl.AbstractWebResourceProvider;
+import com.fr.report.web.ReportMainComponent;
+import com.fr.web.struct.Atom;
+import com.fr.web.struct.Component;
+import com.fr.web.struct.browser.RequestClient;
+import com.fr.web.struct.category.ScriptPath;
+
+/**
+ * @author 秃破天际
+ * @version 10.0
+ * Created by 秃破天际 on 2021/6/17
+ **/
+public class DemoResource extends AbstractWebResourceProvider {
+ @Override
+ public Atom attach() {
+ return ReportMainComponent.KEY;
+ }
+ @Override
+ public Atom client() {
+ return new Component() {
+ @Override
+ public ScriptPath script(RequestClient client) {
+ return ScriptPath.build("com/tptj/demo/hg/verify/define/provider/plugin.js");
+ }
+ };
+ }
+}
diff --git a/src/main/java/com/tptj/demo/hg/verify/define/provider/DemoVerifierEditPane.java b/src/main/java/com/tptj/demo/hg/verify/define/provider/DemoVerifierEditPane.java
new file mode 100644
index 0000000..1263577
--- /dev/null
+++ b/src/main/java/com/tptj/demo/hg/verify/define/provider/DemoVerifierEditPane.java
@@ -0,0 +1,86 @@
+package com.tptj.demo.hg.verify.define.provider;
+
+import com.fr.base.BaseFormula;
+import com.fr.base.Formula;
+import com.fr.design.gui.itableeditorpane.ActionStyle;
+import com.fr.design.gui.itableeditorpane.UIArrayFormulaTableModel;
+import com.fr.design.gui.itableeditorpane.UITableEditorPane;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.general.GeneralUtils;
+import com.fr.report.write.ValueVerifier;
+import com.fr.stable.FormulaProvider;
+import com.fr.stable.StableUtils;
+import javax.swing.*;
+import java.awt.*;
+import java.util.List;
+
+
+/**
+ * @author 秃破天际
+ * @version 10.0
+ * Created by 秃破天际 on 2021/6/17
+ **/
+public class DemoVerifierEditPane extends JPanel {
+ private UITableEditorPane tableEditorPane;
+ private final String[] columnNames = new String[]{
+ Toolkit.i18nText("Fine-Design_Report_Formula_Verify"),
+ Toolkit.i18nText("Fine-Design_Report_Formula_Verify_Warn_Text"),"level"};
+
+ public DemoVerifierEditPane(){
+ this.setLayout(FRGUIPaneFactory.createM_BorderLayout());
+ tableEditorPane = new UITableEditorPane(new UIArrayFormulaTableModel(columnNames, new int[] {
+ ActionStyle.ADDSTYLE, ActionStyle.DELETESTYLE,
+ ActionStyle.MOVEUPSTYLE, ActionStyle.MOVEDOWNSTYLE}));
+ this.add(tableEditorPane, BorderLayout.CENTER);
+ }
+
+ public void populate(ValueVerifier valueVerifier) {
+ if (valueVerifier == null) {
+ return;
+ }
+ int rowCount = valueVerifier.getVerifyItemsCount();
+ Object[][] os = new Object[rowCount][];
+ int tableDataCount = 0;
+ for (int i = 0; i < rowCount; i ++) {
+ DemoVerifyItem item = (DemoVerifyItem)valueVerifier.getVerifyItem(i);
+ FormulaProvider formula = item.getFormula();
+ if (formula == null) {
+ continue;
+ }
+ String msg = item.getMessage();
+ if (!StableUtils.canBeFormula(msg)) {
+ msg = "\"" + msg + "\"";//如果报错信息是以前的写法(字符串)就拼上""
+ }
+ os[tableDataCount++] = new Object[]{
+ formula,
+ BaseFormula.createFormulaBuilder().build(msg),
+ item.getLevel()
+ };
+ }
+ this.tableEditorPane.populate(os);
+ }
+
+ public ValueVerifier update() {
+ ValueVerifier valueVerifier = new ValueVerifier();
+ List list = tableEditorPane.update();
+ for (int i = 0; i < list.size(); i++) {
+ Object[] o = list.get(i);
+ if (o == null || o[0] == null) {
+ continue;
+ }
+ int level = 1;
+ if( o[2] instanceof Formula ){
+ String cont = ((Formula)o[2]).getPureContent();
+ level = Integer.parseInt(cont);
+ }
+ DemoVerifyItem item = new DemoVerifyItem(
+ BaseFormula.createFormulaBuilder().build(o[0]),
+ GeneralUtils.objectToString(o[1]),
+ level);
+ valueVerifier.addVerifyItem(item);
+ }
+ return valueVerifier;
+ }
+
+}
diff --git a/src/main/java/com/tptj/demo/hg/verify/define/provider/DemoVerifyItem.java b/src/main/java/com/tptj/demo/hg/verify/define/provider/DemoVerifyItem.java
new file mode 100644
index 0000000..985f8ae
--- /dev/null
+++ b/src/main/java/com/tptj/demo/hg/verify/define/provider/DemoVerifyItem.java
@@ -0,0 +1,72 @@
+package com.tptj.demo.hg.verify.define.provider;
+
+import com.fr.base.BaseFormula;
+import com.fr.data.VerifyItem;
+import com.fr.data.VerifyResult;
+import com.fr.intelli.record.Focus;
+import com.fr.json.JSONException;
+import com.fr.json.JSONObject;
+import com.fr.record.analyzer.EnableMetrics;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLableReader;
+
+/**
+ * @author 秃破天际
+ * @version 10.0
+ * Created by 秃破天际 on 2021/6/17
+ **/
+@EnableMetrics
+public class DemoVerifyItem extends VerifyItem {
+ private int level;
+ public DemoVerifyItem(){}
+ public DemoVerifyItem(BaseFormula formula, String msg, int level) {
+ super(formula, msg);
+ this.level = level;
+ }
+
+ public int getLevel() {
+ return level;
+ }
+
+ public void setLevel(int level) {
+ this.level = level;
+ }
+ @Focus(id="com.tptj.demo.hg.verify.define.provider.v10",text="VerifyDefineProvider")
+ public VerifyResult createVerifyResult() {
+ DemoVerifyResult result = new DemoVerifyResult();
+ try {
+ result.setFormula( getFormula().clone() );
+ } catch (CloneNotSupportedException e) {
+ }
+ result.setMessage( getMessage() );
+ result.setLevel( level );
+ return result;
+ }
+
+
+ public JSONObject toJSONObjectContent() throws JSONException {
+ JSONObject jo = super.toJSONObjectContent();
+ jo.put("level", this.getLevel());
+ return jo;
+ }
+
+ public void readXML(XMLableReader reader) {
+ super.readXML(reader);
+ String tagName = reader.getTagName();
+ if ("VerifyAttributes".equals(tagName)) {
+ this.level = reader.getAttrAsInt("level",1);
+ }
+
+ }
+
+ public void writeXML(XMLPrintWriter writer) {
+ super.writeXML(writer);
+ writer.startTAG("VerifyAttributes").attr("level",level).end();
+ }
+
+ public Object clone() throws CloneNotSupportedException {
+ DemoVerifyItem cloned = (DemoVerifyItem)super.clone();
+ cloned.level = this.level;
+ return cloned;
+ }
+}
diff --git a/src/main/java/com/tptj/demo/hg/verify/define/provider/DemoVerifyPane.java b/src/main/java/com/tptj/demo/hg/verify/define/provider/DemoVerifyPane.java
new file mode 100644
index 0000000..950fe66
--- /dev/null
+++ b/src/main/java/com/tptj/demo/hg/verify/define/provider/DemoVerifyPane.java
@@ -0,0 +1,32 @@
+package com.tptj.demo.hg.verify.define.provider;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.report.write.ValueVerifier;
+
+/**
+ * @author 秃破天际
+ * @version 10.0
+ * Created by 秃破天际 on 2021/6/17
+ **/
+public class DemoVerifyPane extends BasicBeanPane {
+ private DemoVerifierEditPane valueVerifierEditPane;
+
+ public DemoVerifyPane() {
+ this.setLayout(FRGUIPaneFactory.createBorderLayout());
+ this.valueVerifierEditPane = new DemoVerifierEditPane();
+ this.add(this.valueVerifierEditPane, "Center");
+ }
+ @Override
+ public void populateBean(ValueVerifier ob) {
+ this.valueVerifierEditPane.populate(ob);
+ }
+ @Override
+ public ValueVerifier updateBean() {
+ return this.valueVerifierEditPane.update();
+ }
+ @Override
+ protected String title4PopupWindow() {
+ return "BuiltIn";
+ }
+}
diff --git a/src/main/java/com/tptj/demo/hg/verify/define/provider/DemoVerifyResult.java b/src/main/java/com/tptj/demo/hg/verify/define/provider/DemoVerifyResult.java
new file mode 100644
index 0000000..923feea
--- /dev/null
+++ b/src/main/java/com/tptj/demo/hg/verify/define/provider/DemoVerifyResult.java
@@ -0,0 +1,29 @@
+package com.tptj.demo.hg.verify.define.provider;
+
+import com.fr.data.Verifier;
+import com.fr.data.VerifyResult;
+import com.fr.json.JSONException;
+import com.fr.json.JSONObject;
+
+/**
+ * @author 秃破天际
+ * @version 10.0
+ * Created by 秃破天际 on 2021/6/17
+ **/
+public class DemoVerifyResult extends VerifyResult {
+ private int level;
+
+ public int getLevel() {
+ return level;
+ }
+
+ public void setLevel(int level) {
+ this.level = level;
+ }
+
+ @Override
+ public void mixJSONObject(JSONObject jo, Verifier.Status status, int reportIndex) throws JSONException {
+ super.mixJSONObject(jo, status, reportIndex);
+ jo.put( "level", getLevel() );
+ }
+}
diff --git a/src/main/resources/com/tptj/demo/hg/verify/define/provider/plugin.js b/src/main/resources/com/tptj/demo/hg/verify/define/provider/plugin.js
new file mode 100644
index 0000000..8976a90
--- /dev/null
+++ b/src/main/resources/com/tptj/demo/hg/verify/define/provider/plugin.js
@@ -0,0 +1,21 @@
+/**
+ * @author 秃破天际
+ * @version 10.0
+ * Created by 秃破天际 on 2021/6/17
+ **/
+!(function () {
+ var LEVEL = ["#E56","#345","#87D","#F00"];
+ var initPopError = function(){
+ var old = FR.WritePane.prototype.popupError;
+ FR.WritePane.prototype.popupError = function(json_array){
+ old.call(contentPane,json_array);
+ $.each($(".verify-item-idx0"), function (idx, item) {
+ $(item).css("background",LEVEL[json_array[idx].level-1]);
+ });
+ }
+ };
+ FR.Report.Plugin.Panel.Events.push({
+ name : 'afterload',
+ action : initPopError
+ });
+})();
\ No newline at end of file
diff --git a/verify.cpt b/verify.cpt
new file mode 100644
index 0000000..2968a7b
--- /dev/null
+++ b/verify.cpt
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+