Merge pull request #59 from quick123official/hotfix/2.4.1

Hotfix/2.4.1
quick123official · Oct 30, 2021 · 731e495 · 731e495
2 parents b681df6 + b6bca7b
commit 731e495
Show file tree

Hide file tree

Showing 5 changed files with 4,155 additions and 3,754 deletions.
diff --git a/src/pages/HostContent/index.js b/src/pages/HostContent/index.js
@@ -89,8 +89,13 @@ class HostContent extends Component {
                 let dbname = firstSplitString[0];
                 let secondSplitString = firstSplitString[1].split(",");
                 let thirdSplitString = secondSplitString[0].split("=");
+                let dbIndex = i;
+                if (dbname.startsWith("db")) {
+                    dbIndex = parseInt(dbname.substring(2));
+                }
                 dbTabs.push({
                     key: "" + i,
+                    dbIndex: dbIndex,
                     title: dbname,
                     total: thirdSplitString[1],
                 });
@@ -109,8 +114,9 @@ class HostContent extends Component {
             activeKey: activeKey,
             redisKey: { key: "", type: "" },
         });
+        let dbIndex = this.state.dbTabs[activeKey].dbIndex;
         let redis = this.props.node.redis;
-        redis.select(activeKey, (err, res) => {
+        redis.select(dbIndex, (err, res) => {
             if (err) {
                 message.error("" + err);
                 Log.error(
@@ -178,7 +184,7 @@ class HostContent extends Component {
                                         HOST_KEY_SHOW_TYPE.TREE ? (
                                             <HostKeyTree
                                                 node={this.props.node}
-                                                db={tab.key}
+                                                db={tab.dbIndex}
                                                 updateHostKey={this.updateHostKey.bind(
                                                     this
                                                 )}
@@ -194,7 +200,7 @@ class HostContent extends Component {
                                         HOST_KEY_SHOW_TYPE.TABLE ? (
                                             <HostKey
                                                 node={this.props.node}
-                                                db={tab.key}
+                                                db={tab.dbIndex}
                                                 updateHostKey={this.updateHostKey.bind(
                                                     this
                                                 )}

diff --git a/src/pages/HostKeyHash/index.js b/src/pages/HostKeyHash/index.js
@@ -252,6 +252,7 @@ class HostKeyHash extends Component {
                         pattern,
                         err
                     );
+                    this.setState({ loading: false });
                     return;
                 }
                 let data = [];
@@ -452,11 +453,12 @@ class HostKeyHash extends Component {
                         <Search
                             style={{ width: 300 }}
                             prefix="key :"
-                            enterButton={<Button>search</Button>}
+                            enterButton="Search"
                             size="middle"
                             value={this.state.search.field}
                             onChange={this.onChangeSearch.bind(this)}
                             onSearch={this.searchField.bind(this)}
+                            loading={this.state.loading}
                         />
                     </Tooltip>
                     <Button

diff --git a/src/pages/HostKeySet/index.js b/src/pages/HostKeySet/index.js
@@ -252,6 +252,7 @@ class HostKeySet extends Component {
         } catch (err) {
             message.error("" + err);
             Log.error("HostKeySet searchSortSetByPatternRecursive error", err);
+            this.setState({ loading: false });
         }
     }
     /**
@@ -411,11 +412,12 @@ class HostKeySet extends Component {
                             defaultValue="*"
                             style={{ width: 300 }}
                             prefix="key :"
-                            enterButton={<Button>search</Button>}
+                            enterButton="Search"
                             size="middle"
                             value={this.state.search.searchMember}
                             onChange={this.onChangeSearchMember.bind(this)}
                             onSearch={this.searchSet.bind(this)}
+                            loading={this.state.loading}
                         />
                     </Tooltip>
                     <Button

diff --git a/src/pages/HostKeySortSet/index.js b/src/pages/HostKeySortSet/index.js
@@ -197,6 +197,7 @@ class HostKeySortSet extends Component {
                 (err) => {
                     message.error("" + err);
                     Log.error("HostKeySortSet fetchDataByPage error", err);
+                    this.setState({ loading: false });
                 }
             );
     }
@@ -504,11 +505,12 @@ class HostKeySortSet extends Component {
                         <Search
                             style={{ width: 300 }}
                             prefix="key :"
-                            enterButton={<Button>search</Button>}
+                            enterButton="Search"
                             size="middle"
                             value={this.state.search.searchMember}
                             onChange={this.onChangeSearchMember.bind(this)}
                             onSearch={this.searchSortSet.bind(this)}
+                            loading={this.state.loading}
                         />
                     </Tooltip>
                     <Button