From 7b61c1f996bb2c24c777991b808ed49f820c6a57 Mon Sep 17 00:00:00 2001
From: VampireAchao <achao@apache.org>
Date: Fri, 6 Dec 2024 14:43:58 +0800
Subject: [PATCH 1/5] [type:improve] remove "Namespace development in progress"
 alert

---
 src/components/GlobalHeader/index.js | 3 ---
 src/locales/en-US.json               | 1 -
 src/locales/zh-CN.json               | 1 -
 src/routes/Home/index.js             | 2 +-
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/components/GlobalHeader/index.js b/src/components/GlobalHeader/index.js
index 2d4e0f22c..de0d3afce 100644
--- a/src/components/GlobalHeader/index.js
+++ b/src/components/GlobalHeader/index.js
@@ -169,9 +169,6 @@ class GlobalHeader extends PureComponent {
       type: "global/saveCurrentNamespaceId",
       payload: namespaceId,
     });
-    if (namespaceId !== defaultNamespaceId) {
-      message.warn(getIntlContent("SHENYU.NAMESPACE.ALERTNAMESPACEID.CHANGED"));
-    }
     // Fetch plugins for the new namespace
     dispatch({
       type: "global/fetchPlugins",
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index f6f951681..4737f3857 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -473,6 +473,5 @@
   "SHENYU.NAMESPACE.INPUTDESC":"description",
   "SHENYU.NAMESPACE.INPUTNAMESPACEID":"namespaceId",
   "SHENYU.NAMESPACE.ALERTNAMESPACEID":"Automatically generated namespaceId",
-  "SHENYU.NAMESPACE.ALERTNAMESPACEID.CHANGED":"Namespace development in progress",
   "SHENYU.MENU.SYSTEM.MANAGMENT.NAMESPACEPLUGIN":"Plugin"
 }
diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json
index 73a932560..60325b2bb 100644
--- a/src/locales/zh-CN.json
+++ b/src/locales/zh-CN.json
@@ -479,6 +479,5 @@
   "SHENYU.NAMESPACE.INPUTDESC":"请输入命名空间描述",
   "SHENYU.NAMESPACE.INPUTNAMESPACEID":"请输入namespaceId",
   "SHENYU.NAMESPACE.ALERTNAMESPACEID":"系统自动生成namespaceId",
-  "SHENYU.NAMESPACE.ALERTNAMESPACEID.CHANGED":"命名空间开发中",
   "SHENYU.MENU.SYSTEM.MANAGMENT.NAMESPACEPLUGIN":"插件管理"
 }
