You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by de...@apache.org on 2018/12/19 13:12:49 UTC
[incubator-echarts] branch master updated: test(markline): add
markLine subPixel test
This is an automated email from the ASF dual-hosted git repository.
deqingli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
The following commit(s) were added to refs/heads/master by this push:
new 520ba6c test(markline): add markLine subPixel test
520ba6c is described below
commit 520ba6c72ae0a4c0d6ea1e61f2123981ccbba419
Author: deqingli <an...@gmail.com>
AuthorDate: Wed Dec 19 21:12:19 2018 +0800
test(markline): add markLine subPixel test
---
test/markLine-subPixel.html | 153 ++++++++++++++++++++++++++++++++++++++++++++
test/richText-fontsize.html | 3 -
2 files changed, 153 insertions(+), 3 deletions(-)
diff --git a/test/markLine-subPixel.html b/test/markLine-subPixel.html
new file mode 100644
index 0000000..9fe69e8
--- /dev/null
+++ b/test/markLine-subPixel.html
@@ -0,0 +1,153 @@
+
+<!--
+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/esl.js"></script>
+ <script src="lib/config.js"></script>
+ </head>
+ <body>
+ <style>
+ html, body, #main {
+ width: 100%;
+ height: 100%;
+ /*border: 1px solid #000;*/
+ }
+ </style>
+ <div id="main"><div>
+ <script>
+ require(['echarts'], function (echarts) {
+
+ var chart = echarts.init(document.getElementById('main'), null, {});
+
+ window.onresize = function () {
+ chart.resize();
+ };
+
+ let arr1 = [1000000, 630000, 900000, 1250000, 1954000, 2192000, 1835000, 1789000, 2393000, 1750000, 2400000, 2500000];
+ let arr2 = [1123180.15, 655552.2, 1347675.87, 1481906.4, 3866326.82, 3147657.91, 2432494.66, 1782080.1, 969800];
+
+ let budget = [0];
+ let realIncome = [0];
+
+ for (let i = 0; i < 12; i++) {
+ let tmp = arr1[i] || NaN;
+ tmp = parseFloat((tmp / 10000).toFixed(1));
+ budget.push(tmp + budget[i]);
+ }
+ for (let i = 0; i < 12; i++) {
+ let tmp = arr2[i] || NaN;
+ tmp = parseFloat((tmp / 10000).toFixed(1));
+ realIncome.push(tmp + realIncome[i]);
+ }
+ budget = budget.slice(1);
+ realIncome = realIncome.slice(1);
+
+ chart.setOption({
+ title: {
+ text: 'When resize the window the width of two markLines should be same',
+ subtext: '有点牛集团'
+ },
+ tooltip: {
+ trigger: 'axis'
+ },
+ legend: {
+ data: ['预算收入', '实际收入']
+ },
+ toolbox: {
+ show: true,
+ feature: {
+ dataView: {
+ show: true,
+ readOnly: false
+ },
+ magicType: {
+ show: true,
+ type: ['line', 'bar']
+ },
+ restore: {
+ show: true
+ },
+ saveAsImage: {
+ show: true
+ }
+ }
+ },
+ calculable: true,
+ xAxis: [{
+ type: 'category',
+ splitLine: {
+ show: false
+ },
+ data: function() {
+ var list = [];
+ for (var i = 1; i <= 12; i++) {
+ list.push(i + '月');
+ }
+ return list;
+ }()
+ }],
+ yAxis: [{
+ type: 'value'
+ }],
+ series: [{
+ name: '预算收入',
+ type: 'line',
+ data: budget,
+ markLine: {
+ data: [{
+ type: 'average',
+ name: '平均值'
+ }],
+ lineStyle: {
+ normal: {
+ color: 'black',
+ type: 'solid',
+ width: 1
+ },
+ },
+ }
+ },
+ {
+ name: '实际收入',
+ type: 'line',
+ data: realIncome,
+ markLine: {
+ lineStyle: {
+ normal: {
+ type: 'solid',
+ width: 1,
+ color: 'black'
+ },
+ },
+ data: [{
+ type: 'average',
+ name: '平均值'
+ }]
+ }
+ }
+ ]
+ })
+ });
+ </script>
+ </body>
+</html>
\ No newline at end of file
diff --git a/test/richText-fontsize.html b/test/richText-fontsize.html
index bc32ae7..89ad91e 100644
--- a/test/richText-fontsize.html
+++ b/test/richText-fontsize.html
@@ -24,7 +24,6 @@ under the License.
<meta name="viewport" content="width=device-width, initial-scale=1" />
<script src="lib/esl.js"></script>
<script src="lib/config.js"></script>
- <!-- <script src="lib/jquery.min.js"></script> -->
</head>
<body>
<style>
@@ -60,8 +59,6 @@ under the License.
formatter: "{a} <br/>{b} : {c} ({d}%)"
},
legend: {
- // orient: 'vertical',
- // top: 'middle',
bottom: 10,
left: 'center',
data: ['西凉', '益州','兖州','荆州','幽州']
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org