Merge pull request #9190 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit '88bc20fb0237255c3d9026294bbdd480cecf2f70':
  REPORT-71476 新建保存后，目录没有选中模板，重命名不应该高亮 同步到10.0
  REPORT-73106 将参数面板控件剪切到一个新的cpt,原frm界面就变成和cpt一样
  REPORT-72769 导出事件-已删除事件的导出模板设置会在再次新增的时候存在残留
  REPORT-71957 组件复用-创建组件，确认后提示共享组件创建失败，且日志有报错

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

@@ -279,8 +279,8 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
             this.browserButton.setEnabled(false);
         } else {
             this.browserButton.setEnabled(true);
-            this.reportPathTextField.setText(ob.getTemplatePath());
         }
+        this.reportPathTextField.setText(ob.getTemplatePath());
         this.exportTypeComboBox.setSelectedItem(ob.getExportType());
         this.fileNameRadioGroup.selectIndexButton(ob.isDefaultFileName() ? 0 : 1);
         if (ob.isDefaultFileName()) {

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

@@ -1555,6 +1555,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
                     refreshToolArea();
                 }
                 DesignerFrameFileDealerPane.getInstance().refresh();
+                DesignerFrameFileDealerPane.getInstance().stateChange();
             }
         });
 

designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java

@@ -25,7 +25,6 @@ import com.fr.design.fun.FormWidgetOptionProvider;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormSelection;
 import com.fr.design.mainframe.FormSelectionUtils;
-import com.fr.design.mainframe.share.encrypt.clipboard.impl.EncryptSelectionClipboardHandler;
 import com.fr.design.utils.ComponentUtils;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.general.ComparatorUtils;
@@ -140,11 +139,28 @@ public class SelectionModel {
             if (cutSelection != null) {
                 cutSelection.cut2ClipBoard(clipboard);
                 designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_CUTED);
+                setSelectedCreator(hasSelectedParaComponent() ? designer.getParaComponent() : designer.getRootComponent());
                 designer.repaint();
             }
         }
     }
 
+    /**
+     * 判断是否选中参数面板中的组件
+     * @return boolean
+     */
+    private boolean hasSelectedParaComponent() {
+        XCreator[] roots = selection.getSelectedCreators();
+        if (roots.length > 0) {
+            for (XCreator creator : roots) {
+                if ((creator.getParent() instanceof XWParameterLayout)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     /**
      * 复制当前选中的组件到剪切板
      */

designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java

@@ -582,7 +582,7 @@ public class ShareMainPane extends JPanel {
                     Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
             return false;
         }
-        if (FileCommonUtils.isFileNameValid(name)) {
+        if (!FileCommonUtils.isFileNameValid(name)) {
             FineJOptionPane.showMessageDialog(
                     shareDialog,
                     Toolkit.i18nText("Fine-Design_Share_Generate_Failure_Illegal_Component_Name_Tip"),