@orbcharts/plugins-basic 3.0.0-alpha.52 → 3.0.0-alpha.54

package/dist/src/multiGrid/defaults.d.ts

@@ -1,4 +1,4 @@
-import { MultiGridLegendParams, MultiBarsParams, MultiBarStackParams, MultiBarsTriangleParams, MultiLinesParams, MultiLineAreasParams, MultiDotsParams, MultiGroupAxisParams, MultiValueAxisParams, MultiValueStackAxisParams, OverlappingValueAxesParams } from './types';
+import { MultiGridLegendParams, MultiBarsParams, MultiBarStackParams, MultiBarsTriangleParams, MultiLinesParams, MultiLineAreasParams, MultiDotsParams, MultiGroupAxisParams, MultiValueAxisParams, MultiValueStackAxisParams, OverlappingValueAxesParams, OverlappingValueStackAxesParams } from './types';
 
 export declare const DEFAULT_MULTI_GRID_LEGEND_PARAMS: MultiGridLegendParams;
 export declare const DEFAULT_MULTI_GROUP_AXIS_PARAMS: MultiGroupAxisParams;
@@ -11,3 +11,4 @@ export declare const DEFAULT_MULTI_LINES_PARAMS: MultiLinesParams;
 export declare const DEFAULT_MULTI_LINE_AREAS_PARAMS: MultiLineAreasParams;
 export declare const DEFAULT_MULTI_DOTS_PARAMS: MultiDotsParams;
 export declare const DEFAULT_OVERLAPPING_VALUE_AXES_PARAMS: OverlappingValueAxesParams;
+export declare const DEFAULT_OVERLAPPING_VALUE_STACK_AXES_PARAMS: OverlappingValueStackAxesParams;

package/dist/src/multiGrid/multiGridObservables.d.ts

@@ -2,7 +2,7 @@ import { Observable } from 'rxjs';
 import { ContextObserverMultiGrid, ContextObserverMultiGridDetail } from '@orbcharts/core';
 
 interface MultiGridPluginParams {
-    gridIndexes: number[];
+    gridIndexes: number[] | 'all';
 }
 export declare const multiGridPluginDetailObservables: (observer: ContextObserverMultiGrid<MultiGridPluginParams>) => Observable<ContextObserverMultiGridDetail[]>;
 export {};

package/dist/src/multiGrid/plugins/OverlappingValueStackAxes.d.ts

@@ -1 +1 @@
-export declare const OverlappingValueStackAxes: import('@orbcharts/core').PluginConstructor<"multiGrid", string, import('..').OverlappingValueAxesParams>;
+export declare const OverlappingValueStackAxes: import('@orbcharts/core').PluginConstructor<"multiGrid", string, import('..').OverlappingValueStackAxesParams>;

package/dist/src/multiGrid/types.d.ts

@@ -26,34 +26,36 @@ export interface MultiGridLegendParams {
     textColorType: ColorType;
 }
 export interface MultiGroupAxisParams extends BaseGroupAxisParams {
-    gridIndexes: number[];
+    gridIndexes: number[] | 'all';
 }
 export interface MultiValueAxisParams extends BaseValueAxisParams {
-    gridIndexes: number[];
+    gridIndexes: number[] | 'all';
 }
 export interface MultiValueStackAxisParams extends BaseValueAxisParams {
-    gridIndexes: number[];
+    gridIndexes: number[] | 'all';
 }
 export interface MultiBarsParams extends BaseBarsParams {
-    gridIndexes: number[];
+    gridIndexes: number[] | 'all';
 }
 export interface MultiBarStackParams extends BaseBarStackParams {
-    gridIndexes: number[];
+    gridIndexes: number[] | 'all';
 }
 export interface MultiBarsTriangleParams extends BaseBarsTriangleParams {
-    gridIndexes: number[];
+    gridIndexes: number[] | 'all';
 }
 export interface MultiLinesParams extends BaseLinesParams {
-    gridIndexes: number[];
+    gridIndexes: number[] | 'all';
 }
 export interface MultiLineAreasParams extends BaseLineAreasParams {
-    gridIndexes: number[];
+    gridIndexes: number[] | 'all';
 }
 export interface MultiDotsParams extends BaseDotsParams {
-    gridIndexes: number[];
+    gridIndexes: number[] | 'all';
 }
 export interface OverlappingValueAxesParams {
     firstAxis: BaseValueAxisParams;
     secondAxis: BaseValueAxisParams;
     gridIndexes: [number, number];
 }
+export interface OverlappingValueStackAxesParams extends OverlappingValueAxesParams {
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbcharts/plugins-basic",
-  "version": "3.0.0-alpha.52",
+  "version": "3.0.0-alpha.54",
   "description": "plugins for OrbCharts",
   "author": "Blue Planet Inc.",
   "license": "Apache-2.0",
@@ -35,7 +35,7 @@
     "vite-plugin-dts": "^3.7.3"
   },
   "dependencies": {
-    "@orbcharts/core": "^3.0.0-alpha.48",
+    "@orbcharts/core": "^3.0.0-alpha.50",
     "d3": "^7.8.5",
     "rxjs": "^7.8.1"
   }

