docs: 修改文档和优化demo (#1592)

* docs: 修改文档和优化demo * docs: 有遗漏补提
antvis · Sep 17, 2020 · f555606 · f555606
1 parent a3ed5f4
commit f555606
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 15 deletions.
diff --git a/docs/common/shape-style.en.md b/docs/common/shape-style.en.md
@@ -20,7 +20,7 @@
 
 ```ts
 {
-  pointStyle: {
+  style: {
     fill: 'red',
     fillOpacity: 0.5,
     stroke: 'black',

diff --git a/docs/common/shape-style.zh.md b/docs/common/shape-style.zh.md
@@ -20,7 +20,7 @@
 
 ```ts
 {
-  pointStyle: {
+  style: {
     fill: 'red',
     fillOpacity: 0.5,
     stroke: 'black',

diff --git a/examples/bullet/basic/demo/basic.ts b/examples/bullet/basic/demo/basic.ts
@@ -15,6 +15,17 @@ const bulletPlot = new Bullet('container', {
   rangeField: 'ranges',
   targetField: 'target',
   xField: 'title',
+  bulletStyle: {
+    range: {
+      color: '#5B8FF9',
+    },
+    measure: {
+      color: '#5B8FF9',
+    },
+    target: {
+      color: '#5B8FF9',
+    },
+  },
   xAxis: {
     line: null,
   },

diff --git a/examples/bullet/basic/demo/color.ts b/examples/bullet/basic/demo/color.ts
@@ -19,6 +19,12 @@ const bulletPlot = new Bullet('container', {
     range: {
       color: ['#FFB1AC', '#FFDBA2', '#B4EBBF'],
     },
+    measure: {
+      color: '#5B8FF9',
+    },
+    target: {
+      color: '#5B8FF9',
+    },
   },
   xAxis: {
     line: null,

diff --git a/examples/bullet/basic/demo/grouped.ts b/examples/bullet/basic/demo/grouped.ts
@@ -4,25 +4,25 @@ const data = [
   {
     title: '重庆',
     ranges: [30, 90, 120],
-    measures: [50, 40],
+    measures: [65],
     target: 80,
   },
   {
     title: '杭州',
     ranges: [30, 90, 120],
-    measures: [50, 60],
+    measures: [50],
     target: 100,
   },
   {
     title: '广州',
     ranges: [30, 90, 120],
-    measures: [40, 40],
+    measures: [40],
     target: 85,
   },
   {
     title: '深圳',
     ranges: [30, 90, 120],
-    measures: [50, 60],
+    measures: [50],
     target: 100,
   },
 ];
@@ -37,6 +37,12 @@ const bulletPlot = new Bullet('container', {
     range: {
       color: ['#FFB1AC', '#FFDBA2', '#B4EBBF'],
     },
+    measure: {
+      color: ['#5B8FF9'],
+    },
+    target: {
+      color: '#5B8FF9',
+    },
   },
   label: {
     position: 'middle',
@@ -69,15 +75,10 @@ const bulletPlot = new Bullet('container', {
         marker: { symbol: 'square', style: { fill: '#B4EBBF', r: 5 } },
       },
       {
-        value: '第一季度',
-        name: '第一季度',
+        value: '实际值',
+        name: '实际值',
         marker: { symbol: 'square', style: { fill: '#5B8FF9', r: 5 } },
       },
-      {
-        value: '第二季度',
-        name: '第二季度',
-        marker: { symbol: 'square', style: { fill: ' #5AD8A6', r: 5 } },
-      },
       {
         value: '目标值',
         name: '目标值',

diff --git a/examples/bullet/basic/demo/layout.ts b/examples/bullet/basic/demo/layout.ts
@@ -16,6 +16,17 @@ const bulletPlot = new Bullet('container', {
   rangeField: 'ranges',
   targetField: 'target',
   xField: 'title',
+  bulletStyle: {
+    range: {
+      color: '#5B8FF9',
+    },
+    measure: {
+      color: '#5B8FF9',
+    },
+    target: {
+      color: '#5B8FF9',
+    },
+  },
   xAxis: {
     line: null,
   },

diff --git a/examples/bullet/basic/demo/meta.json b/examples/bullet/basic/demo/meta.json
@@ -18,7 +18,7 @@
         "zh": "基础垂直方向子弹图",
         "en": "basic Bullet chart"
       },
-      "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*Vk43S5pvUJcAAAAAAAAAAABkARQnAQ"
+      "screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*BSeHR45zAxEAAAAAAAAAAAAAARQnAQ"
     },
     {
       "filename": "color.ts",

diff --git a/examples/bullet/basic/demo/stacked.ts b/examples/bullet/basic/demo/stacked.ts
@@ -19,6 +19,12 @@ const bulletPlot = new Bullet('container', {
     range: {
       color: ['#FFB1AC', '#FFDBA2', '#B4EBBF'],
     },
+    measure: {
+      color: ['#5B8FF9', '#5AD8A6'],
+    },
+    target: {
+      color: '#5B8FF9',
+    },
   },
   label: {
     position: 'middle',

diff --git a/src/plots/bullet/utils.ts b/src/plots/bullet/utils.ts
@@ -34,7 +34,7 @@ export function transformData(options: BulletOptions): TransformData {
     });
     // 构建 title * target
     ds.push({
-      index: 'target',
+      index: `${targetField}`,
       [xField]: xField ? item[xField] : String(index),
       [targetField]: item[targetField],
     });