diff --git a/src/routes/Home/index.js b/src/routes/Home/index.js
index 1b6bc1888..fe1d43d9e 100644
--- a/src/routes/Home/index.js
+++ b/src/routes/Home/index.js
@@ -96,7 +96,7 @@ export default class Home extends Component {
     return (
       <div style={{ display: "inline" }}>
         <Tag color="geekblue">{log.operationTime}</Tag>
-        {/* eslint-disable-next-line prettier/prettier */}
+        {/* eslint-disable-next-line prettier/prettier */}Ï
         <span style={textStyle}>{log.operationType}</span> by{" "}
         <span style={textStyle}>{log.operator}</span>
       </div>

From 0bbb6ec5b81f3451c661dc35ebc7f96ed013e6fa Mon Sep 17 00:00:00 2001
From: VampireAchao <achao@apache.org>
Date: Fri, 6 Dec 2024 14:48:16 +0800
Subject: [PATCH 2/5] [type:improve] plugin handler modal name field add search

---
 src/routes/System/PluginHandle/AddModal.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/routes/System/PluginHandle/AddModal.js b/src/routes/System/PluginHandle/AddModal.js
index dad20d5d1..3671e34cd 100644
--- a/src/routes/System/PluginHandle/AddModal.js
+++ b/src/routes/System/PluginHandle/AddModal.js
@@ -129,7 +129,15 @@ class AddPluginHandle extends Component {
               ],
               initialValue: pluginId,
             })(
-              <Select placeholder={getIntlContent("SHENYU.PLUGIN.PLUGIN.NAME")}>
+              <Select
+                placeholder={getIntlContent("SHENYU.PLUGIN.PLUGIN.NAME")}
+                showSearch
+                filterOption={(input, option) =>
+                  option.props.children
+                    .toLowerCase()
+                    .indexOf(input.toLowerCase()) >= 0
+                }
+              >
                 {pluginDropDownList.map((item, i) => {
                   return (
                     <Option key={i} value={item.id}>

From a26ae035ffc7ff31c513a0e4cf123afb4b36c72d Mon Sep 17 00:00:00 2001
From: VampireAchao <achao@apache.org>
Date: Fri, 6 Dec 2024 15:04:27 +0800
Subject: [PATCH 3/5] [type:improve] set selector and rule copy modal source
 margin bottom

---
 src/routes/Plugin/Common/RuleCopy.js     | 2 +-
 src/routes/Plugin/Common/SelectorCopy.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/Plugin/Common/RuleCopy.js b/src/routes/Plugin/Common/RuleCopy.js
index 27417207c..511633e7b 100644
--- a/src/routes/Plugin/Common/RuleCopy.js
+++ b/src/routes/Plugin/Common/RuleCopy.js
@@ -172,7 +172,7 @@ class RuleCopy extends Component {
             </Menu>
           }
         >
-          <Button>
+          <Button style={{ marginBottom: 20 }}>
             <a
               className="ant-dropdown-link"
               style={{ fontWeight: "bold" }}
diff --git a/src/routes/Plugin/Common/SelectorCopy.js b/src/routes/Plugin/Common/SelectorCopy.js
index 9ca62fa04..69f3b0d68 100644
--- a/src/routes/Plugin/Common/SelectorCopy.js
+++ b/src/routes/Plugin/Common/SelectorCopy.js
@@ -151,7 +151,7 @@ class SelectorCopy extends Component {
             </Menu>
           }
         >
-          <Button>
+          <Button style={{ marginBottom: 20 }}>
             <a
               className="ant-dropdown-link"
               style={{ fontWeight: "bold" }}

From e820ff6e98b6b5ca37f23d8ecded736e923ebf95 Mon Sep 17 00:00:00 2001
From: VampireAchao <achao@apache.org>
Date: Fri, 6 Dec 2024 16:24:40 +0800
Subject: [PATCH 4/5] [type:improve] export import dropdown optimize

---
 src/components/GlobalHeader/index.js | 40 +++++++++++-----------------
 src/locales/en-US.json               |  1 +
 src/locales/zh-CN.json               |  1 +
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/components/GlobalHeader/index.js b/src/components/GlobalHeader/index.js
index de0d3afce..5e5824f82 100644
--- a/src/components/GlobalHeader/index.js
+++ b/src/components/GlobalHeader/index.js
@@ -16,16 +16,7 @@
  */
 
 import React, { PureComponent } from "react";
-import {
-  Button,
-  Dropdown,
-  Form,
-  Icon,
-  Input,
-  Menu,
-  message,
-  Modal,
-} from "antd";
+import { Button, Dropdown, Form, Icon, Input, Menu, Modal } from "antd";
 import { connect } from "dva";
 import { withRouter } from "dva/router";
 import ImportModal from "./ImportModal";
@@ -299,6 +290,13 @@ class GlobalHeader extends PureComponent {
           <Icon type="form" />{" "}
           {getIntlContent("SHENYU.GLOBALHEADER.CHANGE.PASSWORD")}
         </Menu.Item>
+        <Menu.Item key="0" onClick={onLogout}>
+          <Icon type="logout" /> {getIntlContent("SHENYU.GLOBALHEADER.LOGOUT")}
+        </Menu.Item>
+      </Menu>
+    );
+    const importMenu = (
+      <Menu>
         {this.checkAuth("system:manager:exportConfig") && (
           <Menu.Item key="2" onClick={this.exportConfigClick}>
             <Icon type="export" /> {getIntlContent("SHENYU.COMMON.EXPORT")}
@@ -309,9 +307,6 @@ class GlobalHeader extends PureComponent {
             <Icon type="import" /> {getIntlContent("SHENYU.COMMON.IMPORT")}
           </Menu.Item>
         )}
-        <Menu.Item key="0" onClick={onLogout}>
-          <Icon type="logout" /> {getIntlContent("SHENYU.GLOBALHEADER.LOGOUT")}
-        </Menu.Item>
       </Menu>
     );
     return (
@@ -354,18 +349,15 @@ class GlobalHeader extends PureComponent {
               </Dropdown>
             </div>
           )}
-          {this.checkAuth("system:manager:importConfig") && (
+          {(this.checkAuth("system:manager:importConfig") ||
+            this.checkAuth("system:manager:exportConfig")) && (
             <div className={styles.item}>
-              <Button onClick={this.importConfigClick}>
-                <Icon type="import" /> {getIntlContent("SHENYU.COMMON.IMPORT")}
-              </Button>
-            </div>
-          )}
-          {this.checkAuth("system:manager:exportConfig") && (
-            <div className={styles.item}>
-              <Button onClick={this.exportConfigClick}>
-                <Icon type="export" /> {getIntlContent("SHENYU.COMMON.EXPORT")}
-              </Button>
+              <Dropdown overlay={importMenu}>
+                <Button>
+                  <Icon type="import" />{" "}
+                  {getIntlContent("SHENYU.COMMON.IMPORT_EXPORT")}
+                </Button>
+              </Dropdown>
             </div>
           )}
           <div className={styles.item}>
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index 4737f3857..bf3d11946 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -403,6 +403,7 @@
   "SHENYU.DOCUMENT.TAG.TABLE.CREATETIME": "Create Time",
   "SHENYU.DOCUMENT.TAG.TABLE.MODIFYTIME": "Modify Time",
   "SHENYU.COMMON.REQUIRED": "Required",
+  "SHENYU.COMMON.IMPORT_EXPORT": "Import/Export configs",
   "SHENYU.COMMON.EXPORT": "Export Configs",
   "SHENYU.COMMON.IMPORT": "Import Configs",
   "SHENYU.COMMON.IMPORT.RESULT": "Import Result",
diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json
index 60325b2bb..379744930 100644
--- a/src/locales/zh-CN.json
+++ b/src/locales/zh-CN.json
@@ -408,6 +408,7 @@
   "SHENYU.DOCUMENT.TAG.TABLE.CREATETIME": "创建时间",
   "SHENYU.DOCUMENT.TAG.TABLE.MODIFYTIME": "修改时间",
   "SHENYU.COMMON.REQUIRED": "必填",
+  "SHENYU.COMMON.IMPORT_EXPORT": "导入配置/导出配置",
   "SHENYU.COMMON.EXPORT": "导出所有配置",
   "SHENYU.COMMON.IMPORT": "导入配置",
   "SHENYU.COMMON.IMPORT.RESULT": "导入结果",

From 774ebaa2a4a7d859a328abcb2b3cdaa2804d59eb Mon Sep 17 00:00:00 2001
From: VampireAchao <achao@apache.org>
Date: Fri, 6 Dec 2024 16:44:58 +0800
Subject: [PATCH 5/5] [type:fix] fix problem

---
 src/routes/Home/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/Home/index.js b/src/routes/Home/index.js
index fe1d43d9e..1b6bc1888 100644
--- a/src/routes/Home/index.js
+++ b/src/routes/Home/index.js
@@ -96,7 +96,7 @@ export default class Home extends Component {
     return (
       <div style={{ display: "inline" }}>
         <Tag color="geekblue">{log.operationTime}</Tag>
-        {/* eslint-disable-next-line prettier/prettier */}Ï
+        {/* eslint-disable-next-line prettier/prettier */}
         <span style={textStyle}>{log.operationType}</span> by{" "}
         <span style={textStyle}>{log.operator}</span>
       </div>