Merge branch 'bugfix/redis_folder_tree'

Author: jiangwu10057

src/model/redis/folderNode.ts

@@ -8,30 +8,28 @@ import RedisBaseNode from "./redisBaseNode";
 export class FolderNode extends RedisBaseNode {
     contextValue = ModelType.REDIS_FOLDER;
     readonly iconPath = path.join(Constants.RES_PATH, `image/folder.svg`);
-    constructor(readonly label: string, readonly prefix: string, readonly childens: string[], readonly parent: Node) {
+    constructor(readonly label: string, readonly childens: string[], readonly parent: Node) {
         super(label)
         this.init(parent)
         this.pattern = label
+        this.level = parent.hasOwnProperty('level') ? parent.level + 1 : 0
     }
 
     public async getChildren() {
-        return FolderNode.buildChilds(this, `${this.prefix}${this.label}`, this.childens)
+        return FolderNode.buildChilds(this, this.childens)
     }
 
-    public static buildChilds(parent: RedisBaseNode, parentPrefix: string, keys: string[]) {
-        if (parentPrefix) {
-            parentPrefix = parentPrefix + ":"
-        }
+    public static buildChilds(parent: RedisBaseNode, keys: string[]) {
         const prefixMap: { [key: string]: string[] } = {}
         for (const key of keys.sort()) {
-            let prefix = key.replace(parentPrefix, "").split(":")[0];
+            let prefix = key.split(":")[parent.level];
             if (!prefixMap[prefix]) prefixMap[prefix] = []
             prefixMap[prefix].push(key)
         }
 
         return Object.keys(prefixMap).map((prefix: string) => {
             if (prefixMap[prefix].length > 1) {
-                return new FolderNode(prefix, parentPrefix, prefixMap[prefix], parent)
+                return new FolderNode(prefix, prefixMap[prefix], parent)
             } else {
                 return new KeyNode(prefixMap[prefix][0], prefix, parent)
             }

src/model/redis/redisBaseNode.ts

@@ -5,6 +5,8 @@ import { RedisClient } from "redis";
 
 export default abstract class RedisBaseNode extends Node {
     pattern = "*";
+    level = 0;
+
     abstract getChildren(): Promise<Node[]>;
 
     public async getClient(): Promise<RedisClient> {

src/model/redis/redisConnectionNode.ts

@@ -28,7 +28,7 @@ export class RedisConnectionNode extends RedisBaseNode {
     async getChildren(): Promise<RedisBaseNode[]> {
         const client = await this.getClient()
         let keys: string[] = await promisify(client.keys).bind(client)(this.pattern);
-        return FolderNode.buildChilds(this, "", keys)
+        return FolderNode.buildChilds(this, keys)
     }
     async openTerminal(): Promise<any> {
         const client = await this.getClient()