Skip to content
Permalink
Browse files
Merge from master
  • Loading branch information
pissang committed Dec 18, 2019
2 parents 2e649d7 + e000003 commit cfe72b94c8a6a6c8568a5a0fc6f0632bacd1aaf3
Showing 135 changed files with 12,215 additions and 4,312 deletions.
@@ -24,6 +24,7 @@ block content
p 可自由选择所需图表、坐标系、组件进行打包下载,并且可对渲染引擎、兼容及压缩问题进行设置
else
p Pack and download the needed charts, coordinates or components<br>with the appropriate settings about rendering engine, compatibility and compression.
div.download-version (version: #{downloadVersion})

.page-content
#configuration.container
@@ -16,10 +16,8 @@ block content

.page-content.container#download-main
.d-section-version.d-section
h3.first 方法一:从 npm 安装
p <code>npm install echarts</code>

h3 方法二:下载发布版本的编译产物,或下载源代码
h3.first 方法一:从下载的源代码或编译产物安装

table.table#download-table
tr
@@ -85,6 +83,9 @@ block content
//- div(class="paper-desc")
//- a(href="http://www.cad.zju.edu.cn/home/vagblog/VAG_Work/echarts.pdf") ECharts: A Declarative Framework for Rapid Construction of Web-based Visualization
h3 方法二:从 npm 安装
p <code>npm install echarts</code>

h3 方法三:选择需要的模块,在线定制下载

if isECharts4
@@ -169,22 +170,23 @@ block extra_js
script(src="js/download.js?_v_=#{homeVersion}")
script(type='text/javascript').
document.getElementById('nav-download').className = 'active';
$('.download-echarts').click(function (e) {
var el = document.createElement('div');
el.innerHTML = '<div class="download-note"><i class="note-icon"><img src="./images/note.svg" /></i> Please cite the following paper whenever you use ECharts in your R&D projects, products, research papers, technical reports, news reports, books, presentations, teaching, patents, and other related intelligence activities. <br /> 当您在研发项目,研究论文,技术报告,新闻报告,书籍,演示文稿,教学,专利等中使用 ECharts 时,请引用以下论文。</div>\
<div class="paper-desc">\
<div class="paper-title">\
ECharts: A Declarative Framework for Rapid Construction of Web-based Visualization\
</div>\
<div class="paper-author">Deqing Li, Honghui Mei, Yi Shen, Shuang Su, Wenli Zhang, Junting Wang, Ming Zu, Wei Chen.</div>\
<div class="paper-journal">Visual Informatics, 2018 <a href="http://www.cad.zju.edu.cn/home/vagblog/VAG_Work/echarts.pdf">[PDF]</a></div>\
</div>';
swal({
title: 'Notice',
content: el
});
_hmt.push(['_trackEvent', 'download', 'download', '#{downloadVersion}']);
});
$('.download-theme').click(function () {
_hmt.push(['_trackEvent', 'download', 'download-theme', '#{downloadVersion}']);
});

//- $('.download-echarts').click(function (e) {
//- var el = document.createElement('div');
//- el.innerHTML = '<div class="download-note"><i class="note-icon"><img src="./images/note.svg" /></i> Please cite the following paper whenever you use ECharts in your R&D projects, products, research papers, technical reports, news reports, books, presentations, teaching, patents, and other related intelligence activities. <br /> 当您在研发项目,研究论文,技术报告,新闻报告,书籍,演示文稿,教学,专利等中使用 ECharts 时,请引用以下论文。</div>\
//- <div class="paper-desc">\
//- <div class="paper-title">\
//- ECharts: A Declarative Framework for Rapid Construction of Web-based Visualization\
//- </div>\
//- <div class="paper-author">Deqing Li, Honghui Mei, Yi Shen, Shuang Su, Wenli Zhang, Junting Wang, Ming Zu, Wei Chen.</div>\
//- <div class="paper-journal">Visual Informatics, 2018 <a href="http://www.cad.zju.edu.cn/home/vagblog/VAG_Work/echarts.pdf">[PDF]</a></div>\
//- </div>';
//- swal({
//- title: 'Notice',
//- content: el
//- });
//- _hmt.push(['_trackEvent', 'download', 'download', '#{downloadVersion}']);
//- });
//- $('.download-theme').click(function () {
//- _hmt.push(['_trackEvent', 'download', 'download-theme', '#{downloadVersion}']);
//- });
@@ -37,7 +37,7 @@ block content
.about-desc Beijing, China
.col-md-3.col-sm-4.col-xs-6
.about-person
img(src='images/people/Ted Liu.jpg')
img(src='images/people/tedliu.jpg')
h5.about-name Ted Liu
.about-desc Beijing, China

@@ -122,7 +122,7 @@ block content
.col-md-3.col-sm-4.col-xs-6
.about-person
a(href='https://github.com/ClemMakesApps', target='_blank')
img(src='images/people/clement.jpeg')
img(src='images/people/clement.jpg')
h5.about-name Clement Ho
.about-desc GitLab
.about-desc Texas, US
@@ -9,13 +9,15 @@ block extra_head
block content

style.
//- #download-main .d-section-version .circle-wrap {
//- line-height: 120px;
//- font-size: 20px;
//- font-family: Helvetica;
//- color: #214d62;
//- font-weight: normal;
//- }
/*
#download-main .d-section-version .circle-wrap {
line-height: 120px;
font-size: 20px;
font-family: Helvetica;
color: #214d62;
font-weight: normal;
}
*/

nav(class='navbar navbar-default navbar-fixed-top')
include ./nav
@@ -25,10 +27,8 @@ block content
p Free to choose to download different versions, different topics, the map data you need. You can be customized according to your needs.
.page-content.container#download-main
.d-section-version.d-section
h3.first Option 1: Install from npm
p <code>npm install echarts</code>

h3 Option 2: Install from released binary, or download source code
h3.first Option 1: Install from downloaded source code or binary

table.table#download-table
tr
@@ -57,13 +57,16 @@ block content
h4 License
p Apache ECharts (incubating) is licensed under <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.

h3 Option 3: Custom Build
a.btn.btn-thirdary.more-btn(href="builder.html") Customize
p Choose the features you want and build the file online.
h3 Option 2: Install from npm
p <code>npm install echarts</code>

h3 Option 3: Custom Build
a.btn.btn-thirdary.more-btn(href="builder.html") Customize
p Choose the features you want and build the file online.

h3 After downloading...
p
a(href='./tutorial.html') Get Started
h3 After downloading...
p
a(href='./tutorial.html') Get Started

include ./footer

@@ -72,40 +75,40 @@ block extra_js
script(type='text/javascript').
document.getElementById('nav-download').className = 'active';

var list = [
{
label: 'Common',
fileName: 'echarts.common.min.js',
descHTML0: 'Includes common charts and components.',
descHTML1: 'line bar pie scatter legend tooltip toolbox markLine markPoint markArea dataZoom'
},
{
label: 'Simple',
fileName: 'echarts.simple.min.js',
descHTML0: 'Only includes basic charts.',
descHTML1: 'line bar pie'
},
{
label: 'Full',
fileName: 'echarts.min.js',
descHTML0: 'Includes all charts and components.',
descHTML1: ''
},
{
label: 'Source',
fileName: 'echarts.js',
descHTML0: 'Source code of all charts and components, including warnings and hints for dev.',
descHTML1: ''
}
];

function encodeHTML(source) {
return source == null
? ''
: String(source)
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;')
.replace(/'/g, '&#39;');
}
//- var list = [
//- {
//- label: 'Common',
//- fileName: 'echarts.common.min.js',
//- descHTML0: 'Includes common charts and components.',
//- descHTML1: 'line bar pie scatter legend tooltip toolbox markLine markPoint markArea dataZoom'
//- },
//- {
//- label: 'Simple',
//- fileName: 'echarts.simple.min.js',
//- descHTML0: 'Only includes basic charts.',
//- descHTML1: 'line bar pie'
//- },
//- {
//- label: 'Full',
//- fileName: 'echarts.min.js',
//- descHTML0: 'Includes all charts and components.',
//- descHTML1: ''
//- },
//- {
//- label: 'Source',
//- fileName: 'echarts.js',
//- descHTML0: 'Source code of all charts and components, including warnings and hints for dev.',
//- descHTML1: ''
//- }
//- ];

//- function encodeHTML(source) {
//- return source == null
//- ? ''
//- : String(source)
//- .replace(/&/g, '&amp;')
//- .replace(/</g, '&lt;')
//- .replace(/>/g, '&gt;')
//- .replace(/"/g, '&quot;')
//- .replace(/'/g, '&#39;');
//- }
@@ -1,5 +1,4 @@
extends ../components/builder

block vars
- var downloadVersion = version;
- var isECharts4 = true;
@@ -57,7 +57,7 @@ block content
.col-md-3.col-sm-4.col-xs-6
.about-person
//- a(href='https://whimsy.apache.org/roster/committer/wave', target='_blank')
img(src='images/people/Dave.jpg')
img(src='images/people/dave.jpg')
h5.about-name Dave Fisher
.about-desc 美国 · 旧金山
.col-md-3.col-sm-4.col-xs-6
@@ -69,13 +69,13 @@ block content
.col-md-3.col-sm-4.col-xs-6
.about-person
//- a(href='https://whimsy.apache.org/roster/committer/wusheng', target='_blank')
img(src='images/people/Sheng Wu.jpg')
img(src='images/people/shengwu.jpg')
h5.about-name 吴晟
.about-desc 北京 · 中国
.col-md-3.col-sm-4.col-xs-6
.about-person
//- a(href='https://whimsy.apache.org/roster/committer/tedliu', target='_blank')
img(src='images/people/Ted Liu.jpg')
img(src='images/people/tedliu.jpg')
h5.about-name Ted Liu
.about-desc 北京 · 中国

@@ -156,7 +156,7 @@ block content
.col-md-3.col-sm-4.col-xs-6
.about-person
a(href='https://github.com/ClemMakesApps', target='_blank')
img(src='images/people/clement.jpeg')
img(src='images/people/clement.jpg')
h5.about-name Clement Ho
.about-desc GitLab
.about-desc 美国 · 得克萨斯州
@@ -1,7 +1,6 @@
extends ../components/download

block vars
- var downloadVersion = version;
- var downloadPath = 'dist';
- var isECharts4 = true;
- var sizeCommon = '473 KB'; //- deprecated
@@ -25,6 +25,11 @@
font-weight: 100;
}
}
.download-version {
margin: 5px;
font-size: 18px;
font-weight: bold;
}
}

#configuration {

0 comments on commit cfe72b9

Please sign in to comment.