Skip to content

Commit

Permalink
Merge pull request #13648 from apache/fix/aggregate
Browse files Browse the repository at this point in the history
Fix/aggregate
  • Loading branch information
100pah authored Nov 19, 2020
2 parents 1eaea81 + c3bdb23 commit 9d8cfc7
Show file tree
Hide file tree
Showing 16 changed files with 1,542 additions and 272 deletions.
6 changes: 6 additions & 0 deletions build/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,12 @@ async function run() {
];
await build(cfgs, opt.min, opt.sourcemap);
}
else if (opt.type === 'myTransform') {
const cfgs = [
config.createMyTransform()
];
await build(cfgs, opt.min, opt.sourcemap);
}
else {
const cfg = config.createECharts(opt);
await build([cfg], opt.min, opt.sourcemap);
Expand Down
25 changes: 25 additions & 0 deletions build/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -212,3 +212,28 @@ exports.createDataTool = function () {
}
};
};

exports.createMyTransform = function () {
let input = nodePath.resolve(ecDir, `test/lib/myTransform/src/index.ts`);

return {
plugins: preparePlugins({
clean: true
}, {
include: [
nodePath.resolve(ecDir, 'test/lib/myTransform/src/**/*.ts'),
nodePath.resolve(ecDir, 'src/**/*.ts')
]
}),
input: input,
output: {
name: 'myTransform',
format: 'umd',
sourcemap: true,
file: nodePath.resolve(ecDir, `test/lib/myTransform/dist/myTransform.js`)
},
watch: {
include: [nodePath.resolve(ecDir, 'test/lib/myTransform/src/**')]
}
};
};
2 changes: 1 addition & 1 deletion src/data/helper/transform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export interface ExternalDataTransformResultItem {
*/
dimensions?: DimensionDefinitionLoose[];
}
interface ExternalDimensionDefinition extends Partial<DimensionDefinition> {
export interface ExternalDimensionDefinition extends Partial<DimensionDefinition> {
// Mandatory
index: DimensionIndex;
}
Expand Down
5 changes: 2 additions & 3 deletions test/custom-shape-morphing2.html

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

8 changes: 3 additions & 5 deletions test/custom-shape-morphing3.html

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

292 changes: 292 additions & 0 deletions test/data-transform-aggregate.html

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

1 change: 1 addition & 0 deletions test/lib/config.js

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

Loading

0 comments on commit 9d8cfc7

Please sign in to comment.