-
Notifications
You must be signed in to change notification settings - Fork 337
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
2f44a3b
commit 36894bc
Showing
10 changed files
with
377 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| export const GEMO_TYPES = [ | ||
| { | ||
| value: 'bar', | ||
| label: '区间', | ||
| label: '矩形', | ||
| }, | ||
| { | ||
| value: 'line', | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,193 @@ | ||
| /** | ||
| * TODO: This file will be used when vega-lite facets bug is fixed. | ||
| * https://github.com/vega/vega-lite/issues/4680 | ||
| */ | ||
| import React, { useEffect, useRef } from 'react'; | ||
| import { Field, IViewField, Record } from '../interfaces'; | ||
| import embed from 'vega-embed'; | ||
| import { Subject } from 'rxjs' | ||
| import * as op from 'rxjs/operators'; | ||
| import { ScenegraphEvent } from 'vega'; | ||
| const SELECTION_NAME = 'geom'; | ||
| interface ReactVegaProps { | ||
| rows: Field[]; | ||
| columns: Field[]; | ||
| dataSource: Record[]; | ||
| defaultAggregate?: boolean; | ||
| geomType: string; | ||
| color?: Field; | ||
| opacity?: Field; | ||
| size?: Field; | ||
| onGeomClick?: (values: any, e: any) => void | ||
| } | ||
| const NULL_FIELD: Field = { | ||
| id: '', | ||
| name: '', | ||
| aggName: 'sum', | ||
| type: 'D' | ||
| } | ||
| const click$ = new Subject<ScenegraphEvent>(); | ||
| const selection$ = new Subject<any>(); | ||
| const geomClick$ = selection$.pipe( | ||
| op.withLatestFrom(click$), | ||
| op.filter(([values, _]) => { | ||
| if (Object.keys(values).length > 0) { | ||
| return true | ||
| } | ||
| return false | ||
| }) | ||
| ); | ||
| function getFieldType(field: Field): 'quantitative' | 'nominal' | 'ordinal' | 'temporal' { | ||
| if (field.type === 'M') return 'quantitative'; | ||
| return 'nominal'; | ||
| } | ||
|
|
||
| function getSingleView(xField: IViewField, yField: IViewField, color: IViewField, opacity: IViewField, size: IViewField, row: IViewField, col: IViewField, defaultAggregated: boolean, geomType: string) { | ||
| return { | ||
| mark: geomType, | ||
| encoding: { | ||
| x: { | ||
| field: xField.id, | ||
| type: getFieldType(xField), | ||
| aggregate: | ||
| xField.type === 'M' && | ||
| defaultAggregated && | ||
| (xField.aggName as any), | ||
| }, | ||
| y: { | ||
| field: yField.id, | ||
| type: getFieldType(yField), | ||
| aggregate: | ||
| yField.type === 'M' && | ||
| defaultAggregated && | ||
| (yField.aggName as any), | ||
| }, | ||
| row: row !== NULL_FIELD ? { | ||
| field: row.id, | ||
| type: getFieldType(row), | ||
| } : undefined, | ||
| column: col !== NULL_FIELD ? { | ||
| field: col.id, | ||
| type: getFieldType(col), | ||
| } : undefined, | ||
| color: color !== NULL_FIELD ? { | ||
| field: color.id, | ||
| type: getFieldType(color) | ||
| } : undefined, | ||
| opacity: opacity !== NULL_FIELD ? { | ||
| field: opacity.id, | ||
| type: getFieldType(opacity) | ||
| } : undefined, | ||
| size: size !== NULL_FIELD ? { | ||
| field: size.id, | ||
| type: getFieldType(size) | ||
| } : undefined | ||
| } | ||
| }; | ||
| } | ||
| const ReactVega: React.FC<ReactVegaProps> = props => { | ||
| const { | ||
| dataSource = [], | ||
| rows = [], | ||
| columns = [], | ||
| defaultAggregate = true, | ||
| geomType, | ||
| color, | ||
| opacity, | ||
| size, | ||
| onGeomClick | ||
| } = props; | ||
| const container = useRef<HTMLDivElement>(null); | ||
| useEffect(() => { | ||
| const clickSub = geomClick$.subscribe(([values, e]) => { | ||
| if (onGeomClick) { | ||
| onGeomClick(values, e); | ||
| } | ||
| }) | ||
| return () => { | ||
| clickSub.unsubscribe(); | ||
| } | ||
| }, []); | ||
| useEffect(() => { | ||
| if (container.current) { | ||
| const rowDims = rows.filter(f => f.type === 'D'); | ||
| const colDims = columns.filter(f => f.type === 'D'); | ||
| const rowMeas = rows.filter(f => f.type === 'M'); | ||
| const colMeas = columns.filter(f => f.type === 'M'); | ||
|
|
||
| const yField = rows.length > 0 ? rows[rows.length - 1] : NULL_FIELD; | ||
| const xField = columns.length > 0 ? columns[columns.length - 1] : NULL_FIELD; | ||
|
|
||
| const rowFacetFields = rowDims.slice(0, -1); | ||
| const colFacetFields = colDims.slice(0, -1); | ||
| const rowFacetField = rowFacetFields.length > 0 ? rowFacetFields[rowFacetFields.length - 1] : NULL_FIELD; | ||
| const colFacetField = colFacetFields.length > 0 ? colFacetFields[colFacetFields.length - 1] : NULL_FIELD; | ||
|
|
||
| const rowRepeatFields = rowMeas.length === 0 ? rowDims.slice(-1) : rowMeas;//rowMeas.slice(0, -1); | ||
| const colRepeatFields = colMeas.length === 0 ? colDims.slice(-1) : colMeas;//colMeas.slice(0, -1); | ||
|
|
||
| const rowRepeatField = rowRepeatFields.length > 0 ? rowRepeatFields[rowRepeatFields.length - 1] : NULL_FIELD; | ||
| const colRepeatField = colRepeatFields.length > 0 ? colRepeatFields[colRepeatFields.length - 1] : NULL_FIELD; | ||
|
|
||
| const dimensions = [...rows, ...columns, color, opacity, size].filter(f => Boolean(f)).map(f => (f as Field).id) | ||
|
|
||
| const spec: any = { | ||
| data: { | ||
| values: dataSource, | ||
| }, | ||
| selection: { | ||
| [SELECTION_NAME]: { | ||
| type: 'single', | ||
| fields: dimensions | ||
| } | ||
| } | ||
| }; | ||
| if (false) { | ||
| // const singleView = getSingleView( | ||
| // xField, | ||
| // yField, | ||
| // color ? color : NULL_FIELD, | ||
| // opacity ? opacity : NULL_FIELD, | ||
| // size ? size : NULL_FIELD, | ||
| // rowFacetField, | ||
| // colFacetField, | ||
| // defaultAggregate, | ||
| // geomType | ||
| // ); | ||
| // spec.mark = singleView.mark; | ||
| // spec.encoding = singleView.encoding; | ||
| } else { | ||
| spec.concat = []; | ||
| console.log('latest', rowRepeatFields, colRepeatFields, rowDims, colDims.slice(-1)) | ||
| for (let i = 0; i < rowRepeatFields.length; i++) { | ||
| for (let j = 0; j < colRepeatFields.length; j++) { | ||
| const singleView = getSingleView( | ||
| colRepeatFields[j] || NULL_FIELD, | ||
| rowRepeatFields[i] || NULL_FIELD, | ||
| color ? color : NULL_FIELD, | ||
| opacity ? opacity : NULL_FIELD, | ||
| size ? size : NULL_FIELD, | ||
| rowFacetField, | ||
| colFacetField, | ||
| defaultAggregate, | ||
| geomType | ||
| ); | ||
| spec.concat.push(singleView) | ||
| } | ||
| } | ||
| } | ||
| console.log(spec) | ||
| embed(container.current, spec, { mode: 'vega-lite', actions: false }).then(res => { | ||
| res.view.addEventListener('click', (e) => { | ||
| click$.next(e); | ||
| }) | ||
| res.view.addSignalListener(SELECTION_NAME, (name: any, values: any) => { | ||
| selection$.next(values); | ||
| }); | ||
| }); | ||
| } | ||
| }, [dataSource, rows, columns, defaultAggregate, geomType, color, opacity, size]); | ||
| return <div ref={container}></div> | ||
| } | ||
|
|
||
| export default ReactVega; |
Oops, something went wrong.