AtiveRingChart 添加 digitalFlopToFixed 配置项

DataV-Team · Jan 10, 2020 · 3fc365f · 3fc365f
1 parent b39fa48
commit 3fc365f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 23 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,25 +1,5 @@
 {
-  "eslint.validate": [
-    "javascript",
-    "javascriptreact",
-    "vue-html",
-    {
-      "language": "typescript",
-      "autoFix": true
-    },
-    {
-      "language": "typescriptreact",
-      "autoFix": true
-    },
-    {
-      "language": "vue",
-      "autoFix": true
-    }
-  ],
   "eslint.run": "onSave",
-  "editor.formatOnSave": true,
-  "eslint.autoFixOnSave": true,
-  "prettier.eslintIntegration": true,
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true
   }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.1.2-alpha (2020-01-10)
+
+### Perfect
+
+- **AtiveRingChart:** 添加 digitalFlopToFixed 配置项.
+
 # 1.1.1-alpha (2020-01-08)
 
 ### New

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jiaminghi/data-view-react",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "React Large screen data display component library",
   "author": "Duan Yu <[email protected]>",
   "license": "MIT",

diff --git a/src/components/activeRingChart/index.js b/src/components/activeRingChart/index.js
@@ -64,6 +64,11 @@ const defaultConfig = {
     fontSize: 25,
     fill: '#fff'
   },
+  /**
+   * @description Digital flop toFixed
+   * @type {Number}
+   */
+  digitalFlopToFixed: 0,
   /**
    * @description CRender animationCurve
    * @type {String}
@@ -90,15 +95,20 @@ const ActiveRingChart = ({ config = {}, className, style }) => {
   const digitalFlop = useMemo(() => {
     if (!mergedConfig) return {}
 
-    const { digitalFlopStyle, data } = mergedConfig
+    const { digitalFlopStyle, digitalFlopToFixed, data } = mergedConfig
 
     const value = data.map(({ value }) => value)
 
     const sum = value.reduce((all, v) => all + v, 0)
 
     const percent = parseInt((value[activeIndex] / sum) * 100) || 0
 
-    return { content: '{nt}%', number: [percent], style: digitalFlopStyle }
+    return {
+      content: '{nt}%',
+      number: [percent],
+      style: digitalFlopStyle,
+      toFixed: digitalFlopToFixed
+    }
   }, [mergedConfig, activeIndex])
 
   const ringName = useMemo(