增加组件wrapper、增加收费注解

.gitignore

@@ -1,25 +1,4 @@
-# ---> Java
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+/build
+/classes
+/transform-classes
 

build.gradle

@@ -14,7 +14,7 @@ ext {
     /**
      * 是否对插件的class进行加密保护，防止反编译
      */
-    guard = true
+    guard = false
 
     def pluginInfo = getPluginInfo()
     pluginPre = "fine-plugin"

plugin.xml

@@ -2,7 +2,7 @@
     <id>com.fr.plugin.sqy.kj.calendar</id>
     <name><![CDATA[ 农历日历 ]]></name>
     <active>yes</active>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <env-version>10.0~11.0</env-version>
     <vendor>yy</vendor>
     <jartime>2021-05-26</jartime>
@@ -11,7 +11,7 @@
 			<![CDATA[2021-11-24 初始化工程]]>
 	</change-notes>
     <main-package>com.fr.plugin.sqy</main-package>
-    <function-recorder class="com.fr.plugin.sqy.kj.calendar.JsFileHandler"/>
+    <function-recorder class="com.fr.plugin.sqy.kj.calendar.FuncRecorder"/>
 
     <extra-core>
         <!--插件注入国际化-->

src/main/java/com/fr/plugin/sqy/kj/calendar/FuncRecorder.java

@@ -0,0 +1,18 @@
+package com.fr.plugin.sqy.kj.calendar;
+
+
+import com.fr.plugin.context.PluginContexts;
+import com.fr.plugin.transform.ExecuteFunctionRecord;
+import com.fr.plugin.transform.FunctionRecorder;
+import com.fr.stable.fun.Authorize;
+
+//功能点注册
+@FunctionRecorder
+@Authorize(callSignKey = PluginConstants.PLUGIN_ID)
+public class FuncRecorder {
+
+
+    public static boolean execute(){
+        return PluginContexts.currentContext() != null && PluginContexts.currentContext().isAvailable();//付费
+    }
+}

src/main/java/com/fr/plugin/sqy/kj/calendar/JsFileHandler.java

@@ -1,15 +1,19 @@
 package com.fr.plugin.sqy.kj.calendar;
 
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.transform.ExecuteFunctionRecord;
 import com.fr.plugin.transform.FunctionRecorder;
 import com.fr.stable.fun.impl.AbstractJavaScriptFileHandler;
 
-@FunctionRecorder
+
 public class JsFileHandler extends AbstractJavaScriptFileHandler{
 
-    @ExecuteFunctionRecord
-    @Override
+
     public String[] pathsForFiles() {
+        if(!FuncRecorder.execute()){
+            FineLoggerFactory.getLogger().error("[{}]插件未注册或已过期",PluginConstants.PLUGIN_ID);
+            return new String[]{};
+        }
         return new String[]{
                 "com/fr/plugin/sqy/kj/calendar/js/plugin_main.js"
         };

src/main/java/com/fr/plugin/sqy/kj/calendar/form/FormXDateEditor.java

@@ -1,9 +1,10 @@
 package com.fr.plugin.sqy.kj.calendar.form;
 
 
-import com.fanruan.api.design.DesignKit;
 import com.fr.design.designer.creator.CRPropertyDescriptor;
 import com.fr.design.designer.creator.XDirectWriteEditor;
+import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.designer.creator.XWScaleLayout;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -108,7 +109,7 @@ public class FormXDateEditor extends XDirectWriteEditor {
         if (this.editor == null) {
             this.editor = FRGUIPaneFactory.createBorderLayout_S_Pane();
             this.editor.add(this.textField = new UITextField(5), "Center");
-            this.btn = new LimpidButton("", this.getIconPath(), this.toData().isVisible() ? 1.0F : 0.4F);
+            this.btn = new LimpidButton("sqy_form_calendar", this.getIconPath(), this.toData().isVisible() ? 1.0F : 0.4F);
             this.btn.setPreferredSize(new Dimension(21, 21));
             this.editor.add(this.btn, "East");
             this.textField.setOpaque(false);
@@ -116,6 +117,36 @@ public class FormXDateEditor extends XDirectWriteEditor {
         }
         return this.editor;
     }
+    @Override
+    protected void initXCreatorProperties() {
+        super.initXCreatorProperties();
+        this.initFieldText();
+    }
+
+
+    @Override
+    protected void makeVisible(boolean visible) {
+        this.btn.makeVisible(visible);
+    }
+
+    @Override
+    protected XLayoutContainer getCreatorWrapper(String widgetName) {
+        return new XWScaleLayout();
+    }
+
+    @Override
+    protected void addToWrapper(XLayoutContainer parentPanel, int width, int minHeight) {
+        this.setSize(width, minHeight);
+        parentPanel.add(this);
+    }
 
+    @Override
+    public boolean shouldScaleCreator() {
+        return true;
+    }
 
+    @Override
+    public void firePropertyChange() {
+        this.initFieldText();
+    }
 }

src/main/java/com/fr/plugin/sqy/kj/calendar/parameter/ParameterXDateEditor.java

@@ -1,9 +1,10 @@
 package com.fr.plugin.sqy.kj.calendar.parameter;
 
 
-import com.fanruan.api.design.DesignKit;
 import com.fr.design.designer.creator.CRPropertyDescriptor;
 import com.fr.design.designer.creator.XDirectWriteEditor;
+import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.designer.creator.XWScaleLayout;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -103,12 +104,14 @@ public class ParameterXDateEditor extends XDirectWriteEditor {
     }
 
 
+
+
     @Override
     protected JComponent initEditor() {
         if (this.editor == null) {
             this.editor = FRGUIPaneFactory.createBorderLayout_S_Pane();
             this.editor.add(this.textField = new UITextField(5), "Center");
-            this.btn = new LimpidButton("", this.getIconPath(), this.toData().isVisible() ? 1.0F : 0.4F);
+            this.btn = new LimpidButton("sqy_form_calendar", this.getIconPath(), this.toData().isVisible() ? 1.0F : 0.4F);
             this.btn.setPreferredSize(new Dimension(21, 21));
             this.editor.add(this.btn, "East");
             this.textField.setOpaque(false);
@@ -116,6 +119,38 @@ public class ParameterXDateEditor extends XDirectWriteEditor {
         }
         return this.editor;
     }
+    @Override
+    protected void initXCreatorProperties() {
+        super.initXCreatorProperties();
+        this.initFieldText();
+    }
+
+
+    @Override
+    protected void makeVisible(boolean visible) {
+        this.btn.makeVisible(visible);
+    }
+
+    @Override
+    protected XLayoutContainer getCreatorWrapper(String widgetName) {
+        return new XWScaleLayout();
+    }
+
+    @Override
+    protected void addToWrapper(XLayoutContainer parentPanel, int width, int minHeight) {
+        this.setSize(width, minHeight);
+        parentPanel.add(this);
+    }
+
+    @Override
+    public boolean shouldScaleCreator() {
+        return true;
+    }
+
+    @Override
+    public void firePropertyChange() {
+        this.initFieldText();
+    }
 
 
 }