Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
8e1c0fe
perf(dataset): improve name-gen perf for high dim data.
pissang Jul 8, 2021
85ee886
refact(data): separate List to DataStorage and SeriesData
pissang Jul 9, 2021
deafca7
refact(data): fix some typo bugs
pissang Jul 9, 2021
973b70d
refact(data): fix downsample
pissang Jul 9, 2021
ed75a2e
refact(data): indices should not keep after clone
pissang Jul 9, 2021
6c07c45
refact(data): share storage on same dataset.
pissang Jul 10, 2021
1d4be90
refact: optimize createDimensions. update test
pissang Jul 10, 2021
63c4177
refact(data): fix several issues in storage sharing
pissang Jul 11, 2021
027cf16
refact(data): cant reuse storage if ordinalMeta is different
pissang Jul 11, 2021
2cac7ca
refact(data): fix seriesLayoutBy and sourceHeader
pissang Jul 12, 2021
2a8b198
refact(data): fix chunk not exists when data is empty.
pissang Jul 12, 2021
8b2e48b
refact(dim): remove completeDimensions
pissang Jul 12, 2021
7739a95
refact(data): only pick necessary dimensions when using dataset
pissang Jul 12, 2021
ff7498a
refact(data): add back appendValues. fix ut
pissang Jul 13, 2021
83bc2d9
refact(data): fix createDimensions multiple times cause default encod…
pissang Jul 13, 2021
bf059ad
refact(data): share source instance with dataset
pissang Jul 13, 2021
50d430d
refact(data): not clone store if possible
pissang Jul 13, 2021
53113c4
refact(data): omit unused dimensions in createDimensions
pissang Jul 13, 2021
7573ceb
refact(data): try to cache dim name map in complete dimensions
pissang Jul 13, 2021
0349b87
refact(data): fix type from dataset may incorrect.
pissang Jul 14, 2021
e9e6077
refact(data): fix storage clone lost indices.
pissang Jul 14, 2021
325a5c9
Merge branch 'master' into dataset-perf
pissang Jul 14, 2021
345402d
refact: don't recreate data storage when converting float to time
pissang Jul 14, 2021
e026f3f
refact(data): fix marker
pissang Jul 14, 2021
3475b9c
refact(data): fix some extent calc issues
pissang Jul 15, 2021
23548b8
test(ut): add path alias for root dir
pissang Jul 15, 2021
1d8da4a
refact(data): getValues from storage. add unit test
pissang Jul 15, 2021
7dd81e1
refact(data): add missing unit test update
pissang Jul 15, 2021
48044f0
Merge branch 'master' into dataset-perf
pissang Jul 15, 2021
8abf642
merge from master
pissang Jul 15, 2021
d0217e1
Merge branch 'master' into dataset-perf
pissang Jul 20, 2021
015e272
fix(series): only get encode from series. not from global
pissang Jul 21, 2021
3b6857f
refact(data): tweak some misleading code
pissang Jul 21, 2021
cfcb981
style: update comments
pissang Jul 21, 2021
4ea973b
style: improve comments
pissang Jul 21, 2021
8766830
Merge branch 'master' into dataset-perf
pissang Jul 21, 2021
3de73ab
chore: update zrender to latest nightly version
pissang Jul 21, 2021
3c09b59
fix(data): fix some code review issues
pissang Jul 22, 2021
0d5886b
refact(data): create data storage after dimensions prepared.
pissang Jul 22, 2021
5bc0c51
refact(data): optimize stack on high dimension data
pissang Jul 22, 2021
90a369c
refact(data): add ordinaMeta to the dimensions key
pissang Jul 23, 2021
c91d711
fix typo
pissang Jul 23, 2021
b785031
refact(data): reverse the optimization of genName
pissang Jul 23, 2021
690647c
refact(data): remove duplication of name generally
pissang Jul 23, 2021
6bed301
refact(data): create default dimensions for dataset
pissang Jul 23, 2021
e252249
refact(data): add dimension name to the key.
pissang Jul 23, 2021
9d6c597
refact(data): tweak dimension hash generation
pissang Jul 23, 2021
bfeb495
revert name gen logic
pissang Jul 23, 2021
40e9590
fix wrong fromZero logic in createDimensions
pissang Jul 23, 2021
ae9226e
refact(data): compatibility with exists echarts-gl code.
pissang Jul 27, 2021
7819423
Merge branch 'master' into dataset-perf
pissang Aug 4, 2021
8e6bd68
refact(data): fix wrong index when only using part of the dimensions …
pissang Aug 4, 2021
2bf188f
refact(data): fix unexpected code removement
pissang Aug 4, 2021
10aed78
fix: fix createDimension result might container name:undefined when d…
100pah Aug 11, 2021
dffeb3a
**There are these issues existing before this commit:**
100pah Aug 19, 2021
5e38220
update eslint-plugin version
100pah Aug 19, 2021
c7d5734
Merge branch 'master' into dataset-perf
100pah Aug 19, 2021
39c7111
fix: rename `SeriesDimensionRequest` to `SeriesDataSchema`.
100pah Aug 19, 2021
8aacfd1
fix: remove deprecated of some method of SeriesData. They are widely …
100pah Aug 20, 2021
15f217a
fix: revert dis/echarts.js.map (mistakenly committed previously)
100pah Aug 20, 2021
6e0a254
fix: update package-lock to fix ci fail (previous commit only commit …
100pah Aug 20, 2021
1e3f1ad
fix: rename to make name shorter.
100pah Aug 20, 2021
dd48619
fix: rename shorter.
100pah Aug 20, 2021
f26ccae
fix: rename DataStorage -> dataStore and some other renames.
100pah Aug 21, 2021
136a97c
fix: fix some issues brought by refactor.
100pah Aug 21, 2021
afafc7b
fix: other rename of data storage -> data store
100pah Aug 21, 2021
ea7b2ec
fix: fix and add test cases.
100pah Aug 22, 2021
75dc3ab
fix: add test case.
100pah Aug 22, 2021
4d1b252
fix: fix issue brought by previous refactor.
100pah Aug 22, 2021
c0bb629
fix: tweak test case.
100pah Aug 22, 2021
53fa03d
fix: fix ut.
100pah Aug 22, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
204 changes: 176 additions & 28 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
"dependencies": {
"tslib": "2.3.0",
"zrender": "npm:zrender-nightly@^5.1.2-dev.20210701"
"zrender": "npm:zrender-nightly@^5.1.2-dev.20210720"
},
"devDependencies": {
"@babel/code-frame": "7.10.4",
Expand All @@ -78,7 +78,7 @@
"@rollup/plugin-node-resolve": "^11.0.0",
"@rollup/plugin-replace": "^2.3.4",
"@types/jest": "^26.0.14",
"@typescript-eslint/eslint-plugin": "^4.9.1",
"@typescript-eslint/eslint-plugin": "^4.29.2",
"@typescript-eslint/parser": "^4.9.1",
"chalk": "^3.0.0",
"commander": "2.11.0",
Expand Down
18 changes: 9 additions & 9 deletions src/animation/universalTransition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import Path from 'zrender/src/graphic/Path';
import { EChartsExtensionInstallRegisters } from '../extension';
import { initProps } from '../util/graphic';
import DataDiffer from '../data/DataDiffer';
import List from '../data/List';
import SeriesData from '../data/SeriesData';
import { Dictionary, DimensionLoose, OptionDataItemObject, UniversalTransitionOption } from '../util/types';
import {
UpdateLifecycleParams,
Expand All @@ -43,22 +43,22 @@ import Displayable from 'zrender/src/graphic/Displayable';

const DATA_COUNT_THRESHOLD = 1e4;

interface GlobalStore { oldSeries: SeriesModel[], oldData: List[] };
interface GlobalStore { oldSeries: SeriesModel[], oldData: SeriesData[] };
const getUniversalTransitionGlobalStore = makeInner<GlobalStore, ExtensionAPI>();

interface DiffItem {
data: List
data: SeriesData
dim: DimensionLoose
divide: UniversalTransitionOption['divideShape']
dataIndex: number
}
interface TransitionSeries {
data: List
data: SeriesData
divide: UniversalTransitionOption['divideShape']
dim?: DimensionLoose
}

function getGroupIdDimension(data: List) {
function getGroupIdDimension(data: SeriesData) {
const dimensions = data.dimensions;
for (let i = 0; i < dimensions.length; i++) {
const dimInfo = data.getDimensionInfo(dimensions[i]);
Expand Down Expand Up @@ -452,7 +452,7 @@ interface SeriesTransitionBatch {
newSeries: TransitionSeries[]
}

function getDivideShapeFromData(data: List) {
function getDivideShapeFromData(data: SeriesData) {
if (data.hostModel) {
return ((data.hostModel as SeriesModel)
.getModel('universalTransition') as Model<UniversalTransitionOption>)
Expand All @@ -466,12 +466,12 @@ function findTransitionSeriesBatches(
) {
const updateBatches = createHashMap<SeriesTransitionBatch>();

const oldDataMap = createHashMap<List>();
const oldDataMap = createHashMap<SeriesData>();
// Map that only store key in array seriesKey.
// Which is used to query the old data when transition from one to multiple series.
const oldDataMapForSplit = createHashMap<{
key: string,
data: List
data: SeriesData
}>();

each(globalStore.oldSeries, (series, idx) => {
Expand Down Expand Up @@ -667,7 +667,7 @@ export function installUniversalTransition(registers: EChartsExtensionInstallReg
// Save all series of current update. Not only the updated one.
const allSeries = ecModel.getSeries();
const savedSeries: SeriesModel[] = globalStore.oldSeries = [];
const savedData: List[] = globalStore.oldData = [];
const savedData: SeriesData[] = globalStore.oldData = [];
for (let i = 0; i < allSeries.length; i++) {
const data = allSeries[i].getData();
// Only save the data that can have transition.
Expand Down
10 changes: 5 additions & 5 deletions src/chart/bar/BarSeries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ import {
SeriesEncodeOptionMixin
} from '../../util/types';
import type Cartesian2D from '../../coord/cartesian/Cartesian2D';
import createListFromArray from '../helper/createListFromArray';
import createSeriesData from '../helper/createSeriesData';
import type Polar from '../../coord/polar/Polar';
import { inheritDefaultOption } from '../../util/component';
import List from '../../data/List';
import SeriesData from '../../data/SeriesData';
import { BrushCommonSelectorsForSeries } from '../../component/brush/selector';

export type PolarBarLabelPosition = SeriesLabelOption['position']
Expand Down Expand Up @@ -89,8 +89,8 @@ class BarSeriesModel extends BaseBarSeriesModel<BarSeriesOption> {

coordinateSystem: Cartesian2D | Polar;

getInitialData(): List {
return createListFromArray(this.getSource(), this, {
getInitialData(): SeriesData {
return createSeriesData(null, this, {
useEncodeDefaulter: true,
createInvertedIndices: !!this.get('realtimeSort', true) || null
});
Expand Down Expand Up @@ -119,7 +119,7 @@ class BarSeriesModel extends BaseBarSeriesModel<BarSeriesOption> {
return progressiveThreshold;
}

brushSelector(dataIndex: number, data: List, selectors: BrushCommonSelectorsForSeries): boolean {
brushSelector(dataIndex: number, data: SeriesData, selectors: BrushCommonSelectorsForSeries): boolean {
return selectors.rect(data.getItemLayout(dataIndex));
}

Expand Down
Loading