Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~tommy/design into release/11.

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

@@ -326,16 +326,19 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
             private UIButton browserButton;
 
             public ExportTemplateChooser() {
-                reportletNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
                 // 路径输入框
-                reportPathTextField = new UITextField(7);
+                reportPathTextField = new UITextField(8);
                 reportPathTextField.setEnabled(false);
-                reportletNamePane.add(reportPathTextField, BorderLayout.WEST);
 
                 // 选择路径按钮
                 browserButton = new UIButton("...");
                 browserButton.setVisible(true);
-                reportletNamePane.add(browserButton, BorderLayout.EAST);
+
+                Component[][] templateChooserComponent = {{reportPathTextField, browserButton}};
+                double[] rowSize = {TableLayout.PREFERRED};
+                double[] columnSize = {TableLayout.FILL, 22};
+                reportletNamePane = TableLayoutHelper.createCommonTableLayoutPane(templateChooserComponent, rowSize, columnSize, 0);
+
                 browserButton.addActionListener(new ActionListener() {
                     @Override
                     public void actionPerformed(ActionEvent evt) {
@@ -777,11 +780,13 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
             if (currentTemplatePane.extendParametersCheckBox.isSelected()) {
                 exportJavaScript.setParameters(null);
             } else {
-                List<ParameterProvider> parameterList = parameterViewPane.update();
-                if (!parameterList.isEmpty()) {
-                    Parameter[] parameters = new Parameter[parameterList.size()];
-                    parameterList.toArray(parameters);
-                    js.setParameters(parameters);
+                if (parameterViewPane != null) {
+                    List<ParameterProvider> parameterList = parameterViewPane.update();
+                    if (!parameterList.isEmpty()) {
+                        Parameter[] parameters = new Parameter[parameterList.size()];
+                        parameterList.toArray(parameters);
+                        js.setParameters(parameters);
+                    }
                 }
             }
             exportJavaScript.addJS(js);

designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeEditorPane.java

@@ -267,6 +267,10 @@ public abstract class TemplateThemeEditorPane<T extends TemplateTheme> extends J
         return nameTextField.checkValid();
     }
 
+    public String getThemeName() {
+        return nameTextField.getText();
+    }
+
     public List<Color> getCurrentColorScheme() {
         return colorListPane.update();
     }

designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java

@@ -60,6 +60,8 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
     private UIButton saveButton = new UIButton();
     private UIButton saveAsButton = new UIButton();
 
+    private TemplateThemeProfileActionListener actionListener = new TemplateThemeProfileActionAdapter();
+
     public TemplateThemeProfilePane(TemplateThemeConfig<T> config) {
         super();
         this.config = config;
@@ -112,6 +114,7 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
                     return;
                 }
                 saveButton.setEnabled(valid && isMutable);
+                actionListener.onThemeNameChecked(themeEditorPane.getThemeName(), valid);
             }
         });
 
@@ -138,6 +141,7 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
         if (saveAsButton != null) {
             saveAsButton.setEnabled(StringUtils.isNotEmpty(name));
         }
+
         isPopulating = false;
     }
 
@@ -330,4 +334,19 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
             this.dispose();
         }
     }
+
+    public void addProfileActionListener(TemplateThemeProfileActionListener actionListener) {
+        if (actionListener != null) {
+            this.actionListener = actionListener;
+        }
+    }
+    public interface TemplateThemeProfileActionListener {
+
+        void onThemeNameChecked(String name, boolean valid);
+    }
+    public static class TemplateThemeProfileActionAdapter implements TemplateThemeProfileActionListener {
+
+        @Override
+        public void onThemeNameChecked(String name, boolean valid) { }
+    }
 }

designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetPopupPreviewPane.java

@@ -162,7 +162,7 @@ public class OnlineWidgetPopupPreviewPane extends AbstractWidgetPopupPreviewPane
         String themeName = widget.getThemeName();
         if (StringUtils.isNotEmpty(themeName)) {
             suitableThemeNamePane.setVisible(true);
-            suitableThemeNameLabel.setText(themeName);
+            suitableThemeNameLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Share_Suitable_Theme_Prefix") + themeName);
         } else {
             suitableThemeNamePane.setVisible(false);
         }