@ -7,22 +7,28 @@ import com.fr.design.designer.IntervalConstants;
import com.fr.design.designer.creator.* ;
import com.fr.design.designer.creator.* ;
import com.fr.design.fit.common.TemplateTool ;
import com.fr.design.fit.common.TemplateTool ;
import com.fr.design.fit.attrpane.PcFitExpandablePane ;
import com.fr.design.fit.attrpane.PcFitExpandablePane ;
import com.fr.design.gui.ilable.UIAutoChangeLineLabel ;
import com.fr.design.gui.ilable.UILabel ;
import com.fr.design.gui.ilable.UILabel ;
import com.fr.design.gui.style.FollowingThemePane ;
import com.fr.design.gui.style.FollowingThemePane ;
import com.fr.design.i18n.Toolkit ;
import com.fr.design.layout.FRGUIPaneFactory ;
import com.fr.design.layout.FRGUIPaneFactory ;
import com.fr.design.layout.TableLayoutHelper ;
import com.fr.design.layout.TableLayoutHelper ;
import com.fr.design.mainframe.WidgetPropertyPane ;
import com.fr.design.mainframe.widget.accessibles.AccessibleElementCaseToolBarEditor ;
import com.fr.design.mainframe.widget.accessibles.AccessibleElementCaseToolBarEditor ;
import com.fr.design.widget.ui.designer.component.PaddingBoundPane ;
import com.fr.design.widget.ui.designer.component.PaddingBoundPane ;
import com.fr.form.ui.ElementCaseEditor ;
import com.fr.form.ui.ElementCaseEditor ;
import com.fr.form.ui.PaddingMargin ;
import com.fr.form.ui.PaddingMargin ;
import com.fr.form.web.FormToolBarManager ;
import com.fr.form.web.FormToolBarManager ;
import com.fr.general.ComparatorUtils ;
import com.fr.general.ComparatorUtils ;
import com.fr.report.fit.FitProvider ;
import com.fr.report.fit.ReportFitAttr ;
import com.fr.report.fit.ReportFitAttr ;
import com.fr.report.fit.ReportFitConfig ;
import javax.swing.BorderFactory ;
import javax.swing.BorderFactory ;
import javax.swing.JPanel ;
import javax.swing.JPanel ;
import java.awt.BorderLayout ;
import java.awt.BorderLayout ;
import java.awt.Color ;
import java.awt.Component ;
import java.awt.Component ;
import java.util.ArrayList ;
import java.util.ArrayList ;
import java.util.List ;
import java.util.List ;
@ -78,11 +84,23 @@ public class ElementEditorDefinePane extends WTitleLayoutDefinePane<ElementCaseE
pcFitExpandablePane = new PcFitExpandablePane ( this ) ;
pcFitExpandablePane = new PcFitExpandablePane ( this ) ;
if ( TemplateTool . isCurrentEditingNewJForm ( ) ) {
if ( TemplateTool . isCurrentEditingNewJForm ( ) ) {
centerPane . add ( pcFitExpandablePane , BorderLayout . SOUTH ) ;
centerPane . add ( pcFitExpandablePane , BorderLayout . SOUTH ) ;
} else if ( isGlobalReportFitBrowser ( ) ) {
UIAutoChangeLineLabel tip = new UIAutoChangeLineLabel ( Toolkit . i18nText ( "Fine-Design_EC_Default_Fit_Config_Tip" ) , 216 ) ;
tip . setForeground ( Color . lightGray ) ;
centerPane . add ( tip , BorderLayout . SOUTH ) ;
}
}
return centerPane ;
return centerPane ;
}
}
private boolean isGlobalReportFitBrowser ( ) {
FitProvider fitProvider = WidgetPropertyPane . getInstance ( ) . getEditingFormDesigner ( ) . getTarget ( ) ;
ReportFitAttr fitAttr = fitProvider . getReportFitAttr ( ) ;
if ( fitAttr = = null ) {
fitAttr = ReportFitConfig . getInstance ( ) . getFrmFitAttr ( ) ;
}
return fitAttr . fitStateInPC ( ) = = 0 ;
}
private CRPropertyDescriptor [ ] removeOldFitEditor ( CRPropertyDescriptor [ ] extraTableEditor ) {
private CRPropertyDescriptor [ ] removeOldFitEditor ( CRPropertyDescriptor [ ] extraTableEditor ) {
if ( ! TemplateTool . isCurrentEditingNewJForm ( ) ) {
if ( ! TemplateTool . isCurrentEditingNewJForm ( ) ) {
return extraTableEditor ;
return extraTableEditor ;