Merge pull request #452 in BA/design from ~LEE/design:dev to dev

* commit '9bfce25c0aac31f39fb3a92de81645c420f42425':
  1
  REPORT-745 designer_base和form依赖关系内容修改
  1
  REPORT-745 designer_base和form依赖关系内容修改
  REPORT-364 报表块刷新和自适应重复bug修复

designer_base/src/com/fr/design/fun/FormElementCaseEditorProvider.java

@@ -1,8 +1,8 @@
 package com.fr.design.fun;
 
-import com.fr.form.ui.ElementCaseEditor;
+import com.fr.form.FormProvider;
+import com.fr.form.ui.ElementCaseEditorProvider;
 import com.fr.stable.fun.ReportFitAttrProvider;
-import com.fr.form.main.Form;
 import com.fr.stable.fun.mark.Mutable;
 
 import java.beans.PropertyDescriptor;
@@ -16,10 +16,7 @@ public interface FormElementCaseEditorProvider extends Mutable {
 
     int CURRENT_LEVEL = 1;
 
-
-    //加个provider返回tab的接口
-    //design_base依赖了form
-    PropertyDescriptor[] createPropertyDescriptor (Class<?> temp, Form form, ElementCaseEditor editor);
+    PropertyDescriptor[] createPropertyDescriptor(Class<?> temp, FormProvider formProvider, ElementCaseEditorProvider editor);
 
     /**
      * 生成属性表

designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProvider.java

@@ -1,8 +1,8 @@
 package com.fr.design.fun.impl;
 
 import com.fr.design.fun.FormElementCaseEditorProvider;
-import com.fr.form.main.Form;
-import com.fr.form.ui.ElementCaseEditor;
+import com.fr.form.FormProvider;
+import com.fr.form.ui.ElementCaseEditorProvider;
 import com.fr.stable.fun.ReportFitAttrProvider;
 import com.fr.stable.fun.mark.API;
 
@@ -24,7 +24,7 @@ public abstract class AbstractFormElementCaseEditorProvider implements FormEleme
     }
 
     @Override
-    public PropertyDescriptor[] createPropertyDescriptor(Class<?> temp, Form reportAttr, ElementCaseEditor editor) {
+    public PropertyDescriptor[] createPropertyDescriptor(Class<?> temp, FormProvider reportAttr, ElementCaseEditorProvider editor) {
         return new PropertyDescriptor[0];
     }
 

designer_form/src/com/fr/design/designer/creator/XElementCase.java

@@ -17,12 +17,13 @@ import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer;
 import com.fr.design.mainframe.widget.renderer.PaddingMarginCellRenderer;
 import com.fr.form.FormElementCaseContainerProvider;
 import com.fr.form.FormElementCaseProvider;
+import com.fr.form.FormProvider;
 import com.fr.form.ui.ElementCaseEditor;
+import com.fr.form.ui.ElementCaseEditorProvider;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.CoreGraphHelper;
 import com.fr.stable.core.PropertyChangeAdapter;
-import com.fr.form.main.Form;
 import com.fr.stable.fun.FitProvider;
 import com.fr.stable.fun.ReportFitAttrProvider;
 
@@ -97,7 +98,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 				new CRPropertyDescriptor("showToolBar", this.data.getClass()).setEditorClass(BooleanEditor.class)
 						.setI18NName(Inter.getLocText("Form-EC_toolbar"))
-						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
+						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
 		};
 
 		//这边有个插件兼容问题,之后还是要改回process才行
@@ -107,8 +108,9 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 				continue;
 			}
 			this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
-			Form form = designer.getTarget();
-			PropertyDescriptor[] extraEditor = provider.createPropertyDescriptor(this.data.getClass(), form, this.toData());
+			FormProvider formProvider = designer.getTarget();
+			ElementCaseEditorProvider elementCaseEditorProvider = this.toData();
+			PropertyDescriptor[] extraEditor = provider.createPropertyDescriptor(this.data.getClass(), formProvider, elementCaseEditorProvider);
 			propertyTableEditor = (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor);
 		}