package/src/multiGrid/defaults.ts

@@ -9,7 +9,8 @@ import type {
   MultiGroupAxisParams,
   MultiValueAxisParams,
   MultiValueStackAxisParams,
-  OverlappingValueAxesParams
+  OverlappingValueAxesParams,
+  OverlappingValueStackAxesParams
 } from './types'
 
 export const DEFAULT_MULTI_GRID_LEGEND_PARAMS: MultiGridLegendParams = {
@@ -151,3 +152,7 @@ export const DEFAULT_OVERLAPPING_VALUE_AXES_PARAMS: OverlappingValueAxesParams =
   },
   gridIndexes: [0, 1]
 }
+
+export const DEFAULT_OVERLAPPING_VALUE_STACK_AXES_PARAMS: OverlappingValueStackAxesParams = {
+  ...DEFAULT_OVERLAPPING_VALUE_AXES_PARAMS
+}

package/src/multiGrid/multiGridObservables.ts

@@ -19,7 +19,7 @@ import type {
 
 // 可設定多個gridIndex的params
 interface MultiGridPluginParams {
-  gridIndexes: number[]
+  gridIndexes: number[] | 'all'
 }
 
 // 對應grid資料的plugin所需Observable（必須有gridIndexes）
@@ -35,6 +35,11 @@ export const multiGridPluginDetailObservables = (observer: ContextObserverMultiG
     gridIndexes: gridIndexes$,
   }).pipe(
     map(data => {
+      // 對應所有grid
+      if (data.gridIndexes === 'all') {
+        return data.multiGridEachDetail
+      }
+      // 自訂對應grid
       return data.gridIndexes.map(gridIndex => {
         return data.multiGridEachDetail[gridIndex] ?? data.multiGridEachDetail[0]
       })

package/src/multiGrid/plugins/OverlappingValueStackAxes.ts

@@ -13,7 +13,7 @@ import {
 import type { ContextObserverMultiGrid, DataFormatterGrid, DataFormatterTypeMap, Layout } from '@orbcharts/core'
 import {
   defineMultiGridPlugin } from '@orbcharts/core'
-import { DEFAULT_OVERLAPPING_VALUE_AXES_PARAMS } from '../defaults'
+import { DEFAULT_OVERLAPPING_VALUE_STACK_AXES_PARAMS } from '../defaults'
 import { createBaseValueAxis } from '../../base/BaseValueAxis'
 import { multiGridPluginDetailObservables } from '../multiGridObservables'
 import { getClassName, getUniID } from '../../utils/orbchartsUtils'
@@ -24,7 +24,7 @@ const pluginName = 'OverlappingValueStackAxes'
 const gridClassName = getClassName(pluginName, 'grid')
 
 // 第一個圖軸使用堆疊的資料，第二個圖軸使用原始資料
-export const OverlappingValueStackAxes = defineMultiGridPlugin(pluginName, DEFAULT_OVERLAPPING_VALUE_AXES_PARAMS)(({ selection, name, subject, observer }) => {
+export const OverlappingValueStackAxes = defineMultiGridPlugin(pluginName, DEFAULT_OVERLAPPING_VALUE_STACK_AXES_PARAMS)(({ selection, name, subject, observer }) => {
   const destroy$ = new Subject()
 
   const unsubscribeFnArr: (() => void)[] = []

package/src/multiGrid/types.ts

@@ -29,39 +29,39 @@ export interface MultiGridLegendParams {
 }
 
 export interface MultiGroupAxisParams extends BaseGroupAxisParams {
-  gridIndexes: number[]
+  gridIndexes: number[] | 'all'
 }
 
 export interface MultiValueAxisParams extends BaseValueAxisParams {
-  gridIndexes: number[]
+  gridIndexes: number[] | 'all'
 }
 
 export interface MultiValueStackAxisParams extends BaseValueAxisParams {
-  gridIndexes: number[]
+  gridIndexes: number[] | 'all'
 }
 
 export interface MultiBarsParams extends BaseBarsParams {
-  gridIndexes: number[]
+  gridIndexes: number[] | 'all'
 }
 
 export interface MultiBarStackParams extends BaseBarStackParams {
-  gridIndexes: number[]
+  gridIndexes: number[] | 'all'
 }
 
 export interface MultiBarsTriangleParams extends BaseBarsTriangleParams {
-  gridIndexes: number[]
+  gridIndexes: number[] | 'all'
 }
 
 export interface MultiLinesParams extends BaseLinesParams {
-  gridIndexes: number[]
+  gridIndexes: number[] | 'all'
 }
 
 export interface MultiLineAreasParams extends BaseLineAreasParams {
-  gridIndexes: number[]
+  gridIndexes: number[] | 'all'
 }
 
 export interface MultiDotsParams extends BaseDotsParams {
-  gridIndexes: number[]
+  gridIndexes: number[] | 'all'
 }
 
 export interface OverlappingValueAxesParams {
@@ -69,3 +69,5 @@ export interface OverlappingValueAxesParams {
   secondAxis: BaseValueAxisParams
   gridIndexes: [number, number]
 }
+
+export interface OverlappingValueStackAxesParams extends OverlappingValueAxesParams {}