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

package/src/tree/computedDataFn.ts

@@ -1,129 +1,129 @@
-import type { DataTree, DataTreeObj, DataTreeDatum, ComputedDataFn, ComputedDataTree } from '../../lib/core-types'
-import { isPlainObject } from '../utils/commonUtils'
-import { seriesColorPredicate, createDefaultCategoryLabel } from '../utils/orbchartsUtils'
-
-export const computedDataFn: ComputedDataFn<'tree'> = (context) => {
-  const { data = [], dataFormatter, chartParams } = context
-
-  const defaultCategoryLabel = createDefaultCategoryLabel()
-
-  // <categoryLabel, categoryIndex>
-  const CategoryIndexMap = new Map<string, number>(
-    dataFormatter.categoryLabels.map((label, index) => [label, index])
-  )
-
-  let computedBranchData: ComputedDataTree = {
-    id: '',
-    index: 0,
-    label: '',
-    description: '',
-    categoryIndex: -1,
-    categoryLabel: '',
-    color: '',
-    visible: true,
-    // tooltipContent: '',
-    data: {},
-    value: 0,
-    level: 0,
-    seq: 0,
-    children: []
-  }
-
-  try {
-    // 建立樹狀結構資料
-    const dataTreeObj: DataTreeObj = (function () {
-      if (isPlainObject(data) === true) {
-        // 原本就是樹狀結構則直接複製
-        // return structuredClone(data) as DataTreeObj
-        return JSON.parse(JSON.stringify(data)) as DataTreeObj
-      } else if (Array.isArray(data) === false) {
-        return {
-          id: ''
-        }
-      }
-      // -- 陣列格式轉物件 --
-      // let rootId = ''
-      let root: DataTreeDatum | undefined = undefined
-      // const DataMap: Map<string, DataTreeDatum> = new Map()
-      const ChildrenMap: Map<string, DataTreeDatum[]> = new Map()
-      ;(data as DataTreeDatum[]).forEach(d => {
-        // DataMap.set(d.id, d)
-
-        if (!d.parent) {
-          // rootId = d.id
-          root = d
-        } else {
-          const children: DataTreeDatum[] = ChildrenMap.get(d.parent) ?? []
-          children.push(d)
-          ChildrenMap.set(d.parent!, children)
-        }
-      })
-
-      const createBranchData = (root: DataTreeDatum): DataTreeObj => {
-        return {
-          id: root.id,
-          label: root.label,
-          data: root.data,
-          // tooltipContent: root.tooltipContent,
-          value: root.value,
-          categoryLabel: root.categoryLabel ?? defaultCategoryLabel,
-          children: (ChildrenMap.get(root.id) ?? []).map(d => {
-            // 遞迴
-            return createBranchData(d)
-          })
-        }
-      }
-      if (root) {
-        return createBranchData(root)
-      } else {
-        return {
-          id: ''
-        }
-      }    
-    })()
-
-    let index = 0
-    
-    const formatBranchData = (branch: DataTreeObj, level: number, seq: number): ComputedDataTree => {
-      const childLayer = level + 1
-      const categoryLabel: string = branch.categoryLabel ?? defaultCategoryLabel
-      if (!CategoryIndexMap.has(categoryLabel)) {
-        CategoryIndexMap.set(categoryLabel, CategoryIndexMap.size)
-      }
-      const categoryIndex = CategoryIndexMap.get(categoryLabel) ?? 0
-
-      const currentIndex = index
-      index++
-      const formattedBranchData: ComputedDataTree = {
-        id: branch.id,
-        index: currentIndex,
-        level,
-        seq,
-        label: branch.label ?? '',
-        description: branch.description ?? '',
-        categoryIndex,
-        categoryLabel,
-        color: seriesColorPredicate(categoryIndex, chartParams),
-        data: branch.data ?? {},
-        // tooltipContent: branch.tooltipContent ? branch.tooltipContent : dataFormatter.tooltipContentFormat(branch, level, seq, context),
-        value: branch.value,
-        visible: true, // 先給預設值
-        children: (branch.children ?? []).map((d, i) => {
-          // 遞迴
-          return formatBranchData(d, childLayer, i)
-        })
-      }
-
-      formattedBranchData.visible = dataFormatter.visibleFilter(formattedBranchData, context)
-
-      return formattedBranchData
-    }
-    computedBranchData = formatBranchData(dataTreeObj, 0, 0)
-  } catch (e) {
-    // console.error(e)
-    throw Error(e)
-  }
-
-  return computedBranchData
-
-}
+import type { DataTree, DataTreeObj, DataTreeDatum, ComputedDataFn, ComputedDataTree } from '../../lib/core-types'
+import { isPlainObject } from '../utils/commonUtils'
+import { seriesColorPredicate, createDefaultCategoryLabel } from '../utils/orbchartsUtils'
+
+export const computedDataFn: ComputedDataFn<'tree'> = (context) => {
+  const { data = [], dataFormatter, chartParams } = context
+
+  const defaultCategoryLabel = createDefaultCategoryLabel()
+
+  // <categoryLabel, categoryIndex>
+  const CategoryIndexMap = new Map<string, number>(
+    dataFormatter.categoryLabels.map((label, index) => [label, index])
+  )
+
+  let computedBranchData: ComputedDataTree = {
+    id: '',
+    index: 0,
+    label: '',
+    description: '',
+    categoryIndex: -1,
+    categoryLabel: '',
+    color: '',
+    visible: true,
+    // tooltipContent: '',
+    data: {},
+    value: 0,
+    level: 0,
+    seq: 0,
+    children: []
+  }
+
+  try {
+    // 建立樹狀結構資料
+    const dataTreeObj: DataTreeObj = (function () {
+      if (isPlainObject(data) === true) {
+        // 原本就是樹狀結構則直接複製
+        // return structuredClone(data) as DataTreeObj
+        return JSON.parse(JSON.stringify(data)) as DataTreeObj
+      } else if (Array.isArray(data) === false) {
+        return {
+          id: ''
+        }
+      }
+      // -- 陣列格式轉物件 --
+      // let rootId = ''
+      let root: DataTreeDatum | undefined = undefined
+      // const DataMap: Map<string, DataTreeDatum> = new Map()
+      const ChildrenMap: Map<string, DataTreeDatum[]> = new Map()
+      ;(data as DataTreeDatum[]).forEach(d => {
+        // DataMap.set(d.id, d)
+
+        if (!d.parent) {
+          // rootId = d.id
+          root = d
+        } else {
+          const children: DataTreeDatum[] = ChildrenMap.get(d.parent) ?? []
+          children.push(d)
+          ChildrenMap.set(d.parent!, children)
+        }
+      })
+
+      const createBranchData = (root: DataTreeDatum): DataTreeObj => {
+        return {
+          id: root.id,
+          label: root.label,
+          data: root.data,
+          // tooltipContent: root.tooltipContent,
+          value: root.value,
+          categoryLabel: root.categoryLabel ?? defaultCategoryLabel,
+          children: (ChildrenMap.get(root.id) ?? []).map(d => {
+            // 遞迴
+            return createBranchData(d)
+          })
+        }
+      }
+      if (root) {
+        return createBranchData(root)
+      } else {
+        return {
+          id: ''
+        }
+      }    
+    })()
+
+    let index = 0
+    
+    const formatBranchData = (branch: DataTreeObj, level: number, seq: number): ComputedDataTree => {
+      const childLayer = level + 1
+      const categoryLabel: string = branch.categoryLabel ?? defaultCategoryLabel
+      if (!CategoryIndexMap.has(categoryLabel)) {
+        CategoryIndexMap.set(categoryLabel, CategoryIndexMap.size)
+      }
+      const categoryIndex = CategoryIndexMap.get(categoryLabel) ?? 0
+
+      const currentIndex = index
+      index++
+      const formattedBranchData: ComputedDataTree = {
+        id: branch.id,
+        index: currentIndex,
+        level,
+        seq,
+        label: branch.label ?? '',
+        description: branch.description ?? '',
+        categoryIndex,
+        categoryLabel,
+        color: seriesColorPredicate(categoryIndex, chartParams),
+        data: branch.data ?? {},
+        // tooltipContent: branch.tooltipContent ? branch.tooltipContent : dataFormatter.tooltipContentFormat(branch, level, seq, context),
+        value: branch.value,
+        visible: true, // 先給預設值
+        children: (branch.children ?? []).map((d, i) => {
+          // 遞迴
+          return formatBranchData(d, childLayer, i)
+        })
+      }
+
+      formattedBranchData.visible = dataFormatter.visibleFilter(formattedBranchData, context)
+
+      return formattedBranchData
+    }
+    computedBranchData = formatBranchData(dataTreeObj, 0, 0)
+  } catch (e) {
+    // console.error(e)
+    throw Error(e)
+  }
+
+  return computedBranchData
+
+}

