@orbcharts/plugins-basic 3.0.0-alpha.44 → 3.0.0-alpha.45

package/src/grid/plugins/ValueStackAxis.ts

@@ -1,71 +1,80 @@
-import {
-  takeUntil,
-  map,
-  switchMap,
-  iif,
-  Subject } from 'rxjs'
-import {
-  defineGridPlugin } from '@orbcharts/core'
-import { DEFAULT_VALUE_STACK_AXIS_PARAMS } from '../defaults'
-
-import { createBaseValueAxis } from '../../base/BaseValueAxis'
-
-const pluginName = 'ValueStackAxis'
-
-export const ValueStackAxis = defineGridPlugin(pluginName, DEFAULT_VALUE_STACK_AXIS_PARAMS)(({ selection, name, observer, subject }) => {
-  
-  const destroy$ = new Subject()
-
-  // 將原本的value全部替換成加總後的value
-  const stackedData$ = observer.computedData$.pipe(
-    takeUntil(destroy$),
-    map(data => {
-      // 將同一group的value加總起來
-      const stackedValue = new Array(data[0] ? data[0].length : 0)
-        .fill(null)
-        .map((_, i) => {
-          return data.reduce((prev, current) => {
-            if (current && current[i]) {
-              const currentValue = current[i].value == null || current[i].visible == false
-                ? 0
-                : current[i].value!
-              return prev + currentValue
-            }
-            return prev
-          }, 0)
-        })
-      // 將原本的value全部替換成加總後的value
-      const computedData = data.map((series, seriesIndex) => {
-        return series.map((d, i) => {
-          return {
-            ...d,
-            value: stackedValue[i],
-          }
-        })
-      })
-      return computedData
-    }),
-  )
-
-  const unsubscribeBaseValueAxis = createBaseValueAxis(pluginName, {
-    selection,
-    computedData$: observer.isSeriesPositionSeprate$.pipe(
-      switchMap(isSeriesPositionSeprate => {
-        return iif(() => isSeriesPositionSeprate, observer.computedData$, stackedData$)
-      })
-    ),
-    fullParams$: observer.fullParams$,
-    fullDataFormatter$: observer.fullDataFormatter$,
-    fullChartParams$: observer.fullChartParams$,  
-    gridAxesTransform$: observer.gridAxesTransform$,
-    gridAxesReverseTransform$: observer.gridAxesReverseTransform$,
-    gridAxesSize$: observer.gridAxesSize$,
-    gridContainer$: observer.gridContainer$,
-    isSeriesPositionSeprate$: observer.isSeriesPositionSeprate$,
-  })
-
-  return () => {
-    destroy$.next(undefined)
-    unsubscribeBaseValueAxis()
-  }
+import {
+  takeUntil,
+  map,
+  distinctUntilChanged,
+  shareReplay,
+  switchMap,
+  iif,
+  Subject } from 'rxjs'
+import {
+  defineGridPlugin } from '@orbcharts/core'
+import { DEFAULT_VALUE_STACK_AXIS_PARAMS } from '../defaults'
+
+import { createBaseValueAxis } from '../../base/BaseValueAxis'
+
+const pluginName = 'ValueStackAxis'
+
+export const ValueStackAxis = defineGridPlugin(pluginName, DEFAULT_VALUE_STACK_AXIS_PARAMS)(({ selection, name, observer, subject }) => {
+  
+  const destroy$ = new Subject()
+
+  // 將原本的value全部替換成加總後的value
+  const stackedData$ = observer.computedData$.pipe(
+    takeUntil(destroy$),
+    map(data => {
+      // 將同一group的value加總起來
+      const stackedValue = new Array(data[0] ? data[0].length : 0)
+        .fill(null)
+        .map((_, i) => {
+          return data.reduce((prev, current) => {
+            if (current && current[i]) {
+              const currentValue = current[i].value == null || current[i].visible == false
+                ? 0
+                : current[i].value!
+              return prev + currentValue
+            }
+            return prev
+          }, 0)
+        })
+      // 將原本的value全部替換成加總後的value
+      const computedData = data.map((series, seriesIndex) => {
+        return series.map((d, i) => {
+          return {
+            ...d,
+            value: stackedValue[i],
+          }
+        })
+      })
+      return computedData
+    }),
+  )
+
+  const isSeriesSeprate$ = observer.fullDataFormatter$.pipe(
+    takeUntil(destroy$),
+    map(d => d.grid.separateSeries),
+    distinctUntilChanged(),
+    shareReplay(1)
+  )
+
+  const unsubscribeBaseValueAxis = createBaseValueAxis(pluginName, {
+    selection,
+    computedData$: isSeriesSeprate$.pipe(
+      switchMap(isSeriesSeprate => {
+        return iif(() => isSeriesSeprate, observer.computedData$, stackedData$)
+      })
+    ),
+    fullParams$: observer.fullParams$,
+    fullDataFormatter$: observer.fullDataFormatter$,
+    fullChartParams$: observer.fullChartParams$,  
+    gridAxesTransform$: observer.gridAxesTransform$,
+    gridAxesReverseTransform$: observer.gridAxesReverseTransform$,
+    gridAxesSize$: observer.gridAxesSize$,
+    gridContainerPosition$: observer.gridContainerPosition$,
+    isSeriesSeprate$,
+  })
+
+  return () => {
+    destroy$.next(undefined)
+    unsubscribeBaseValueAxis()
+  }
 })

package/src/grid/types.ts

@@ -1,121 +1,121 @@
-import type { ColorType } from '@orbcharts/core'
-// import type { BaseLegendParams } from '../base/BaseLegend'
-
-// export type LineType = 'line' | 'area' | 'gradientArea'
-// export type BarType = 'rect' | 'triangle'
-
-export interface LinesParams {
-  lineCurve: string
-  lineWidth: number
-  // labelFn: (d: ComputedDatumSeries) => string
-  // labelPositionFn: (d: ComputedDatumSeries) => 'top' | 'bottom' | 'left' | 'right' | 'center'
-  // labelStyleFn: (d: ComputedDatumSeries) => string
-  // labelFontSizeFn: (d: ComputedDatumSeries) => number
-  // labelColorFn: (d: ComputedDatumSeries) => string
-  // labelPadding: number
-}
-
-export interface LineAreasParams {
-  lineCurve: string
-  linearGradientOpacity: [number, number]
-}
-
-export interface DotsParams {
-  radius: number
-  fillColorType: ColorType
-  strokeColorType: ColorType
-  strokeWidth: number
-  onlyShowHighlighted: boolean
-}
-
-export interface GroupAuxParams {
-  showLine: boolean
-  showLabel: boolean
-  lineDashArray: string
-  lineColorType: ColorType
-  labelColorType: ColorType
-  labelTextColorType: ColorType
-  labelTextFormat: string | ((text: any) => string)
-  labelPadding: number
-}
-
-export interface BarsParams {
-  // barType: BarType
-  barWidth: number
-  barPadding: number
-  barGroupPadding: number // 群組和群組間的間隔
-  barRadius: number | boolean
-}
-
-export interface BarsDivergingParams extends BarsParams {}
-
-export interface BarStackParams {
-  barWidth: number
-  barGroupPadding: number
-  barRadius: number | boolean
-}
-
-export interface BarsTriangleParams {
-  barWidth: number
-  barPadding: number
-  barGroupPadding: number // 群組和群組間的間隔
-  linearGradientOpacity: [number, number]
-}
-
-export interface GroupAxisParams {
-  // xLabel: string
-  // labelAnchor: 'start' | 'end'
-  labelOffset: [number, number]
-  labelColorType: ColorType
-  axisLineVisible: boolean
-  axisLineColorType: ColorType
-  tickFormat: string | ((text: any) => string)
-  tickLineVisible: boolean
-  tickPadding: number
-  tickFullLine: boolean
-  tickFullLineDasharray: string
-  tickColorType: ColorType
-  // axisLineColor: string
-  // axisLabelColor: string
-  tickTextRotate: number
-  tickTextColorType: ColorType
-}
-
-export interface ValueAxisParams {
-  // xLabel: string
-  // labelAnchor: 'start' | 'end'
-  labelOffset: [number, number]
-  labelColorType: ColorType
-  axisLineVisible: boolean
-  axisLineColorType: ColorType
-  ticks: number
-  tickFormat: string | ((text: d3.NumberValue) => string)
-  tickLineVisible: boolean
-  tickPadding: number
-  tickFullLine: boolean
-  tickFullLineDasharray: string
-  tickColorType: ColorType
-  // axisLineColor: string
-  // axisLabelColor: string
-  tickTextRotate: number
-  tickTextColorType: ColorType
-}
-
-export interface ValueStackAxisParams extends ValueAxisParams {}
-
-export interface ScalingAreaParams {
-
-}
-
-export interface GridLegendParams {
-  position: 'top' | 'bottom' | 'left' | 'right'
-  justify: 'start' | 'center' | 'end'
-  padding: number
-  backgroundFill: ColorType
-  backgroundStroke: ColorType
-  gap: number
-  listRectWidth: number
-  listRectHeight: number
-  listRectRadius: number
-  textColorType: ColorType
+import type { ColorType } from '@orbcharts/core'
+// import type { BaseLegendParams } from '../base/BaseLegend'
+
+// export type LineType = 'line' | 'area' | 'gradientArea'
+// export type BarType = 'rect' | 'triangle'
+
+export interface LinesParams {
+  lineCurve: string
+  lineWidth: number
+  // labelFn: (d: ComputedDatumSeries) => string
+  // labelPositionFn: (d: ComputedDatumSeries) => 'top' | 'bottom' | 'left' | 'right' | 'center'
+  // labelStyleFn: (d: ComputedDatumSeries) => string
+  // labelFontSizeFn: (d: ComputedDatumSeries) => number
+  // labelColorFn: (d: ComputedDatumSeries) => string
+  // labelPadding: number
+}
+
+export interface LineAreasParams {
+  lineCurve: string
+  linearGradientOpacity: [number, number]
+}
+
+export interface DotsParams {
+  radius: number
+  fillColorType: ColorType
+  strokeColorType: ColorType
+  strokeWidth: number
+  onlyShowHighlighted: boolean
+}
+
+export interface GroupAuxParams {
+  showLine: boolean
+  showLabel: boolean
+  lineDashArray: string
+  lineColorType: ColorType
+  labelColorType: ColorType
+  labelTextColorType: ColorType
+  labelTextFormat: string | ((text: any) => string)
+  labelPadding: number
+}
+
+export interface BarsParams {
+  // barType: BarType
+  barWidth: number
+  barPadding: number
+  barGroupPadding: number // 群組和群組間的間隔
+  barRadius: number | boolean
+}
+
+export interface BarsDivergingParams extends BarsParams {}
+
+export interface BarStackParams {
+  barWidth: number
+  barGroupPadding: number
+  barRadius: number | boolean
+}
+
+export interface BarsTriangleParams {
+  barWidth: number
+  barPadding: number
+  barGroupPadding: number // 群組和群組間的間隔
+  linearGradientOpacity: [number, number]
+}
+
+export interface GroupAxisParams {
+  // xLabel: string
+  // labelAnchor: 'start' | 'end'
+  labelOffset: [number, number]
+  labelColorType: ColorType
+  axisLineVisible: boolean
+  axisLineColorType: ColorType
+  tickFormat: string | ((text: any) => string)
+  tickLineVisible: boolean
+  tickPadding: number
+  tickFullLine: boolean
+  tickFullLineDasharray: string
+  tickColorType: ColorType
+  // axisLineColor: string
+  // axisLabelColor: string
+  tickTextRotate: number
+  tickTextColorType: ColorType
+}
+
+export interface ValueAxisParams {
+  // xLabel: string
+  // labelAnchor: 'start' | 'end'
+  labelOffset: [number, number]
+  labelColorType: ColorType
+  axisLineVisible: boolean
+  axisLineColorType: ColorType
+  ticks: number
+  tickFormat: string | ((text: d3.NumberValue) => string)
+  tickLineVisible: boolean
+  tickPadding: number
+  tickFullLine: boolean
+  tickFullLineDasharray: string
+  tickColorType: ColorType
+  // axisLineColor: string
+  // axisLabelColor: string
+  tickTextRotate: number
+  tickTextColorType: ColorType
+}
+
+export interface ValueStackAxisParams extends ValueAxisParams {}
+
+export interface ScalingAreaParams {
+
+}
+
+export interface GridLegendParams {
+  position: 'top' | 'bottom' | 'left' | 'right'
+  justify: 'start' | 'center' | 'end'
+  padding: number
+  backgroundFill: ColorType
+  backgroundStroke: ColorType
+  gap: number
+  listRectWidth: number
+  listRectHeight: number
+  listRectRadius: number
+  textColorType: ColorType
 }

package/src/index.ts

@@ -1,10 +1,10 @@
-// export { default as container } from './noneDataPlugins/container'
-// export { default as pie } from './seriesPlugins/pie'
-// export { default as pieEventTexts } from './seriesPlugins/pieEventTexts'
-// export { default as pieLabels } from './seriesPlugins/pieLabels'
-
-export * from './grid'
-export * from './multiGrid'
-export * from './noneData'
-export * from './series'
+// export { default as container } from './noneDataPlugins/container'
+// export { default as pie } from './seriesPlugins/pie'
+// export { default as pieEventTexts } from './seriesPlugins/pieEventTexts'
+// export { default as pieLabels } from './seriesPlugins/pieLabels'
+
+export * from './grid'
+export * from './multiGrid'
+export * from './noneData'
+export * from './series'
 export * from './tree'