Merge branch 'dev' into gh-pages
diff --git a/build/copyResource.js b/build/copyResource.js
index 9f37c54..d36d55d 100644
--- a/build/copyResource.js
+++ b/build/copyResource.js
@@ -77,9 +77,14 @@
destPath
);
- process.stdout.clearLine();
- process.stdout.cursorTo(0);
- process.stdout.write(chalk.green(`resource copied to: ${destPath}`));
+ if (process.stdout.clearLine) {
+ process.stdout.clearLine();
+ process.stdout.cursorTo(0);
+ process.stdout.write(chalk.green(`resource copied to: ${destPath}`));
+ }
+ else {
+ console.log(chalk.green(`resource copied to: ${destPath}`));
+ }
}
console.log('\ncopyResourcesToDest done.');
diff --git a/public/data/archive/custom-aggregate-scatter-bar.js b/public/data/archive/custom-aggregate-scatter-bar.js
index 840a7c2..5f542f6 100644
--- a/public/data/archive/custom-aggregate-scatter-bar.js
+++ b/public/data/archive/custom-aggregate-scatter-bar.js
@@ -182,7 +182,7 @@
};
myChart.setOption(option, {
- replaceMerge: ['xAxis', 'yAxis', 'viusalMap'],
+ replaceMerge: ['xAxis', 'yAxis', 'visualMap'],
transition: {
from: { seriesIndex: 0, dimension: 'M_TAG' },
to: { seriesIndex: 0, dimension: 'M_TAG' }
diff --git a/public/data/archive/custom-aggregate-scatter-pie.js b/public/data/archive/custom-aggregate-scatter-pie.js
index 6c7a155..a851a35 100644
--- a/public/data/archive/custom-aggregate-scatter-pie.js
+++ b/public/data/archive/custom-aggregate-scatter-pie.js
@@ -180,7 +180,7 @@
};
myChart.setOption(option, {
- replaceMerge: ['xAxis', 'yAxis', 'viusalMap'],
+ replaceMerge: ['xAxis', 'yAxis', 'visualMap'],
transition: {
from: { seriesIndex: 0, dimension: 'M_TAG' },
to: { seriesIndex: 0, dimension: 'M_TAG' }