fix: Guide 的 position 百分比解析需要考虑原始数据中本身包含 '%' 的情况.Closed #590.

antvis · Aug 31, 2019 · b299390 · b299390
1 parent 98b9f94
commit b299390
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/component/guide/base.js b/src/component/guide/base.js
@@ -48,7 +48,8 @@ class GuideBase {
     }
 
     // 如果数据格式是 ['50%', '50%'] 的格式
-    if (Util.isString(position[0]) && position[0].indexOf('%') !== -1) {
+    // fix: 原始数据中可能会包含 'xxx5%xxx' 这样的数据，需要判断下 https://github.com/antvis/f2/issues/590
+    if (Util.isString(position[0]) && position[0].indexOf('%') !== -1 && !isNaN(position[0].slice(0, -1))) {
       return this.parsePercentPoint(coord, position);
     }
 

diff --git a/test/unit/component/guide/base-spec.js b/test/unit/component/guide/base-spec.js
@@ -15,7 +15,7 @@ describe('Guide Base', function() {
     }
   });
   const xScale = new Scale.Cat({
-    values: [ '一月', '二月', '三月', '四月', '五月' ]
+    values: [ '一月', '二月', '45%三月', '四月', '五月' ]
   });
 
   const yScale = new Scale.Linear({
@@ -24,7 +24,7 @@ describe('Guide Base', function() {
   });
 
   it('Base class method: parsePoint(coord, point)', function() {
-    const point = [ '三月', 600 ];
+    const point = [ '45%三月', 600 ];
     const cfg = {
       xScale,
       yScales: [ yScale ]