This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch fix-18517 in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 98a78b2c53946c0fc2c83d57b0bb7ad34851702a Author: Ovilia <zwl.s...@gmail.com> AuthorDate: Tue Apr 18 15:48:16 2023 +0800 fix(label): ellipsis was not working --- src/label/labelStyle.ts | 2 +- src/util/types.ts | 2 + test/label-ellipsis.html | 110 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 1 deletion(-) diff --git a/src/label/labelStyle.ts b/src/label/labelStyle.ts index cd5f8c4a6..3d6740a37 100644 --- a/src/label/labelStyle.ts +++ b/src/label/labelStyle.ts @@ -460,7 +460,7 @@ const TEXT_PROPS_WITH_GLOBAL = [ 'textShadowColor', 'textShadowBlur', 'textShadowOffsetX', 'textShadowOffsetY' ] as const; const TEXT_PROPS_SELF = [ - 'align', 'lineHeight', 'width', 'height', 'tag', 'verticalAlign' + 'align', 'lineHeight', 'width', 'height', 'tag', 'verticalAlign', 'ellipsis' ] as const; const TEXT_PROPS_BOX = [ 'padding', 'borderWidth', 'borderRadius', 'borderDashOffset', diff --git a/src/util/types.ts b/src/util/types.ts index 6f135e83a..445957043 100644 --- a/src/util/types.ts +++ b/src/util/types.ts @@ -1056,6 +1056,8 @@ export interface LabelOption extends TextCommonOption { minMargin?: number overflow?: TextStyleProps['overflow'] + ellipsis?: TextStyleProps['ellipsis'] + silent?: boolean precision?: number | 'auto' valueAnimation?: boolean diff --git a/test/label-ellipsis.html b/test/label-ellipsis.html new file mode 100644 index 000000000..04b3b15da --- /dev/null +++ b/test/label-ellipsis.html @@ -0,0 +1,110 @@ +<!DOCTYPE html> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + + +<html> + <head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1" /> + <script src="lib/simpleRequire.js"></script> + <script src="lib/config.js"></script> + <script src="lib/jquery.min.js"></script> + <script src="lib/facePrint.js"></script> + <script src="lib/testHelper.js"></script> + <!-- <script src="ut/lib/canteen.js"></script> --> + <link rel="stylesheet" href="lib/reset.css" /> + </head> + <body> + <style> + </style> + + + + <div id="main0"></div> + + + + + + + <script> + require([ + 'echarts', + // 'map/js/china', + // './data/nutrients.json' + ], function (echarts) { + var option; + + option = { + title: { + text: 'Main Title', + left: 'center', + top: 'center', + textStyle: { + fontSize: 30, + width: 120, + overflow: 'truncate', + ellipsis: '%%%' + } + }, + xAxis: { + type: 'category', + data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'], + axisLabel: { + width: 50, + overflow: 'truncate', + ellipsis: '%%%', + formatter: 'xxxxxxxxxxxxxxxxxx' + } + }, + yAxis: { + type: 'value' + }, + series: [ + { + data: [150, 230, 224, 218, 135, 147, 260], + type: 'line', + label: { + show: true, + formatter: 'xxxxxxxxxxxxx', + width: 50, + overflow: 'truncate', + ellipsis: '%%%' + } + } + ] + }; + + var chart = testHelper.create(echarts, 'main0', { + title: [ + 'It should display "%%%" instead of "..." as ellipsis' + ], + option: option + // height: 300, + // buttons: [{text: 'btn-txt', onclick: function () {}}], + // recordCanvas: true, + }); + }); + </script> + + + </body> +</html> + --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org