diff --git a/examples/area/basic/demo/meta.json b/examples/area/basic/demo/meta.json index f1e8977af7..f5e65e30c0 100644 --- a/examples/area/basic/demo/meta.json +++ b/examples/area/basic/demo/meta.json @@ -10,7 +10,7 @@ "zh": "基础面积图", "en": "basic Area chart" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*aARCQbtAl4AAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*AE2CTr-Uz3QAAAAAAAAAAAAAARQnAQ" }, { "filename": "basic-gradients.ts", @@ -18,7 +18,7 @@ "zh": "渐变色面积图", "en": "gradients Area chart" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*aARCQbtAl4AAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*4dnrSbNeOGQAAAAAAAAAAAAAARQnAQ" }, { "filename": "basic-slider.ts", @@ -26,7 +26,7 @@ "zh": "缩略轴面积图", "en": "slider Area chart" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*aARCQbtAl4AAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*xXtxRLa2CHoAAAAAAAAAAAAAARQnAQ" }, { "filename": "basic-annotation.ts", @@ -34,7 +34,7 @@ "zh": "带中位线标注的基础面积图", "en": "basic Area chart with Line Annotation" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*aARCQbtAl4AAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*7dkjRqqCukoAAAAAAAAAAAAAARQnAQ" } ] } diff --git a/examples/area/stacked/demo/area-large-data.ts b/examples/area/stacked/demo/area-large-data.ts index d746b71455..04988ea1c6 100644 --- a/examples/area/stacked/demo/area-large-data.ts +++ b/examples/area/stacked/demo/area-large-data.ts @@ -19,6 +19,9 @@ fetch('https://gw.alipayobjects.com/os/bmw-prod/55424a73-7cb8-4f79-b60d-3ab627ac formatter: (v) => `${v}`.replace(/\d{1,3}(?=(\d{3})+$)/g, (s) => `${s},`), }, }, + legend: { + position: 'top', + }, }); area.render(); diff --git a/examples/area/stacked/demo/basic.ts b/examples/area/stacked/demo/basic.ts index 1dbdeffa62..4cb668711c 100644 --- a/examples/area/stacked/demo/basic.ts +++ b/examples/area/stacked/demo/basic.ts @@ -8,6 +8,9 @@ fetch('https://gw.alipayobjects.com/os/bmw-prod/b21e7336-0b3e-486c-9070-612ede49 xField: 'date', yField: 'value', seriesField: 'country', + legend: { + position: 'right-top', + }, }); area.render(); }); diff --git a/examples/area/stacked/demo/meta.json b/examples/area/stacked/demo/meta.json index f7cee4faba..a3fc6fbd91 100644 --- a/examples/area/stacked/demo/meta.json +++ b/examples/area/stacked/demo/meta.json @@ -26,7 +26,7 @@ "zh": "带缩略轴堆叠面积图", "en": "StackedArea with slider" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*u6u1RqMG9coAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*LGuMQ4uO_0EAAAAAAAAAAAAAARQnAQ" } ] } diff --git a/examples/bar/basic/demo/meta.json b/examples/bar/basic/demo/meta.json index b5cb9a862b..d795b4bd1b 100644 --- a/examples/bar/basic/demo/meta.json +++ b/examples/bar/basic/demo/meta.json @@ -26,7 +26,7 @@ "zh": "基础条形图 - 自定义颜色", "en": "Bar chart color" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*uSKqQo2lCPoAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*IfUNT5Mhz_IAAAAAAAAAAAAAARQnAQ" }, { "filename": "width.ts", diff --git a/examples/bar/grouped/demo/basic.ts b/examples/bar/grouped/demo/basic.ts index 9ff9672b4b..9f04d7f3f4 100644 --- a/examples/bar/grouped/demo/basic.ts +++ b/examples/bar/grouped/demo/basic.ts @@ -2,94 +2,54 @@ import { Bar } from '@antv/g2plot'; const data = [ { - year: '1991', - value: 3, - type: 'Lon', + label: 'Mon.', + type: 'series1', + value: 2800, }, { - year: '1992', - value: 4, - type: 'Lon', + label: 'Mon.', + type: 'series2', + value: 2260, }, { - year: '1993', - value: 3.5, - type: 'Lon', + label: 'Tues.', + type: 'series1', + value: 1800, }, { - year: '1994', - value: 5, - type: 'Lon', + label: 'Tues.', + type: 'series2', + value: 1300, }, { - year: '1995', - value: 4.9, - type: 'Lon', + label: 'Wed.', + type: 'series1', + value: 950, }, { - year: '1996', - value: 6, - type: 'Lon', + label: 'Wed.', + type: 'series2', + value: 900, }, { - year: '1997', - value: 7, - type: 'Lon', + label: 'Thur.', + type: 'series1', + value: 500, }, { - year: '1998', - value: 9, - type: 'Lon', + label: 'Thur.', + type: 'series2', + value: 390, }, { - year: '1999', - value: 13, - type: 'Lon', + label: 'Fri.', + type: 'series1', + value: 170, }, { - year: '1991', - value: 3, - type: 'Bor', - }, - { - year: '1992', - value: 4, - type: 'Bor', - }, - { - year: '1993', - value: 3.5, - type: 'Bor', - }, - { - year: '1994', - value: 5, - type: 'Bor', - }, - { - year: '1995', - value: 4.9, - type: 'Bor', - }, - { - year: '1996', - value: 6, - type: 'Bor', - }, - { - year: '1997', - value: 7, - type: 'Bor', - }, - { - year: '1998', - value: 9, - type: 'Bor', - }, - { - year: '1999', - value: 13, - type: 'Bor', + label: 'Fri.', + type: 'series2', + value: 100, }, ]; @@ -97,8 +57,21 @@ const stackedBarPlot = new Bar('container', { data, isGroup: true, xField: 'value', - yField: 'year', + yField: 'label', + color: ['#1383ab', '#c52125'], seriesField: 'type', + marginRatio: 0, + label: { + // 可手动配置 label 数据标签位置 + position: 'middle', // 'left', 'middle', 'right' + // 可配置附加的布局方法 + layout: [ + // 柱形图数据标签位置自动调整 + { type: 'interval-adjust-position' }, + // 数据标签文颜色自动调整 + { type: 'adjust-color' }, + ], + }, }); stackedBarPlot.render(); diff --git a/examples/bar/grouped/demo/label.ts b/examples/bar/grouped/demo/label.ts deleted file mode 100644 index b5d9a22d5d..0000000000 --- a/examples/bar/grouped/demo/label.ts +++ /dev/null @@ -1,115 +0,0 @@ -import { Bar } from '@antv/g2plot'; - -const data = [ - { - year: '1991', - value: 3, - type: 'Lon', - }, - { - year: '1992', - value: 4, - type: 'Lon', - }, - { - year: '1993', - value: 3.5, - type: 'Lon', - }, - { - year: '1994', - value: 5, - type: 'Lon', - }, - { - year: '1995', - value: 4.9, - type: 'Lon', - }, - { - year: '1996', - value: 6, - type: 'Lon', - }, - { - year: '1997', - value: 7, - type: 'Lon', - }, - { - year: '1998', - value: 9, - type: 'Lon', - }, - { - year: '1999', - value: 13, - type: 'Lon', - }, - { - year: '1991', - value: 3, - type: 'Bor', - }, - { - year: '1992', - value: 4, - type: 'Bor', - }, - { - year: '1993', - value: 3.5, - type: 'Bor', - }, - { - year: '1994', - value: 5, - type: 'Bor', - }, - { - year: '1995', - value: 4.9, - type: 'Bor', - }, - { - year: '1996', - value: 6, - type: 'Bor', - }, - { - year: '1997', - value: 7, - type: 'Bor', - }, - { - year: '1998', - value: 9, - type: 'Bor', - }, - { - year: '1999', - value: 13, - type: 'Bor', - }, -]; - -const stackedBarPlot = new Bar('container', { - data, - isGroup: true, - xField: 'value', - yField: 'year', - seriesField: 'type', - label: { - // 可手动配置 label 数据标签位置 - position: 'middle', // 'left', 'middle', 'right' - // 可配置附加的布局方法 - layout: [ - // 柱形图数据标签位置自动调整 - { type: 'interval-adjust-position' }, - // 数据标签文颜色自动调整 - { type: 'adjust-color' }, - ], - }, -}); - -stackedBarPlot.render(); diff --git a/examples/bar/grouped/demo/margin.ts b/examples/bar/grouped/demo/margin.ts deleted file mode 100644 index 7d768b47b5..0000000000 --- a/examples/bar/grouped/demo/margin.ts +++ /dev/null @@ -1,105 +0,0 @@ -import { Bar } from '@antv/g2plot'; - -const data = [ - { - year: '1991', - value: 3, - type: 'Lon', - }, - { - year: '1992', - value: 4, - type: 'Lon', - }, - { - year: '1993', - value: 3.5, - type: 'Lon', - }, - { - year: '1994', - value: 5, - type: 'Lon', - }, - { - year: '1995', - value: 4.9, - type: 'Lon', - }, - { - year: '1996', - value: 6, - type: 'Lon', - }, - { - year: '1997', - value: 7, - type: 'Lon', - }, - { - year: '1998', - value: 9, - type: 'Lon', - }, - { - year: '1999', - value: 13, - type: 'Lon', - }, - { - year: '1991', - value: 3, - type: 'Bor', - }, - { - year: '1992', - value: 4, - type: 'Bor', - }, - { - year: '1993', - value: 3.5, - type: 'Bor', - }, - { - year: '1994', - value: 5, - type: 'Bor', - }, - { - year: '1995', - value: 4.9, - type: 'Bor', - }, - { - year: '1996', - value: 6, - type: 'Bor', - }, - { - year: '1997', - value: 7, - type: 'Bor', - }, - { - year: '1998', - value: 9, - type: 'Bor', - }, - { - year: '1999', - value: 13, - type: 'Bor', - }, -]; - -const stackedBarPlot = new Bar('container', { - data, - isGroup: true, - xField: 'value', - yField: 'year', - seriesField: 'type', - marginRatio: 1 / 32, -}); - -stackedBarPlot.render(); diff --git a/examples/bar/grouped/demo/meta.json b/examples/bar/grouped/demo/meta.json index 4c6743e936..12842d47a9 100644 --- a/examples/bar/grouped/demo/meta.json +++ b/examples/bar/grouped/demo/meta.json @@ -10,23 +10,7 @@ "zh": "分组条形图", "en": "Grouped Bar chart" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*a5SmRYq1wmcAAAAAAAAAAABkARQnAQ" - }, - { - "filename": "label.ts", - "title": { - "zh": "分组条形图 - 数据标签", - "en": "Grouped Bar chart label" - }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*a5SmRYq1wmcAAAAAAAAAAABkARQnAQ" - }, - { - "filename": "margin.ts", - "title": { - "zh": "分组条形图 - 分组间距", - "en": "Grouped Bar chart Bar margin" - }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*a5SmRYq1wmcAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*kKDgToM_XmIAAAAAAAAAAAAAARQnAQ" } ] } diff --git a/examples/bar/stacked/demo/basic.ts b/examples/bar/stacked/demo/basic.ts index b898b2712a..8603b42df8 100644 --- a/examples/bar/stacked/demo/basic.ts +++ b/examples/bar/stacked/demo/basic.ts @@ -94,11 +94,22 @@ const data = [ ]; const stackedBarPlot = new Bar('container', { - data, + data: data.reverse(), isStack: true, xField: 'value', yField: 'year', seriesField: 'type', + label: { + // 可手动配置 label 数据标签位置 + position: 'middle', // 'left', 'middle', 'right' + // 可配置附加的布局方法 + layout: [ + // 柱形图数据标签位置自动调整 + { type: 'interval-adjust-position' }, + // 数据标签文颜色自动调整 + { type: 'adjust-color' }, + ], + }, }); stackedBarPlot.render(); diff --git a/examples/bar/stacked/demo/label.ts b/examples/bar/stacked/demo/label.ts deleted file mode 100644 index 8bb4ea5ac5..0000000000 --- a/examples/bar/stacked/demo/label.ts +++ /dev/null @@ -1,115 +0,0 @@ -import { Bar } from '@antv/g2plot'; - -const data = [ - { - year: '1991', - value: 3, - type: 'Lon', - }, - { - year: '1992', - value: 4, - type: 'Lon', - }, - { - year: '1993', - value: 3.5, - type: 'Lon', - }, - { - year: '1994', - value: 5, - type: 'Lon', - }, - { - year: '1995', - value: 4.9, - type: 'Lon', - }, - { - year: '1996', - value: 6, - type: 'Lon', - }, - { - year: '1997', - value: 7, - type: 'Lon', - }, - { - year: '1998', - value: 9, - type: 'Lon', - }, - { - year: '1999', - value: 13, - type: 'Lon', - }, - { - year: '1991', - value: 3, - type: 'Bor', - }, - { - year: '1992', - value: 4, - type: 'Bor', - }, - { - year: '1993', - value: 3.5, - type: 'Bor', - }, - { - year: '1994', - value: 5, - type: 'Bor', - }, - { - year: '1995', - value: 4.9, - type: 'Bor', - }, - { - year: '1996', - value: 6, - type: 'Bor', - }, - { - year: '1997', - value: 7, - type: 'Bor', - }, - { - year: '1998', - value: 9, - type: 'Bor', - }, - { - year: '1999', - value: 13, - type: 'Bor', - }, -]; - -const stackedBarPlot = new Bar('container', { - data, - isStack: true, - xField: 'value', - yField: 'year', - seriesField: 'type', - label: { - // 可手动配置 label 数据标签位置 - position: 'middle', // 'left', 'middle', 'right' - // 可配置附加的布局方法 - layout: [ - // 柱形图数据标签位置自动调整 - { type: 'interval-adjust-position' }, - // 数据标签文颜色自动调整 - { type: 'adjust-color' }, - ], - }, -}); - -stackedBarPlot.render(); diff --git a/examples/bar/stacked/demo/meta.json b/examples/bar/stacked/demo/meta.json index d941fd63e3..cd91d3ae94 100644 --- a/examples/bar/stacked/demo/meta.json +++ b/examples/bar/stacked/demo/meta.json @@ -11,14 +11,6 @@ "en": "StackedBar chart" }, "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*N8smQYy45fAAAAAAAAAAAABkARQnAQ" - }, - { - "filename": "label.ts", - "title": { - "zh": "堆叠条形图 - 数据标签", - "en": "StackedBar chart label" - }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*N8smQYy45fAAAAAAAAAAAABkARQnAQ" } ] } diff --git a/examples/box/basic/demo/meta.json b/examples/box/basic/demo/meta.json index 0cae319474..3fbcbae69b 100644 --- a/examples/box/basic/demo/meta.json +++ b/examples/box/basic/demo/meta.json @@ -26,7 +26,7 @@ "zh": "基础箱型图（有异常值）", "en": "Box chart with error" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_f5c722/afts/img/A*XU8zRY8NSHsAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*cE6vR461omUAAAAAAAAAAAAAARQnAQ" } ] } \ No newline at end of file diff --git a/examples/bullet/basic/demo/meta.json b/examples/bullet/basic/demo/meta.json index 2d6bcb5378..71ba8b06dd 100644 --- a/examples/bullet/basic/demo/meta.json +++ b/examples/bullet/basic/demo/meta.json @@ -42,7 +42,7 @@ "zh": "分组子弹图", "en": "grouped Bullet chart" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*N-DoQbx-WMwAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*m78MS5pgqrkAAAAAAAAAAAAAARQnAQ" } ] } diff --git a/examples/column/basic/demo/meta.json b/examples/column/basic/demo/meta.json index 50e293cd7c..1aab8519d4 100644 --- a/examples/column/basic/demo/meta.json +++ b/examples/column/basic/demo/meta.json @@ -26,7 +26,7 @@ "zh": "基础柱状图 - 自定义颜色", "en": "Column chart color" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*ydTeQY3N8GkAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*j-JZQYbuNS8AAAAAAAAAAAAAARQnAQ" }, { "filename": "width.ts", @@ -34,7 +34,7 @@ "zh": "基础柱状图 - 柱子宽度", "en": "Column chart column width" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*ydTeQY3N8GkAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*92VnSrkQLeAAAAAAAAAAAABkARQnAQ" }, { "filename": "region-annotation.ts", @@ -42,7 +42,7 @@ "zh": "带辅助框标注的基础柱状图", "en": "Basic Column chart with region annotation" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*92VnSrkQLeAAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*FOmATLFeuxkAAAAAAAAAAAAAARQnAQ" } ] } diff --git a/examples/column/grouped/demo/basic.ts b/examples/column/grouped/demo/basic.ts index 78b8f6c03a..9b0cae5304 100644 --- a/examples/column/grouped/demo/basic.ts +++ b/examples/column/grouped/demo/basic.ts @@ -2,103 +2,105 @@ import { Column } from '@antv/g2plot'; const data = [ { - year: '1991', - value: 3, - type: 'Lon', + name: 'London', + 月份: 'Jan.', + 月均降雨量: 18.9, }, { - year: '1992', - value: 4, - type: 'Lon', + name: 'London', + 月份: 'Feb.', + 月均降雨量: 28.8, }, { - year: '1993', - value: 3.5, - type: 'Lon', + name: 'London', + 月份: 'Mar.', + 月均降雨量: 39.3, }, { - year: '1994', - value: 5, - type: 'Lon', + name: 'London', + 月份: 'Apr.', + 月均降雨量: 81.4, }, { - year: '1995', - value: 4.9, - type: 'Lon', + name: 'London', + 月份: 'May', + 月均降雨量: 47, }, { - year: '1996', - value: 6, - type: 'Lon', + name: 'London', + 月份: 'Jun.', + 月均降雨量: 20.3, }, { - year: '1997', - value: 7, - type: 'Lon', + name: 'London', + 月份: 'Jul.', + 月均降雨量: 24, }, { - year: '1998', - value: 9, - type: 'Lon', + name: 'London', + 月份: 'Aug.', + 月均降雨量: 35.6, }, { - year: '1999', - value: 13, - type: 'Lon', + name: 'Berlin', + 月份: 'Jan.', + 月均降雨量: 12.4, }, { - year: '1991', - value: 3, - type: 'Bor', + name: 'Berlin', + 月份: 'Feb.', + 月均降雨量: 23.2, }, { - year: '1992', - value: 4, - type: 'Bor', + name: 'Berlin', + 月份: 'Mar.', + 月均降雨量: 34.5, }, { - year: '1993', - value: 3.5, - type: 'Bor', + name: 'Berlin', + 月份: 'Apr.', + 月均降雨量: 99.7, }, { - year: '1994', - value: 5, - type: 'Bor', + name: 'Berlin', + 月份: 'May', + 月均降雨量: 52.6, }, { - year: '1995', - value: 4.9, - type: 'Bor', + name: 'Berlin', + 月份: 'Jun.', + 月均降雨量: 35.5, }, { - year: '1996', - value: 6, - type: 'Bor', + name: 'Berlin', + 月份: 'Jul.', + 月均降雨量: 37.4, }, { - year: '1997', - value: 7, - type: 'Bor', - }, - { - year: '1998', - value: 9, - type: 'Bor', - }, - { - year: '1999', - value: 13, - type: 'Bor', + name: 'Berlin', + 月份: 'Aug.', + 月均降雨量: 42.4, }, ]; const stackedColumnPlot = new Column('container', { data, isGroup: true, - xField: 'year', - yField: 'value', - seriesField: 'type', + xField: '月份', + yField: '月均降雨量', + seriesField: 'name', + color: ['#1ca9e6', '#f88c24'], + label: { + // 可手动配置 label 数据标签位置 + position: 'middle', // 'top', 'middle', 'bottom' + // 可配置附加的布局方法 + layout: [ + // 柱形图数据标签位置自动调整 + { type: 'interval-adjust-position' }, + // 数据标签文颜色自动调整 + { type: 'adjust-color' }, + ], + }, }); stackedColumnPlot.render(); diff --git a/examples/column/grouped/demo/label.ts b/examples/column/grouped/demo/label.ts deleted file mode 100644 index c312ad324a..0000000000 --- a/examples/column/grouped/demo/label.ts +++ /dev/null @@ -1,115 +0,0 @@ -import { Column } from '@antv/g2plot'; - -const data = [ - { - year: '1991', - value: 3, - type: 'Lon', - }, - { - year: '1992', - value: 4, - type: 'Lon', - }, - { - year: '1993', - value: 3.5, - type: 'Lon', - }, - { - year: '1994', - value: 5, - type: 'Lon', - }, - { - year: '1995', - value: 4.9, - type: 'Lon', - }, - { - year: '1996', - value: 6, - type: 'Lon', - }, - { - year: '1997', - value: 7, - type: 'Lon', - }, - { - year: '1998', - value: 9, - type: 'Lon', - }, - { - year: '1999', - value: 13, - type: 'Lon', - }, - { - year: '1991', - value: 3, - type: 'Bor', - }, - { - year: '1992', - value: 4, - type: 'Bor', - }, - { - year: '1993', - value: 3.5, - type: 'Bor', - }, - { - year: '1994', - value: 5, - type: 'Bor', - }, - { - year: '1995', - value: 4.9, - type: 'Bor', - }, - { - year: '1996', - value: 6, - type: 'Bor', - }, - { - year: '1997', - value: 7, - type: 'Bor', - }, - { - year: '1998', - value: 9, - type: 'Bor', - }, - { - year: '1999', - value: 13, - type: 'Bor', - }, -]; - -const stackedColumnPlot = new Column('container', { - data, - isGroup: true, - xField: 'year', - yField: 'value', - seriesField: 'type', - label: { - // 可手动配置 label 数据标签位置 - position: 'middle', // 'top', 'middle', 'bottom' - // 可配置附加的布局方法 - layout: [ - // 柱形图数据标签位置自动调整 - { type: 'interval-adjust-position' }, - // 数据标签文颜色自动调整 - { type: 'adjust-color' }, - ], - }, -}); - -stackedColumnPlot.render(); diff --git a/examples/column/grouped/demo/margin.ts b/examples/column/grouped/demo/margin.ts index 4680d62ace..633fadb19a 100644 --- a/examples/column/grouped/demo/margin.ts +++ b/examples/column/grouped/demo/margin.ts @@ -2,104 +2,94 @@ import { Column } from '@antv/g2plot'; const data = [ { - year: '1991', - value: 3, - type: 'Lon', + name: 'London', + 月份: 'Jan.', + 月均降雨量: 18.9, }, { - year: '1992', - value: 4, - type: 'Lon', + name: 'London', + 月份: 'Feb.', + 月均降雨量: 28.8, }, { - year: '1993', - value: 3.5, - type: 'Lon', + name: 'London', + 月份: 'Mar.', + 月均降雨量: 39.3, }, { - year: '1994', - value: 5, - type: 'Lon', + name: 'London', + 月份: 'Apr.', + 月均降雨量: 81.4, }, { - year: '1995', - value: 4.9, - type: 'Lon', + name: 'London', + 月份: 'May', + 月均降雨量: 47, }, { - year: '1996', - value: 6, - type: 'Lon', + name: 'London', + 月份: 'Jun.', + 月均降雨量: 20.3, }, { - year: '1997', - value: 7, - type: 'Lon', + name: 'London', + 月份: 'Jul.', + 月均降雨量: 24, }, { - year: '1998', - value: 9, - type: 'Lon', + name: 'London', + 月份: 'Aug.', + 月均降雨量: 35.6, }, { - year: '1999', - value: 13, - type: 'Lon', + name: 'Berlin', + 月份: 'Jan.', + 月均降雨量: 12.4, }, { - year: '1991', - value: 3, - type: 'Bor', + name: 'Berlin', + 月份: 'Feb.', + 月均降雨量: 23.2, }, { - year: '1992', - value: 4, - type: 'Bor', + name: 'Berlin', + 月份: 'Mar.', + 月均降雨量: 34.5, }, { - year: '1993', - value: 3.5, - type: 'Bor', + name: 'Berlin', + 月份: 'Apr.', + 月均降雨量: 99.7, }, { - year: '1994', - value: 5, - type: 'Bor', + name: 'Berlin', + 月份: 'May', + 月均降雨量: 52.6, }, { - year: '1995', - value: 4.9, - type: 'Bor', + name: 'Berlin', + 月份: 'Jun.', + 月均降雨量: 35.5, }, { - year: '1996', - value: 6, - type: 'Bor', + name: 'Berlin', + 月份: 'Jul.', + 月均降雨量: 37.4, }, { - year: '1997', - value: 7, - type: 'Bor', - }, - { - year: '1998', - value: 9, - type: 'Bor', - }, - { - year: '1999', - value: 13, - type: 'Bor', + name: 'Berlin', + 月份: 'Aug.', + 月均降雨量: 42.4, }, ]; - const stackedColumnPlot = new Column('container', { data, isGroup: true, - xField: 'year', - yField: 'value', - seriesField: 'type', - marginRatio: 1 / 32, + xField: '月份', + yField: '月均降雨量', + seriesField: 'name', + color: ['#1ca9e6', '#f88c24'], + marginRatio: 0, }); stackedColumnPlot.render(); diff --git a/examples/column/grouped/demo/meta.json b/examples/column/grouped/demo/meta.json index f158b13fc0..f0858c490f 100644 --- a/examples/column/grouped/demo/meta.json +++ b/examples/column/grouped/demo/meta.json @@ -12,14 +12,6 @@ }, "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*AKPAToru0A4AAAAAAAAAAABkARQnAQ" }, - { - "filename": "label.ts", - "title": { - "zh": "分组柱状图 - 数据标签", - "en": "Grouped Column chart label" - }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*AKPAToru0A4AAAAAAAAAAABkARQnAQ" - }, { "filename": "margin.ts", "title": { diff --git a/examples/column/stacked/demo/basic.ts b/examples/column/stacked/demo/basic.ts index 8fbda38089..10430ce976 100644 --- a/examples/column/stacked/demo/basic.ts +++ b/examples/column/stacked/demo/basic.ts @@ -99,6 +99,7 @@ const stackedColumnPlot = new Column('container', { xField: 'year', yField: 'value', seriesField: 'type', + color: ['#1ca9e6', '#f88c24'], }); stackedColumnPlot.render(); diff --git a/examples/column/stacked/demo/label.ts b/examples/column/stacked/demo/label.ts index 445f46dd9d..e8e1eb1603 100644 --- a/examples/column/stacked/demo/label.ts +++ b/examples/column/stacked/demo/label.ts @@ -99,6 +99,7 @@ const stackedColumnPlot = new Column('container', { xField: 'year', yField: 'value', seriesField: 'type', + color: ['#ae331b', '#1a6179'], label: { // 可手动配置 label 数据标签位置 position: 'middle', // 'top', 'bottom', 'middle' diff --git a/examples/dual-axes/column-line/demo/column-line.ts b/examples/dual-axes/column-line/demo/column-line.ts index 07669f21d8..590df01b80 100644 --- a/examples/dual-axes/column-line/demo/column-line.ts +++ b/examples/dual-axes/column-line/demo/column-line.ts @@ -20,7 +20,7 @@ const dualAxesChart = new DualAxes('container', { geometry: 'line', lineStyle: { lineWidth: 2, - stroke: '#29cae4', + stroke: '#FAA219', }, }, ], diff --git a/examples/dual-axes/column-line/demo/meta.json b/examples/dual-axes/column-line/demo/meta.json index 593d3fbf81..de3486af4a 100644 --- a/examples/dual-axes/column-line/demo/meta.json +++ b/examples/dual-axes/column-line/demo/meta.json @@ -34,7 +34,7 @@ "zh": "柱线混合图表-更多示例", "en": "custom-column-line" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*ldsOR4yQZnAAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*aiU7SpgRN48AAAAAAAAAAAAAARQnAQ" } ] } diff --git a/examples/dual-axes/dual-line/demo/meta.json b/examples/dual-axes/dual-line/demo/meta.json index 8403bc35fd..42bbc7aeed 100644 --- a/examples/dual-axes/dual-line/demo/meta.json +++ b/examples/dual-axes/dual-line/demo/meta.json @@ -26,7 +26,7 @@ "zh": "多折线混合图表", "en": "dual-multi-line" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*kAgfTZPPjAsAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*9kCzTIT2E94AAAAAAAAAAAAAARQnAQ" } ] } diff --git a/examples/dual-axes/stacked-column-line/demo/meta.json b/examples/dual-axes/stacked-column-line/demo/meta.json index 31b7a02fff..3f4f8bc057 100644 --- a/examples/dual-axes/stacked-column-line/demo/meta.json +++ b/examples/dual-axes/stacked-column-line/demo/meta.json @@ -18,7 +18,7 @@ "zh": "堆叠柱线图表-自定义样式", "en": "custom-stacked-column-line" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*S7V_SbjUSwsAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*9IptSKDIopIAAAAAAAAAAAAAARQnAQ" }, { "filename": "stacked-column-multi-line.ts", diff --git a/examples/dual-axes/stacked-column-line/demo/stacked-column-line.ts b/examples/dual-axes/stacked-column-line/demo/stacked-column-line.ts index fbbfacee4c..89a16d9362 100644 --- a/examples/dual-axes/stacked-column-line/demo/stacked-column-line.ts +++ b/examples/dual-axes/stacked-column-line/demo/stacked-column-line.ts @@ -33,6 +33,7 @@ const dualAxesChart = new DualAxes('container', { }, { geometry: 'line', + color: '#FAA219', }, ], }); diff --git a/examples/funnel/basic/demo/meta.json b/examples/funnel/basic/demo/meta.json index 1f597f42c3..7a079da625 100644 --- a/examples/funnel/basic/demo/meta.json +++ b/examples/funnel/basic/demo/meta.json @@ -42,7 +42,7 @@ "zh": "动态高度漏斗图-转置", "en": "dynamic height funnel chart" }, - "screenshot": "https://gw.alicdn.com/tfs/TB1EgtsuuT2gK0jSZFvXXXnFXXa-958-591.png" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*r5sGSpTBUz0AAAAAAAAAAAAAARQnAQ" }, { "filename": "compare-transpose.ts", diff --git a/examples/gauge/basic/demo/meta.json b/examples/gauge/basic/demo/meta.json index 4dc502fe82..d65a4cc692 100644 --- a/examples/gauge/basic/demo/meta.json +++ b/examples/gauge/basic/demo/meta.json @@ -10,7 +10,7 @@ "zh": "仪表盘", "en": "Gauge chart" }, - "screenshot": "https://gw.alicdn.com/tfs/TB1peOutYr1gK0jSZFDXXb9yVXa-484-468.png" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*wjukQ4x3qfMAAAAAAAAAAAAAARQnAQ" }, { "filename": "complex.ts", @@ -18,7 +18,7 @@ "zh": "自定义配置的仪表盘", "en": "Gauge chart - custom style" }, - "screenshot": "https://gw.alicdn.com/tfs/TB1IICyt4D1gK0jSZFyXXciOVXa-517-474.png" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*bbXcRqcMTsIAAAAAAAAAAAAAARQnAQ" } ] } diff --git a/examples/line/basic/demo/line-with-point.ts b/examples/line/basic/demo/line-with-point.ts deleted file mode 100644 index ec7b05ff16..0000000000 --- a/examples/line/basic/demo/line-with-point.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Line } from '@antv/g2plot'; - -const data = [ - { year: '1991', value: 3 }, - { year: '1992', value: 4 }, - { year: '1993', value: 3.5 }, - { year: '1994', value: 5 }, - { year: '1995', value: 4.9 }, - { year: '1996', value: 6 }, - { year: '1997', value: 7 }, - { year: '1998', value: 9 }, - { year: '1999', value: 13 }, -]; - -const line = new Line('container', { - data, - xField: 'year', - yField: 'value', - point: {}, - label: {}, -}); - -line.render(); diff --git a/examples/line/basic/demo/meta.json b/examples/line/basic/demo/meta.json index 86e3bf2f98..a3f3b3722c 100644 --- a/examples/line/basic/demo/meta.json +++ b/examples/line/basic/demo/meta.json @@ -20,14 +20,6 @@ }, "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*fQihRrLMIWsAAAAAAAAAAABkARQnAQ" }, - { - "filename": "line-with-point.ts", - "title": { - "zh": "带数据点的折线图", - "en": "Line chart with data point" - }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*lSOiS4lGCaIAAAAAAAAAAABkARQnAQ" - }, { "filename": "line-point-style.ts", "title": { @@ -42,7 +34,7 @@ "zh": "带缩略轴的折线", "en": "Line chart with slider" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*4NmuSaVRZ44AAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*T0pISJhToPEAAAAAAAAAAAAAARQnAQ" }, { "filename": "line-annotation.ts", @@ -50,7 +42,7 @@ "zh": "折线图辅助线", "en": "Line chart with guide line" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*4NmuSaVRZ44AAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*YnkLRojc99wAAAAAAAAAAAAAARQnAQ" }, { "filename": "line-annotation-color.ts", @@ -58,7 +50,7 @@ "zh": "折线图线条颜色变化", "en": "Line chart with guide line" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*4NmuSaVRZ44AAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*ElDbQ4yz14kAAAAAAAAAAAAAARQnAQ" } ] } diff --git a/examples/line/multiple/demo/line-color.ts b/examples/line/multiple/demo/line-color.ts index a485bcdb9d..a9c928f4c3 100644 --- a/examples/line/multiple/demo/line-color.ts +++ b/examples/line/multiple/demo/line-color.ts @@ -1,12 +1,13 @@ import { Line } from '@antv/g2plot'; -fetch('https://gw.alipayobjects.com/os/bmw-prod/c48dbbb1-fccf-4a46-b68f-a3ddb4908b68.json') +fetch('https://gw.alipayobjects.com/os/bmw-prod/55424a73-7cb8-4f79-b60d-3ab627ac5698.json') .then((res) => res.json()) .then((data) => { const line = new Line('container', { data, - xField: 'date', + xField: 'year', yField: 'value', + seriesField: 'category', yAxis: { label: { // 数值格式化为千分位 @@ -16,7 +17,6 @@ fetch('https://gw.alipayobjects.com/os/bmw-prod/c48dbbb1-fccf-4a46-b68f-a3ddb490 legend: { position: 'right-top', }, - seriesField: 'type', color: ['#1979C9', '#D62A0D', '#FAA219'], }); diff --git a/examples/line/multiple/demo/meta.json b/examples/line/multiple/demo/meta.json index c22ec5d3f6..25013f39fa 100644 --- a/examples/line/multiple/demo/meta.json +++ b/examples/line/multiple/demo/meta.json @@ -5,12 +5,12 @@ }, "demos": [ { - "filename": "line-multiple.ts", + "filename": "line-large-data.ts", "title": { - "zh": "多折线图", - "en": "multiple Line chart" + "zh": "二氧化碳排放量来源", + "en": "The causes of CO2 emissions" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*vlFFSqrmsUkAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*IZ9nRq-a6fIAAAAAAAAAAABkARQnAQ" }, { "filename": "line-label.ts", @@ -20,14 +20,6 @@ }, "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*3HyPSaIxw0gAAAAAAAAAAABkARQnAQ" }, - { - "filename": "line-large-data.ts", - "title": { - "zh": "二氧化碳排放量来源", - "en": "The causes of CO2 emissions" - }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*IZ9nRq-a6fIAAAAAAAAAAABkARQnAQ" - }, { "filename": "line-color.ts", "title": { @@ -42,7 +34,7 @@ "zh": "通过回调函数指定折线颜色", "en": "set line color through callback function" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*IZ9nRq-a6fIAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*iHQDSZ9g2fQAAAAAAAAAAAAAARQnAQ" }, { "filename": "line-style.ts", @@ -50,7 +42,7 @@ "zh": "指定折线样式", "en": "setting line style" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*IZ9nRq-a6fIAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*bY-vQZy9eBkAAAAAAAAAAAAAARQnAQ" }, { "filename": "marker-active.ts", diff --git a/examples/liquid/basic/demo/meta.json b/examples/liquid/basic/demo/meta.json index 253105ded1..adcdb0c4df 100644 --- a/examples/liquid/basic/demo/meta.json +++ b/examples/liquid/basic/demo/meta.json @@ -10,7 +10,7 @@ "zh": "水波图", "en": "Liquid chart" }, - "screenshot": "https://gw.alicdn.com/tfs/TB1peOutYr1gK0jSZFDXXb9yVXa-484-468.png" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*IDi-RoqQ6YkAAAAAAAAAAAAAARQnAQ" }, { "filename": "style.ts", @@ -18,7 +18,7 @@ "zh": "样式自定义的水波图", "en": "Liquid chart - custom style" }, - "screenshot": "https://gw.alicdn.com/tfs/TB1IICyt4D1gK0jSZFyXXciOVXa-517-474.png" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*rEHnS449gAwAAAAAAAAAAAAAARQnAQ" } ] } diff --git a/examples/liquid/basic/demo/style.ts b/examples/liquid/basic/demo/style.ts index 0024328fe5..09b2f8f853 100644 --- a/examples/liquid/basic/demo/style.ts +++ b/examples/liquid/basic/demo/style.ts @@ -1,9 +1,6 @@ import { Liquid } from '@antv/g2plot'; const liquidPlot = new Liquid(document.getElementById('container'), { - width: 600, - height: 300, - autoFit: false, percent: 0.75, statistic: { content: { diff --git a/examples/progress/basic/demo/meta.json b/examples/progress/basic/demo/meta.json index 346359caec..c468399741 100644 --- a/examples/progress/basic/demo/meta.json +++ b/examples/progress/basic/demo/meta.json @@ -4,21 +4,13 @@ "en": "Category" }, "demos": [ - { - "filename": "progress.ts", - "title": { - "zh": "迷你进度条图", - "en": "basic Progress chart" - }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*nBhpT5HbGOAAAAAAAAAAAABkARQnAQ" - }, { "filename": "progress-style.ts", "title": { "zh": "迷你进度条图样式", "en": "Tiny Progress style" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*fQihRrLMIWsAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*xjbxRJTD2wUAAAAAAAAAAAAAARQnAQ" }, { "filename": "progress-style-callback.ts", @@ -26,7 +18,7 @@ "zh": "迷你进度条图回调样式", "en": "Tiny Progress style callback" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*lSOiS4lGCaIAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*wKUaS7xLrYgAAAAAAAAAAAAAARQnAQ" }, { "filename": "progress-width.ts", @@ -34,7 +26,7 @@ "zh": "迷你进度条图大小", "en": "Tiny Progress width" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*4NmuSaVRZ44AAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*qseORomBj9sAAAAAAAAAAAAAARQnAQ" } ] } diff --git a/examples/progress/basic/demo/progress.ts b/examples/progress/basic/demo/progress.ts deleted file mode 100644 index ebe9d32aec..0000000000 --- a/examples/progress/basic/demo/progress.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Progress } from '@antv/g2plot'; - -const progress = new Progress('container', { - height: 100, - width: 300, - autoFit: false, - percent: 0.7, -}); - -progress.render(); diff --git a/examples/ring-progress/basic/demo/meta.json b/examples/ring-progress/basic/demo/meta.json index 59d64d8922..29728926d7 100644 --- a/examples/ring-progress/basic/demo/meta.json +++ b/examples/ring-progress/basic/demo/meta.json @@ -10,7 +10,7 @@ "zh": "迷你进度环图", "en": "basic Ring chart" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*nBhpT5HbGOAAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*dP0sQrvPsDsAAAAAAAAAAAAAARQnAQ" }, { "filename": "ring-progress-style.ts", @@ -18,7 +18,7 @@ "zh": "迷你进度环图样式", "en": "Tiny Ring style" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*fQihRrLMIWsAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*HkhsTZBx334AAAAAAAAAAAAAARQnAQ" }, { "filename": "ring-progress-style-callback.ts", @@ -26,7 +26,7 @@ "zh": "迷你进度环图回调样式", "en": "Tiny Ring style callback" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*lSOiS4lGCaIAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*BS8MSbFYjDEAAAAAAAAAAAAAARQnAQ" }, { "filename": "ring-progress-radius.ts", @@ -34,7 +34,7 @@ "zh": "迷你进度环图半径大小", "en": "Tiny Ring radius" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*4NmuSaVRZ44AAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*lK1kQYoNQysAAAAAAAAAAAAAARQnAQ" } ] } diff --git a/examples/rose/basic/demo/basic.ts b/examples/rose/basic/demo/basic.ts index b0c31b9b89..ea3ece04da 100644 --- a/examples/rose/basic/demo/basic.ts +++ b/examples/rose/basic/demo/basic.ts @@ -15,6 +15,9 @@ const rosePlot = new Rose('container', { yField: 'value', seriesField: 'type', radius: 0.9, + legend: { + position: 'bottom', + }, }); rosePlot.render(); diff --git a/examples/rose/basic/demo/interaction.ts b/examples/rose/basic/demo/interaction.ts index a7365ba729..3e591c0857 100644 --- a/examples/rose/basic/demo/interaction.ts +++ b/examples/rose/basic/demo/interaction.ts @@ -15,6 +15,9 @@ const rosePlot = new Rose('container', { yField: 'value', seriesField: 'type', radius: 0.9, + legend: { + position: 'bottom', + }, interactions: [{ type: 'element-active' }], }); diff --git a/examples/rose/basic/demo/meta.json b/examples/rose/basic/demo/meta.json index e4bdd3b9c9..aa4829ad5b 100644 --- a/examples/rose/basic/demo/meta.json +++ b/examples/rose/basic/demo/meta.json @@ -18,7 +18,7 @@ "zh": "玫瑰图-内部图形标签", "en": "Rose chart - inner label" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*OgVJR7IIQiMAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*nCcjT7v3dbYAAAAAAAAAAAAAARQnAQ" }, { "filename": "rose-state.ts", diff --git a/examples/rose/basic/demo/rose-state.ts b/examples/rose/basic/demo/rose-state.ts index 2cf20c13cd..feb85a1356 100644 --- a/examples/rose/basic/demo/rose-state.ts +++ b/examples/rose/basic/demo/rose-state.ts @@ -24,6 +24,9 @@ const rosePlot = new Rose('container', { }, }, }, + legend: { + position: 'bottom', + }, interactions: [{ type: 'element-active' }], }); diff --git a/examples/rose/grouped/index.en.md b/examples/rose/grouped/index.en.md index 45c884d29f..abc18d58e1 100644 --- a/examples/rose/grouped/index.en.md +++ b/examples/rose/grouped/index.en.md @@ -1,4 +1,4 @@ --- title: 分组玫瑰图 -order: 0 +order: 1 --- diff --git a/examples/rose/grouped/index.zh.md b/examples/rose/grouped/index.zh.md index 45c884d29f..abc18d58e1 100644 --- a/examples/rose/grouped/index.zh.md +++ b/examples/rose/grouped/index.zh.md @@ -1,4 +1,4 @@ --- title: 分组玫瑰图 -order: 0 +order: 1 --- diff --git a/examples/rose/stacked/index.en.md b/examples/rose/stacked/index.en.md index 912c2948a3..fff30be92d 100644 --- a/examples/rose/stacked/index.en.md +++ b/examples/rose/stacked/index.en.md @@ -1,4 +1,4 @@ --- title: 堆叠玫瑰图 -order: 0 +order: 2 --- diff --git a/examples/rose/stacked/index.zh.md b/examples/rose/stacked/index.zh.md index 912c2948a3..fff30be92d 100644 --- a/examples/rose/stacked/index.zh.md +++ b/examples/rose/stacked/index.zh.md @@ -1,4 +1,4 @@ --- title: 堆叠玫瑰图 -order: 0 +order: 2 --- diff --git a/examples/stock/basic/demo/meta.json b/examples/stock/basic/demo/meta.json index 2057095583..b98172b178 100644 --- a/examples/stock/basic/demo/meta.json +++ b/examples/stock/basic/demo/meta.json @@ -10,7 +10,7 @@ "zh": "基础蜡烛图", "en": "basic Candlestick chart" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_f5c722/afts/img/A*M9Q4Rrq3V0gAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*-zWUSo2PFj0AAAAAAAAAAAAAARQnAQ" } ] } diff --git a/examples/sunburst/basic/demo/meta.json b/examples/sunburst/basic/demo/meta.json index 59f1e15f39..a4e0a51299 100644 --- a/examples/sunburst/basic/demo/meta.json +++ b/examples/sunburst/basic/demo/meta.json @@ -18,7 +18,7 @@ "zh": "指定径向类型", "en": "specifies the refect type" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_f5c722/afts/img/A*MNDYS59mjpYAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*SlsPRZgT9fwAAAAAAAAAAAAAARQnAQ" } ] } diff --git a/examples/tiny-area/basic/demo/meta.json b/examples/tiny-area/basic/demo/meta.json index ead19a988b..e98ab5cbfc 100644 --- a/examples/tiny-area/basic/demo/meta.json +++ b/examples/tiny-area/basic/demo/meta.json @@ -10,7 +10,7 @@ "zh": "基础迷你面积图", "en": "basic Line chart" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*nBhpT5HbGOAAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*8Qf7Q45ubMMAAAAAAAAAAAAAARQnAQ" }, { "filename": "area-style.ts", @@ -18,7 +18,7 @@ "zh": "迷你面积图样式", "en": "Tiny Line style" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*fQihRrLMIWsAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*RVNgQ641-xoAAAAAAAAAAAAAARQnAQ" }, { "filename": "area-with-scale.ts", @@ -26,7 +26,7 @@ "zh": "迷你面积图比例尺", "en": "Tiny Line scale" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*4NmuSaVRZ44AAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*HXjfSIAueVMAAAAAAAAAAAAAARQnAQ" } ] } diff --git a/examples/tiny-column/basic/demo/meta.json b/examples/tiny-column/basic/demo/meta.json index 05a5d8bd4b..24747474ae 100644 --- a/examples/tiny-column/basic/demo/meta.json +++ b/examples/tiny-column/basic/demo/meta.json @@ -10,7 +10,7 @@ "zh": "基础迷你柱形图", "en": "basic Column chart" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*nBhpT5HbGOAAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*lJWoS5D2OC0AAAAAAAAAAAAAARQnAQ" }, { "filename": "column-style.ts", @@ -18,7 +18,7 @@ "zh": "迷你柱形图样式", "en": "Tiny Column style" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*fQihRrLMIWsAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*xIFLRY4wT4EAAAAAAAAAAAAAARQnAQ" }, { "filename": "column-style-callback.ts", @@ -26,7 +26,7 @@ "zh": "迷你柱形图回调样式", "en": "Tiny Column style callback" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*lSOiS4lGCaIAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*qWh-Rrc9FvIAAAAAAAAAAAAAARQnAQ" }, { "filename": "line-width-ratio.ts", @@ -34,7 +34,7 @@ "zh": "迷你柱形图比例尺", "en": "Tiny Column scale" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*4NmuSaVRZ44AAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*vzqFRYuhUUsAAAAAAAAAAAAAARQnAQ" } ] } diff --git a/examples/tiny-line/basic/demo/meta.json b/examples/tiny-line/basic/demo/meta.json index 0b51b6193f..2d6a869af5 100644 --- a/examples/tiny-line/basic/demo/meta.json +++ b/examples/tiny-line/basic/demo/meta.json @@ -10,7 +10,7 @@ "zh": "基础迷你折线图", "en": "basic Line chart" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*nBhpT5HbGOAAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*v0_RR7osTYsAAAAAAAAAAAAAARQnAQ" }, { "filename": "line-style.ts", @@ -18,7 +18,7 @@ "zh": "迷你折线图样式", "en": "Tiny Line style" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*fQihRrLMIWsAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*XmW4RbbtsdoAAAAAAAAAAAAAARQnAQ" }, { "filename": "line-style-callback.ts", @@ -26,7 +26,7 @@ "zh": "迷你折线图回调样式", "en": "Tiny Line style callback" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*lSOiS4lGCaIAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*RorlQ4yd4uQAAAAAAAAAAAAAARQnAQ" }, { "filename": "line-with-scale.ts", @@ -34,7 +34,7 @@ "zh": "迷你折线图比例尺", "en": "Tiny Line scale" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*4NmuSaVRZ44AAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*OEi9QLuVNUcAAAAAAAAAAAAAARQnAQ" } ] } diff --git a/examples/word-cloud/basic/demo/meta.json b/examples/word-cloud/basic/demo/meta.json index ef71494dcf..1a5a4ff998 100644 --- a/examples/word-cloud/basic/demo/meta.json +++ b/examples/word-cloud/basic/demo/meta.json @@ -34,7 +34,7 @@ "zh": "词云图-图片遮罩-base64", "en": "Word Cloud chart - image mask base64" }, - "screenshot": "https://gw.alipayobjects.com/mdn/rms_f5c722/afts/img/A*id4CSZIMCtsAAAAAAAAAAABkARQnAQ" + "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*qkYyQqFTU4YAAAAAAAAAAAAAARQnAQ" } ] }