From b638168388be417717ef6d1514a9944141cd0374 Mon Sep 17 00:00:00 2001
From: PanLi320 <854954082@qq.com>
Date: Fri, 4 Nov 2016 16:45:24 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-745=20designer=5Fbase=E5=92=8Cform?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB=E5=86=85=E5=AE=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/fun/FormElementCaseEditorProvider.java  |  6 +++---
 .../AbstractFormElementCaseEditorProvider.java     |  7 +++----
 .../fr/design/designer/creator/XElementCase.java   | 14 +++++---------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/designer_base/src/com/fr/design/fun/FormElementCaseEditorProvider.java b/designer_base/src/com/fr/design/fun/FormElementCaseEditorProvider.java
index 4ad5699fdd..92a1a835f4 100644
--- a/designer_base/src/com/fr/design/fun/FormElementCaseEditorProvider.java
+++ b/designer_base/src/com/fr/design/fun/FormElementCaseEditorProvider.java
@@ -1,11 +1,11 @@
 package com.fr.design.fun;
 
-import com.fr.stable.fun.IOFileAttrMark;
+import com.fr.form.FormProvider;
+import com.fr.form.ui.ElementCaseEditorProvider;
 import com.fr.stable.fun.ReportFitAttrProvider;
 import com.fr.stable.fun.mark.Mutable;
 
 import java.beans.PropertyDescriptor;
-import java.util.Map;
 
 /**
  * Created by zhouping on 2015/9/10.
@@ -16,7 +16,7 @@ public interface FormElementCaseEditorProvider extends Mutable {
 
     int CURRENT_LEVEL = 1;
 
-    PropertyDescriptor[] createPropertyDescriptor (Class<?> temp, Map<String, IOFileAttrMark> attrMarkMap, ReportFitAttrProvider reportFitAttr);
+    PropertyDescriptor[] createPropertyDescriptor(Class<?> temp, FormProvider formProvider, ElementCaseEditorProvider editor);
 
     /**
      * 生成属性表
diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProvider.java
index e6d4621aff..c3cdbaa422 100644
--- a/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProvider.java
+++ b/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProvider.java
@@ -1,12 +1,12 @@
 package com.fr.design.fun.impl;
 
 import com.fr.design.fun.FormElementCaseEditorProvider;
-import com.fr.stable.fun.IOFileAttrMark;
+import com.fr.form.FormProvider;
+import com.fr.form.ui.ElementCaseEditorProvider;
 import com.fr.stable.fun.ReportFitAttrProvider;
 import com.fr.stable.fun.mark.API;
 
 import java.beans.PropertyDescriptor;
-import java.util.Map;
 
 /**
  * Created by zhouping on 2015/9/10.
@@ -23,8 +23,7 @@ public abstract class AbstractFormElementCaseEditorProvider implements FormEleme
         return this.getClass().getName();
     }
 
-    @Override
-    public PropertyDescriptor[] createPropertyDescriptor(Class<?> temp, Map<String, IOFileAttrMark> attrMarkMap, ReportFitAttrProvider reportFitAttr) {
+    public PropertyDescriptor[] createPropertyDescriptor(Class<?> temp, FormProvider reportAttr, ElementCaseEditorProvider editor) {
         return new PropertyDescriptor[0];
     }
 
diff --git a/designer_form/src/com/fr/design/designer/creator/XElementCase.java b/designer_form/src/com/fr/design/designer/creator/XElementCase.java
index b7ba2f65d9..5d161969bf 100644
--- a/designer_form/src/com/fr/design/designer/creator/XElementCase.java
+++ b/designer_form/src/com/fr/design/designer/creator/XElementCase.java
@@ -20,7 +20,9 @@ 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;
@@ -109,15 +111,9 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 				continue;
 			}
 			this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
-			ElementCaseEditor editor = this.toData();
-			FitProvider fitProvider = (FitProvider) designer.getTarget();
-			ReportFitAttrProvider fitAttr = fitProvider.getFitAttr();
-			//兼容之前报表块（之前三个选项为：默认 横向 双向 现在是：横向 双向 不自适应)
-			if (editor.getFitStateInPC() == 0) {
-				editor.setReportFitAttr(null);
-			}
-			ReportFitAttrProvider reportFitAttr = editor.getReportFitAttr() == null ? fitAttr : editor.getReportFitAttr();
-			PropertyDescriptor[] extraEditor = provider.createPropertyDescriptor(this.data.getClass(), editor.getAttrMarkMap(), reportFitAttr);
+			FormProvider formProvider = designer.getTarget();
+			ElementCaseEditorProvider elementCaseEditorProvider = this.toData();
+			PropertyDescriptor[] extraEditor = provider.createPropertyDescriptor(this.data.getClass(), formProvider, elementCaseEditorProvider);
 			propertyTableEditor = (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor);
 		}