[incubator-echarts] branch next updated: chore: use trick to fix sourcemap instead of parsing full to add UMD wrapper.
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
The following commit(s) were added to refs/heads/next by this push:
new 285be45 chore: use trick to fix sourcemap instead of parsing full to
add UMD wrapper.
285be45 is described below
commit 285be458f245949725007706cb44f4d74ce5baa3
Author: pissang
AuthorDate: Wed May 27 13:41:42 2020 +0800
chore: use trick to fix sourcemap instead of parsing full to add UMD
wrapper.
---
build/dev-fast.js | 37 +++--
package.json | 1 -
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/build/dev-fast.js b/build/dev-fast.js
index 412eb82..d11b5f5 100644
--- a/build/dev-fast.js
+++ b/build/dev-fast.js
@@ -3,7 +3,7 @@ const path = require('path');
const {build} = require('esbuild');
const fs = require('fs');
const debounce = require('lodash.debounce');
-const sourceMap = require('source-map');
+// const sourceMap = require('source-map');
const outFilePath = path.resolve(__dirname, '../dist/echarts.js');
@@ -26,16 +26,25 @@ const umdWrapperTail = `
}));`;
async function wrapUMDCode() {
-const consumer = await new
sourceMap.SourceMapConsumer(fs.readFileSync(outFilePath + '.map', 'utf8'));
-const node =
sourceMap.SourceNode.fromStringWithSourceMap(fs.readFileSync(outFilePath,
'utf-8'), consumer);
-// add six empty lines
-node.prepend(umdWrapperHead);
-node.add(umdWrapperTail);
-const res = node.toStringWithSourceMap({
-file: outFilePath
-});
-fs.writeFileSync(outFilePath, res.code, 'utf-8');
-fs.writeFileSync(outFilePath + '.map', res.map.toString(), 'utf-8');
+// const consumer = await new
sourceMap.SourceMapConsumer(fs.readFileSync(outFilePath + '.map', 'utf8'));
+// const node =
sourceMap.SourceNode.fromStringWithSourceMap(fs.readFileSync(outFilePath,
'utf-8'), consumer);
+// // add six empty lines
+// node.prepend(umdWrapperHead);
+// node.add(umdWrapperTail);
+// const res = node.toStringWithSourceMap({
+// file: outFilePath
+// });
+// fs.writeFileSync(outFilePath, res.code, 'utf-8');
+// fs.writeFileSync(outFilePath + '.map', res.map.toString(), 'utf-8');
+
+const code = fs.readFileSync(outFilePath, 'utf-8');
+fs.writeFileSync(outFilePath, umdWrapperHead + code + umdWrapperTail,
'utf-8');
+
+const sourceMap = JSON.parse(fs.readFileSync(outFilePath + '.map',
'utf-8'));
+// Fast trick for fixing source map
+sourceMap.mappings = umdWrapperHead.split('\n').map(() => '').join(';') +
sourceMap.mappings;
+
+fs.writeFileSync(outFilePath + '.map', JSON.stringify(sourceMap), 'utf-8');
}
function rebuild() {
@@ -48,14 +57,14 @@ function rebuild() {
bundle: true,
}).catch(e => {
console.error(e.toString());
-}).then(() => {
+}).then(async () => {
console.time('Wrap UMD');
-wrapUMDCode();
+await wrapUMDCode();
console.timeEnd('Wrap UMD');
})
}
-const debouncedRebuild = debounce(rebuild, 200);
+const debouncedRebuild = debounce(rebuild, 100);
chokidar.watch([
path.resolve(__dirname, '../src/**/*.ts'),
diff --git a/package.json b/package.json
index 84c3d9a..c1b90ae 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,6 @@
"serve-handler": "6.1.1",
"slugify": "1.3.4",
"socket.io": "2.2.0",
-"source-map": "^0.7.3",
"typescript": "^3.8.3"
}
}
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] Mr-jiangzhiguo commented on issue #9565: SVG and Canvas have different results for "Pie with scrollable legend" chart in echarts example
Mr-jiangzhiguo commented on issue #9565: URL: https://github.com/apache/incubator-echarts/issues/9565#issuecomment-633828698 I meet the same issues. When will it be fixed ? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] pissang commented on issue #12706: echarts树图的bug
pissang commented on issue #12706: URL: https://github.com/apache/incubator-echarts/issues/12706#issuecomment-634406243 可以放截图 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] Wdingding opened a new issue #12700: [ANIMATION] Symbol and line drawing order of line chart
Wdingding opened a new issue #12700: URL: https://github.com/apache/incubator-echarts/issues/12700 Original way: symbol appears first, then connect the line from left to right, the order is unreasonable and the waiting time is longer Change plan: the symbol of the line chart appears at the top of the line while drawing the line This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] IsKaros commented on issue #12703: 树图自定义symbol在firefox无法正常显示
IsKaros commented on issue #12703: URL: https://github.com/apache/incubator-echarts/issues/12703#issuecomment-634381821 > Seems to be related to #12367, it may have nothing to do with browsers. 你好，chrome可以正常显示，但在firefox使用官方自带的图标也可以正常显示的。那几个issue我看了，是要点击节点才显示，我这个点了也不行。FF中发现把SVG换成png就可以。 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] echarts-bot[bot] commented on pull request #12702: feat(datastack):stack support positive add negative, close 12699
echarts-bot[bot] commented on pull request #12702: URL: https://github.com/apache/incubator-echarts/pull/12702#issuecomment-633783988 Thanks for your contribution! The community will review it ASAP. In the meanwhile, please checkout [the coding standard](https://echarts.apache.org/en/coding-standard.html) and Wiki about [How to make a pull request](https://github.com/apache/incubator-echarts/wiki/How-to-make-a-pull-request). This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] lliiuu commented on issue #5507: 柱状图 y轴axisLabel 左对齐问题
lliiuu commented on issue #5507: URL: https://github.com/apache/incubator-echarts/issues/5507#issuecomment-633919512 > @ellyliang 请问最后是怎么解决的呢？我也是动态标签长短不一，会展示不全。 你好，你这问题解决了吗，我也有相同的问题。 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] sinpor commented on pull request #12168: fix(toolbox): only change title of requested feature. closes #12162
sinpor commented on pull request #12168: URL: https://github.com/apache/incubator-echarts/pull/12168#issuecomment-633762943 @nsmgr8 The 4.8.0 has been resolved. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] leotabosa opened a new issue #12698: 4 quadrant scatter graph with positive numbers only?
leotabosa opened a new issue #12698: URL: https://github.com/apache/incubator-echarts/issues/12698 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts-doc] plainheart closed pull request #100: feat: added missing docs about `ignoreForceLayout` for graph series.
plainheart closed pull request #100: URL: https://github.com/apache/incubator-echarts-doc/pull/100 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] Patrick-Y-github opened a new issue #12696: 地图上的散点显示不完全
Patrick-Y-github opened a new issue #12696: URL: https://github.com/apache/incubator-echarts/issues/12696 当我在Echarts上运行时，地图上的散点显示正常，如下：  当我导入到flask时，地图上的散点显示不完全，如下：  当把地图放大时，可以看见部分散点，不过依然不能完整显示，如下：  请问，如何解决这一问题？ This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] plainheart edited a comment on issue #12703: 树图自定义symbol在firefox无法正常显示
plainheart edited a comment on issue #12703: URL: https://github.com/apache/incubator-echarts/issues/12703#issuecomment-634347063 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] Wdingding opened a new issue #12701: [ANIMATION] Change the animation and appearance time of markPoint
Wdingding opened a new issue #12701: URL: https://github.com/apache/incubator-echarts/issues/12701 Original method: MarkPoint appears at the same time as the line is drawn, and the animation method gradually becomes larger. Change plan: MarkPoint appears after drawing the line, adding the effect of elasticity on the animation. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] leotabosa closed issue #12698: 4 quadrant scatter graph with positive numbers only?
leotabosa closed issue #12698: URL: https://github.com/apache/incubator-echarts/issues/12698 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts-doc] pissang commented on pull request #101: fix: added missing properties(name/seriesType) in some series.
pissang commented on pull request #101: URL: https://github.com/apache/incubator-echarts-doc/pull/101#issuecomment-633811476 Nice work! Thanks! This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] AbhaysinghBhosale commented on issue #9265: xAxis.nameGap and yAxis.nameGap should be set automatically given grid.containLabel
AbhaysinghBhosale commented on issue #9265: URL: https://github.com/apache/incubator-echarts/issues/9265#issuecomment-633919871 Is there any fix/workaround for this issue? In my case if nameGap set with static value it overlap once yAxis data reaches to 4 digit. and yAxis name overlap over ticks This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] fxxjdedd commented on issue #9265: xAxis.nameGap and yAxis.nameGap should be set automatically given grid.containLabel
fxxjdedd commented on issue #9265: URL: https://github.com/apache/incubator-echarts/issues/9265#issuecomment-633927270 @AbhaysinghBhosale https://github.com/apache/incubator-echarts/issues/9265#issuecomment-536500226 use the `axis.getViewLabel` and calculate these labels's dom width, then you get a nameGap... This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] wtujvk commented on issue #2461: china.js好像乱码了，谁有解决方法
wtujvk commented on issue #2461: URL: https://github.com/apache/incubator-echarts/issues/2461#issuecomment-633793259 能提供Chain.js的utf-8 bom格式吗， 格式化后不能正常使用： utf-8 BOM格式 CRLF This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] ValueLan commented on issue #9116: Tooltips with the "axis" trigger are closed when calling chartInstance.setOption().
ValueLan commented on issue #9116:
URL:
https://github.com/apache/incubator-echarts/issues/9116#issuecomment-634390256
`
let index = -1;
chartInstance.on("hideTip", function() {
index = -1;
});
chartInstance.on("showTip", function() {
index = 1;
});
function setOption() {
chartInstance.setOption({});
if (index != -1) {
dispatchAction({
type: "showTip"
});
}
}
`
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] echarts-bot[bot] closed issue #12704: 饼图当设置了默认高亮事件后图例事件显示文本会重叠
echarts-bot[bot] closed issue #12704: URL: https://github.com/apache/incubator-echarts/issues/12704 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts-doc] plainheart commented on a change in pull request #99: feat: added missing events and actions docs of legend(selectall & inverseselect).
plainheart commented on a change in pull request #99:
URL:
https://github.com/apache/incubator-echarts-doc/pull/99#discussion_r430201577
##
File path: en/api/action.md
##
@@ -92,6 +92,28 @@ dispatchAction({
**EVENT:** [legendselectchanged](~events.legendselectchanged)
+### legendAllSelect(Action)
+Selects all legends.
+
+```js
+dispatchAction({
+type: 'legendAllSelect'
+})
+```
+
+**EVENT:** [legendselectall](~events.legendselectall)
+
+### legendInverseSelect(Action)
+Unselects all legends.
+
Review comment:
Yes~ That's my fault. I'm sure you are right. :)
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] wf123537200 opened a new pull request #12702: feat(datastack):stack support positive add negative, close 12699
wf123537200 opened a new pull request #12702: URL: https://github.com/apache/incubator-echarts/pull/12702 ## Brief Information This pull request is in the type of: - [ ] bug fixing - [x] new feature - [ ] others ### What does this PR do? stack support positive add negative ### Fixed issues #12699 ## Details ### Before: What was the problem?  ### After: How is it fixed in this PR?  ## Usage ### Are there any API changes? - [ ] The API has been changed. ### Related test cases or examples to use the new APIs NA. ## Others ### Merging options - [ ] Please squash the commits into a single one when merge. ### Other information This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] echarts-bot[bot] commented on issue #12704: 饼图当设置了默认高亮事件后图例事件显示文本会重叠
echarts-bot[bot] commented on issue #12704: URL: https://github.com/apache/incubator-echarts/issues/12704#issuecomment-634369025 This issue is not created using [issue template](https://ecomfe.github.io/echarts-issue-helper/) so I'm going to close it. Sorry for this, but it helps save our maintainers' time so that more developers get helped. Feel free to create another issue using the issue template. If you think you have already made your point clear without the template, or your problem cannot be covered by it, you may re-open this issue again. 这个 issue 未使用 [issue 模板](https://ecomfe.github.io/echarts-issue-helper/?lang=zh-cn) 创建，所以我将关闭此 issue。 为此带来的麻烦我深表歉意，但是请理解这是为了节约社区维护者的时间，以更高效地服务社区的开发者群体。 如果您愿意，可以请使用 issue 模板重新创建 issue。 如果你认为虽然没有使用模板，但你已经提供了复现问题的充分描述，或者你的问题无法使用模板表达，也可以重新 open 这个 issue。 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] plainheart commented on issue #12703: 树图自定义symbol在firefox无法正常显示
plainheart commented on issue #12703: URL: https://github.com/apache/incubator-echarts/issues/12703#issuecomment-634347063 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] partitect commented on issue #11389: svg football pitch to geojson convert
partitect commented on issue #11389: URL: https://github.com/apache/incubator-echarts/issues/11389#issuecomment-633921727 Can you add this future on version 5.0? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts-doc] 100pah merged pull request #96: feat: added function type for `symbolRotate`
100pah merged pull request #96: URL: https://github.com/apache/incubator-echarts-doc/pull/96 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] travis1111 commented on pull request #12590: feat(graph): graph support multiple edges, for #6811
travis commented on pull request #12590: URL: https://github.com/apache/incubator-echarts/pull/12590#issuecomment-633598568 Someone please review this :-) we also need this This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] soopencool opened a new issue #12705: echarts树图bug
soopencool opened a new issue #12705:
URL: https://github.com/apache/incubator-echarts/issues/12705
Version
4.8.0
Reproduction link
https://echarts.apache.org/examples/zh/editor.html?c=tree-polyline
Steps to reproduce
你们不充许放截图，截图就一目了然了。
var data = { "name": "flare", "children": [
{
"name": "data",
/* "children": [再注释这段代码（一定是先注释底下那段，再注释这段才会看到效果），这里显示图就不正确了，有一些多余的线段
{
"name": "converters",
"children": [
{"name": "Converters", "value": 721},
{"name": "DelimitedTextConverter", "value": 4294}
]
},
{
"name": "DataUtil",
"value": 3322
}
]*/
},
/*{ 先注释这段代码，显示图是正确的
"name": "display",
"children": [
{"name": "DirtySprite", "value": 8833},
{"name": "LineSprite", "value": 1732},
{"name": "RectSprite", "value": 3623}
]
},
{
"name": "flex",
"children": [
{"name": "FlareVis", "value": 4116}
]
},
{
"name": "query",
"children": [
{"name": "AggregateExpression", "value": 1616},
{"name": "And", "value": 1027},
{"name": "Arithmetic", "value": 3891},
{"name": "Average", "value": 891},
{"name": "BinaryExpression", "value": 2893},
{"name": "Comparison", "value": 5103},
{"name": "CompositeExpression", "value": 3677},
{"name": "Count", "value": 781},
{"name": "DateUtil", "value": 4141},
{"name": "Distinct", "value": 933},
{"name": "Expression", "value": 5130},
{"name": "ExpressionIterator", "value": 3617},
{"name": "Fn", "value": 3240},
{"name": "If", "value": 2732},
{"name": "IsA", "value": 2039},
{"name": "Literal", "value": 1214},
{"name": "Match", "value": 3748},
{"name": "Maximum", "value": 843},
{
"name": "methods",
"children": [
{"name": "add", "value": 593},
{"name": "and", "value": 330},
{"name": "average", "value": 287},
{"name": "count", "value": 277},
{"name": "distinct", "value": 292},
{"name": "div", "value": 595},
{"name": "eq", "value": 594},
{"name": "fn", "value": 460},
{"name": "gt", "value": 603},
{"name": "gte", "value": 625},
{"name": "iff", "value": 748},
{"name": "isa", "value": 461},
{"name": "lt", "value": 597},
{"name": "lte", "value": 619},
{"name": "max", "value": 283},
{"name": "min", "value": 283},
{"name": "mod", "value": 591},
{"name": "mul", "value": 603},
{"name": "neq", "value": 599},
{"name": "not", "value": 386},
{"name": "or", "value": 323},
{"name": "orderby", "value": 307},
{"name": "range", "value": 772},
{"name": "select", "value": 296},
{"name": "stddev", "value": 363},
{"name": "sub", "value": 600},
{"name": "sum", "value": 280},
{"name": "update", "value": 307},
{"name": "variance", "value": 335},
{"name": "where", "value": 299},
{"name": "xor", "value": 354},
{"name": "x_x", "value": 264}
]
},
{"name": "Minimum", "value": 843},
{"name": "Not", "value": 1554},
{"name": "Or", "value": 970},
{"name": "Query", "value": 13896},
{"name": "Range", "value": 1594},
{"name": "StringUtil", "value": 4130},
{"name": "Sum", "value": 791},
{"name": "Variable", "value": 1124},
{"name": "Variance", "value": 1876},
{"name": "Xor", "value": 1101}
]
},
{
"name": "scale",
"children": [
{"name": "IScaleMap", "value": 2105},
{"name": "LinearScale", "value": 1316},
{"name": "LogScale", "value": 3151},
{"name": "OrdinalScale", "value": 3770},
{"name": "QuantileScale", "value": 2435},
{"name": "QuantitativeScale", "value": 4839},
{"name": "RootScale", "value": 1756},
{"name": "Scale", "value": 4268},
{"name": "ScaleType", "value": 1821},
{"name": "TimeScale",
[GitHub] [incubator-echarts] soopencool opened a new issue #12706: echarts树图的bug
soopencool opened a new issue #12706:
URL: https://github.com/apache/incubator-echarts/issues/12706
### Version
4.8.0
### Reproduction link
[https://echarts.apache.org/examples/zh/editor.html?c=tree-polyline](https://echarts.apache.org/examples/zh/editor.html?c=tree-polyline)
### Steps to reproduce
你们不充许放截图，截图就一目了然了。
* var data = {
"name": "flare",
"children": [
{
"name": "data",
/* "children":
[先保留这段代码，然再注释这段代码（其他的化data多余的代码都去除，再注释这段才会看到效果），这里显示图就不正确了，有一些多余的线段
{
"name": "converters",
"children": [
{"name": "Converters", "value": 721},
{"name": "DelimitedTextConverter", "value": 4294}
]
},
{
"name": "DataUtil",
"value": 3322
}
]*/
}
]
};
### What is expected?
正确显示（没有多余的线段）
### What is actually happening?
有多余的线段
---
当children有多个节点时，突然把这个children清空了，就会出现这种情况
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] KJohn2q opened a new issue #12704: 饼图当设置了默认高亮事件后图例事件显示文本会重叠
KJohn2q opened a new issue #12704:
URL: https://github.com/apache/incubator-echarts/issues/12704
饼图设置了默认高亮事件，在环图内部显示文本，当鼠标移入图例且与当前高亮图形不对应时，图例移入事件显示的文本会与默认显示的文本重叠。
以下是默认显示的代码：
```
devicebydis.dispatchAction({ type: 'highlight', seriesIndex: 0,
dataIndex: 0 });
devicebydis.dispatchAction({ type: 'highlight', seriesIndex: 1,
dataIndex: 0 });
devicebydis.dispatchAction({ type: 'highlight', seriesIndex: 2,
dataIndex: 0 });
devicebydis.on('mouseover', function (v) {
if (v.dataIndex != 0) {
devicebydis.dispatchAction({
type: 'downplay',
seriesIndex: v.seriesIndex,
dataIndex: 0
});
}
devicebydis.dispatchAction({ type: 'pieselected', seriesId: ''})
});
devicebydis.on('mouseout', function(v) {
devicebydis.dispatchAction({ type: 'highlight', seriesIndex:
v.seriesIndex, dataIndex: 0 });
});
```
官方文档并没有提供图例移入事件的api描述，该怎么解决这个问题？
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts-doc] plainheart opened a new pull request #101: fix: added missing properties(name/seriesType) in some series.
plainheart opened a new pull request #101: URL: https://github.com/apache/incubator-echarts-doc/pull/101 Some series are missing the `name` or `seriesType` property which brings a expected document description or a bad link.   This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] ValueLan edited a comment on issue #9116: Tooltips with the "axis" trigger are closed when calling chartInstance.setOption().
ValueLan edited a comment on issue #9116: URL: https://github.com/apache/incubator-echarts/issues/9116#issuecomment-634390256 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] echarts-bot[bot] commented on issue #12705: echarts树图bug
echarts-bot[bot] commented on issue #12705: URL: https://github.com/apache/incubator-echarts/issues/12705#issuecomment-634398612 This issue is not created using [issue template](https://ecomfe.github.io/echarts-issue-helper/) so I'm going to close it. Sorry for this, but it helps save our maintainers' time so that more developers get helped. Feel free to create another issue using the issue template. If you think you have already made your point clear without the template, or your problem cannot be covered by it, you may re-open this issue again. 这个 issue 未使用 [issue 模板](https://ecomfe.github.io/echarts-issue-helper/?lang=zh-cn) 创建，所以我将关闭此 issue。 为此带来的麻烦我深表歉意，但是请理解这是为了节约社区维护者的时间，以更高效地服务社区的开发者群体。 如果您愿意，可以请使用 issue 模板重新创建 issue。 如果你认为虽然没有使用模板，但你已经提供了复现问题的充分描述，或者你的问题无法使用模板表达，也可以重新 open 这个 issue。 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts-doc] pissang commented on a change in pull request #99: feat: added missing events and actions docs of legend(selectall & inverseselect).
pissang commented on a change in pull request #99:
URL:
https://github.com/apache/incubator-echarts-doc/pull/99#discussion_r430162191
##
File path: en/api/action.md
##
@@ -92,6 +92,28 @@ dispatchAction({
**EVENT:** [legendselectchanged](~events.legendselectchanged)
+### legendAllSelect(Action)
+Selects all legends.
+
+```js
+dispatchAction({
+type: 'legendAllSelect'
+})
+```
+
+**EVENT:** [legendselectall](~events.legendselectall)
+
+### legendInverseSelect(Action)
+Unselects all legends.
+
Review comment:
I think it's inverse selection instead of unselecting. It may change to
selected status after button clicked.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts-doc] pissang merged pull request #101: fix: added missing properties(name/seriesType) in some series.
pissang merged pull request #101: URL: https://github.com/apache/incubator-echarts-doc/pull/101 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] WuEyuan opened a new issue #12699: 折线图上同个类目轴上的值如果一负一正，则切换成堆积后，不会相互叠加
WuEyuan opened a new issue #12699: URL: https://github.com/apache/incubator-echarts/issues/12699 ### Version 4.1.0-release ### Reproduction link [https://codesandbox.io/s/zen-curie-8nx4i?file=/src/App.vue](https://codesandbox.io/s/zen-curie-8nx4i?file=/src/App.vue) ### Steps to reproduce 打开后，点击折线图右上角的“切换堆叠按钮”，会发现同个类目轴上一负一正的点不会堆叠，保持不变，都为正或都为负或者有一个为0才有堆叠效果 ### What is expected? 期望一正一负时也能够堆叠 ### What is actually happening? 同个类目轴上一负一正的点不会堆叠，保持不变，都为正或都为负或者有一个为0才有堆叠效果 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts-doc] pissang merged pull request #99: feat: added missing events and actions docs of legend(selectall & inverseselect).
pissang merged pull request #99: URL: https://github.com/apache/incubator-echarts-doc/pull/99 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] echarts-bot[bot] closed issue #12705: echarts树图bug
echarts-bot[bot] closed issue #12705: URL: https://github.com/apache/incubator-echarts/issues/12705 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] plainheart commented on issue #12696: 地图上的散点显示不完全
plainheart commented on issue #12696: URL: https://github.com/apache/incubator-echarts/issues/12696#issuecomment-633610169 看起来像是CSS/HTML的问题，建议在 https://gallery.echartsjs.com/editor.html 提供一个可复现的示例。 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] echarts-bot[bot] commented on issue #12697: 散点图开启大数据优化，brush无法正常返回选取的数据
echarts-bot[bot] commented on issue #12697: URL: https://github.com/apache/incubator-echarts/issues/12697#issuecomment-633954544 @zhutianlong95 Please provide a demo for the issue either with https://codepen.io/Ovilia/pen/dyYWXWM or https://gallery.echartsjs.com/editor.html. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] zhutianlong95 opened a new issue #12697: 散点图开起大数据优化，brush无法正常返回选取的数据
zhutianlong95 opened a new issue #12697: URL: https://github.com/apache/incubator-echarts/issues/12697 散点图开启large:true时，brush的brushselected事件不能返回选中的数据index，selected中的dataIndex都是空，文档中并无提及 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts-doc] pissang closed pull request #100: feat: added missing docs about `ignoreForceLayout` for graph series.
pissang closed pull request #100: URL: https://github.com/apache/incubator-echarts-doc/pull/100 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] IsKaros opened a new issue #12703: 树图自定义symbol在firefox无法正常显示
IsKaros opened a new issue #12703:
URL: https://github.com/apache/incubator-echarts/issues/12703
**Version**
4.8.0-release
**Steps to reproduce**
symbol使用的是自定义的本地图片
``JavaScript
function setChartOption(data) {
return {
series: [
{
type: "tree",
data: [data],
name: "treeChart",
top: "1%",
left: "5%",
right: "8%",
bottom: "5%",
symbol: function (value, params) {
if (params.data.type == "source") {
return "image://./../user/image/source.svg";
} else if (params.data.type == "date") {
return "image://./../user/image/date.svg";
// return 'image://./../user/image/date2.svg'
} else if (params.data.type == "location") {
return "image://./../user/image/location.svg";
} else if (params.data.type == "system") {
return "image://./../user/image/system.svg";
} else if (params.data.type == "connection") {
return "image://./../user/image/connection.svg";
} else if (params.data.type == "events") {
return "image://./../user/image/event.svg";
} else if (params.data.type == "evidence") {
return "image://./../user/image/evidence.svg";
}
if (params.data.hasModal == true) {
return "image://./../user/image/circle.svg";
} else {
return "image://./../user/image/empty_circle.svg";
}
},
// symbolSize: 16,
symbolSize: [32, 32],
initialTreeDepth: 10,
// color:'#1b75d3',
label: {
position: "inside",
// verticalAlign: 'bottom',
align: "center",
offset: [0, 26],
color: "#1b75d3",
padding: 0,
fontSize: 12,
formatter: function (params) {
return params.data.name;
},
},
itemStyle: {
normal: {
borderColor: "#1b75d3", //折点颜色
},
},
lineStyle: {
curveness: "0.4",
},
leaves: {
name: "leaves",
label: {
// position: 'center',
show: true,
position: "insideBottom",
verticalAlign: "middle",
// distance:20,
align: "center",
color: "#1b75d3",
height: 30,
lineHeight: 20,
padding: [0, 5],
offset: [0, 10],
},
},
expandAndCollapse: true,
animationDuration: 500,
animationDurationUpdate: 700,
},
],
};
}
``
**What is expected?**
在firefox下也可以正常显示
**What is actually happening?**
firefox无法正常显示自定义symbol，连label文本都消失了
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] wf123537200 commented on issue #12699: 折线图上同个类目轴上的值如果一负一正，则切换成堆积后，不会相互叠加
wf123537200 commented on issue #12699: URL: https://github.com/apache/incubator-echarts/issues/12699#issuecomment-633784872 Maybe the positive and negative limit is reasonable The pr fix this situation,but maybe no reasonable This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] 01/01: Merge branch 'next' into label-enhancement
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch label-enhancement in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git commit 7f53a78736a83e5b130e496de3388bc6849dfc65 Merge: bce7435 1740726 Author: pissang AuthorDate: Wed May 27 11:04:53 2020 +0800 Merge branch 'next' into label-enhancement build/dev-fast.js | 29 + package-lock.json | 30 +++--- package.json | 2 ++ 3 files changed, 50 insertions(+), 11 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch label-enhancement updated (bce7435 -> 7f53a78)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch label-enhancement in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. from bce7435 fix(bar): compat barBorderWidth add e0a31e3 chore: add sourcemap in esbuild add 1740726 chore: fix sourcemap after add umd wrapper in esbuild new 7f53a78 Merge branch 'next' into label-enhancement The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build/dev-fast.js | 29 + package-lock.json | 30 +++--- package.json | 2 ++ 3 files changed, 50 insertions(+), 11 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch next updated: chore: fix sourcemap after add umd wrapper in esbuild
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
The following commit(s) were added to refs/heads/next by this push:
new 1740726 chore: fix sourcemap after add umd wrapper in esbuild
1740726 is described below
commit 174072664a19198ca0f653b817f0625e8f40398e
Author: pissang
AuthorDate: Wed May 27 11:04:23 2020 +0800
chore: fix sourcemap after add umd wrapper in esbuild
---
build/dev-fast.js | 28
package-lock.json | 30 +++---
package.json | 2 ++
3 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/build/dev-fast.js b/build/dev-fast.js
index 891789a..412eb82 100644
--- a/build/dev-fast.js
+++ b/build/dev-fast.js
@@ -2,6 +2,8 @@ const chokidar = require('chokidar');
const path = require('path');
const {build} = require('esbuild');
const fs = require('fs');
+const debounce = require('lodash.debounce');
+const sourceMap = require('source-map');
const outFilePath = path.resolve(__dirname, '../dist/echarts.js');
@@ -23,9 +25,18 @@ const umdWrapperHead = `
const umdWrapperTail = `
}));`;
-// attach properties to the exports object to define
-// the exported module properties.
-exports.action = function () {};
+async function wrapUMDCode() {
+const consumer = await new
sourceMap.SourceMapConsumer(fs.readFileSync(outFilePath + '.map', 'utf8'));
+const node =
sourceMap.SourceNode.fromStringWithSourceMap(fs.readFileSync(outFilePath,
'utf-8'), consumer);
+// add six empty lines
+node.prepend(umdWrapperHead);
+node.add(umdWrapperTail);
+const res = node.toStringWithSourceMap({
+file: outFilePath
+});
+fs.writeFileSync(outFilePath, res.code, 'utf-8');
+fs.writeFileSync(outFilePath + '.map', res.map.toString(), 'utf-8');
+}
function rebuild() {
build({
@@ -38,16 +49,17 @@ function rebuild() {
}).catch(e => {
console.error(e.toString());
}).then(() => {
-const mainCode = fs.readFileSync(outFilePath, 'utf-8');
-fs.writeFileSync(outFilePath, umdWrapperHead + mainCode +
umdWrapperTail)
+console.time('Wrap UMD');
+wrapUMDCode();
+console.timeEnd('Wrap UMD');
})
}
+const debouncedRebuild = debounce(rebuild, 200);
+
chokidar.watch([
path.resolve(__dirname, '../src/**/*.ts'),
path.resolve(__dirname, '../node_modules/zrender/src/**/*.ts'),
], {
persistent: true
-}).on('change', rebuild).on('ready', function () {
-rebuild();
-})
\ No newline at end of file
+}).on('all', debouncedRebuild);
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 5514063..9fbae77 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -70,6 +70,12 @@
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz;,
"integrity":
"sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
"dev": true
+},
+"source-map": {
+ "version": "0.5.7",
+ "resolved":
"https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz;,
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "dev": true
}
}
},
@@ -96,6 +102,12 @@
"lodash": "^4.17.13",
"to-fast-properties": "^2.0.0"
}
+},
+"source-map": {
+ "version": "0.5.7",
+ "resolved":
"https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz;,
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "dev": true
}
}
},
@@ -5822,6 +5834,12 @@
"integrity":
"sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
"dev": true
},
+"lodash.debounce": {
+ "version": "4.0.8",
+ "resolved":
"https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz;,
+ "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+ "dev": true
+},
"lodash.get": {
"version": "4.4.2",
"resolved":
"https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz;,
@@ -7441,6 +7459,12 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz;,
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
"dev": true
+},
+"source-map": {
+ "version": "0.5.7",
+ "resolved":
"https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz;,
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "dev": true
}
}
},
@@ -7603,9 +7627,9 @@
}
},
"source-map": {
- "version": "0.5.7",
- "resolved":
"https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz;,
- "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "version": "0.7.3",
+ "resolved":
[incubator-echarts-doc] branch master updated: fix: added missing symbols and fix some wrong in option
This is an automated email from the ASF dual-hosted git repository.
wangdd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git
The following commit(s) were added to refs/heads/master by this push:
new ecd8ae2 fix: added missing symbols and fix some wrong in option
ecd8ae2 is described below
commit ecd8ae2d648bfd49b93ffd7acfed126b919603f5
Author: Wdingding
AuthorDate: Wed May 27 10:37:43 2020 +0800
fix: added missing symbols and fix some wrong in option
---
en/option/partial/text-style.md | 8
en/option/series/tree.md| 2 +-
zh/option/partial/color-desc.md | 2 +-
zh/option/partial/text-style.md | 12 ++--
zh/option/partial/tooltip-common.md | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/en/option/partial/text-style.md b/en/option/partial/text-style.md
index 0b9320d..56bdd45 100644
--- a/en/option/partial/text-style.md
+++ b/en/option/partial/text-style.md
@@ -106,7 +106,7 @@ ${name} text color.
#${prefix} fontStyle(string)='normal'
-${name} font style
+${name} font style.
Options are:
+ `'normal'`
@@ -116,7 +116,7 @@ Options are:
#${prefix} fontWeight(string|number)=${defaultFontWeight|default('normal')}
-${name} font thick weight
+${name} font thick weight.
Options are:
+ `'normal'`
@@ -128,13 +128,13 @@ Options are:
#${prefix} fontFamily(string)='sans-serif'
-${name} font family
+${name} font family.
Can also be 'serif' , 'monospace', ...
#${prefix} fontSize(number)=${defaultFontSize|default(12)}
-${name} font size
+${name} font size.
{{ if: !${noAlign} }}
diff --git a/en/option/series/tree.md b/en/option/series/tree.md
index 3a780da..5e81f6a 100644
--- a/en/option/series/tree.md
+++ b/en/option/series/tree.md
@@ -172,7 +172,7 @@ The style of the leaf node in the tree.
## data(Object)
-[series-tree.data](~series-tree.data) the data format is a tree structure，for
example：
+[series-tree.data](~series-tree.data) the data format is a tree structure, for
example：
```javascript
{ // note that the outermost layer is an object that represents the root node
of the tree.
diff --git a/zh/option/partial/color-desc.md b/zh/option/partial/color-desc.md
index d443e5e..ef1621e 100644
--- a/zh/option/partial/color-desc.md
+++ b/zh/option/partial/color-desc.md
@@ -32,6 +32,6 @@
> // 纹理填充
> color: {
> image: imageDom, // 支持为 HTMLImageElement, HTMLCanvasElement，不支持路径字符串
-> repeat: 'repeat' // 是否平铺, 可以是 'repeat-x', 'repeat-y', 'no-repeat'
+> repeat: 'repeat' // 是否平铺，可以是 'repeat-x', 'repeat-y', 'no-repeat'
> }
> ```
\ No newline at end of file
diff --git a/zh/option/partial/text-style.md b/zh/option/partial/text-style.md
index 9220cc0..a2e6ae2 100644
--- a/zh/option/partial/text-style.md
+++ b/zh/option/partial/text-style.md
@@ -106,7 +106,7 @@ ${name}文字的颜色。
#${prefix} fontStyle(string)='normal'
-${name}文字字体的风格
+${name}文字字体的风格。
可选：
+ `'normal'`
@@ -116,7 +116,7 @@ ${name}文字字体的风格
#${prefix} fontWeight(string|number)=${defaultFontWeight|default('normal')}
-${name}文字字体的粗细
+${name}文字字体的粗细。
可选：
+ `'normal'`
@@ -128,13 +128,13 @@ ${name}文字字体的粗细
#${prefix} fontFamily(string)='sans-serif'
-${name}文字的字体系列
+${name}文字的字体系列。
还可以是 'serif' , 'monospace', 'Arial', 'Courier New', 'Microsoft YaHei', ...
#${prefix} fontSize(number)=${defaultFontSize|default(12)}
-${name}文字的字体大小
+${name}文字的字体大小。
{{ if: !${noAlign} }}
@@ -188,9 +188,9 @@ ${name}文字的字体大小
文字块背景色。
-可以是直接的颜色值，例如：`'#123234'`, `'red'`, `'rgba(0,23,11,0.3)'`。
+可以使用颜色值，例如：`'#123234'`, `'red'`, `'rgba(0,23,11,0.3)'`。
-可以支持使用图片，例如：
+也可以直接使用图片，例如：
```js
backgroundColor: {
diff --git a/zh/option/partial/tooltip-common.md
b/zh/option/partial/tooltip-common.md
index 49cb5b1..870b075 100644
--- a/zh/option/partial/tooltip-common.md
+++ b/zh/option/partial/tooltip-common.md
@@ -213,7 +213,7 @@
+ `Function`
-回调函数，格式如下
+回调函数，格式如下：
```js
(point: Array, params: Object|Array., dom: HTMLDomElement, rect:
Object, size: Object) => Array
```
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch next updated: chore: add sourcemap in esbuild
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
The following commit(s) were added to refs/heads/next by this push:
new e0a31e3 chore: add sourcemap in esbuild
e0a31e3 is described below
commit e0a31e30a854a2f0793ff9beb08b1a81fb3e475d
Author: pissang
AuthorDate: Wed May 27 10:34:28 2020 +0800
chore: add sourcemap in esbuild
---
build/dev-fast.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/build/dev-fast.js b/build/dev-fast.js
index d609f16..891789a 100644
--- a/build/dev-fast.js
+++ b/build/dev-fast.js
@@ -33,6 +33,7 @@ function rebuild() {
entryPoints: [path.resolve(__dirname, '../echarts.all.ts')],
outfile: outFilePath,
format: 'cjs',
+sourcemap: true,
bundle: true,
}).catch(e => {
console.error(e.toString());
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch label-enhancement updated: fix(bar): compat barBorderWidth
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch label-enhancement
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
The following commit(s) were added to refs/heads/label-enhancement by this push:
new bce7435 fix(bar): compat barBorderWidth
bce7435 is described below
commit bce74350da4b1930fe49ceaa40421455b46add01
Author: pissang
AuthorDate: Wed May 27 10:29:56 2020 +0800
fix(bar): compat barBorderWidth
---
src/preprocessor/backwardCompat.ts | 24 ++--
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/preprocessor/backwardCompat.ts
b/src/preprocessor/backwardCompat.ts
index b83c529..c303624 100644
--- a/src/preprocessor/backwardCompat.ts
+++ b/src/preprocessor/backwardCompat.ts
@@ -71,19 +71,23 @@ const COMPATITABLE_COMPONENTS = [
'grid', 'geo', 'parallel', 'legend', 'toolbox', 'title', 'visualMap',
'dataZoom', 'timeline'
];
+const BAR_ITEM_STYLE_MAP = [
+['borderRadius', 'barBorderRadius'],
+['borderColor', 'barBorderColor'],
+['borderWidth', 'barBorderWidth']
+];
+
function compatBarItemStyle(option: Dictionary) {
const itemStyle = option && option.itemStyle;
if (itemStyle) {
-if (itemStyle.barBorderRadius != null) {
-itemStyle.barderRadius = itemStyle.barBorderRadius;
-if (__DEV__) {
-deprecateLog('barBorderRadius has been changed to
borderRadius.');
-}
-}
-if (itemStyle.barBorderColor != null) {
-itemStyle.borderColor = itemStyle.barBorderColor;
-if (__DEV__) {
-deprecateLog('barBorderColor has been changed to
borderColor.');
+for (let i = 0; i < BAR_ITEM_STYLE_MAP.length; i++) {
+const oldName = BAR_ITEM_STYLE_MAP[i][1];
+const newName = BAR_ITEM_STYLE_MAP[i][0];
+if (itemStyle[oldName] != null) {
+itemStyle[newName] = itemStyle[oldName];
+if (__DEV__) {
+deprecateLog(`${oldName} has been changed to ${newName}.`);
+}
}
}
}
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] 01/01: Merge branch 'next' into merge-release-to-next
This is an automated email from the ASF dual-hosted git repository. sushuang pushed a commit to branch merge-release-to-next in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git commit 4c1e406d67779de4f8c9ad225ee54aedc7a420f7 Merge: e8c44b6 4d8fbea Author: 100pah AuthorDate: Wed May 27 04:48:04 2020 +0800 Merge branch 'next' into merge-release-to-next build/dev-fast.js | 52 ++ package-lock.json | 113 package.json| 3 ++ src/data/List.ts| 43 --- src/data/helper/dataProvider.ts | 6 +-- src/echarts.ts | 85 +++--- src/model/Global.ts | 17 +++--- 7 files changed, 241 insertions(+), 78 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch merge-release-to-next updated (e8c44b6 -> 4c1e406)
This is an automated email from the ASF dual-hosted git repository. sushuang pushed a change to branch merge-release-to-next in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. from e8c44b6 fix: fix bar compat bug brought in 565535fc9906a78e701819f62de42a0ffb0f674a add 1b7f2f4 fix let declare order in ES6 build target. add 4d8fbea chore: try esbuild to improve rebuild speed in dev mode. new 4c1e406 Merge branch 'next' into merge-release-to-next The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build/dev-fast.js | 52 ++ package-lock.json | 113 package.json| 3 ++ src/data/List.ts| 43 --- src/data/helper/dataProvider.ts | 6 +-- src/echarts.ts | 85 +++--- src/model/Global.ts | 17 +++--- 7 files changed, 241 insertions(+), 78 deletions(-) create mode 100644 build/dev-fast.js - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] 03/05: compat: compat `barBorderColor` `barBorderWidth` `barBorderRadius`.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch merge-release-to-next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 565535fc9906a78e701819f62de42a0ffb0f674a
Author: 100pah
AuthorDate: Wed May 27 04:00:45 2020 +0800
compat: compat `barBorderColor` `barBorderWidth` `barBorderRadius`.
---
src/chart/bar/BarSeries.ts| 10 ++--
src/chart/bar/BarView.ts | 23
src/chart/bar/barItemStyle.ts | 121 ++
src/model/mixin/itemStyle.ts | 2 +-
4 files changed, 141 insertions(+), 15 deletions(-)
diff --git a/src/chart/bar/BarSeries.ts b/src/chart/bar/BarSeries.ts
index 7d3c9b9..206ad57 100644
--- a/src/chart/bar/BarSeries.ts
+++ b/src/chart/bar/BarSeries.ts
@@ -19,7 +19,7 @@
import BaseBarSeriesModel, {BaseBarSeriesOption} from './BaseBarSeries';
import SeriesModel from '../../model/Series';
-import { ItemStyleOption, OptionDataValue, LabelOption, SeriesStackOptionMixin
} from '../../util/types';
+import { ItemStyleOption, OptionDataValue, LabelOption,
SeriesStackOptionMixin, ZRColor } from '../../util/types';
import type Cartesian2D from '../../coord/cartesian/Cartesian2D';
import type Polar from '../../coord/polar/Polar';
import { inheritDefaultOption } from '../../util/component';
@@ -29,10 +29,12 @@ import { BrushCommonSelectorsForSeries } from
'../../component/brush/selector';
type BarDataValue = OptionDataValue | OptionDataValue[];
export interface BarItemStyleOption extends ItemStyleOption {
-/**
- * Border radius is not supported for bar on polar
- */
+// Border radius is not supported for bar on polar
+borderRadius?: number | number[]
+// Compat. See `src/chart/bar/barItemStyle`.
barBorderRadius?: number | number[]
+barBorderColor?: ItemStyleOption['borderColor']
+barBorderWidth?: ItemStyleOption['borderWidth']
}
export interface BarDataItemOption {
name?: string
diff --git a/src/chart/bar/BarView.ts b/src/chart/bar/BarView.ts
index 0512041..2a5710e 100644
--- a/src/chart/bar/BarView.ts
+++ b/src/chart/bar/BarView.ts
@@ -46,8 +46,11 @@ import type { RectLike } from
'zrender/src/core/BoundingRect';
import type Model from '../../model/Model';
import { isCoordinateSystemType } from '../../coord/CoordinateSystem';
import { getDefaultLabel } from '../helper/labelHelper';
+import {
+getBarItemStyle, fixBarItemStyle, getBarItemModelBorderWidth,
+getBarBorderColor, getBarBorderRadius, getBarItemModelBorderRadius
+} from './barItemStyle';
-const BAR_BORDER_WIDTH_QUERY = ['itemStyle', 'borderWidth'] as const;
const _eventPos = [0, 0];
const mathMax = Math.max;
@@ -166,7 +169,7 @@ class BarView extends ChartView {
const drawBackground = seriesModel.get('showBackground', true);
const backgroundModel = seriesModel.getModel('backgroundStyle');
-const barBorderRadius = backgroundModel.get('barBorderRadius') || 0;
+const barBorderRadius = getBarBorderRadius(backgroundModel) || 0;
const bgEls: BarView['_backgroundEls'] = [];
const oldBgEls = this._backgroundEls;
@@ -179,7 +182,7 @@ class BarView extends ChartView {
if (drawBackground) {
const bgLayout = getLayout[coord.type](data, dataIndex);
const bgEl = createBackgroundEl(coord,
isHorizontalOrRadial, bgLayout);
-bgEl.useStyle(backgroundModel.getItemStyle());
+bgEl.useStyle(getBarItemStyle(backgroundModel));
// Only cartesian2d support borderRadius.
if (coord.type === 'cartesian2d') {
(bgEl as Rect).setShape('r', barBorderRadius);
@@ -219,7 +222,7 @@ class BarView extends ChartView {
if (drawBackground) {
const bgEl = oldBgEls[oldIndex];
-bgEl.useStyle(backgroundModel.getItemStyle());
+bgEl.useStyle(getBarItemStyle(backgroundModel));
// Only cartesian2d support borderRadius.
if (coord.type === 'cartesian2d') {
(bgEl as Rect).setShape('r', barBorderRadius);
@@ -553,13 +556,13 @@ function updateStyle(
isPolar: boolean
) {
const style = data.getItemVisual(dataIndex, 'style');
-const hoverStyle = itemModel.getModel(['emphasis',
'itemStyle']).getItemStyle();
+const hoverStyle = getBarItemStyle(itemModel.getModel(['emphasis',
'itemStyle']));
if (!isPolar) {
-(el as Rect).setShape('r', itemModel.get(['itemStyle',
'barBorderRadius']) || 0);
+(el as Rect).setShape('r', getBarItemModelBorderRadius(itemModel) ||
0);
}
-el.useStyle(style);
+el.useStyle(fixBarItemStyle(itemModel, style));
el.ignore = isZeroOnPolar(layout as SectorLayout);
@@ -595,7 +598,7 @@ function getLineWidth(
itemModel: Model,
rawLayout:
[incubator-echarts] 05/05: fix: fix bar compat bug brought in 565535fc9906a78e701819f62de42a0ffb0f674a
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch merge-release-to-next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit e8c44b62afdddf5b6a7709bf587d376aaa60a494
Author: 100pah
AuthorDate: Wed May 27 04:44:03 2020 +0800
fix: fix bar compat bug brought in 565535fc9906a78e701819f62de42a0ffb0f674a
---
src/chart/bar/barItemStyle.ts | 34 +++---
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/chart/bar/barItemStyle.ts b/src/chart/bar/barItemStyle.ts
index a76847a..b6ac517 100644
--- a/src/chart/bar/barItemStyle.ts
+++ b/src/chart/bar/barItemStyle.ts
@@ -42,6 +42,7 @@ const getBarItemStyleInner = makeStyleMapper(
// But the echarts-doc has been describing it as `barBorderXxx`
// until echarts4. So we still compat that settings to reduce
// the break change.
+// `barBorderXXX` always has higher priority.
['stroke', 'barBorderColor'],
['lineWidth', 'barBorderWidth'],
['opacity'],
@@ -75,18 +76,13 @@ export function fixBarItemStyle(
const barBorderColor = itemModel.get(ITEM_STYLE_BAR_BORDER_COLOR);
const barBorderWidth = itemModel.get(ITEM_STYLE_BAR_BORDER_WIDTH);
-let newProps: Dictionary;
-if (barBorderColor != null) {
-newProps = newProps || {};
-newProps.barBorderColor = barBorderColor;
-}
-if (barBorderWidth != null) {
-newProps = newProps || {};
-newProps.barBorderColor = barBorderWidth;
-}
-if (newProps) {
-style = zrUtil.createObject(style, newProps);
+if (barBorderColor != null || barBorderWidth != null) {
+// Here the `style` is a plain object, see `visual/style.ts`.
+style = zrUtil.defaults({
+stroke: barBorderColor,
+lineWidth: barBorderWidth
+}, style);
}
return style;
@@ -94,28 +90,28 @@ export function fixBarItemStyle(
export function getBarBorderColor(styleModel: Model):
BarItemStyleOption['borderColor'] {
return zrUtil.retrieve2(
-styleModel.get('borderColor'),
-styleModel.get('barBorderColor')
+styleModel.get('barBorderColor'),
+styleModel.get('borderColor')
);
}
export function getBarBorderRadius(styleModel: Model):
BarItemStyleOption['borderRadius'] {
return zrUtil.retrieve2(
-styleModel.get('borderRadius'),
-styleModel.get('barBorderRadius')
+styleModel.get('barBorderRadius'),
+styleModel.get('borderRadius')
);
}
export function getBarItemModelBorderWidth(itemModel:
Model): BarItemStyleOption['borderWidth'] {
return zrUtil.retrieve2(
-itemModel.get(ITEM_STYLE_BORDER_WIDTH),
-itemModel.get(ITEM_STYLE_BAR_BORDER_WIDTH)
+itemModel.get(ITEM_STYLE_BAR_BORDER_WIDTH),
+itemModel.get(ITEM_STYLE_BORDER_WIDTH)
);
}
export function getBarItemModelBorderRadius(itemModel:
Model): BarItemStyleOption['borderRadius'] {
return zrUtil.retrieve2(
-itemModel.get(ITEM_STYLE_BORDER_RADIUS),
-itemModel.get(ITEM_STYLE_BAR_BORDER_RADIUS)
+itemModel.get(ITEM_STYLE_BAR_BORDER_RADIUS),
+itemModel.get(ITEM_STYLE_BORDER_RADIUS)
);
}
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch merge-release-to-next created (now e8c44b6)
This is an automated email from the ASF dual-hosted git repository. sushuang pushed a change to branch merge-release-to-next in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. at e8c44b6 fix: fix bar compat bug brought in 565535fc9906a78e701819f62de42a0ffb0f674a This branch includes the following new commits: new dd3d83c Merge branch 'release' into merge-release-to-next new 670ae04 ts: tweak ts type new 565535f compat: compat `barBorderColor` `barBorderWidth` `barBorderRadius`. new 99260dd ts: fix type. new e8c44b6 fix: fix bar compat bug brought in 565535fc9906a78e701819f62de42a0ffb0f674a The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] 02/05: ts: tweak ts type
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch merge-release-to-next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 670ae045aa47a764797a1c6a94b23c9ceb017b7d
Author: 100pah
AuthorDate: Wed May 27 04:00:06 2020 +0800
ts: tweak ts type
---
src/echarts.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/echarts.ts b/src/echarts.ts
index a7d47cf..e6b5db1 100644
--- a/src/echarts.ts
+++ b/src/echarts.ts
@@ -514,7 +514,7 @@ class ECharts extends Eventful {
getDataURL(opts?: {
// file type 'png' by default
-type?: 'png' | 'jpg',
+type?: 'png' | 'jpg' | 'svg',
pixelRatio?: number,
backgroundColor?: ZRColor,
// component type array
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] 04/05: ts: fix type.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch merge-release-to-next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 99260dd5aaa6cbdddb1436c041aa2acbdb859498
Author: 100pah
AuthorDate: Wed May 27 04:12:03 2020 +0800
ts: fix type.
---
src/chart/helper/Line.ts | 2 +-
src/coord/geo/geoSourceManager.ts | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/chart/helper/Line.ts b/src/chart/helper/Line.ts
index 0ec7ce5..d67694d 100644
--- a/src/chart/helper/Line.ts
+++ b/src/chart/helper/Line.ts
@@ -277,7 +277,7 @@ class Line extends graphic.Group {
// Only these properties supported in this emphasis style here.
emphasisState.style = {
text: emphasisText as string,
-textFill: hoverLabelModel.getTextColor(true),
+fill: hoverLabelModel.getTextColor(true),
// For merging hover style to normal style, do not use
// `hoverLabelModel.getFont()` here.
fontStyle: hoverLabelModel.getShallow('fontStyle'),
diff --git a/src/coord/geo/geoSourceManager.ts
b/src/coord/geo/geoSourceManager.ts
index b1dc27d..6ec97cd 100644
--- a/src/coord/geo/geoSourceManager.ts
+++ b/src/coord/geo/geoSourceManager.ts
@@ -30,7 +30,7 @@ import Group from 'zrender/src/graphic/Group';
interface Loader {
-load: (mapName: string, mapRecord: MapRecord, nameProperty: string) => {
+load: (mapName: string, mapRecord: MapRecord, nameProperty?: string) => {
regions?: Region[];
boundingRect?: BoundingRect;
};
@@ -44,7 +44,7 @@ const loaders = {
export default {
-load: function (mapName: string, nameMap: NameMap, nameProperty: string): {
+load: function (mapName: string, nameMap: NameMap, nameProperty?: string):
{
regions: Region[];
// Key: mapName
regionsMap: HashMap;
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts-doc] branch master updated (abeda43 -> 60869c2)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git. from abeda43 Merge pull request #101 from plainheart/master new 68d23b3 feat: added missing events and actions docs of legend(selectall & inverseselect). new d0a02a1 fix: unselect should be inverse. new 60869c2 Merge pull request #99 from plainheart/feat-legend-doc The 1630 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: en/api/action.md | 22 ++ en/api/events.md | 26 ++ zh/api/action.md | 20 zh/api/events.md | 26 ++ 4 files changed, 94 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] 01/01: Merge branch 'next' into label-enhancement
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch label-enhancement
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 72c10a2d326e10dc17634bb97d05203e011f50b1
Merge: ea1978b 4d8fbea
Author: pissang
AuthorDate: Tue May 26 22:52:02 2020 +0800
Merge branch 'next' into label-enhancement
build/dev-fast.js | 52 +
package-lock.json | 113 ++
package.json| 3 +
src/chart/bar/BarView.ts| 5 +-
src/component/axis/AngleAxisView.ts | 7 +-
src/coord/CoordinateSystem.ts | 3 -
src/data/List.ts| 43 ---
src/data/helper/dataProvider.ts | 6 +-
src/echarts.ts | 81 ++---
src/model/Component.ts | 14 ++-
src/model/Global.ts | 17 ++-
src/model/Model.ts | 14 ++-
src/model/Series.ts | 14 ++-
src/util/graphic.ts | 24 +++-
src/util/types.ts | 1 +
src/view/Chart.ts | 14 ++-
src/view/Component.ts | 14 ++-
test/-cases.js | 2 +
test/axis-splitArea.html| 170 +++
test/bar-stream-large.html | 15 ++-
test/hoverStyle.html| 26 -
test/lib/reset.css | 14 +++
test/lib/testHelper.js | 224 +---
test/stream-basic.css | 39 +++
test/stream-basic.js| 99
test/stream-basic1.html | 106 +
test/stream-basic2.html | 114 ++
27 files changed, 1074 insertions(+), 160 deletions(-)
diff --cc src/echarts.ts
index 7420e3a,5be348b..6723c9d
--- a/src/echarts.ts
+++ b/src/echarts.ts
@@@ -175,6 -174,48 +175,44 @@@ messageCenterProto.on = createRegisterE
messageCenterProto.off = createRegisterEventWithLowercaseMessageCenter('off');
// messageCenterProto.one =
createRegisterEventWithLowercaseMessageCenter('one');
+ // ---
+ // Internal method names for class ECharts
+ // ---
+ let prepare: (ecIns: ECharts) => void;
+ let prepareView: (ecIns: ECharts, isComponent: boolean) => void;
+ let updateDirectly: (
+ ecIns: ECharts, method: string, payload: Payload, mainType:
ComponentMainType, subType?: ComponentSubType
+ ) => void;
+ type UpdateMethod = (this: ECharts, payload?: Payload) => void;
+ let updateMethods: {
+ prepareAndUpdate: UpdateMethod,
+ update: UpdateMethod,
+ updateTransform: UpdateMethod,
+ updateView: UpdateMethod,
+ updateVisual: UpdateMethod,
+ updateLayout: UpdateMethod
+ };
+ let doConvertPixel: (ecIns: ECharts, methodName: string, finder: ModelFinder,
value: any) => any;
+ let updateStreamModes: (ecIns: ECharts, ecModel: GlobalModel) => void;
+ let doDispatchAction: (this: ECharts, payload: Payload, silent: boolean) =>
void;
+ let flushPendingActions: (this: ECharts, silent: boolean) => void;
+ let triggerUpdatedEvent: (this: ECharts, silent: boolean) => void;
+ let bindRenderedEvent: (zr: zrender.ZRenderType, ecIns: ECharts) => void;
+ let clearColorPalette: (ecModel: GlobalModel) => void;
+ let render: (ecIns: ECharts, ecModel: GlobalModel, api: ExtensionAPI,
payload: Payload) => void;
+ let renderComponents: (
+ ecIns: ECharts, ecModel: GlobalModel, api: ExtensionAPI, payload:
Payload, dirtyList?: ComponentView[]
+ ) => void;
+ let renderSeries: (
+ ecIns: ECharts,
+ ecModel: GlobalModel,
+ api: ExtensionAPI,
+ payload: Payload | 'remain',
+ dirtyMap?: {[uid: string]: any}
+ ) => void;
+ let performPostUpdateFuncs: (ecModel: GlobalModel, api: ExtensionAPI) => void;
-let updateHoverLayerStatus: (ecIns: ECharts, ecModel: GlobalModel) => void;
-let updateBlend: (seriesModel: SeriesModel, chartView: ChartView) => void;
-let updateZ: (model: ComponentModel, view: ComponentView | ChartView) => void;
-let updateHoverEmphasisHandler: (view: ComponentView | ChartView) => void;
+ let createExtensionAPI: (ecIns: ECharts) => ExtensionAPI;
+ let enableConnect: (chart: ECharts) => void;
class ECharts extends Eventful {
@@@ -1666,11 -1692,13 +1704,14 @@@
if (dirtyMap && dirtyMap.get(seriesModel.uid)) {
renderTask.dirty();
}
-
-unfinished |=
+renderTask.perform(scheduler.getPerformArgs(renderTask));
+if (renderTask.perform(scheduler.getPerformArgs(renderTask)))
{
+unfinished = true;
+}
chartView.group.silent = !!seriesModel.get('silent');
+ // Should not call markRedraw on group, because it will
disable zrender
+ // increamental render (alway render from the
[incubator-echarts] branch label-enhancement updated (ea1978b -> 72c10a2)
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a change to branch label-enhancement
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.
from ea1978b fix: use fill instead of textFIll for text
add 398f619 feat: enable label to be silent.
add 08d6c47 fix: incorrect commit ed73906f11fadec7b2f0af37fb0972a84d30bf5d
add b338c22 fix: (1) move "auto outside stroke" back to zrender. Think
that's reasonable to auto provide this strategy to user. (2) do not specify
insideStroke directly, use zrender auto strategry, otherwise incorrect in
emphasis.
add 2708396 fix: tweak emphasis text position.
add 0802ef0 fix: (1) revert increamental render broken brought by
a96d97191b28500d2a3dc4f44e53221d54fbe218 (2) add stream test tools.
add 95e9b27 fix: (1) fix bar incremental render (brought by
a61fd5ab7f434c7e967e107d6435c1e3f4f6d008) (2) add stream test case.
add 1785081 fix: clarify comments.
add 9db5c3e fix: fix interval split area in polor: should go back to the
start angle.
add 1b7f2f4 fix let declare order in ES6 build target.
add 4d8fbea chore: try esbuild to improve rebuild speed in dev mode.
new 72c10a2 Merge branch 'next' into label-enhancement
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build/dev-fast.js | 52 +
package-lock.json | 113 +++
package.json | 3 +
src/chart/bar/BarView.ts | 5 +-
src/component/axis/AngleAxisView.ts| 7 +-
src/coord/CoordinateSystem.ts | 3 -
src/data/List.ts | 43 ++--
src/data/helper/dataProvider.ts| 6 +-
src/echarts.ts | 81
src/model/Component.ts | 14 +-
src/model/Global.ts| 17 +-
src/model/Model.ts | 14 +-
src/model/Series.ts| 14 +-
src/util/graphic.ts| 24 ++-
src/util/types.ts | 1 +
src/view/Chart.ts | 14 +-
src/view/Component.ts | 14 +-
test/-cases.js | 2 +
test/axis-splitArea.html | 170
test/bar-stream-large.html | 15 +-
test/hoverStyle.html | 26 ++-
test/lib/reset.css | 14 ++
test/lib/testHelper.js | 224 +
.../removeDEV/src/code.src.js => stream-basic.css} | 47 ++---
test/stream-basic.js | 99 +
test/stream-basic1.html| 106 ++
test/stream-basic2.html| 114 +++
27 files changed, 1052 insertions(+), 190 deletions(-)
create mode 100644 build/dev-fast.js
copy test/{build/removeDEV/src/code.src.js => stream-basic.css} (66%)
create mode 100644 test/stream-basic.js
create mode 100644 test/stream-basic1.html
create mode 100644 test/stream-basic2.html
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch next updated (9db5c3e -> 4d8fbea)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch next in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. from 9db5c3e fix: fix interval split area in polor: should go back to the start angle. new 1b7f2f4 fix let declare order in ES6 build target. new 4d8fbea chore: try esbuild to improve rebuild speed in dev mode. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build/dev-fast.js | 52 ++ package-lock.json | 113 package.json| 3 ++ src/data/List.ts| 43 --- src/data/helper/dataProvider.ts | 6 +-- src/echarts.ts | 85 +++--- src/model/Global.ts | 17 +++--- 7 files changed, 241 insertions(+), 78 deletions(-) create mode 100644 build/dev-fast.js - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] 01/02: fix let declare order in ES6 build target.
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 1b7f2f494e6d65ed1ffa540dcb2b4a7f8b251002
Author: pissang
AuthorDate: Tue May 26 22:33:22 2020 +0800
fix let declare order in ES6 build target.
---
src/data/List.ts| 43 ++---
src/data/helper/dataProvider.ts | 6 +--
src/echarts.ts | 85 -
src/model/Global.ts | 17 -
4 files changed, 73 insertions(+), 78 deletions(-)
diff --git a/src/data/List.ts b/src/data/List.ts
index 34e621f..7c578b9 100644
--- a/src/data/List.ts
+++ b/src/data/List.ts
@@ -144,6 +144,27 @@ export interface DefaultDataVisual {
colorFromPalette?: boolean
}
+// -
+// Internal method declarations:
+// -
+let defaultDimValueGetters: {[sourceFormat: string]: DimValueGetter};
+let prepareInvertedIndex: (list: List) => void;
+let getRawValueFromStore: (list: List, dimIndex: number, rawIndex: number) =>
any;
+let getIndicesCtor: (list: List) => DataArrayLikeConstructor;
+let prepareChunks: (
+storage: DataStorage, dimInfo: DataDimensionInfo, chunkSize: number,
chunkCount: number, end: number
+) => void;
+let getRawIndexWithoutIndices: (this: List, idx: number) => number;
+let getRawIndexWithIndices: (this: List, idx: number) => number;
+let getId: (list: List, rawIndex: number) => string;
+let normalizeDimensions: (dimensions: ItrParamDims) => Array;
+let validateDimensions: (list: List, dims: DimensionName[]) => void;
+let cloneListForMapAndSample: (original: List, excludeDimensions:
DimensionName[]) => List;
+let cloneDimStore: (originalDimStore: DataValueChunk[]) => DataValueChunk[];
+let getInitialExtent: () => [number, number];
+let setItemDataAndSeriesIndex: (this: Element, child: Element) => void;
+let transferProperties: (target: List, source: List) => void;
+
class List<
HostModel extends Model = Model,
Visual extends DefaultDataVisual = DefaultDataVisual
@@ -2154,26 +2175,4 @@ class List<
}
-// -
-// Internal method declarations:
-// -
-let defaultDimValueGetters: {[sourceFormat: string]: DimValueGetter};
-let prepareInvertedIndex: (list: List) => void;
-let getRawValueFromStore: (list: List, dimIndex: number, rawIndex: number) =>
any;
-let getIndicesCtor: (list: List) => DataArrayLikeConstructor;
-let prepareChunks: (
-storage: DataStorage, dimInfo: DataDimensionInfo, chunkSize: number,
chunkCount: number, end: number
-) => void;
-let getRawIndexWithoutIndices: (this: List, idx: number) => number;
-let getRawIndexWithIndices: (this: List, idx: number) => number;
-let getId: (list: List, rawIndex: number) => string;
-let normalizeDimensions: (dimensions: ItrParamDims) => Array;
-let validateDimensions: (list: List, dims: DimensionName[]) => void;
-let cloneListForMapAndSample: (original: List, excludeDimensions:
DimensionName[]) => List;
-let cloneDimStore: (originalDimStore: DataValueChunk[]) => DataValueChunk[];
-let getInitialExtent: () => [number, number];
-let setItemDataAndSeriesIndex: (this: Element, child: Element) => void;
-let transferProperties: (target: List, source: List) => void;
-
-
export default List;
diff --git a/src/data/helper/dataProvider.ts b/src/data/helper/dataProvider.ts
index 3ba7daa..c499f06 100644
--- a/src/data/helper/dataProvider.ts
+++ b/src/data/helper/dataProvider.ts
@@ -53,6 +53,9 @@ export interface DataProvider {
clean(): void;
}
+
+let providerMethods: Dictionary;
+
/**
* If normal array used, mutable chunk size is supported.
* If typed array used, chunk size must be fixed.
@@ -260,9 +263,6 @@ export class DefaultDataProvider implements DataProvider {
})();
}
-
-let providerMethods: Dictionary;
-
// TODO
// merge it to dataProvider?
type RawValueGetter = (
diff --git a/src/echarts.ts b/src/echarts.ts
index bb85b18..5be348b 100644
--- a/src/echarts.ts
+++ b/src/echarts.ts
@@ -174,6 +174,48 @@ messageCenterProto.on =
createRegisterEventWithLowercaseMessageCenter('on');
messageCenterProto.off = createRegisterEventWithLowercaseMessageCenter('off');
// messageCenterProto.one =
createRegisterEventWithLowercaseMessageCenter('one');
+// ---
+// Internal method names for class ECharts
+// ---
+let prepare: (ecIns: ECharts) => void;
+let prepareView: (ecIns: ECharts, isComponent: boolean) => void;
+let updateDirectly: (
+ecIns: ECharts, method: string, payload: Payload, mainType:
ComponentMainType, subType?: ComponentSubType
+) => void;
+type UpdateMethod = (this: ECharts, payload?: Payload) => void;
+let updateMethods: {
+prepareAndUpdate: UpdateMethod,
+update: UpdateMethod,
+updateTransform: UpdateMethod,
+updateView: UpdateMethod,
+
[incubator-echarts] 02/02: chore: try esbuild to improve rebuild speed in dev mode.
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 4d8fbea69eafc807c3aa935314f0f962177ea53f
Author: pissang
AuthorDate: Tue May 26 22:36:39 2020 +0800
chore: try esbuild to improve rebuild speed in dev mode.
Rebuild cost reduced to 100ms on macbook 15. Build target is always ES6 in
dev.
---
build/dev-fast.js | 52 +
package-lock.json | 113 ++
package.json | 3 ++
3 files changed, 168 insertions(+)
diff --git a/build/dev-fast.js b/build/dev-fast.js
new file mode 100644
index 000..d609f16
--- /dev/null
+++ b/build/dev-fast.js
@@ -0,0 +1,52 @@
+const chokidar = require('chokidar');
+const path = require('path');
+const {build} = require('esbuild');
+const fs = require('fs');
+
+const outFilePath = path.resolve(__dirname, '../dist/echarts.js');
+
+const umdWrapperHead = `
+(function (root, factory) {
+if (typeof define === 'function' && define.amd) {
+// AMD. Register as an anonymous module.
+define(['exports'], factory);
+} else if (typeof exports === 'object' && typeof exports.nodeName !==
'string') {
+// CommonJS
+factory(exports);
+} else {
+// Browser globals
+factory((root.echarts = {}));
+}
+}(typeof self !== 'undefined' ? self : this, function (exports, b) {
+`;
+
+const umdWrapperTail = `
+}));`;
+
+// attach properties to the exports object to define
+// the exported module properties.
+exports.action = function () {};
+
+function rebuild() {
+build({
+stdio: 'inherit',
+entryPoints: [path.resolve(__dirname, '../echarts.all.ts')],
+outfile: outFilePath,
+format: 'cjs',
+bundle: true,
+}).catch(e => {
+console.error(e.toString());
+}).then(() => {
+const mainCode = fs.readFileSync(outFilePath, 'utf-8');
+fs.writeFileSync(outFilePath, umdWrapperHead + mainCode +
umdWrapperTail)
+})
+}
+
+chokidar.watch([
+path.resolve(__dirname, '../src/**/*.ts'),
+path.resolve(__dirname, '../node_modules/zrender/src/**/*.ts'),
+], {
+persistent: true
+}).on('change', rebuild).on('ready', function () {
+rebuild();
+})
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index ebb71d9..5514063 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1610,6 +1610,12 @@
"callsite": "1.0.0"
}
},
+"binary-extensions": {
+ "version": "2.0.0",
+ "resolved":
"https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz;,
+ "integrity":
"sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
+ "dev": true
+},
"blob": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz;,
@@ -1809,6 +1815,89 @@
"integrity":
"sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
"dev": true
},
+"chokidar": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz;,
+ "integrity":
"sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
+ "dev": true,
+ "requires": {
+"anymatch": "~3.1.1",
+"braces": "~3.0.2",
+"fsevents": "~2.1.2",
+"glob-parent": "~5.1.0",
+"is-binary-path": "~2.1.0",
+"is-glob": "~4.0.1",
+"normalize-path": "~3.0.0",
+"readdirp": "~3.4.0"
+ },
+ "dependencies": {
+"anymatch": {
+ "version": "3.1.1",
+ "resolved":
"https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz;,
+ "integrity":
"sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+ "dev": true,
+ "requires": {
+"normalize-path": "^3.0.0",
+"picomatch": "^2.0.4"
+ }
+},
+"braces": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz;,
+ "integrity":
"sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+ "dev": true,
+ "requires": {
+"fill-range": "^7.0.1"
+ }
+},
+"fill-range": {
+ "version": "7.0.1",
+ "resolved":
"https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz;,
+ "integrity":
"sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+ "dev": true,
+ "requires": {
+"to-regex-range": "^5.0.1"
+ }
+},
+"fsevents": {
+ "version": "2.1.3",
+ "resolved":
[incubator-echarts] 02/02: fix: use fill instead of textFIll for text
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch label-enhancement
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit ea1978b4d0b6dee41a46d48cdcb1f9866a633050
Author: pissang
AuthorDate: Tue May 26 15:16:05 2020 +0800
fix: use fill instead of textFIll for text
---
src/chart/helper/Line.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/chart/helper/Line.ts b/src/chart/helper/Line.ts
index 0ec7ce5..d67694d 100644
--- a/src/chart/helper/Line.ts
+++ b/src/chart/helper/Line.ts
@@ -277,7 +277,7 @@ class Line extends graphic.Group {
// Only these properties supported in this emphasis style here.
emphasisState.style = {
text: emphasisText as string,
-textFill: hoverLabelModel.getTextColor(true),
+fill: hoverLabelModel.getTextColor(true),
// For merging hover style to normal style, do not use
// `hoverLabelModel.getFont()` here.
fontStyle: hoverLabelModel.getShallow('fontStyle'),
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] 01/02: fix: fix hover scale in graph and tree
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch label-enhancement
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 601259d75d48eaa7e8c2164f7d1207c86116dac8
Author: pissang
AuthorDate: Tue May 26 15:15:42 2020 +0800
fix: fix hover scale in graph and tree
---
src/chart/graph/GraphView.ts | 4 ++--
src/chart/helper/Symbol.ts | 29 +++--
src/chart/tree/TreeView.ts | 4 ++--
3 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/src/chart/graph/GraphView.ts b/src/chart/graph/GraphView.ts
index e9e2559..f1dd3b1 100644
--- a/src/chart/graph/GraphView.ts
+++ b/src/chart/graph/GraphView.ts
@@ -448,8 +448,8 @@ class GraphView extends ChartView {
const nodeScale = getNodeGlobalScale(seriesModel);
-data.eachItemGraphicEl(function (el, idx) {
-el.scaleX = el.scaleY = nodeScale;
+data.eachItemGraphicEl(function (el: Symbol, idx) {
+el.setSymbolScale(nodeScale);
});
}
diff --git a/src/chart/helper/Symbol.ts b/src/chart/helper/Symbol.ts
index 7bb3cd5..b67240a 100644
--- a/src/chart/helper/Symbol.ts
+++ b/src/chart/helper/Symbol.ts
@@ -46,8 +46,8 @@ class Symbol extends graphic.Group {
/**
* Original scale
*/
-private _scaleX: number;
-private _scaleY: number;
+private _sizeX: number;
+private _sizeY: number;
private _z2: number;
@@ -174,8 +174,8 @@ class Symbol extends graphic.Group {
const fadeIn = true;
const target: PathProps = {
-scaleX: this._scaleX,
-scaleY: this._scaleY
+scaleX: this._sizeX,
+scaleY: this._sizeY
};
fadeIn && (target.style = {
opacity: symbolPath.style.opacity
@@ -276,16 +276,14 @@ class Symbol extends graphic.Group {
return useNameLabel ? data.getName(idx) : getDefaultLabel(data,
idx);
}
-this._scaleX = symbolSize[0] / 2;
-this._scaleY = symbolSize[1] / 2;
+this._sizeX = symbolSize[0] / 2;
+this._sizeY = symbolSize[1] / 2;
symbolPath.ensureState('emphasis').style = hoverItemStyle;
if (hoverAnimation && seriesModel.isAnimationEnabled()) {
-const scaleEmphasisState = this.ensureState('emphasis');
-const scale = Math.max(1.1, 3 / this._scaleY + 1);
-scaleEmphasisState.scaleX = scale;
-scaleEmphasisState.scaleY = scale;
+this.ensureState('emphasis');
+this.setSymbolScale(1);
}
else {
this.states.emphasis = null;
@@ -294,6 +292,17 @@ class Symbol extends graphic.Group {
graphic.enableHoverEmphasis(this);
}
+setSymbolScale(scale: number) {
+const emphasisState = this.states.emphasis;
+if (emphasisState) {
+const hoverScale = Math.max(scale * 1.1, 3 / this._sizeY + scale);
+emphasisState.scaleX = hoverScale;
+emphasisState.scaleY = hoverScale;
+}
+
+this.scaleX = this.scaleY = scale;
+}
+
fadeOut(cb: () => void, opt?: {
keepLabel: boolean
}) {
diff --git a/src/chart/tree/TreeView.ts b/src/chart/tree/TreeView.ts
index dc01b8b..0910809 100644
--- a/src/chart/tree/TreeView.ts
+++ b/src/chart/tree/TreeView.ts
@@ -358,8 +358,8 @@ class TreeView extends ChartView {
const nodeScale = this._getNodeGlobalScale(seriesModel);
-data.eachItemGraphicEl(function (el, idx) {
-el.scaleX = el.scaleY = nodeScale;
+data.eachItemGraphicEl(function (el: SymbolClz, idx) {
+el.setSymbolScale(nodeScale);
});
}
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch label-enhancement updated (0bb61d0 -> ea1978b)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch label-enhancement in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. from 0bb61d0 fix: exclude default stroke when intersecting labels. new 601259d fix: fix hover scale in graph and tree new ea1978b fix: use fill instead of textFIll for text The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/chart/graph/GraphView.ts | 4 ++-- src/chart/helper/Line.ts | 2 +- src/chart/helper/Symbol.ts | 29 +++-- src/chart/tree/TreeView.ts | 4 ++-- 4 files changed, 24 insertions(+), 15 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
