update dist and lib

DataV-Team · Jun 16, 2020 · 0862955 · 0862955
1 parent 1342926
commit 0862955
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 16 deletions.
diff --git a/dist/charts.map.js b/dist/charts.map.js
diff --git a/dist/charts.min.js b/dist/charts.min.js
diff --git a/lib/extend/index.js b/lib/extend/index.js
@@ -146,7 +146,9 @@ var numberText = {
     number: [],
     content: '',
     position: [0, 0],
-    toFixed: 0
+    toFixed: 0,
+    rowGap: 0,
+    formatter: null
   },
   validator: function validator(_ref7) {
     var shape = _ref7.shape;
@@ -167,14 +169,18 @@ var numberText = {
     var number = shape.number,
         content = shape.content,
         toFixed = shape.toFixed,
-        rowGap = shape.rowGap;
+        rowGap = shape.rowGap,
+        formatter = shape.formatter;
     var textSegments = content.split('{nt}');
-    var lastSegmentIndex = textSegments.length - 1;
     var textString = '';
     textSegments.forEach(function (t, i) {
-      var currentNumber = number[i];
-      if (i === lastSegmentIndex) currentNumber = '';
-      if (typeof currentNumber === 'number') currentNumber = currentNumber.toFixed(toFixed);
+      var currentNumber = number[i] || '';
+
+      if (typeof currentNumber === 'number') {
+        currentNumber = currentNumber.toFixed(toFixed);
+        if (typeof formatter === 'function') currentNumber = formatter(currentNumber);
+      }
+
       textString += t + (currentNumber || '');
     });
 
@@ -183,7 +189,7 @@ var numberText = {
     }, {
       shape: _objectSpread({}, shape, {
         content: textString,
-        rowGap: rowGap || 0
+        rowGap: rowGap
       })
     });
   }