修复点击图在某些特殊情况下采集到的选择器不一致但对应的是同一个元素导致的点击图数据计算错误

Author: shengyonggen

heatmap.min.js

@@ -9177,13 +9177,33 @@ var heatmap_render = {
 
     var dataPageTotal = 0;
     var usableData = [];
-    
+    var usableElem = [];
+    // 去除找不到对应元素的已经无效的选择器
     _.each(data,function(obj){
-      if( obj.by_values[0] && _.querySelectorAll(obj.by_values[0])[0] ){
+      var elem = null; 
+      if( obj.by_values[0] && (elem = _.querySelectorAll(obj.by_values[0])[0]) ){
         usableData.push(obj);
+        usableElem.push(elem);
       }
     });
 
+    // 多个选择器对应一个元素,使用最后的元素
+    if(usableData.length > 1){
+        for(var i =0; i < usableElem.length; i++){
+          for(var j = (i+1); j < usableElem.length; j++){
+            if(usableElem[i] === usableElem[j]){
+              usableData[j].values[0][0] += usableData[i].values[0][0];
+              delete usableData[i];
+              break;
+            }
+          }
+        }
+    }
+
+    usableData = _.filter(usableData,function(a){
+        return a;
+    });
+
     if(usableData.length === 0){
       me.showErrorInfo(me.requestType);
     }

sensorsdata.amd.min.js

@@ -174,6 +174,24 @@ logger.info = function() {
 
 })();
 
+_.filter = function (arr, fn, self) {
+  var hasOwn = Object.prototype.hasOwnProperty;
+  if (arr.filter) {
+    return arr.filter(fn);
+  }
+  var ret = [];
+  for (var i = 0; i < arr.length; i++) {
+    if (!hasOwn.call(arr, i)) {
+      continue;
+    }
+    var val = arr[i];
+    if (fn.call(self, val, i, arr)) {
+      ret.push(val);
+    }
+  }
+  return ret;
+};
+
 _.inherit = function(subclass, superclass) {
   subclass.prototype = new superclass();
   subclass.prototype.constructor = subclass;

sensorsdata.min.js

@@ -153,7 +153,7 @@ var ObjProto = Object.prototype;
 var slice = ArrayProto.slice;
 var toString = ObjProto.toString;
 var hasOwnProperty = ObjProto.hasOwnProperty;
-var LIB_VERSION = '1.10.9';
+var LIB_VERSION = '1.11.2';
 
 sd.lib_version = LIB_VERSION;
 
@@ -323,6 +323,24 @@ logger.info = function() {
 
 })();
 
+_.filter = function (arr, fn, self) {
+  var hasOwn = Object.prototype.hasOwnProperty;
+  if (arr.filter) {
+    return arr.filter(fn);
+  }
+  var ret = [];
+  for (var i = 0; i < arr.length; i++) {
+    if (!hasOwn.call(arr, i)) {
+      continue;
+    }
+    var val = arr[i];
+    if (fn.call(self, val, i, arr)) {
+      ret.push(val);
+    }
+  }
+  return ret;
+};
+
 _.inherit = function(subclass, superclass) {
   subclass.prototype = new superclass();
   subclass.prototype.constructor = subclass;

src/heatmap.js

@@ -150,7 +150,7 @@ var ObjProto = Object.prototype;
 var slice = ArrayProto.slice;
 var toString = ObjProto.toString;
 var hasOwnProperty = ObjProto.hasOwnProperty;
-var LIB_VERSION = '1.10.9';
+var LIB_VERSION = '1.11.2';
 
 sd.lib_version = LIB_VERSION;
 
@@ -320,6 +320,24 @@ logger.info = function() {
 
 })();
 
+_.filter = function (arr, fn, self) {
+  var hasOwn = Object.prototype.hasOwnProperty;
+  if (arr.filter) {
+    return arr.filter(fn);
+  }
+  var ret = [];
+  for (var i = 0; i < arr.length; i++) {
+    if (!hasOwn.call(arr, i)) {
+      continue;
+    }
+    var val = arr[i];
+    if (fn.call(self, val, i, arr)) {
+      ret.push(val);
+    }
+  }
+  return ret;
+};
+
 _.inherit = function(subclass, superclass) {
   subclass.prototype = new superclass();
   subclass.prototype.constructor = subclass;

src/sdk.js

@@ -1 +1 @@
-var sensorsdata_js_sdk_latest_version = '1.10.9';
+var sensorsdata_js_sdk_latest_version = '1.11.2';