@orbcharts/core 3.0.0-beta.5 → 3.0.0-beta.7

package/src/utils/relationshipObservables.ts

@@ -0,0 +1,85 @@
+import {
+  combineLatest,
+  distinctUntilChanged,
+  filter,
+  map,
+  merge,
+  takeUntil,
+  shareReplay,
+  switchMap,
+  Subject,
+  Observable } from 'rxjs'
+import type {
+  ChartParams,
+  ComputedDataRelationship,
+  ComputedDataTypeMap,
+  ComputedNode,
+  ComputedEdge,
+  DataFormatterTree } from '../../lib/core-types'
+
+
+export const categoryLabelsObservable = (
+  CategoryNodeMap$: Observable<Map<string, ComputedNode[]>>,
+  CategoryEdgeMap$: Observable<Map<string, ComputedEdge[]>>
+): Observable<string[]> => {
+  return combineLatest({
+    CategoryNodeMap: CategoryNodeMap$,
+    CategoryEdgeMap: CategoryEdgeMap$
+  }).pipe(
+    switchMap(async d => d),
+    map(data => {
+      return [...Array.from(data.CategoryNodeMap.keys()), ...Array.from(data.CategoryEdgeMap.keys())]
+    }),
+    distinctUntilChanged((a, b) => {
+      return JSON.stringify(a).length === JSON.stringify(b).length
+    }),
+  )
+}
+
+export const NodeMapObservable = (computedData$: Observable<ComputedDataRelationship>) => {
+  return computedData$.pipe(
+    map(data => {
+      const nodeMap = new Map<string, ComputedNode>()
+      data.nodes.forEach(node => {
+        nodeMap.set(node.id, node)
+      })
+      return nodeMap
+    }),
+  )
+}
+
+export const EdgeMapObservable = (computedData$: Observable<ComputedDataRelationship>) => {
+  return computedData$.pipe(
+    map(data => {
+      const edgeMap = new Map<string, ComputedEdge>()
+      data.edges.forEach(edge => {
+        edgeMap.set(edge.id, edge)
+      })
+      return edgeMap
+    }),
+  )
+}
+
+// 所有可見的節點
+export const relationshipVisibleComputedDataObservable = ({ computedData$, NodeMap$ }: {
+  computedData$: Observable<ComputedDataRelationship>
+  NodeMap$: Observable<Map<string, ComputedNode>>
+}) => {
+  return combineLatest({
+    computedData: computedData$,
+    NodeMap: NodeMap$
+  }).pipe(
+    switchMap(async d => d),
+    map(data => {
+      return {
+        nodes: data.computedData.nodes.filter(node => node.visible),
+        edges: data.computedData.edges
+          .filter(edge => edge.visible)
+          // 依照節點是否存在篩選
+          .filter(edge => {
+            return data.NodeMap.has(edge.startNode.id) && data.NodeMap.has(edge.endNode.id)
+          })
+      }
+    })
+  )
+}

package/src/utils/seriesObservables.ts

