Merge branch 'master' of https://github.com/xiuluodaren/quick_redis_blog

# Conflicts:
#	src/pages/HostKeyTree/index.js

Author: xiuluoshendaren

README.en.md

@@ -38,6 +38,9 @@ Windows & Mac OS X & Linux : [https://gitee.com/quick123official/quick_redis_blo
 
 ## Software screenshot
 
+-The keys are displayed in the form of a directory
+![The keys are displayed in the form of a directory](https://quick123.net/images/introduction/show_keys_by_tree.jpg "The keys are displayed in the form of a directory")
+
 -Home page
 ![Home page](https://quick123.net/images/introduction/key-zset-value.png "Home page")
 

README.md

@@ -38,6 +38,9 @@ Windows & Mac OS X & Linux : [https://gitee.com/quick123official/quick_redis_blo
 
 ## Software screenshot
 
+-The keys are displayed in the form of a directory
+![The keys are displayed in the form of a directory](https://quick123.net/images/introduction/show_keys_by_tree.jpg "The keys are displayed in the form of a directory")
+
 -Home page
 ![Home page](https://quick123.net/images/introduction/key-zset-value.png "Home page")
 

public/modules/ElectronIntlUniversal.js

@@ -124,12 +124,17 @@ const ElectronIntlUniversal = {
      * @memberof ElectronIntlUniversal
      */
     readSystemConfig: () => {
-        let filePath = ElectronIntlUniversal.getSystemConfigFilePath();
         let systemConfigData = undefined;
+        let filePath = undefined;
         try {
+            filePath = ElectronIntlUniversal.getSystemConfigFilePath();
             systemConfigData = fs.readFileSync(filePath, "utf-8");
         } catch (e) {
-            Log.error("[cmd=ElectronIntlUniversal] readSystemConfig error", langPath, e);
+            Log.error(
+                "[cmd=ElectronIntlUniversal] readSystemConfig error",
+                filePath,
+                e
+            );
         }
         if (systemConfigData !== undefined) {
             systemConfigData = JSON.parse(systemConfigData);
@@ -144,7 +149,7 @@ const ElectronIntlUniversal = {
             if (locale === undefined) {
                 locale = "en";
             }
-            systemConfigData = { lang: locale };
+            systemConfigData = { lang: locale, splitSign: ":" };
         }
         return systemConfigData;
     },

src/components/SystemConfig/index.js

@@ -88,7 +88,7 @@ class SystemConfig extends React.Component {
                             <Select
                                 key={this.state.config.lang}
                                 defaultValue={this.state.config.lang}
-                                style={{ width: 200 }}
+                                style={{ width: 300 }}
                                 onChange={this.handleLangChange.bind(this)}
                             >
                                 {options}
@@ -98,16 +98,15 @@ class SystemConfig extends React.Component {
                             {intl.get("SystemConfig.tree.split")}
                         </Col>
                         <Col span={18}>
-                            <Tooltip title="Will use the 'keys' command">
+                            <Tooltip title="When you set this value, the keys will be displayed in the form of a directory.">
                                 <Input
-                                    style={{ width: 200 }}
+                                    style={{ width: 300 }}
                                     placeholder="Input Delimiter"
                                     defaultValue={this.state.config.splitSign}
                                     value={this.state.config.splitSign}
                                     onChange={this.handleSplitSignChange}
-                                />{" "}
+                                />
                             </Tooltip>
-                            {/* , */}
                         </Col>
                     </Row>
                 </Modal>

src/pages/HostKeyTree/index.js

@@ -1,6 +1,5 @@
 import React, { Component } from "react";
 import {
-    Space,
     Input,
     Button,
     Modal,
@@ -10,6 +9,8 @@ import {
     Tree,
     Dropdown,
     Menu,
+    Row,
+    Col,
 } from "antd";
 import { DeleteTwoTone } from "@ant-design/icons";
 import { message } from "antd";
@@ -50,7 +51,7 @@ class HostKeyTree extends Component {
      *
      * @memberof HostKeyTree
      */
-    splitSign = ":";
+    splitSign = "";
     /**
      * 选中的key
      *
@@ -330,7 +331,7 @@ class HostKeyTree extends Component {
                         }
                     );
                 }
-                this.searchKey(this.searchInput.current.input.value);
+                this.searchKey(this.searchInput.current.input.state.value);
             }
         });
     };
@@ -414,7 +415,7 @@ class HostKeyTree extends Component {
                             }
                         );
                     }
-                    this.searchKey(this.searchInput.current.input.value);
+                    this.searchKey(this.searchInput.current.input.state.value);
                 }
             },
             (err) => {
@@ -456,39 +457,50 @@ class HostKeyTree extends Component {
     render() {
         return (
             <div>
-                <Space size="small" direction="vertical" style={{width:"100%"}}>
-                    <Button block onClick={this.openCreateKeyMadal.bind(this)}>
-                        {intl.get("HostKey.create.key")}
-                    </Button>
-                    <Tooltip
-                        placement="right"
-                        title={intl.get("common.search.tooltip.limit")}
-                    >
-                        <Search
-                            ref={this.searchInput}
-                            onSearch={this.searchKey.bind(this)}
-                            enterButton={
-                                <Button icon={<SearchOutlined />}></Button>
-                            }
-                            disabled={this.state.searchDisable}
-                        />
-                    </Tooltip>
-                    <Dropdown
-                        overlay={this.showTreeRightClickMenu.bind(this)}
-                        trigger={["contextMenu"]}
-                    >
-                        <div>
-                            <DirectoryTree
-                                treeData={this.state.treeData}
-                                onSelect={this.onDirectoryTreeSelect.bind(this)}
-                                onDoubleClick={this.handleDoubleClick.bind(
-                                    this
-                                )}
-                                height={750}
-                            ></DirectoryTree>
-                        </div>
-                    </Dropdown>
-                </Space>
+                <Row gutter={[16, 6]}>
+                    <Col span={24}>
+                        <Button
+                            block
+                            onClick={this.openCreateKeyMadal.bind(this)}
+                        >
+                            {intl.get("HostKey.create.key")}
+                        </Button>
+                    </Col>
+                    <Col span={24}>
+                        <Tooltip
+                            placement="right"
+                            title={intl.get("common.search.tooltip.limit")}
+                        >
+                            <Search
+                                ref={this.searchInput}
+                                onSearch={this.searchKey.bind(this)}
+                                enterButton={
+                                    <Button icon={<SearchOutlined />}></Button>
+                                }
+                                disabled={this.state.searchDisable}
+                            />
+                        </Tooltip>
+                    </Col>
+                    <Col span={24}>
+                        <Dropdown
+                            overlay={this.showTreeRightClickMenu.bind(this)}
+                            trigger={["contextMenu"]}
+                        >
+                            <div>
+                                <DirectoryTree
+                                    treeData={this.state.treeData}
+                                    onSelect={this.onDirectoryTreeSelect.bind(
+                                        this
+                                    )}
+                                    onDoubleClick={this.handleDoubleClick.bind(
+                                        this
+                                    )}
+                                    height={750}
+                                ></DirectoryTree>
+                            </div>
+                        </Dropdown>
+                    </Col>
+                </Row>
                 <div>
                     <Modal
                         title={intl.get("HostKey.create.key")}

src/services/RedisService.js

@@ -95,7 +95,6 @@ export default class RedisService {
      */
     static redisEvent(node, dispatch, callback, redis) {
         redis.once("connect", function () {
-            Log.info("[cmd=RedisService] connectRedis connect.", node);
             RedisService.dispatchSuccess(node, redis, dispatch);
             message.success(
                 intl.get("RedisService.info.connection.established.success")

src/utils/LocaleUtils.js

@@ -119,7 +119,8 @@ export default class LocaleUtils {
             if (locale === undefined) {
                 locale = "en";
             }
-            systemConfigData = { lang: locale, splitSign: "" };
+            // splitSign 默认设置为 :
+            systemConfigData = { lang: locale, splitSign: ":" };
             this.saveSystemConfig(systemConfigData);
         }
         return systemConfigData;