|
|
|
@ -17,6 +17,7 @@ import com.fr.design.designer.TargetComponent;
|
|
|
|
|
import com.fr.design.event.TargetModifiedEvent; |
|
|
|
|
import com.fr.design.event.TargetModifiedListener; |
|
|
|
|
import com.fr.design.file.HistoryTemplateListPane; |
|
|
|
|
import com.fr.design.form.parameter.FormParaDesigner; |
|
|
|
|
import com.fr.design.gui.ibutton.UIButton; |
|
|
|
|
import com.fr.design.gui.ibutton.UIButtonGroup; |
|
|
|
|
import com.fr.design.layout.FRGUIPaneFactory; |
|
|
|
@ -30,6 +31,10 @@ import com.fr.design.menu.ShortCut;
|
|
|
|
|
import com.fr.design.menu.ToolBarDef; |
|
|
|
|
import com.fr.design.module.DesignModuleFactory; |
|
|
|
|
import com.fr.design.style.background.BackgroundPane; |
|
|
|
|
import com.fr.form.main.parameter.FormParameterUI; |
|
|
|
|
import com.fr.form.ui.Widget; |
|
|
|
|
import com.fr.form.ui.container.WAbsoluteLayout; |
|
|
|
|
import com.fr.form.ui.container.WLayout; |
|
|
|
|
import com.fr.log.FineLoggerFactory; |
|
|
|
|
import com.fr.main.parameter.ReportParameterAttr; |
|
|
|
|
import com.fr.main.parameter.TemplateParameterAttr; |
|
|
|
@ -46,6 +51,7 @@ import java.awt.Color;
|
|
|
|
|
import java.awt.Component; |
|
|
|
|
import java.awt.Container; |
|
|
|
|
import java.awt.Dimension; |
|
|
|
|
import java.awt.Rectangle; |
|
|
|
|
import java.awt.event.ActionEvent; |
|
|
|
|
import java.awt.event.ActionListener; |
|
|
|
|
import java.awt.event.ItemEvent; |
|
|
|
@ -249,6 +255,22 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
|
|
|
|
|
FineLoggerFactory.getLogger().error(e.getMessage(), e); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
currentIndex = reportParameterAttr.getCurrentIndex(); |
|
|
|
|
//因为以前的版本没有保存currentIndex,所以要计算currentIndex的值
|
|
|
|
|
if (parameterUI != null && parameterUI instanceof FormParameterUI && currentIndex == 0) { |
|
|
|
|
WLayout wLayout = ((FormParameterUI) parameterUI).getContainer(); |
|
|
|
|
int widgetCount = wLayout.getWidgetCount(); |
|
|
|
|
Rectangle endRec = null; |
|
|
|
|
for (int i = 0; i < widgetCount; i++) { |
|
|
|
|
Widget widget = wLayout.getWidget(i); |
|
|
|
|
Rectangle tempRec = ((WAbsoluteLayout.BoundsWidget) widget).getBounds(); |
|
|
|
|
if (endRec == null || tempRec.y > endRec.y) { |
|
|
|
|
endRec = tempRec; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (endRec != null) |
|
|
|
|
currentIndex = (int) (Math.ceil(endRec.y / FormParaDesigner.V_COMPONENT_GAP)) * NUM_IN_A_LINE; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
paraDesignEditor.populate(parameterUI); |
|
|
|
|
|
|
|
|
@ -268,8 +290,6 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
|
|
|
|
|
bridge.setBackground(reportParameterAttr.getBackground()); |
|
|
|
|
bridge.setUseParamsTemplate(reportParameterAttr.isUseParamsTemplate()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
currentIndex = reportParameterAttr.getCurrentIndex(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -438,7 +458,7 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
|
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
paraDesignEditor.addingAllParameter2Editor(parameterArray, currentIndex); |
|
|
|
|
currentIndex = paraDesignEditor.addingAllParameter2EditorWithReturnValue(parameterArray, currentIndex); |
|
|
|
|
|
|
|
|
|
parameterArray = null; |
|
|
|
|
refreshParameter(); |
|
|
|
|