@@ -1,176 +1,176 @@
-import {
-  combineLatest,
-  distinctUntilChanged,
-  filter,
-  map,
-  merge,
-  takeUntil,
-  shareReplay,
-  switchMap,
-  Subject,
-  Observable } from 'rxjs'
-import type {
-  ChartParams,
-  ComputedDatumSeries,
-  ComputedDataTypeMap,
-  DataFormatterTypeMap,
-  ContainerPosition,
-  Layout } from '../../lib/core-types'
-import { calcSeriesContainerLayout } from './orbchartsUtils'
-
-export const separateSeriesObservable = ({ fullDataFormatter$ }: { fullDataFormatter$: Observable<DataFormatterTypeMap<'series'>> }) => {
-  return fullDataFormatter$.pipe(
-    map(data => data.separateSeries),
-    distinctUntilChanged(),
-  )
-}
-
-export const seriesLabelsObservable = ({ computedData$ }: { computedData$: Observable<ComputedDataTypeMap<'series'>> }) => {
-  return computedData$.pipe(
-    map(data => {
-      return data
-        .filter(series => series.length)
-        .map(series => {
-          return series[0].seriesLabel
-        })
-    }),
-    distinctUntilChanged((a, b) => {
-      return JSON.stringify(a).length === JSON.stringify(b).length
-    }),
-  )
-}
-
-export const seriesVisibleComputedDataObservable = ({ computedData$ }: { computedData$: Observable<ComputedDataTypeMap<'series'>> }) => {
-  return computedData$.pipe(
-    map(data => {
-      return data.map(series => {
-        return series.filter(datum => datum.visible != false)
-      })
-    })
-  )
-}
-
-export const seriesComputedLayoutDataObservable = ({ computedData$, fullDataFormatter$ }: {
-  computedData$: Observable<ComputedDataTypeMap<'series'>>,
-  fullDataFormatter$: Observable<DataFormatterTypeMap<'series'>>
-}) => {
-  return combineLatest({
-    computedData: computedData$,
-    fullDataFormatter: fullDataFormatter$
-  }).pipe(
-    switchMap(async (d) => d),
-    map(data => {
-      const sumData: ComputedDatumSeries[][] = data.fullDataFormatter.sumSeries == true
-        ? data.computedData.map(d => {
-            return [
-              // 加總為一筆資料
-              d.reduce((acc, current) => {
-                if (acc == null) {
-                  return current // 取得第一筆資料
-                }
-                acc.value = acc.value + current.value
-                return acc
-              }, null)
-            ]
-          })
-        : data.computedData
-      
-      return data.fullDataFormatter.separateSeries == true
-        // 有拆分的話每個series為一組
-        ? sumData
-          .map(series => {
-            return series.sort((a, b) => a.seq - b.seq)
-          })
-        // 無拆分的話所有資料為一組
-        : [
-          sumData
-            .flat()
-            .sort((a, b) => a.seq - b.seq)
-        ]
-    })
-  )
-}
-
-
-// 所有container位置（對應series）
-export const seriesContainerPositionObservable = ({ computedData$, fullDataFormatter$, layout$ }: {
-  computedData$: Observable<ComputedDataTypeMap<'series'>>
-  fullDataFormatter$: Observable<DataFormatterTypeMap<'series'>>
-  layout$: Observable<Layout>
-}): Observable<ContainerPosition[]> => {
-
-  const gridContainerPosition$ = combineLatest({
-    computedData: computedData$,
-    fullDataFormatter: fullDataFormatter$,
-    layout: layout$,
-  }).pipe(
-    switchMap(async (d) => d),
-    map(data => {
-      
-      if (data.fullDataFormatter.separateSeries) {
-        // -- 依slotIndexes計算 --
-        return calcSeriesContainerLayout(data.layout, data.fullDataFormatter.container, data.computedData.length)
-        // return data.computedData.map((seriesData, seriesIndex) => {
-        //   const columnIndex = seriesIndex % data.fullDataFormatter.container.columnAmount
-        //   const rowIndex = Math.floor(seriesIndex / data.fullDataFormatter.container.columnAmount)
-        //   const { startX, startY, centerX, centerY, width, height } = calcContainerPosition(data.layout, data.fullDataFormatter.container, rowIndex, columnIndex)
-        //   return {
-        //     slotIndex: seriesIndex,
-        //     rowIndex,
-        //     columnIndex,
-        //     startX,
-        //     startY,
-        //     centerX,
-        //     centerY,
-        //     width,
-        //     height,
-        //   }
-        // })
-      } else {
-        // -- 無拆分 --
-        return calcSeriesContainerLayout(data.layout, data.fullDataFormatter.container, 1)
-        // const columnIndex = 0
-        // const rowIndex = 0
-        // return data.computedData.map((seriesData, seriesIndex) => {
-        //   const { startX, startY, centerX, centerY, width, height } = calcContainerPosition(data.layout, data.fullDataFormatter.container, rowIndex, columnIndex)
-        //   return {
-        //     slotIndex: 0,
-        //     rowIndex,
-        //     columnIndex,
-        //     startX,
-        //     startY,
-        //     centerX,
-        //     centerY,
-        //     width,
-        //     height,
-        //   }
-        // })
-      }
-    })
-  )
-
-  return gridContainerPosition$
-}
-
-export const seriesContainerPositionMapObservable = ({ seriesContainerPosition$, seriesLabels$, separateSeries$ }: {
-  seriesContainerPosition$: Observable<ContainerPosition[]>
-  seriesLabels$: Observable<string[]>
-  separateSeries$: Observable<boolean>
-}) => {
-  return combineLatest({
-    seriesContainerPosition: seriesContainerPosition$,
-    seriesLabels: seriesLabels$,
-    separateSeries: separateSeries$,
-  }).pipe(
-    switchMap(async (d) => d),
-    map(data => {
-      return data.separateSeries
-        ? new Map<string, ContainerPosition>(data.seriesLabels.map((seriesLabel, seriesIndex) => {
-          return [seriesLabel, data.seriesContainerPosition[seriesIndex] ?? data.seriesContainerPosition[0]]
-        }))
-        : new Map<string, ContainerPosition>(data.seriesLabels.map((seriesLabel, seriesIndex) => {
-          return [seriesLabel, data.seriesContainerPosition[0]]
-        }))
-    })
-  )
+import {
+  combineLatest,
+  distinctUntilChanged,
+  filter,
+  map,
+  merge,
+  takeUntil,
+  shareReplay,
+  switchMap,
+  Subject,
+  Observable } from 'rxjs'
+import type {
+  ChartParams,
+  ComputedDatumSeries,
+  ComputedDataTypeMap,
+  DataFormatterTypeMap,
+  ContainerPosition,
+  Layout } from '../../lib/core-types'
+import { calcSeriesContainerLayout } from './orbchartsUtils'
+
+export const separateSeriesObservable = ({ fullDataFormatter$ }: { fullDataFormatter$: Observable<DataFormatterTypeMap<'series'>> }) => {
+  return fullDataFormatter$.pipe(
+    map(data => data.separateSeries),
+    distinctUntilChanged(),
+  )
+}
+
+export const seriesLabelsObservable = ({ computedData$ }: { computedData$: Observable<ComputedDataTypeMap<'series'>> }) => {
+  return computedData$.pipe(
+    map(data => {
+      return data
+        .filter(series => series.length)
+        .map(series => {
+          return series[0].seriesLabel
+        })
+    }),
+    distinctUntilChanged((a, b) => {
+      return JSON.stringify(a).length === JSON.stringify(b).length
+    }),
+  )
+}
+
+export const seriesVisibleComputedDataObservable = ({ computedData$ }: { computedData$: Observable<ComputedDataTypeMap<'series'>> }) => {
+  return computedData$.pipe(
+    map(data => {
+      return data.map(series => {
+        return series.filter(datum => datum.visible != false)
+      })
+    })
+  )
+}
+
+export const seriesComputedLayoutDataObservable = ({ computedData$, fullDataFormatter$ }: {
+  computedData$: Observable<ComputedDataTypeMap<'series'>>,
+  fullDataFormatter$: Observable<DataFormatterTypeMap<'series'>>
+}) => {
+  return combineLatest({
+    computedData: computedData$,
+    fullDataFormatter: fullDataFormatter$
+  }).pipe(
+    switchMap(async (d) => d),
+    map(data => {
+      const sumData: ComputedDatumSeries[][] = data.fullDataFormatter.sumSeries == true
+        ? data.computedData.map(d => {
+            return [
+              // 加總為一筆資料
+              d.reduce((acc, current) => {
+                if (acc == null) {
+                  return current // 取得第一筆資料
+                }
+                acc.value = acc.value + current.value
+                return acc
+              }, null)
+            ]
+          })
+        : data.computedData
+      
+      return data.fullDataFormatter.separateSeries == true
+        // 有拆分的話每個series為一組
+        ? sumData
+          .map(series => {
+            return series.sort((a, b) => a.seq - b.seq)
+          })
+        // 無拆分的話所有資料為一組
+        : [
+          sumData
+            .flat()
+            .sort((a, b) => a.seq - b.seq)
+        ]
+    })
+  )
+}
+
+
+// 所有container位置（對應series）
+export const seriesContainerPositionObservable = ({ computedData$, fullDataFormatter$, layout$ }: {
+  computedData$: Observable<ComputedDataTypeMap<'series'>>
+  fullDataFormatter$: Observable<DataFormatterTypeMap<'series'>>
+  layout$: Observable<Layout>
+}): Observable<ContainerPosition[]> => {
+
+  const gridContainerPosition$ = combineLatest({
+    computedData: computedData$,
+    fullDataFormatter: fullDataFormatter$,
+    layout: layout$,
+  }).pipe(
+    switchMap(async (d) => d),
+    map(data => {
+      
+      if (data.fullDataFormatter.separateSeries) {
+        // -- 依slotIndexes計算 --
+        return calcSeriesContainerLayout(data.layout, data.fullDataFormatter.container, data.computedData.length)
+        // return data.computedData.map((seriesData, seriesIndex) => {
+        //   const columnIndex = seriesIndex % data.fullDataFormatter.container.columnAmount
+        //   const rowIndex = Math.floor(seriesIndex / data.fullDataFormatter.container.columnAmount)
+        //   const { startX, startY, centerX, centerY, width, height } = calcContainerPosition(data.layout, data.fullDataFormatter.container, rowIndex, columnIndex)
+        //   return {
+        //     slotIndex: seriesIndex,
+        //     rowIndex,
+        //     columnIndex,
+        //     startX,
+        //     startY,
+        //     centerX,
+        //     centerY,
+        //     width,
+        //     height,
+        //   }
+        // })
+      } else {
+        // -- 無拆分 --
+        return calcSeriesContainerLayout(data.layout, data.fullDataFormatter.container, 1)
+        // const columnIndex = 0
+        // const rowIndex = 0
+        // return data.computedData.map((seriesData, seriesIndex) => {
+        //   const { startX, startY, centerX, centerY, width, height } = calcContainerPosition(data.layout, data.fullDataFormatter.container, rowIndex, columnIndex)
+        //   return {
+        //     slotIndex: 0,
+        //     rowIndex,
+        //     columnIndex,
+        //     startX,
+        //     startY,
+        //     centerX,
+        //     centerY,
+        //     width,
+        //     height,
+        //   }
+        // })
+      }
+    })
+  )
+
+  return gridContainerPosition$
+}
+
+export const seriesContainerPositionMapObservable = ({ seriesContainerPosition$, seriesLabels$, separateSeries$ }: {
+  seriesContainerPosition$: Observable<ContainerPosition[]>
+  seriesLabels$: Observable<string[]>
+  separateSeries$: Observable<boolean>
+}) => {
+  return combineLatest({
+    seriesContainerPosition: seriesContainerPosition$,
+    seriesLabels: seriesLabels$,
+    separateSeries: separateSeries$,
+  }).pipe(
+    switchMap(async (d) => d),
+    map(data => {
+      return data.separateSeries
+        ? new Map<string, ContainerPosition>(data.seriesLabels.map((seriesLabel, seriesIndex) => {
+          return [seriesLabel, data.seriesContainerPosition[seriesIndex] ?? data.seriesContainerPosition[0]]
+        }))
+        : new Map<string, ContainerPosition>(data.seriesLabels.map((seriesLabel, seriesIndex) => {
+          return [seriesLabel, data.seriesContainerPosition[0]]
+        }))
+    })
+  )
 }

package/src/utils/treeObservables.ts

@@ -1,106 +1,106 @@
-import {
-  combineLatest,
-  distinctUntilChanged,
-  filter,
-  map,
-  merge,
-  takeUntil,
-  shareReplay,
-  switchMap,
-  Subject,
-  Observable } from 'rxjs'
-import type {
-  ChartParams,
-  ComputedDataTree,
-  ComputedDataTypeMap,
-  DataFormatterTree } from '../../lib/core-types'
-
-
-// 所有節點list結構
-export const nodeListObservable = ({ computedData$ }: { computedData$: Observable<ComputedDataTree> }) => {
-  return computedData$.pipe(
-    map(data => {
-      function setNodeList (accNodeList: ComputedDataTree[], branch: ComputedDataTree) {
-        accNodeList.push(branch)
-        if (branch.children) {
-          branch.children.forEach(childBranch => {
-            accNodeList = setNodeList(accNodeList, childBranch) // 遞迴子節點
-          })
-        }
-        return accNodeList
-      }
-      return setNodeList([], data)
-    })
-  )
-}
-
-// export const categoryLabelsObservable = ({ nodeList$, fullDataFormatter$ }: {
-//   nodeList$: Observable<ComputedDataTree[]>
-//   fullDataFormatter$: Observable<DataFormatterTree>
-// }) => {
-
-//   const categoryLabels$ = fullDataFormatter$.pipe(
-//     map(d => d.categoryLabels),
-//     distinctUntilChanged((a, b) => {
-//       return JSON.stringify(a).length === JSON.stringify(b).length
-//     }),
-//   )
-
-//   return combineLatest({
-//     nodeList: nodeList$,
-//     categoryLabels: categoryLabels$
-//   }).pipe(
-//     switchMap(async d => d),
-//     map(data => {
-//       const CurrentLabelSet = new Set(data.categoryLabels)
-//       const ExistLabelSet = new Set(
-//         data.nodeList.filter(node => node.visible).map(node => node.categoryLabel)
-//       )
-//       // 加入已存在的label（data.nodeList有，但是dataFormatter.categoryLabels沒有）
-//       Array.from(ExistLabelSet).forEach(label => {
-//         if (!CurrentLabelSet.has(label)) {
-//           CurrentLabelSet.add(label)
-//         }
-//       })
-//       // 移除不存在的label（dataFormatter.categoryLabels有，但是data.nodeList沒有）
-//       Array.from(CurrentLabelSet).forEach(label => {
-//         if (!ExistLabelSet.has(label)) {
-//           ExistLabelSet.delete(label)
-//         }
-//       })
-
-//       return Array.from(CurrentLabelSet)
-//     }),
-//     distinctUntilChanged((a, b) => {
-//       return JSON.stringify(a).length === JSON.stringify(b).length
-//     }),
-//   )
-// }
-
-export const categoryLabelsObservable = (CategoryDataMap$: Observable<Map<string, ComputedDataTree[]>>) => {
-  return CategoryDataMap$.pipe(
-    map(data => {
-      return Array.from(data.keys())
-    }),
-    distinctUntilChanged((a, b) => {
-      return JSON.stringify(a).length === JSON.stringify(b).length
-    }),
-  )
-}
-
-// 所有可見的節點
-export const treeVisibleComputedDataObservable = ({ computedData$ }: { computedData$: Observable<ComputedDataTree> }) => {
-  return computedData$.pipe(
-    map(data => {
-      function filterChildren (accTree: ComputedDataTree) {
-        if (accTree.children) {
-          accTree.children = accTree.children
-            .filter(child => child.visible) // 篩選visible
-            .map(child => filterChildren(child)) // 遞迴子節點
-        }
-        return accTree
-      }
-      return filterChildren(data)
-    })
-  )
+import {
+  combineLatest,
+  distinctUntilChanged,
+  filter,
+  map,
+  merge,
+  takeUntil,
+  shareReplay,
+  switchMap,
+  Subject,
+  Observable } from 'rxjs'
+import type {
+  ChartParams,
+  ComputedDataTree,
+  ComputedDataTypeMap,
+  DataFormatterTree } from '../../lib/core-types'
+
+
+// 所有節點list結構
+export const nodeListObservable = ({ computedData$ }: { computedData$: Observable<ComputedDataTree> }) => {
+  return computedData$.pipe(
+    map(data => {
+      function setNodeList (accNodeList: ComputedDataTree[], branch: ComputedDataTree) {
+        accNodeList.push(branch)
+        if (branch.children) {
+          branch.children.forEach(childBranch => {
+            accNodeList = setNodeList(accNodeList, childBranch) // 遞迴子節點
+          })
+        }
+        return accNodeList
+      }
+      return setNodeList([], data)
+    })
+  )
+}
+
+// export const categoryLabelsObservable = ({ nodeList$, fullDataFormatter$ }: {
+//   nodeList$: Observable<ComputedDataTree[]>
+//   fullDataFormatter$: Observable<DataFormatterTree>
+// }) => {
+
+//   const categoryLabels$ = fullDataFormatter$.pipe(
+//     map(d => d.categoryLabels),
+//     distinctUntilChanged((a, b) => {
+//       return JSON.stringify(a).length === JSON.stringify(b).length
+//     }),
+//   )
+
+//   return combineLatest({
+//     nodeList: nodeList$,
+//     categoryLabels: categoryLabels$
+//   }).pipe(
+//     switchMap(async d => d),
+//     map(data => {
+//       const CurrentLabelSet = new Set(data.categoryLabels)
+//       const ExistLabelSet = new Set(
+//         data.nodeList.filter(node => node.visible).map(node => node.categoryLabel)
+//       )
+//       // 加入已存在的label（data.nodeList有，但是dataFormatter.categoryLabels沒有）
+//       Array.from(ExistLabelSet).forEach(label => {
+//         if (!CurrentLabelSet.has(label)) {
+//           CurrentLabelSet.add(label)
+//         }
+//       })
+//       // 移除不存在的label（dataFormatter.categoryLabels有，但是data.nodeList沒有）
+//       Array.from(CurrentLabelSet).forEach(label => {
+//         if (!ExistLabelSet.has(label)) {
+//           ExistLabelSet.delete(label)
+//         }
+//       })
+
+//       return Array.from(CurrentLabelSet)
+//     }),
+//     distinctUntilChanged((a, b) => {
+//       return JSON.stringify(a).length === JSON.stringify(b).length
+//     }),
+//   )
+// }
+
+export const categoryLabelsObservable = (CategoryDataMap$: Observable<Map<string, ComputedDataTree[]>>) => {
+  return CategoryDataMap$.pipe(
+    map(data => {
+      return Array.from(data.keys())
+    }),
+    distinctUntilChanged((a, b) => {
+      return JSON.stringify(a).length === JSON.stringify(b).length
+    }),
+  )
+}
+
+// 所有可見的節點
+export const treeVisibleComputedDataObservable = ({ computedData$ }: { computedData$: Observable<ComputedDataTree> }) => {
+  return computedData$.pipe(
+    map(data => {
+      function filterChildren (accTree: ComputedDataTree) {
+        if (accTree.children) {
+          accTree.children = accTree.children
+            .filter(child => child.visible) // 篩選visible
+            .map(child => filterChildren(child)) // 遞迴子節點
+        }
+        return accTree
+      }
+      return filterChildren(data)
+    })
+  )
 }