|
|
@ -3,7 +3,6 @@ |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
package com.fr.poly.creator; |
|
|
|
package com.fr.poly.creator; |
|
|
|
|
|
|
|
|
|
|
|
import com.fr.base.BaseUtils; |
|
|
|
|
|
|
|
import com.fr.base.ScreenResolution; |
|
|
|
import com.fr.base.ScreenResolution; |
|
|
|
import com.fr.base.vcs.DesignerMode; |
|
|
|
import com.fr.base.vcs.DesignerMode; |
|
|
|
import com.fr.design.constants.UIConstants; |
|
|
|
import com.fr.design.constants.UIConstants; |
|
|
@ -11,7 +10,15 @@ import com.fr.design.event.TargetModifiedEvent; |
|
|
|
import com.fr.design.event.TargetModifiedListener; |
|
|
|
import com.fr.design.event.TargetModifiedListener; |
|
|
|
import com.fr.design.file.HistoryTemplateListPane; |
|
|
|
import com.fr.design.file.HistoryTemplateListPane; |
|
|
|
import com.fr.design.gui.frpane.HyperlinkGroupPane; |
|
|
|
import com.fr.design.gui.frpane.HyperlinkGroupPane; |
|
|
|
import com.fr.design.mainframe.*; |
|
|
|
import com.fr.design.mainframe.CellElementPropertyPane; |
|
|
|
|
|
|
|
import com.fr.design.mainframe.CellWidgetPropertyPane; |
|
|
|
|
|
|
|
import com.fr.design.mainframe.DesignerContext; |
|
|
|
|
|
|
|
import com.fr.design.mainframe.EastRegionContainerPane; |
|
|
|
|
|
|
|
import com.fr.design.mainframe.ElementCasePane; |
|
|
|
|
|
|
|
import com.fr.design.mainframe.HyperlinkGroupPaneActionImpl; |
|
|
|
|
|
|
|
import com.fr.design.mainframe.JTemplate; |
|
|
|
|
|
|
|
import com.fr.design.mainframe.JWorkBook; |
|
|
|
|
|
|
|
import com.fr.design.mainframe.ReportFloatPane; |
|
|
|
import com.fr.design.mainframe.cell.QuickEditorRegion; |
|
|
|
import com.fr.design.mainframe.cell.QuickEditorRegion; |
|
|
|
import com.fr.design.present.ConditionAttributesGroupPane; |
|
|
|
import com.fr.design.present.ConditionAttributesGroupPane; |
|
|
|
import com.fr.grid.GridUtils; |
|
|
|
import com.fr.grid.GridUtils; |
|
|
@ -26,8 +33,9 @@ import com.fr.report.poly.PolyECBlock; |
|
|
|
import com.fr.stable.unit.UNITConstants; |
|
|
|
import com.fr.stable.unit.UNITConstants; |
|
|
|
import com.fr.stable.unit.UnitRectangle; |
|
|
|
import com.fr.stable.unit.UnitRectangle; |
|
|
|
|
|
|
|
|
|
|
|
import javax.swing.*; |
|
|
|
import javax.swing.JPanel; |
|
|
|
import java.awt.*; |
|
|
|
import java.awt.BorderLayout; |
|
|
|
|
|
|
|
import java.awt.Dimension; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* @author richer |
|
|
|
* @author richer |
|
|
@ -166,6 +174,7 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> { |
|
|
|
// 条件属性
|
|
|
|
// 条件属性
|
|
|
|
ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance(); |
|
|
|
ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance(); |
|
|
|
conditionAttributesGroupPane.populate(editComponent); |
|
|
|
conditionAttributesGroupPane.populate(editComponent); |
|
|
|
|
|
|
|
EastRegionContainerPane.getInstance().replaceConditionAttrPane(conditionAttributesGroupPane); |
|
|
|
|
|
|
|
|
|
|
|
EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell()); |
|
|
|
EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell()); |
|
|
|
if (chooseBlock) { |
|
|
|
if (chooseBlock) { |
|
|
|