From aadeb1c0515a860e0cef3183a70dc1b564e71b7f Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Wed, 15 Jun 2016 01:01:47 +0800 Subject: [PATCH 01/11] rt --- .../design/designer/creator/XElementCase.java | 64 ++++++++++++++----- 1 file changed, 47 insertions(+), 17 deletions(-) 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 29310ca0c..94f5eaffe 100644 --- a/designer_form/src/com/fr/design/designer/creator/XElementCase.java +++ b/designer_form/src/com/fr/design/designer/creator/XElementCase.java @@ -1,5 +1,6 @@ package com.fr.design.designer.creator; +import com.fr.base.ConfigManager; import com.fr.design.ExtraDesignClassManager; import com.fr.design.designer.properties.mobile.ElementCasePropertyUI; import com.fr.design.form.util.XCreatorConstants; @@ -9,7 +10,10 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.CoverReportPane; import com.fr.design.mainframe.EditingMouseListener; import com.fr.design.mainframe.FormDesigner; -import com.fr.design.mainframe.widget.editors.*; +import com.fr.design.mainframe.WidgetPropertyPane; +import com.fr.design.mainframe.widget.editors.BooleanEditor; +import com.fr.design.mainframe.widget.editors.PaddingMarginEditor; +import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor; import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer; import com.fr.design.mainframe.widget.renderer.PaddingMarginCellRenderer; import com.fr.form.FormElementCaseContainerProvider; @@ -18,6 +22,8 @@ import com.fr.form.ui.ElementCaseEditor; import com.fr.general.Inter; import com.fr.stable.ArrayUtils; import com.fr.stable.core.PropertyChangeAdapter; +import com.fr.stable.fun.FitProvider; +import com.fr.stable.fun.ReportFitAttrProvider; import javax.swing.*; import java.awt.*; @@ -29,17 +35,21 @@ import java.beans.PropertyDescriptor; public class XElementCase extends XBorderStyleWidgetCreator implements FormElementCaseContainerProvider{ private UILabel imageLable; private JPanel coverPanel; + private FormDesigner designer; public XElementCase(ElementCaseEditor widget, Dimension initSize) { super(widget, initSize); + this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner(); + } - + protected void initXCreatorProperties() { super.initXCreatorProperties(); + // 报表块初始化时要加载对应的borderStyle initBorderStyle(); } - + /** * 是否支持设置标题 * @return 是返回true @@ -78,13 +88,33 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme }; FormElementCaseEditorProcessor processor = ExtraDesignClassManager.getInstance().getPropertyTableEditor(); - if (processor == null){ + PropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass()); + if (processor == null) { return propertyTableEditor; } - PropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass()); + //新建报表块的自适应属性和表单所设置的自适应属性保持一致 + if (this.toData().getReportFitAttr() == null) { + if (getFitAttrProvider().fitStateInPC() != 0) { + this.toData().setFitStateInPC(getFitAttrProvider().fitStateInPC()); + } else { + return propertyTableEditor; + } + } return (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor); } + //获取表单保存的自适应属性，如果没有，就用全局保存的自适应属性 + private ReportFitAttrProvider getFitAttrProvider () { + FitProvider wbTpl = (FitProvider) designer.getTarget(); + ReportFitAttrProvider globalFitAttr = ConfigManager.getProviderInstance().getFitAttrProvider(); + ReportFitAttrProvider fitAttr = wbTpl.getFitAttr(); + if (fitAttr != null) { + return fitAttr; + } + return globalFitAttr; + + + } @Override protected String getIconName() { @@ -118,7 +148,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme } return editor; } - + /** * 从data中获取到图片背景, 并设置到Label上 */ @@ -126,10 +156,10 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme UILabel imageLable = new UILabel(); BufferedImage image = toData().getECImage(); setLabelBackground(image, imageLable); - + return imageLable; } - + /** * 设置指定Label的背景 */ @@ -179,7 +209,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme public boolean canEnterIntoParaPane(){ return false; } - + /** * 返回报表块对应的widget * @return 返回ElementCaseEditor @@ -187,11 +217,11 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme public ElementCaseEditor toData() { return ((ElementCaseEditor) data); } - + public FormElementCaseProvider getElementCase() { return toData().getElementCase(); } - + public String getElementCaseContainerName() { return toData().getWidgetName(); } @@ -199,20 +229,20 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme public void setElementCase(FormElementCaseProvider el) { toData().setElementCase(el); } - + public void setBackground(BufferedImage image){ toData().setECImage(image); setEditorIcon(image); } - + private void setEditorIcon(BufferedImage image){ setLabelBackground(image, imageLable); } - + public Dimension getSize(){ return new Dimension(this.getWidth(), this.getHeight()); } - + /** * 响应点击事件 * @param editingMouseListener 事件处理器 @@ -222,8 +252,8 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme super.respondClick(editingMouseListener, e); switchTab(e,editingMouseListener); } - - + + private void switchTab(MouseEvent e,EditingMouseListener editingMouseListener){ FormDesigner designer = editingMouseListener.getDesigner(); if (e.getClickCount() == 2 || designer.getCursor().getType() == Cursor.HAND_CURSOR){ From 093339c75fb922fe158e124074b8d36a320aa0fe Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Wed, 15 Jun 2016 01:06:06 +0800 Subject: [PATCH 02/11] rt --- .../src/com/fr/design/designer/creator/XElementCase.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 94f5eaffe..1bc489353 100644 --- a/designer_form/src/com/fr/design/designer/creator/XElementCase.java +++ b/designer_form/src/com/fr/design/designer/creator/XElementCase.java @@ -94,11 +94,10 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme } //新建报表块的自适应属性和表单所设置的自适应属性保持一致 if (this.toData().getReportFitAttr() == null) { - if (getFitAttrProvider().fitStateInPC() != 0) { - this.toData().setFitStateInPC(getFitAttrProvider().fitStateInPC()); - } else { + if (getFitAttrProvider().fitStateInPC() == 0) { return propertyTableEditor; } + this.toData().setFitStateInPC(getFitAttrProvider().fitStateInPC()); } return (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor); } From e2fa9ed902c798a4133e7dbd0c0a6af82085283f Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Wed, 15 Jun 2016 01:15:05 +0800 Subject: [PATCH 03/11] rt --- .../src/com/fr/design/designer/creator/XElementCase.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 1bc489353..27405ab09 100644 --- a/designer_form/src/com/fr/design/designer/creator/XElementCase.java +++ b/designer_form/src/com/fr/design/designer/creator/XElementCase.java @@ -101,8 +101,11 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme } return (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor); } - - //获取表单保存的自适应属性，如果没有，就用全局保存的自适应属性 + + /** + * 获取表单保存的自适应属性，如果没有，就用全局保存的自适应属性 + * @return 返回自适应属性 + */ private ReportFitAttrProvider getFitAttrProvider () { FitProvider wbTpl = (FitProvider) designer.getTarget(); ReportFitAttrProvider globalFitAttr = ConfigManager.getProviderInstance().getFitAttrProvider(); From dfce694cb3cc0b1e0f002c1169561e83e498136b Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Wed, 15 Jun 2016 14:36:22 +0800 Subject: [PATCH 04/11] rt --- .../fr/design/designer/creator/XElementCase.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) 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 27405ab09..a181ccbf7 100644 --- a/designer_form/src/com/fr/design/designer/creator/XElementCase.java +++ b/designer_form/src/com/fr/design/designer/creator/XElementCase.java @@ -39,7 +39,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme public XElementCase(ElementCaseEditor widget, Dimension initSize) { super(widget, initSize); - this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner(); + } @@ -88,20 +88,16 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme }; FormElementCaseEditorProcessor processor = ExtraDesignClassManager.getInstance().getPropertyTableEditor(); - PropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass()); + this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner(); + FitProvider wbTpl = (FitProvider) designer.getTarget(); + ReportFitAttrProvider fitAttr = wbTpl.getFitAttr(); + PropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass(), fitAttr, this.toData()); if (processor == null) { return propertyTableEditor; } - //新建报表块的自适应属性和表单所设置的自适应属性保持一致 - if (this.toData().getReportFitAttr() == null) { - if (getFitAttrProvider().fitStateInPC() == 0) { - return propertyTableEditor; - } - this.toData().setFitStateInPC(getFitAttrProvider().fitStateInPC()); - } return (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor); } - + /** * 获取表单保存的自适应属性，如果没有，就用全局保存的自适应属性 * @return 返回自适应属性 From b79724e729118f010aafeb3bcaf51785d97271f5 Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Thu, 16 Jun 2016 01:09:47 +0800 Subject: [PATCH 05/11] rt --- .../fr/design/fun/FormElementCaseEditorProcessor.java | 6 +++++- .../impl/AbstractFormElementCaseEditorProcessor.java | 9 ++++++++- .../com/fr/design/designer/creator/XElementCase.java | 11 +++++------ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/designer_base/src/com/fr/design/fun/FormElementCaseEditorProcessor.java b/designer_base/src/com/fr/design/fun/FormElementCaseEditorProcessor.java index 346fdb2b0..bece9e21c 100644 --- a/designer_base/src/com/fr/design/fun/FormElementCaseEditorProcessor.java +++ b/designer_base/src/com/fr/design/fun/FormElementCaseEditorProcessor.java @@ -1,6 +1,7 @@ package com.fr.design.fun; import com.fr.stable.fun.Level; +import com.fr.stable.fun.ReportFitAttrProvider; import java.beans.PropertyDescriptor; @@ -19,6 +20,9 @@ public interface FormElementCaseEditorProcessor extends Level{ * @param temp 传入当前操作的class * @return 返回属性表 */ - PropertyDescriptor[] createPropertyDescriptor(Class temp); + PropertyDescriptor[] createPropertyDescriptor(Class temp, ReportFitAttrProvider formFitAttr, ReportFitAttrProvider elementcaseFitAttr); + + int getFitStateInPC(ReportFitAttrProvider fitAttrProvider); + } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java b/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java index d528627d6..334b07a1c 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java @@ -1,6 +1,7 @@ package com.fr.design.fun.impl; import com.fr.design.fun.FormElementCaseEditorProcessor; +import com.fr.stable.fun.ReportFitAttrProvider; import java.beans.PropertyDescriptor; @@ -19,7 +20,13 @@ public abstract class AbstractFormElementCaseEditorProcessor implements FormElem * @param temp 传入当前操作的class * @return 返回属性表 */ - public PropertyDescriptor[] createPropertyDescriptor(Class temp){ + @Override + public PropertyDescriptor[] createPropertyDescriptor(Class temp, ReportFitAttrProvider formFitAttr, ReportFitAttrProvider elementcaseFitAttr) { return new PropertyDescriptor[0]; } + + @Override + public int getFitStateInPC(ReportFitAttrProvider fitAttrProvider) { + return 0; + } } \ No newline at end of file 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 a181ccbf7..84ac74cf5 100644 --- a/designer_form/src/com/fr/design/designer/creator/XElementCase.java +++ b/designer_form/src/com/fr/design/designer/creator/XElementCase.java @@ -91,10 +91,13 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner(); FitProvider wbTpl = (FitProvider) designer.getTarget(); ReportFitAttrProvider fitAttr = wbTpl.getFitAttr(); - PropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass(), fitAttr, this.toData()); + PropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass(), fitAttr, this.toData().getReportFitAttr()); if (processor == null) { return propertyTableEditor; } + if (toData().getReportFitAttr() == null && processor.getFitStateInPC(fitAttr) != 0) { + toData().setFormFitAttr(getFitAttrProvider(fitAttr)); + } return (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor); } @@ -102,16 +105,12 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme * 获取表单保存的自适应属性，如果没有，就用全局保存的自适应属性 * @return 返回自适应属性 */ - private ReportFitAttrProvider getFitAttrProvider () { - FitProvider wbTpl = (FitProvider) designer.getTarget(); + private ReportFitAttrProvider getFitAttrProvider (ReportFitAttrProvider fitAttr) { ReportFitAttrProvider globalFitAttr = ConfigManager.getProviderInstance().getFitAttrProvider(); - ReportFitAttrProvider fitAttr = wbTpl.getFitAttr(); if (fitAttr != null) { return fitAttr; } return globalFitAttr; - - } @Override From fd3059c963999acd2db3f67c5eadd61d51cee458 Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Thu, 16 Jun 2016 01:18:16 +0800 Subject: [PATCH 06/11] rt --- .../src/com/fr/design/designer/creator/XElementCase.java | 1 + 1 file changed, 1 insertion(+) 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 84ac74cf5..aa8dbb44a 100644 --- a/designer_form/src/com/fr/design/designer/creator/XElementCase.java +++ b/designer_form/src/com/fr/design/designer/creator/XElementCase.java @@ -103,6 +103,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme /** * 获取表单保存的自适应属性，如果没有，就用全局保存的自适应属性 + * @param fitAttr 表单的自适应属性 * @return 返回自适应属性 */ private ReportFitAttrProvider getFitAttrProvider (ReportFitAttrProvider fitAttr) { From a7792aa6aede8a428b61d5b401c80d3678d0b8ed Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Thu, 16 Jun 2016 01:24:26 +0800 Subject: [PATCH 07/11] rt --- .../fr/design/fun/FormElementCaseEditorProcessor.java | 7 +++++++ .../fun/impl/AbstractFormElementCaseEditorProcessor.java | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/fun/FormElementCaseEditorProcessor.java b/designer_base/src/com/fr/design/fun/FormElementCaseEditorProcessor.java index bece9e21c..929350c15 100644 --- a/designer_base/src/com/fr/design/fun/FormElementCaseEditorProcessor.java +++ b/designer_base/src/com/fr/design/fun/FormElementCaseEditorProcessor.java @@ -18,10 +18,17 @@ public interface FormElementCaseEditorProcessor extends Level{ /** * 生成属性表 * @param temp 传入当前操作的class + * @param formFitAttr 表单自适应属性 + * @param elementcaseFitAttr 报表块自适应属性 * @return 返回属性表 */ PropertyDescriptor[] createPropertyDescriptor(Class temp, ReportFitAttrProvider formFitAttr, ReportFitAttrProvider elementcaseFitAttr); + /** + * 返回pc自适应属性值 + * @param fitAttrProvider 传入的自适应属性 + * @return 返回pc自适应属性值 + */ int getFitStateInPC(ReportFitAttrProvider fitAttrProvider); diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java b/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java index 334b07a1c..f5e0c035b 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java @@ -16,8 +16,10 @@ public abstract class AbstractFormElementCaseEditorProcessor implements FormElem /** - * 生成属性表 + * 返回pc自适应属性值 * @param temp 传入当前操作的class + * @param formFitAttr 表单自适应属性 + * @param elementcaseFitAttr 报表块自适应属性 * @return 返回属性表 */ @Override @@ -25,6 +27,11 @@ public abstract class AbstractFormElementCaseEditorProcessor implements FormElem return new PropertyDescriptor[0]; } + /** + * 生成属性表 + * @param fitAttrProvider 传入的自适应属性 + * @return 返回pc自适应属性值 + */ @Override public int getFitStateInPC(ReportFitAttrProvider fitAttrProvider) { return 0; From b8b60ce4a4ebe52e4491c313b82462de79e2edf3 Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Thu, 16 Jun 2016 01:40:29 +0800 Subject: [PATCH 08/11] rt --- .../fun/impl/AbstractFormElementCaseEditorProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java b/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java index f5e0c035b..e9b1ac351 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java @@ -16,7 +16,7 @@ public abstract class AbstractFormElementCaseEditorProcessor implements FormElem /** - * 返回pc自适应属性值 + * 生成属性表 * @param temp 传入当前操作的class * @param formFitAttr 表单自适应属性 * @param elementcaseFitAttr 报表块自适应属性 @@ -28,7 +28,7 @@ public abstract class AbstractFormElementCaseEditorProcessor implements FormElem } /** - * 生成属性表 + * 返回pc自适应属性值 * @param fitAttrProvider 传入的自适应属性 * @return 返回pc自适应属性值 */ From 074633c4df94d0798aa67a767934814edb589178 Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Thu, 16 Jun 2016 10:27:47 +0800 Subject: [PATCH 09/11] rt --- .../src/com/fr/design/designer/creator/XElementCase.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 aa8dbb44a..9054013c0 100644 --- a/designer_form/src/com/fr/design/designer/creator/XElementCase.java +++ b/designer_form/src/com/fr/design/designer/creator/XElementCase.java @@ -91,12 +91,14 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner(); FitProvider wbTpl = (FitProvider) designer.getTarget(); ReportFitAttrProvider fitAttr = wbTpl.getFitAttr(); - PropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass(), fitAttr, this.toData().getReportFitAttr()); + ElementCaseEditor editor = this.toData(); + ReportFitAttrProvider reportFitAttr = editor.getReportFitAttr() == null ? getFitAttrProvider(fitAttr) : editor.getReportFitAttr(); + PropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass(), reportFitAttr); if (processor == null) { return propertyTableEditor; } - if (toData().getReportFitAttr() == null && processor.getFitStateInPC(fitAttr) != 0) { - toData().setFormFitAttr(getFitAttrProvider(fitAttr)); + if (editor.getReportFitAttr() == null) { + editor.setFormFitAttr(getFitAttrProvider(fitAttr)); } return (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor); } From ffcbea3199fd6553ec1b12b806a417485d7fa0b6 Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Thu, 16 Jun 2016 10:28:26 +0800 Subject: [PATCH 10/11] rt --- .../com/fr/design/fun/FormElementCaseEditorProcessor.java | 5 ++--- .../fun/impl/AbstractFormElementCaseEditorProcessor.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/designer_base/src/com/fr/design/fun/FormElementCaseEditorProcessor.java b/designer_base/src/com/fr/design/fun/FormElementCaseEditorProcessor.java index 929350c15..2db416d88 100644 --- a/designer_base/src/com/fr/design/fun/FormElementCaseEditorProcessor.java +++ b/designer_base/src/com/fr/design/fun/FormElementCaseEditorProcessor.java @@ -18,11 +18,10 @@ public interface FormElementCaseEditorProcessor extends Level{ /** * 生成属性表 * @param temp 传入当前操作的class - * @param formFitAttr 表单自适应属性 - * @param elementcaseFitAttr 报表块自适应属性 + * @param reportFitAttr 传入的自适应属性 * @return 返回属性表 */ - PropertyDescriptor[] createPropertyDescriptor(Class temp, ReportFitAttrProvider formFitAttr, ReportFitAttrProvider elementcaseFitAttr); + PropertyDescriptor[] createPropertyDescriptor(Class temp, ReportFitAttrProvider reportFitAttr); /** * 返回pc自适应属性值 diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java b/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java index e9b1ac351..8d026bed7 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java @@ -18,12 +18,11 @@ public abstract class AbstractFormElementCaseEditorProcessor implements FormElem /** * 生成属性表 * @param temp 传入当前操作的class - * @param formFitAttr 表单自适应属性 - * @param elementcaseFitAttr 报表块自适应属性 + * @param reportFitAttr 传入的自适应属性 * @return 返回属性表 */ @Override - public PropertyDescriptor[] createPropertyDescriptor(Class temp, ReportFitAttrProvider formFitAttr, ReportFitAttrProvider elementcaseFitAttr) { + public PropertyDescriptor[] createPropertyDescriptor(Class temp, ReportFitAttrProvider reportFitAttr) { return new PropertyDescriptor[0]; } From 30edd83e8f84197c0f8b8efd9ea5e2cfe6a45acb Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Thu, 16 Jun 2016 10:57:34 +0800 Subject: [PATCH 11/11] rt --- .../design/designer/creator/XElementCase.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) 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 9054013c0..074547803 100644 --- a/designer_form/src/com/fr/design/designer/creator/XElementCase.java +++ b/designer_form/src/com/fr/design/designer/creator/XElementCase.java @@ -1,6 +1,5 @@ package com.fr.design.designer.creator; -import com.fr.base.ConfigManager; import com.fr.design.ExtraDesignClassManager; import com.fr.design.designer.properties.mobile.ElementCasePropertyUI; import com.fr.design.form.util.XCreatorConstants; @@ -92,30 +91,17 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme FitProvider wbTpl = (FitProvider) designer.getTarget(); ReportFitAttrProvider fitAttr = wbTpl.getFitAttr(); ElementCaseEditor editor = this.toData(); - ReportFitAttrProvider reportFitAttr = editor.getReportFitAttr() == null ? getFitAttrProvider(fitAttr) : editor.getReportFitAttr(); + ReportFitAttrProvider reportFitAttr = editor.getReportFitAttr() == null ? fitAttr : editor.getReportFitAttr(); PropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass(), reportFitAttr); if (processor == null) { return propertyTableEditor; } if (editor.getReportFitAttr() == null) { - editor.setFormFitAttr(getFitAttrProvider(fitAttr)); + editor.setReportFitInPc(processor.getFitStateInPC(fitAttr)); } return (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor); } - /** - * 获取表单保存的自适应属性，如果没有，就用全局保存的自适应属性 - * @param fitAttr 表单的自适应属性 - * @return 返回自适应属性 - */ - private ReportFitAttrProvider getFitAttrProvider (ReportFitAttrProvider fitAttr) { - ReportFitAttrProvider globalFitAttr = ConfigManager.getProviderInstance().getFitAttrProvider(); - if (fitAttr != null) { - return fitAttr; - } - return globalFitAttr; - } - @Override protected String getIconName() { return "text_field_16.png";