chore: 优化colorField

antvis · Oct 22, 2020 · bf85063 · bf85063
1 parent 4ef598b
commit bf85063
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 9 deletions.
diff --git a/__tests__/unit/plots/word-cloud/color-spec.ts b/__tests__/unit/plots/word-cloud/color-spec.ts
@@ -14,8 +14,8 @@ describe('word-cloud color option', () => {
 
     cloud.render();
 
-    const field = cloud.chart.geometries[0].getGroupFields()[0];
-    expect(field).toBe('text');
+    const fields = cloud.chart.geometries[0].getGroupFields();
+    expect(fields.length).toBe(1);
   });
 
   it('wordField', () => {

diff --git a/docs/manual/plots/word-cloud.en.md b/docs/manual/plots/word-cloud.en.md
@@ -43,7 +43,7 @@ order: 0
 
 功能描述： 根据该字段进行颜色映射
 
-默认配置： wordField 字段的值
+默认配置： 无
 
 #### timeInterval
 

diff --git a/docs/manual/plots/word-cloud.zh.md b/docs/manual/plots/word-cloud.zh.md
@@ -43,7 +43,7 @@ order: 0
 
 功能描述： 根据该字段进行颜色映射
 
-默认配置： wordField 字段的值
+默认配置： 无
 
 #### timeInterval
 

diff --git a/examples/word-cloud/basic/API.en.md b/examples/word-cloud/basic/API.en.md
@@ -32,6 +32,14 @@
 
 默认配置： 无
 
+#### colorField
+
+**可选**, _string_
+
+功能描述： 根据该字段进行颜色映射
+
+默认配置： 无
+
 #### timeInterval
 
 **可选**, _number_

diff --git a/examples/word-cloud/basic/API.zh.md b/examples/word-cloud/basic/API.zh.md
@@ -32,6 +32,14 @@
 
 默认配置： 无
 
+#### colorField
+
+**可选**, _string_
+
+功能描述： 根据该字段进行颜色映射
+
+默认配置： 无
+
 #### timeInterval
 
 **可选**, _number_

diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
   },
   "dependencies": {
     "@antv/event-emitter": "^0.1.2",
-    "@antv/g2": "^4.1.0-beta.13",
+    "@antv/g2": "^4.1.0-beta.14",
     "d3-hierarchy": "^2.0.0",
     "dayjs": "^1.8.36",
     "size-sensor": "^1.0.1",

diff --git a/src/plots/word-cloud/adaptor.ts b/src/plots/word-cloud/adaptor.ts
@@ -21,9 +21,7 @@ function geometry(params: Params<WordCloudOptions>): Params<WordCloudOptions> {
     options: {
       xField: 'x',
       yField: 'y',
-      // 给 seriesField 一个默认值，否则它为空时
-      // 每个词语的颜色会显示成白色。
-      seriesField: colorField ? 'color' : 'text',
+      seriesField: colorField && 'color',
       point: {
         color,
         shape: 'word-cloud',

diff --git a/src/plots/word-cloud/shapes/word-cloud.ts b/src/plots/word-cloud/shapes/word-cloud.ts
@@ -33,7 +33,7 @@ function getTextAttrs(cfg: Config): ShapeAttrs {
     textAlign: 'center',
     fontFamily: cfg.data.font,
     fontWeight: cfg.data.weight,
-    fill: cfg.color,
+    fill: cfg.color || cfg.defaultStyle.fill,
     textBaseline: 'alphabetic',
   };
 }