Merge pull request #5484 in DESIGN/design from release/10.0 to bugfix/10.0

* commit 'b1058789adcee9c2afb3a5d79e854ebb3dc56103':
  REPORT-57647 cpt参数面板中组件被下方覆盖时 工具需要不可见
  REPORT-57609 & REPORT-57622 导出-导出事件-模板web属性设置&服务器配置设置事件-默认设置不对
  REPORT-57624 导出-导出事件-模板web属性设置导出事件-保存后再打开变为邮件事件
  REPORT-57431 导出-导出事件-模板选择-文本框需要不可编辑

designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java

@@ -117,7 +117,9 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
 
     private JPanel initParamsPane() {
         extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
+        extendParametersCheckBox.setSelected(true);
         parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
+        parameterViewPane.setVisible(false);
         parameterViewPane.addTableEditorListener(new TableModelListener() {
             public void tableChanged(TableModelEvent e) {
                 List<ParameterProvider> list = parameterViewPane.update();
@@ -158,6 +160,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
         customNameRadio = new UIRadioButton(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Filename_Custom"));
         addRadioToGroup(fileNameRadioGroup, defaultNameRadio, customNameRadio);
         fileNameFormulaEditor = new FormulaEditor(Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
+        fileNameFormulaEditor.setEnabled(false);
         fileNameRadioGroup.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -220,10 +223,8 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
             @Override
             public void actionPerformed(ActionEvent e) {
                 if (currentTemplateRadio.isSelected()) {
-                    reportPathTextField.setEnabled(false);
                     browserButton.setEnabled(false);
                 } else {
-                    reportPathTextField.setEnabled(true);
                     browserButton.setEnabled(true);
                 }
             }
@@ -234,11 +235,13 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
         JPanel reportletNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         // 路径输入框
         reportPathTextField = new UITextField(20);
+        reportPathTextField.setEnabled(false);
         reportletNamePane.add(reportPathTextField, BorderLayout.CENTER);
 
         // 选择路径按钮
         browserButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Select"));
         browserButton.setPreferredSize(new Dimension(browserButton.getPreferredSize().width, 20));
+        browserButton.setEnabled(false);
         reportletNamePane.add(browserButton, BorderLayout.EAST);
         browserButton.addActionListener(new ActionListener() {
             @Override
@@ -272,10 +275,8 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
         }
         this.templateRadioGroup.selectIndexButton(ob.isCurrentTemplate() ? 0 : 1);
         if (ob.isCurrentTemplate()) {
-            this.reportPathTextField.setEnabled(false);
             this.browserButton.setEnabled(false);
         } else {
-            this.reportPathTextField.setEnabled(true);
             this.browserButton.setEnabled(true);
             this.reportPathTextField.setText(ob.getTemplatePath());
         }

designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java

@@ -783,6 +783,12 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		// 不超过可绘制区域
 		int extraX = Math.min(creatorRightX, formDesignerWidth);
 		int extraY = creatorRightY < 0 ? 0 : Math.min(creatorRightY, formDesignerHeight);
+
+		if (designer.isFormParaDesigner() && extraY + this.getHeight() >= formDesignerHeight) {
+			popup.setVisible(false);
+			return;
+		}
+
 		// 放到事件尾部执行
 		SwingUtilities.invokeLater(new Runnable() {
 			@Override

designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java

@@ -101,16 +101,16 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
         // 发送邮件
         EmailPane emailPane = new EmailPane();
         hyperlinkPane.add(EMAIL, emailPane);
-        // 导出事件
+        cards.add(javaScriptPane);
+        cards.add(commit2DBJavaScriptPane);
+        cards.add(customActionPane);
+        cards.add(emailPane);
+        // 导出事件 这里要按顺序添加
         if (workbook) {
             ExportJavaScriptPane exportJavaScriptPane = new ExportJavaScriptPane();
             hyperlinkPane.add(EXPORT, exportJavaScriptPane);
             cards.add(exportJavaScriptPane);
         }
-        cards.add(javaScriptPane);
-        cards.add(commit2DBJavaScriptPane);
-        cards.add(customActionPane);
-        cards.add(emailPane);
         //其他事件
         addOtherEvent();
         hyperlinkPane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Report_JavaScript_Set")));