From 7dedcbc2aa43bdc16312f23c3baa972b2076cfc9 Mon Sep 17 00:00:00 2001
From: pengda <pengda@fanruan.com>
Date: Thu, 21 Oct 2021 19:07:23 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-61012=20&=20REPORT-61285=20=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E8=81=94=E5=8A=A8=E9=97=AE=E9=A2=98=E5=8F=8A=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/gui/itableeditorpane/UITableEditorPane.java | 8 ++++++++
 .../com/fr/design/javascript/ExportJavaScriptPane.java    | 7 ++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java
index d6973f6bb..07756a56b 100644
--- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java
@@ -153,4 +153,12 @@ public class UITableEditorPane<T> extends BasicPane {
         tableModel.stopCellEditing();
     }
 
+
+    /**
+     * 设置表头是否可以改变大小
+     */
+    public void setHeaderResizing(boolean resizingAllowed){
+        editTable.getTableHeader().setResizingAllowed(resizingAllowed);
+    }
+
 }
diff --git a/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java b/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java
index 416dd26c8..9b323a88e 100644
--- a/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java
+++ b/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java
@@ -263,6 +263,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
             this.setBorder(UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Template_Other")));
 
             editorPane = new UITableEditorPane<>(new ExportJSTableModel());
+            editorPane.setHeaderResizing(false);
 
             this.add(editorPane, BorderLayout.CENTER);
         }
@@ -488,7 +489,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
 
             @Override
             public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
-                exportTypeComboBox.setSelectedItem(value);
+                exportTypeComboBox.setSelectedItem(getList().get(row).getExportType());
                 return exportTypeComboBox;
             }
 
@@ -544,7 +545,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
 
             @Override
             public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
-                fileNameComboBox.setSelectedItem(value);
+                fileNameComboBox.setSelectedItem(getList().get(row).isDefaultFileName() ? DEFAULT : CUSTOM);
                 return fileNameComboBox;
             }
 
@@ -643,7 +644,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
 
             @Override
             public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
-                parameterSetting.setSelectedItem(value);
+                parameterSetting.setSelectedItem(getList().get(row).isExtendParameters() ? DEFAULT : CUSTOM);
                 return parameterSetting;
             }