cxw-010203

components/word-cloud/index.js

@@ -120,21 +120,35 @@ Component({
       } = event.currentTarget.dataset
       this.triggerEvent('detail', detail);
     },
-    doData(list = []) {
-      if (list.length === 0) {
+    doData(arr1 = []) {
+      if (arr1.length === 0) {
         return []
       }
+      let list = this.doList(arr1);
       let arr = [];
       let maxVal = list[0][1];
+      let minVal = list[list.length - 1][1];
       let l = list.length;
       let x = l / (375 * this.data.height)
-      let max = x * maxVal;
-      let y = 23 / max;
+      let fx = Math.sqrt(x);
+      let max = fx * maxVal;
+      let fy = maxVal / minVal;
+      let fz = fy * 100 >= 500 ? 500 : fy*100;
+      let y = fz/ max;
       list.forEach(ele => {
-        let a = [ele[0], ele[1] * x * y];
+        let a = [ele[0], ele[1] * x * y ];
         arr.push(a)
       })
       return arr;
+    },
+    doList(arr = []) {
+      let list = [];
+      if(arr.length > 140) {
+        list = arr.slice(139)
+      } else {
+        list = arr;
+      }
+      return list
     }
   }
 })