Pull request #6319: REPORT-61012 & REPORT-61285 控件联动问题及样式问题

Merge in DESIGN/design from ~PENGDA/design:final/11.0 to final/11.0

* commit '7dedcbc2aa43bdc16312f23c3baa972b2076cfc9':
  REPORT-61012 & REPORT-61285 控件联动问题及样式问题

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);
+    }
+
 }

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;
             }