diff --git a/public/data/thumb-dark/matrix-confusion.png b/public/data/thumb-dark/matrix-confusion.png new file mode 100644 index 00000000..fdde08ea Binary files /dev/null and b/public/data/thumb-dark/matrix-confusion.png differ diff --git a/public/data/thumb-dark/matrix-confusion.webp b/public/data/thumb-dark/matrix-confusion.webp new file mode 100644 index 00000000..253a475d Binary files /dev/null and b/public/data/thumb-dark/matrix-confusion.webp differ diff --git a/public/data/thumb-dark/matrix-correlation-heatmap.png b/public/data/thumb-dark/matrix-correlation-heatmap.png new file mode 100644 index 00000000..8f0614c4 Binary files /dev/null and b/public/data/thumb-dark/matrix-correlation-heatmap.png differ diff --git a/public/data/thumb-dark/matrix-correlation-heatmap.webp b/public/data/thumb-dark/matrix-correlation-heatmap.webp new file mode 100644 index 00000000..d6e26fdb Binary files /dev/null and b/public/data/thumb-dark/matrix-correlation-heatmap.webp differ diff --git a/public/data/thumb-dark/matrix-correlation-scatter.png b/public/data/thumb-dark/matrix-correlation-scatter.png new file mode 100644 index 00000000..2742dd4a Binary files /dev/null and b/public/data/thumb-dark/matrix-correlation-scatter.png differ diff --git a/public/data/thumb-dark/matrix-correlation-scatter.webp b/public/data/thumb-dark/matrix-correlation-scatter.webp new file mode 100644 index 00000000..154a8851 Binary files /dev/null and b/public/data/thumb-dark/matrix-correlation-scatter.webp differ diff --git a/public/data/thumb-dark/matrix-covariance.png b/public/data/thumb-dark/matrix-covariance.png new file mode 100644 index 00000000..fa58ff50 Binary files /dev/null and b/public/data/thumb-dark/matrix-covariance.png differ diff --git a/public/data/thumb-dark/matrix-covariance.webp b/public/data/thumb-dark/matrix-covariance.webp new file mode 100644 index 00000000..f1eab1df Binary files /dev/null and b/public/data/thumb-dark/matrix-covariance.webp differ diff --git a/public/data/thumb-dark/matrix-graph.png b/public/data/thumb-dark/matrix-graph.png new file mode 100644 index 00000000..da7058ec Binary files /dev/null and b/public/data/thumb-dark/matrix-graph.png differ diff --git a/public/data/thumb-dark/matrix-graph.webp b/public/data/thumb-dark/matrix-graph.webp new file mode 100644 index 00000000..0cdc48a6 Binary files /dev/null and b/public/data/thumb-dark/matrix-graph.webp differ diff --git a/public/data/thumb-dark/matrix-periodic-table.png b/public/data/thumb-dark/matrix-periodic-table.png new file mode 100644 index 00000000..86759b4c Binary files /dev/null and b/public/data/thumb-dark/matrix-periodic-table.png differ diff --git a/public/data/thumb-dark/matrix-periodic-table.webp b/public/data/thumb-dark/matrix-periodic-table.webp new file mode 100644 index 00000000..82f72ef8 Binary files /dev/null and b/public/data/thumb-dark/matrix-periodic-table.webp differ diff --git a/public/data/thumb-dark/matrix-pie.png b/public/data/thumb-dark/matrix-pie.png new file mode 100644 index 00000000..a6716127 Binary files /dev/null and b/public/data/thumb-dark/matrix-pie.png differ diff --git a/public/data/thumb-dark/matrix-pie.webp b/public/data/thumb-dark/matrix-pie.webp new file mode 100644 index 00000000..69ff86c8 Binary files /dev/null and b/public/data/thumb-dark/matrix-pie.webp differ diff --git a/public/data/thumb-dark/matrix-simple.png b/public/data/thumb-dark/matrix-simple.png new file mode 100644 index 00000000..2a5cabda Binary files /dev/null and b/public/data/thumb-dark/matrix-simple.png differ diff --git a/public/data/thumb-dark/matrix-simple.webp b/public/data/thumb-dark/matrix-simple.webp new file mode 100644 index 00000000..81c813ac Binary files /dev/null and b/public/data/thumb-dark/matrix-simple.webp differ diff --git a/public/data/thumb/matrix-confusion.png b/public/data/thumb/matrix-confusion.png new file mode 100644 index 00000000..03a88f8a Binary files /dev/null and b/public/data/thumb/matrix-confusion.png differ diff --git a/public/data/thumb/matrix-confusion.webp b/public/data/thumb/matrix-confusion.webp new file mode 100644 index 00000000..9d18cce6 Binary files /dev/null and b/public/data/thumb/matrix-confusion.webp differ diff --git a/public/data/thumb/matrix-correlation-heatmap.png b/public/data/thumb/matrix-correlation-heatmap.png new file mode 100644 index 00000000..b97e0837 Binary files /dev/null and b/public/data/thumb/matrix-correlation-heatmap.png differ diff --git a/public/data/thumb/matrix-correlation-heatmap.webp b/public/data/thumb/matrix-correlation-heatmap.webp new file mode 100644 index 00000000..4912be34 Binary files /dev/null and b/public/data/thumb/matrix-correlation-heatmap.webp differ diff --git a/public/data/thumb/matrix-correlation-scatter.png b/public/data/thumb/matrix-correlation-scatter.png new file mode 100644 index 00000000..d9c573d2 Binary files /dev/null and b/public/data/thumb/matrix-correlation-scatter.png differ diff --git a/public/data/thumb/matrix-correlation-scatter.webp b/public/data/thumb/matrix-correlation-scatter.webp new file mode 100644 index 00000000..781809b4 Binary files /dev/null and b/public/data/thumb/matrix-correlation-scatter.webp differ diff --git a/public/data/thumb/matrix-covariance.png b/public/data/thumb/matrix-covariance.png new file mode 100644 index 00000000..4598845b Binary files /dev/null and b/public/data/thumb/matrix-covariance.png differ diff --git a/public/data/thumb/matrix-covariance.webp b/public/data/thumb/matrix-covariance.webp new file mode 100644 index 00000000..70a03d06 Binary files /dev/null and b/public/data/thumb/matrix-covariance.webp differ diff --git a/public/data/thumb/matrix-graph.png b/public/data/thumb/matrix-graph.png new file mode 100644 index 00000000..bf23b488 Binary files /dev/null and b/public/data/thumb/matrix-graph.png differ diff --git a/public/data/thumb/matrix-graph.webp b/public/data/thumb/matrix-graph.webp new file mode 100644 index 00000000..630a8a15 Binary files /dev/null and b/public/data/thumb/matrix-graph.webp differ diff --git a/public/data/thumb/matrix-periodic-table.png b/public/data/thumb/matrix-periodic-table.png new file mode 100644 index 00000000..60cdbbae Binary files /dev/null and b/public/data/thumb/matrix-periodic-table.png differ diff --git a/public/data/thumb/matrix-periodic-table.webp b/public/data/thumb/matrix-periodic-table.webp new file mode 100644 index 00000000..42d3e129 Binary files /dev/null and b/public/data/thumb/matrix-periodic-table.webp differ diff --git a/public/data/thumb/matrix-pie.png b/public/data/thumb/matrix-pie.png new file mode 100644 index 00000000..498d7935 Binary files /dev/null and b/public/data/thumb/matrix-pie.png differ diff --git a/public/data/thumb/matrix-pie.webp b/public/data/thumb/matrix-pie.webp new file mode 100644 index 00000000..212537f6 Binary files /dev/null and b/public/data/thumb/matrix-pie.webp differ diff --git a/public/data/thumb/matrix-simple.png b/public/data/thumb/matrix-simple.png new file mode 100644 index 00000000..e3cfbe8f Binary files /dev/null and b/public/data/thumb/matrix-simple.png differ diff --git a/public/data/thumb/matrix-simple.webp b/public/data/thumb/matrix-simple.webp new file mode 100644 index 00000000..73a56ff4 Binary files /dev/null and b/public/data/thumb/matrix-simple.webp differ diff --git a/public/examples/ts/matrix-correlation-heatmap.ts b/public/examples/ts/matrix-correlation-heatmap.ts index a2c17229..ab8351f6 100644 --- a/public/examples/ts/matrix-correlation-heatmap.ts +++ b/public/examples/ts/matrix-correlation-heatmap.ts @@ -52,22 +52,7 @@ option = { calculable: true, orient: 'horizontal', top: 5, - left: 'center', - inRange: { - color: [ - '#313695', - '#4575b4', - '#74add1', - '#abd9e9', - '#e0f3f8', - '#ffffbf', - '#fee090', - '#fdae61', - '#f46d43', - '#d73027', - '#a50026' - ] - } + left: 'center' }, series: { type: 'heatmap', diff --git a/public/examples/ts/matrix-covariance.ts b/public/examples/ts/matrix-covariance.ts index 730923ec..e61a8fc3 100644 --- a/public/examples/ts/matrix-covariance.ts +++ b/public/examples/ts/matrix-covariance.ts @@ -62,15 +62,21 @@ for (let i = 1; i <= size; ++i) { option = { matrix: { x: { - data: xData + data: xData, + show: false }, y: { - data: yData + data: yData, + show: false }, width: 500, height: 500, left: (window.innerWidth - 500) / 2 }, + tooltip: { + show: true, + valueFormatter: value => Math.round(value) + }, visualMap: { type: 'continuous', min: 15, diff --git a/src/asset/icon/matrix.svg b/src/asset/icon/matrix.svg new file mode 100644 index 00000000..fc012f14 --- /dev/null +++ b/src/asset/icon/matrix.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/common/config.js b/src/common/config.js index 4cecae9c..77fe2999 100644 --- a/src/common/config.js +++ b/src/common/config.js @@ -20,6 +20,7 @@ export const EXAMPLE_CATEGORIES = [ 'pictorialBar', 'themeRiver', 'calendar', + 'matrix', 'custom', 'dataset', diff --git a/src/common/i18n.js b/src/common/i18n.js index f7389f65..ec62b5f6 100644 --- a/src/common/i18n.js +++ b/src/common/i18n.js @@ -108,6 +108,7 @@ export default { pictorialBar: 'PictorialBar', themeRiver: 'ThemeRiver', calendar: 'Calendar', + matrix: 'Matrix', custom: 'Custom', dataset: 'Dataset', @@ -237,6 +238,7 @@ export default { pictorialBar: '象形柱图', themeRiver: '主题河流图', calendar: '日历坐标系', + matrix: '矩阵坐标系', custom: '自定义系列', dataset: '数据集', diff --git a/src/explore/Explore.vue b/src/explore/Explore.vue index a0023e3c..2f9902b9 100644 --- a/src/explore/Explore.vue +++ b/src/explore/Explore.vue @@ -94,6 +94,7 @@ const icons = {}; 'pictorialBar', 'themeRiver', 'calendar', + 'matrix', 'custom', 'sunburst', 'tree',