|
|
@ -20,6 +20,7 @@ import com.fr.form.FormProvider; |
|
|
|
import com.fr.form.ui.ElementCaseEditor; |
|
|
|
import com.fr.form.ui.ElementCaseEditor; |
|
|
|
import com.fr.form.ui.ElementCaseEditorProvider; |
|
|
|
import com.fr.form.ui.ElementCaseEditorProvider; |
|
|
|
import com.fr.report.fit.ReportFitAttr; |
|
|
|
import com.fr.report.fit.ReportFitAttr; |
|
|
|
|
|
|
|
import com.fr.report.fit.ReportFitConfig; |
|
|
|
import com.fr.stable.ArrayUtils; |
|
|
|
import com.fr.stable.ArrayUtils; |
|
|
|
import com.fr.stable.CoreGraphHelper; |
|
|
|
import com.fr.stable.CoreGraphHelper; |
|
|
|
import com.fr.stable.core.PropertyChangeAdapter; |
|
|
|
import com.fr.stable.core.PropertyChangeAdapter; |
|
|
@ -127,7 +128,8 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme |
|
|
|
private CRPropertyDescriptor getReportFitEditor() { |
|
|
|
private CRPropertyDescriptor getReportFitEditor() { |
|
|
|
this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner(); |
|
|
|
this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner(); |
|
|
|
FitProvider wbTpl = designer.getTarget(); |
|
|
|
FitProvider wbTpl = designer.getTarget(); |
|
|
|
ReportFitAttr fitAttr = wbTpl.getReportFitAttr(); |
|
|
|
//这边获取到的全局要考虑到服务器的配置
|
|
|
|
|
|
|
|
ReportFitAttr fitAttr = wbTpl.getReportFitAttr() == null ? ReportFitConfig.getInstance().getFrmFitAttr() : wbTpl.getReportFitAttr(); |
|
|
|
ElementCaseEditor editor = this.toData(); |
|
|
|
ElementCaseEditor editor = this.toData(); |
|
|
|
//兼容之前报表块(之前三个选项为:默认 横向 双向 现在是:横向 双向 不自适应)
|
|
|
|
//兼容之前报表块(之前三个选项为:默认 横向 双向 现在是:横向 双向 不自适应)
|
|
|
|
if (editor.getFitStateInPC() == 0) { |
|
|
|
if (editor.getFitStateInPC() == 0) { |
|
|
|