Skip to content

Commit

Permalink
update with ECharts 5.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Ovilia committed Apr 29, 2021
1 parent b2cdc7c commit 8272862
Show file tree
Hide file tree
Showing 18 changed files with 81 additions and 58 deletions.
25 changes: 24 additions & 1 deletion ec-canvas/echarts.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion pages/bar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ function initChart(canvas, width, height, dpr) {
canvas.setChart(chart);

var option = {
color: ['#37a2da', '#32c5e9', '#67e0e3'],
tooltip: {
trigger: 'axis',
axisPointer: { // 坐标轴指示器,坐标轴触发有效
Expand Down
1 change: 0 additions & 1 deletion pages/funnel/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ function initChart(canvas, width, height, dpr) {

var option = {
backgroundColor: "#ffffff",
color: ["#37A2DA", "#32C5E9", "#67E0E3", "#91F2DE", "#FFDB5C", "#FF9F7F"],
tooltip: {
trigger: 'item',
formatter: "{a}\n{b} : {c}%"
Expand Down
12 changes: 1 addition & 11 deletions pages/gauge/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,14 @@ function initChart(canvas, width, height, dpr) {

var option = {
backgroundColor: "#ffffff",
color: ["#37A2DA", "#32C5E9", "#67E0E3"],
series: [{
name: '业务指标',
type: 'gauge',
detail: {
formatter: '{value}%'
},
axisLine: {
show: true,
lineStyle: {
width: 30,
shadowBlur: 0,
color: [
[0.3, '#67e0e3'],
[0.7, '#37a2da'],
[1, '#fd666d']
]
}
show: true
},
data: [{
value: 40,
Expand Down
1 change: 0 additions & 1 deletion pages/graph/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ function initChart(canvas, width, height, dpr) {
canvas.setChart(chart);

var option = {
color: ["#37A2DA", "#32C5E9", "#67E0E3", "#91F2DE", "#FFDB5C", "#FF9F7F"],
title: {
text: 'Graph 简单示例'
},
Expand Down
1 change: 0 additions & 1 deletion pages/lazyLoad/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ const app = getApp();

function setOption(chart) {
const option = {
color: ['#37a2da', '#32c5e9', '#67e0e3'],
tooltip: {
trigger: 'axis',
axisPointer: { // 坐标轴指示器,坐标轴触发有效
Expand Down
1 change: 0 additions & 1 deletion pages/line/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ function initChart(canvas, width, height, dpr) {
text: '测试下面legend的红色区域不应被裁剪',
left: 'center'
},
color: ["#37A2DA", "#67E0E3", "#9FE6B8"],
legend: {
data: ['A', 'B', 'C'],
top: 50,
Expand Down
1 change: 0 additions & 1 deletion pages/move/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ Page({

function getBarOption() {
return {
color: ['#37a2da', '#32c5e9', '#67e0e3'],
tooltip: {
trigger: 'axis',
axisPointer: { // 坐标轴指示器,坐标轴触发有效
Expand Down
2 changes: 0 additions & 2 deletions pages/multiCharts/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ Page({

function getBarOption() {
return {
color: ['#37a2da', '#32c5e9', '#67e0e3'],
tooltip: {
trigger: 'axis',
axisPointer: { // 坐标轴指示器,坐标轴触发有效
Expand Down Expand Up @@ -177,7 +176,6 @@ function getScatterOption() {
};

return {
color: ["#FF7070", "#60B6E3"],
backgroundColor: '#eee',
xAxis: axisCommon,
yAxis: axisCommon,
Expand Down
1 change: 0 additions & 1 deletion pages/parallel/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ function initChart(canvas, width, height, dpr) {
canvas.setChart(chart);

var option = {
color: ['#37a2da'],
parallelAxis: [
{ dim: 0, name: 'Price' },
{ dim: 1, name: 'Net Weight' },
Expand Down
3 changes: 1 addition & 2 deletions pages/pie/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ function initChart(canvas, width, height, dpr) {

var option = {
backgroundColor: "#ffffff",
color: ["#37A2DA", "#32C5E9", "#67E0E3", "#91F2DE", "#FFDB5C", "#FF9F7F"],
series: [{
label: {
normal: {
Expand All @@ -21,7 +20,7 @@ function initChart(canvas, width, height, dpr) {
},
type: 'pie',
center: ['50%', '50%'],
radius: ['40%', '60%'],
radius: ['20%', '40%'],
data: [{
value: 55,
name: '北京'
Expand Down
1 change: 0 additions & 1 deletion pages/radar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ function initChart(canvas, width, height, dpr) {

var option = {
backgroundColor: "#ffffff",
color: ["#37A2DA", "#FF9F7F"],
xAxis: {
show: false
},
Expand Down
1 change: 0 additions & 1 deletion pages/sankey/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ function initChart(canvas, width, height, dpr) {
canvas.setChart(chart);

var option = {
color: ["#37A2DA", "#32C5E9", "#67E0E3", "#91F2DE", "#92CEFF", "#6084E0"],
series: {
type: 'sankey',
layout: 'none',
Expand Down
1 change: 0 additions & 1 deletion pages/saveCanvas/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ function initChart(canvas, width, height, dpr) {
canvas.setChart(chart);

var option = {
color: ['#37a2da', '#32c5e9', '#67e0e3'],
tooltip: {
trigger: 'axis',
axisPointer: { // 坐标轴指示器,坐标轴触发有效
Expand Down
1 change: 0 additions & 1 deletion pages/scatter/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ function initChart(canvas, width, height, dpr) {
};

var option = {
color: ["#FF7070", "#60B6E3"],
backgroundColor: '#eee',
xAxis: axisCommon,
yAxis: axisCommon,
Expand Down
1 change: 0 additions & 1 deletion pages/themeRiver/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ function initChart(canvas, width, height, dpr) {
canvas.setChart(chart);

var option = {
color: ["#37A2DA", "#32C5E9", "#67E0E3", "#91F2DE", "#FFDB5C", "#FF9F7F"],
tooltip: {
trigger: 'axis',
axisPointer: {
Expand Down
3 changes: 1 addition & 2 deletions pages/treemap/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,7 @@ function initChart(canvas, width, height, dpr) {
}]
},
],
leafDepth: 2,
color: ["#FFA54F", "#FF8040", "#FFD39B", "#FF4500"]
leafDepth: 2
}]
};

Expand Down
82 changes: 54 additions & 28 deletions project.config.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,56 @@
{
"description": "ECharts 图表示例",
"setting": {
"urlCheck": true,
"es6": true,
"postcss": false,
"minified": false,
"newFeature": true
},
"compileType": "miniprogram",
"libVersion": "2.10.2",
"appid": "wxee40007e9b62f5d0",
"projectname": "ECharts%20Demo",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": {
"search": {
"current": -1,
"list": []
},
"conversation": {
"current": -1,
"list": []
},
"miniprogram": {
"current": -1,
"list": []
}
}
"description": "ECharts 图表示例",
"setting": {
"urlCheck": true,
"es6": true,
"enhance": false,
"postcss": false,
"preloadBackgroundData": false,
"minified": false,
"newFeature": true,
"coverView": true,
"nodeModules": false,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
"useApiHostProcess": false,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"enableEngineNative": false,
"bundle": false,
"useIsolateContext": true,
"useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false,
"userConfirmedBundleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
"minifyWXSS": true
},
"compileType": "miniprogram",
"libVersion": "2.10.2",
"appid": "wxee40007e9b62f5d0",
"projectname": "ECharts%20Demo",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": {
"search": {
"list": []
},
"conversation": {
"list": []
},
"miniprogram": {
"list": []
}
}
}

0 comments on commit 8272862

Please sign in to comment.