修改

src/main/java/com/fr/plugin/form/widget/core/URLSource.java

@@ -1,6 +1,6 @@
 package com.fr.plugin.form.widget.core;
 
-import com.fanruan.api.Formula.BaseFormula;
+import com.fr.base.BaseFormula;
 import com.fr.stable.ParameterProvider;
 import com.fanruan.api.cal.ParameterKit;
 import com.fanruan.api.util.RenderKit;
@@ -13,7 +13,7 @@ import com.fr.script.Calculator;
 import com.fanruan.api.util.CodeKit;
 import com.fanruan.api.cal.FormulaKit;
 import com.fanruan.api.err.UtilEvalError;
-import com.fanruan.api.report.form.WidgetName;
+import com.fr.stable.Nameable;
 import com.fr.stable.script.CalculatorProvider;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLableReader;
@@ -51,12 +51,7 @@ public class URLSource extends RHIframeSource {
         String result = null;
         if (FormulaKit.checkFormulaContent(url)) {
             try {
-                result = GeneralKit.objectToString(calculator.evalValue(new BaseFormula(url) {
-                    @Override
-                    public String getXmlTag() {
-                        return null;
-                    }
-                }));
+                result = GeneralKit.objectToString(FormulaKit.newFormula(url));
             } catch (Exception u) {
                LogKit.error(u.getMessage(), u);
             }
@@ -101,8 +96,8 @@ public class URLSource extends RHIframeSource {
                 } else if (obj instanceof FArray) {
                     obj = ((FArray) obj).cjkEncode();
                     jo.put(parameters[i].getName(), obj);
-                } else if (obj instanceof WidgetName) {
-                    jo.put("widgetName", ((WidgetName) obj).getName());
+                } else if (obj instanceof Nameable) {
+                    jo.put("widgetName", ((Nameable) obj).getName());
                 } else {
                     // 还可以是数字啊什么的
                     jo.put(parameters[i].getName(), obj);

src/main/java/com/fr/plugin/form/widget/monitor/RHFunctionProcessor.java

@@ -1,20 +0,0 @@
-package com.fr.plugin.form.widget.monitor;
-//
-//import com.fr.stable.fun.impl.AbstractFunctionProcessor;
-//
-///**
-// * Created by richie on 15/12/3.
-// */
-//public class RHFunctionProcessor extends AbstractFunctionProcessor {
-//
-//    private static RHFunctionProcessor instance = new RHFunctionProcessor();
-//
-//    public static RHFunctionProcessor getInstance() {
-//        return instance;
-//    }
-//
-//    @Override
-//    public String getLocaleKey() {
-//        return "Plugin-RH_Iframe_Name";
-//    }
-//}

src/main/java/com/fr/plugin/form/widget/ui/XRHIframe.java

@@ -2,9 +2,9 @@ package com.fr.plugin.form.widget.ui;
 
 import com.fr.design.designer.creator.CRPropertyDescriptor;
 import com.fr.design.designer.creator.XWidgetCreator;
-import com.fanruan.api.macro.XCreatorConstants;
+import com.fanruan.api.design.work.form.macro.XCreatorConstants;
 import com.fanruan.api.design.ui.component.UITextField;
-import com.fanruan.api.design.ui.layout.FRGUIPaneFactoryKit;
+import com.fanruan.api.design.util.GUICoreKit;
 import com.fanruan.api.design.DesignKit;
 import com.fr.plugin.form.widget.core.RHIframe;
 import com.fr.plugin.form.widget.core.RHIframeAttr;
@@ -47,10 +47,10 @@ public class XRHIframe extends XWidgetCreator {
     @Override
     protected JComponent initEditor() {
         if (editor == null) {
-            editor = FRGUIPaneFactoryKit.createBorderLayout_S_Pane();
+            editor = GUICoreKit.createBorderLayoutPane();
             address = new UITextField(showDescriptionText());
             editor.add(address, BorderLayout.NORTH);
-            JPanel contentPane = FRGUIPaneFactoryKit.createNormalFlowInnerContainer_S_Pane();
+            JPanel contentPane = GUICoreKit.createNormalFlowInnerContainerPane();
             contentPane.setBackground(Color.white);
             editor.add(contentPane, BorderLayout.CENTER);
         }