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] 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";