package/src/tree/contextObserverCallback.ts

@@ -1,58 +1,58 @@
-import { map, shareReplay } from 'rxjs'
-import type { ContextObserverCallback } from '../../lib/core-types'
-import { highlightObservable, categoryDataMapObservable, textSizePxObservable } from '../utils/observables'
-import {
-  nodeListObservable,
-  categoryLabelsObservable,
-  treeVisibleComputedDataObservable
-} from '../utils/treeObservables'
-
-export const contextObserverCallback: ContextObserverCallback<'tree'> = ({ subject, observer }) => {
-
-  const textSizePx$ = textSizePxObservable(observer.fullChartParams$).pipe(
-    shareReplay(1)
-  )
-
-  const nodeList$ = nodeListObservable({
-    computedData$: observer.computedData$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const treeHighlight$ = highlightObservable({
-    datumList$: nodeList$,
-    fullChartParams$: observer.fullChartParams$,
-    event$: subject.event$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const CategoryDataMap$ = categoryDataMapObservable({
-    datumList$: nodeList$
-  }).pipe(
-    shareReplay(1)
-  )
-  
-  const categoryLabels$ = categoryLabelsObservable(CategoryDataMap$).pipe(
-    shareReplay(1)
-  )
-
-  const visibleComputedData$ = treeVisibleComputedDataObservable({
-    computedData$: observer.computedData$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  return {
-    fullParams$: observer.fullParams$,
-    fullChartParams$: observer.fullChartParams$,
-    fullDataFormatter$: observer.fullDataFormatter$,
-    computedData$: observer.computedData$,
-    layout$: observer.layout$,
-    textSizePx$,
-    treeHighlight$,
-    categoryLabels$,
-    CategoryDataMap$,
-    visibleComputedData$
-  }
-}
+import { map, shareReplay } from 'rxjs'
+import type { ContextObserverCallback } from '../../lib/core-types'
+import { highlightObservable, categoryDataMapObservable, textSizePxObservable } from '../utils/observables'
+import {
+  nodeListObservable,
+  categoryLabelsObservable,
+  treeVisibleComputedDataObservable
+} from '../utils/treeObservables'
+
+export const contextObserverCallback: ContextObserverCallback<'tree'> = ({ subject, observer }) => {
+
+  const textSizePx$ = textSizePxObservable(observer.fullChartParams$).pipe(
+    shareReplay(1)
+  )
+
+  const nodeList$ = nodeListObservable({
+    computedData$: observer.computedData$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const treeHighlight$ = highlightObservable({
+    datumList$: nodeList$,
+    fullChartParams$: observer.fullChartParams$,
+    event$: subject.event$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const CategoryDataMap$ = categoryDataMapObservable({
+    datumList$: nodeList$
+  }).pipe(
+    shareReplay(1)
+  )
+  
+  const categoryLabels$ = categoryLabelsObservable(CategoryDataMap$).pipe(
+    shareReplay(1)
+  )
+
+  const visibleComputedData$ = treeVisibleComputedDataObservable({
+    computedData$: observer.computedData$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  return {
+    fullParams$: observer.fullParams$,
+    fullChartParams$: observer.fullChartParams$,
+    fullDataFormatter$: observer.fullDataFormatter$,
+    computedData$: observer.computedData$,
+    layout$: observer.layout$,
+    textSizePx$,
+    treeHighlight$,
+    categoryLabels$,
+    CategoryDataMap$,
+    visibleComputedData$
+  }
+}

package/src/tree/dataFormatterValidator.ts

@@ -1,14 +1,14 @@
-import type { DataFormatterValidator, DataFormatterTypeMap } from '../../lib/core-types'
-import { validateColumns } from '../utils/validator'
-
-export const dataFormatterValidator: DataFormatterValidator<'tree'> = (dataFormatter: DataFormatterTypeMap<'tree'>) => {
-  const result = validateColumns(dataFormatter, {
-    visibleFilter: {
-      toBeTypes: ['Function']
-    },
-    categoryLabels: {
-      toBeTypes: ['string[]']
-    }
-  })
-  return result
+import type { DataFormatterValidator, DataFormatterTypeMap } from '../../lib/core-types'
+import { validateColumns } from '../utils/validator'
+
+export const dataFormatterValidator: DataFormatterValidator<'tree'> = (dataFormatter: DataFormatterTypeMap<'tree'>) => {
+  const result = validateColumns(dataFormatter, {
+    visibleFilter: {
+      toBeTypes: ['Function']
+    },
+    categoryLabels: {
+      toBeTypes: ['string[]']
+    }
+  })
+  return result
 }

package/src/tree/dataValidator.ts

@@ -1,14 +1,14 @@
-import type { DataValidator, DataTypeMap } from '../../lib/core-types'
-import { validateColumns } from '../utils/validator'
-import { isPlainObject } from '../utils'
-
-export const dataValidator: DataValidator<'tree'> = (data: DataTypeMap<'tree'>) => {
-  const result = validateColumns({ data }, {
-    data: {
-      toBe: 'DataTreeObj | DataTreeDatum[]',
-      // 畢免資料量過大檢查不完，不深度檢查
-      test: (value) => isPlainObject(value) && value.id !== undefined
-    }
-  })
-  return result
+import type { DataValidator, DataTypeMap } from '../../lib/core-types'
+import { validateColumns } from '../utils/validator'
+import { isPlainObject } from '../utils'
+
+export const dataValidator: DataValidator<'tree'> = (data: DataTypeMap<'tree'>) => {
+  const result = validateColumns({ data }, {
+    data: {
+      toBe: 'DataTreeObj | DataTreeDatum[]',
+      // 畢免資料量過大檢查不完，不深度檢查
+      test: (value) => isPlainObject(value) && value.id !== undefined
+    }
+  })
+  return result
 }

package/src/utils/commonUtils.ts

@@ -1,55 +1,55 @@
-
-// 是否為原始物件
-export function isPlainObject(variable: any) {
-  return Object.prototype.toString.call(variable) === "[object Object]";
-}
-
-// 是否為function
-export function isFunction(fn: any) {
-  // return !!fn && !fn.nodename && fn.constructor != String && fn.constructor != RegExp && fn.constructor != Array && /function/i.test(fn + "");
-  return Object.prototype.toString.call(fn) === '[object Function]'
-}
-
-// 是否為dom
-export function isDom(obj: any) {
-  return !!(obj && obj.nodeType);
-}
-
-// 將可選的參數和預設值合併
-export function mergeOptionsWithDefault<Options extends { [key: string]: any; }> (options: {[key: string]: any}, defaultOptions: Options): Options {
-  if (isPlainObject(options) === false || isPlainObject(defaultOptions) === false) {
-    return Object.assign({}, defaultOptions)
-  }
-  const mergeObjColumns = (_options: {[key: string]: any}, _defaultOptions: {[key: string]: any}) => {
-    const obj: Options = (Object.assign({}, _defaultOptions) as any)
-    for (let key of Object.keys(_options)) {
-      if ((key in _defaultOptions) == false) {
-        continue
-      }
-      let objValue: any = undefined
-      // 下一層的plain object
-      if (isPlainObject(_options[key]) && isPlainObject(_defaultOptions[key])) {
-        objValue = mergeObjColumns(_options[key], _defaultOptions[key])
-        obj[key as keyof Options] = objValue
-      }
-      // 不是plain object直接賦值
-      else {
-        obj[key as keyof Options] = _options[key]
-      }
-    }
-    return obj
-  }
-  
-  return mergeObjColumns(options, defaultOptions)
-}
-
-// 加上千分位 ,
-export function formatCommaNumber (num = 0): string {
-  try {
-    let parts = num.toString().split('.');
-    parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-    return parts.join('.');
-  } catch (e: any) {
-    console.error(e)
-  }
-}
+
+// 是否為原始物件
+export function isPlainObject(variable: any) {
+  return Object.prototype.toString.call(variable) === "[object Object]";
+}
+
+// 是否為function
+export function isFunction(fn: any) {
+  // return !!fn && !fn.nodename && fn.constructor != String && fn.constructor != RegExp && fn.constructor != Array && /function/i.test(fn + "");
+  return Object.prototype.toString.call(fn) === '[object Function]'
+}
+
+// 是否為dom
+export function isDom(obj: any) {
+  return !!(obj && obj.nodeType);
+}
+
+// 將可選的參數和預設值合併
+export function mergeOptionsWithDefault<Options extends { [key: string]: any; }> (options: {[key: string]: any}, defaultOptions: Options): Options {
+  if (isPlainObject(options) === false || isPlainObject(defaultOptions) === false) {
+    return Object.assign({}, defaultOptions)
+  }
+  const mergeObjColumns = (_options: {[key: string]: any}, _defaultOptions: {[key: string]: any}) => {
+    const obj: Options = (Object.assign({}, _defaultOptions) as any)
+    for (let key of Object.keys(_options)) {
+      if ((key in _defaultOptions) == false) {
+        continue
+      }
+      let objValue: any = undefined
+      // 下一層的plain object
+      if (isPlainObject(_options[key]) && isPlainObject(_defaultOptions[key])) {
+        objValue = mergeObjColumns(_options[key], _defaultOptions[key])
+        obj[key as keyof Options] = objValue
+      }
+      // 不是plain object直接賦值
+      else {
+        obj[key as keyof Options] = _options[key]
+      }
+    }
+    return obj
+  }
+  
+  return mergeObjColumns(options, defaultOptions)
+}
+
+// 加上千分位 ,
+export function formatCommaNumber (num = 0): string {
+  try {
+    let parts = num.toString().split('.');
+    parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+    return parts.join('.');
+  } catch (e: any) {
+    console.error(e)
+  }
+}