refact(data): getValues from storage. add unit test

ep1so · Jul 15, 2021 · 1d8da4a · 1d8da4a
1 parent 23548b8
commit 1d8da4a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 13 deletions.
diff --git a/src/data/DataStorage.ts b/src/data/DataStorage.ts
@@ -447,6 +447,31 @@ class DataStorage {
         return dimStore ? dimStore[this.getRawIndex(idx)] : NaN;
     }
 
+    getValues(idx: number): ParsedValue[];
+    getValues(dimensions: readonly DimensionIndex[], idx?: number): ParsedValue[]
+    getValues(dimensions: readonly DimensionIndex[] | number, idx?: number): ParsedValue[] {
+        const values = [];
+        let dimArr: DimensionIndex[] = [];
+        if (idx == null) {
+            idx = dimensions as number;
+            // TODO get all from store?
+            dimensions = [];
+            // All dimensions
+            for (let i = 0; i < this._dimensions.length; i++) {
+                dimArr.push(i);
+            }
+        }
+        else {
+            dimArr = dimensions as DimensionIndex[];
+        }
+
+        for (let i = 0, len = dimArr.length; i < len; i++) {
+            values.push(this.get(dimArr[i], idx));
+        }
+
+        return values;
+    }
+
     /**
      * @param dim concrete dim
      */

diff --git a/src/data/SeriesData.ts b/src/data/SeriesData.ts
@@ -656,18 +656,10 @@ class SeriesData<
     getValues(idx: number): ParsedValue[];
     getValues(dimensions: readonly DimensionName[], idx: number): ParsedValue[];
     getValues(dimensions: readonly DimensionName[] | number, idx?: number): ParsedValue[] {
-        const values = [];
-        if (!zrUtil.isArray(dimensions)) {
-            idx = dimensions as number;
-            // TODO get all from store?
-            dimensions = this.dimensions;
-        }
-
-        for (let i = 0, len = dimensions.length; i < len; i++) {
-            values.push(this.get(dimensions[i], idx));
-        }
-
-        return values;
+        const store = this._store;
+        return zrUtil.isArray(dimensions)
+            ? store.getValues(map(dimensions, dim => this._getStoreDimIndex(dim)), idx)
+            : store.getValues(dimensions as number);
     }
 
     /**

diff --git a/src/data/helper/sourceManager.ts b/src/data/helper/sourceManager.ts
@@ -369,7 +369,7 @@ export class SourceManager {
      */
     getDataStorage(): DataStorage | undefined {
         if (__DEV__) {
-            assert(isSeries(this._sourceHost), 'Can only call getDataStorage on series source manager.')
+            assert(isSeries(this._sourceHost), 'Can only call getDataStorage on series source manager.');
         }
         const source = this.getSource(0);
         const dimensionsDefine = source.dimensionsDefine;