fix(pie): support multi pie item

ElemeFE · Nov 2, 2018 · 0a99bd2 · 0a99bd2
1 parent 6cab8ac
commit 0a99bd2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/packages/pie/main.js b/src/packages/pie/main.js
@@ -1,5 +1,5 @@
 import { itemPoint } from '../../constants'
-import { getFormated } from '../../utils'
+import { getFormated, setArrayValue } from '../../utils'
 import { cloneDeep } from 'utils-lite'
 
 const pieRadius = 100
@@ -33,16 +33,14 @@ function getPieSeries (args) {
   let rowsTemp = []
   if (level) {
     level.forEach((levelItems, index) => {
-      levelItems.forEach(item => { levelTemp[item] = index })
+      levelItems.forEach(item => { setArrayValue(levelTemp, item, index) })
     })
     innerRows.forEach(row => {
       const itemLevel = levelTemp[row[dimension]]
-      if (itemLevel !== undefined) {
-        if (rowsTemp[itemLevel]) {
-          rowsTemp[itemLevel].push(row)
-        } else {
-          rowsTemp[itemLevel] = [row]
-        }
+      if (itemLevel && itemLevel.length) {
+        itemLevel.forEach(levelItem => {
+          setArrayValue(rowsTemp, levelItem, row)
+        })
       }
     })
   } else {

diff --git a/src/utils.js b/src/utils.js
@@ -103,3 +103,11 @@ export const getAmap = (key, v) => {
   }
   return amapPromise
 }
+
+export function setArrayValue (arr, index, value) {
+  if (arr[index] !== undefined) {
+    arr[index].push(value)
+  } else {
+    arr[index] = [value]
+  }
+}