Skip to content

Commit db89388

Browse files
author
shengyonggen
committed
优化点击图样式，优化没有设置heatmap_url的错误
1 parent 795402e commit db89388

File tree

10 files changed

+45
-36
lines changed

10 files changed

+45
-36
lines changed

‎heatmap.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sensorsdata.amd.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sensorsdata.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/heatmap.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8657,7 +8657,7 @@ var heatmap_render = {
86578657

86588658
var me = this;
86598659
var str = '<div style="padding: 8px;"><div style="color: #CACACA">当前内容：</div><div style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{data_current_content}}</div></div><div style="background: #444; height:1px;"></div><div style="padding: 8px;">'+
8660-
'<table style="width:100%;"><tr><td>点击次数: </td><td style="text-align:right;">{{value_fix}}次</td></tr><tr><td style="cursor:pointer;" title="点击次数/当前页面的浏览次数"><span style="float:left;">点击率</span><span style="float:left;margin-left:3px;"><svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g transform="translate(-1803.000000, -158.000000)" fill="#979797"><g transform="translate(1737.000000, 84.000000)"><path d="M71,74 C68.24,74 66,76.24 66,79 C66,81.76 68.24,84 71,84 C73.76,84 76,81.76 76,79 C76,76.24 73.76,74 71,74 L71,74 Z M71.5,82.5 L70.5,82.5 L70.5,81.5 L71.5,81.5 L71.5,82.5 L71.5,82.5 Z M72.535,78.625 L72.085,79.085 C71.725,79.45 71.5,79.75 71.5,80.5 L70.5,80.5 L70.5,80.25 C70.5,79.7 70.725,79.2 71.085,78.835 L71.705,78.205 C71.89,78.025 72,77.775 72,77.5 C72,76.95 71.55,76.5 71,76.5 C70.45,76.5 70,76.95 70,77.5 L69,77.5 C69,76.395 69.895,75.5 71,75.5 C72.105,75.5 73,76.395 73,77.5 C73,77.94 72.82,78.34 72.535,78.625 L72.535,78.625 Z" id="prompt"></path></g></g></g></svg></span></td><td style="text-align:right;">{{data_click_percent}}</td></tr><tr><td style="cursor:pointer;" title="点击次数/当前页面的点击总次数"><span style="float:left;">点击占比</span> <span style="float:left;margin-left:3px;"><svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g transform="translate(-1803.000000, -158.000000)" fill="#979797"><g transform="translate(1737.000000, 84.000000)"><path d="M71,74 C68.24,74 66,76.24 66,79 C66,81.76 68.24,84 71,84 C73.76,84 76,81.76 76,79 C76,76.24 73.76,74 71,74 L71,74 Z M71.5,82.5 L70.5,82.5 L70.5,81.5 L71.5,81.5 L71.5,82.5 L71.5,82.5 Z M72.535,78.625 L72.085,79.085 C71.725,79.45 71.5,79.75 71.5,80.5 L70.5,80.5 L70.5,80.25 C70.5,79.7 70.725,79.2 71.085,78.835 L71.705,78.205 C71.89,78.025 72,77.775 72,77.5 C72,76.95 71.55,76.5 71,76.5 C70.45,76.5 70,76.95 70,77.5 L69,77.5 C69,76.395 69.895,75.5 71,75.5 C72.105,75.5 73,76.395 73,77.5 C73,77.94 72.82,78.34 72.535,78.625 L72.535,78.625 Z" id="prompt"></path></g></g></g></svg></span></td><td style="text-align:right;">{{data_page_percent}}</td></tr></table>'+
8660+
'<table style="width:100%;color:#fff;font-size:13px;"><tr><td>点击次数: </td><td style="text-align:right;">{{value_fix}}次</td></tr><tr><td style="cursor:pointer;" title="点击次数/当前页面的浏览次数"><span style="float:left;">点击率</span><span style="float:left;margin-left:3px;"><svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g transform="translate(-1803.000000, -158.000000)" fill="#979797"><g transform="translate(1737.000000, 84.000000)"><path d="M71,74 C68.24,74 66,76.24 66,79 C66,81.76 68.24,84 71,84 C73.76,84 76,81.76 76,79 C76,76.24 73.76,74 71,74 L71,74 Z M71.5,82.5 L70.5,82.5 L70.5,81.5 L71.5,81.5 L71.5,82.5 L71.5,82.5 Z M72.535,78.625 L72.085,79.085 C71.725,79.45 71.5,79.75 71.5,80.5 L70.5,80.5 L70.5,80.25 C70.5,79.7 70.725,79.2 71.085,78.835 L71.705,78.205 C71.89,78.025 72,77.775 72,77.5 C72,76.95 71.55,76.5 71,76.5 C70.45,76.5 70,76.95 70,77.5 L69,77.5 C69,76.395 69.895,75.5 71,75.5 C72.105,75.5 73,76.395 73,77.5 C73,77.94 72.82,78.34 72.535,78.625 L72.535,78.625 Z" id="prompt"></path></g></g></g></svg></span></td><td style="text-align:right;">{{data_click_percent}}</td></tr><tr><td style="cursor:pointer;" title="点击次数/当前页面的点击总次数"><span style="float:left;">点击占比</span> <span style="float:left;margin-left:3px;"><svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g transform="translate(-1803.000000, -158.000000)" fill="#979797"><g transform="translate(1737.000000, 84.000000)"><path d="M71,74 C68.24,74 66,76.24 66,79 C66,81.76 68.24,84 71,84 C73.76,84 76,81.76 76,79 C76,76.24 73.76,74 71,74 L71,74 Z M71.5,82.5 L70.5,82.5 L70.5,81.5 L71.5,81.5 L71.5,82.5 L71.5,82.5 Z M72.535,78.625 L72.085,79.085 C71.725,79.45 71.5,79.75 71.5,80.5 L70.5,80.5 L70.5,80.25 C70.5,79.7 70.725,79.2 71.085,78.835 L71.705,78.205 C71.89,78.025 72,77.775 72,77.5 C72,76.95 71.55,76.5 71,76.5 C70.45,76.5 70,76.95 70,77.5 L69,77.5 C69,76.395 69.895,75.5 71,75.5 C72.105,75.5 73,76.395 73,77.5 C73,77.94 72.82,78.34 72.535,78.625 L72.535,78.625 Z" id="prompt"></path></g></g></g></svg></span></td><td style="text-align:right;">{{data_page_percent}}</td></tr></table>'+
86618661
'</div><div style="background: #444; height:1px;"></div><div style="padding: 8px;"><div style="color: #CACACA;">历史内容：</div><div style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{data_top_value}}</div></div><div style="background: #444; height:1px;"></div><div style="padding: 6px 8px;"><a style="color:#2a90e2;text-decoration: none;" href="{{data_user_link}}" target="_blank">查看用户列表</a ></div>';
86628662

86638663
var newStr = '';

‎src/sdk.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3159,21 +3159,22 @@ saEvent.send = function(p, callback) {
31593159

31603160
var me = this;
31613161
function isReady(data,type,url){
3162-
3163-
_.loadScript({
3162+
if(sd.para.heatmap_url){
3163+
_.loadScript({
31643164
success:function(){
3165-
31663165
setTimeout(function(){
31673166
if(typeof sa_jssdk_heatmap_render !== 'undefined'){
31683167
sa_jssdk_heatmap_render(sd,data,type,url);
31693168
}
3170-
},0)
3171-
3169+
},0);
31723170
},
31733171
error:function(){},
31743172
type:'js',
31753173
url: sd.para.heatmap_url
3176-
})
3174+
});
3175+
}else{
3176+
logger.info('没有指定heatmap_url的路径');
3177+
}
31773178

31783179
}
31793180
// 如果有id，才有可能是首次，首次的时候把web_url存进去

‎src/sensorsdata.full.amd.js‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,10 @@ sd.initPara = function(para){
102102
sd.para[i] = sd.para_default[i];
103103
}
104104
}
105-
106-
sd.para.heatmap_url = sd.para.heatmap_url || sd.para.sdk_url.replace(/[^\/]+\.min\.js/,'heatmap.min.js');
105+
//优化自动取heatmap.min.js
106+
if(!sd.para.heatmap_url && sd.para.sdk_url){
107+
sd.para.heatmap_url = sd.para.sdk_url.replace(/[^\/]+\.js$/,'heatmap.min.js');
108+
}
107109

108110
if(_.isObject(sd.para.heatmap)) {
109111
if(_.isEmptyObject(sd.para.heatmap)){
@@ -142,7 +144,7 @@ var ObjProto = Object.prototype;
142144
var slice = ArrayProto.slice;
143145
var toString = ObjProto.toString;
144146
var hasOwnProperty = ObjProto.hasOwnProperty;
145-
var LIB_VERSION = '1.9.4';
147+
var LIB_VERSION = '1.9.5';
146148

147149
sd.lib_version = LIB_VERSION;
148150

@@ -3291,21 +3293,22 @@ saEvent.send = function(p, callback) {
32913293

32923294
var me = this;
32933295
function isReady(data,type,url){
3294-
3295-
_.loadScript({
3296+
if(sd.para.heatmap_url){
3297+
_.loadScript({
32963298
success:function(){
3297-
32983299
setTimeout(function(){
32993300
if(typeof sa_jssdk_heatmap_render !== 'undefined'){
33003301
sa_jssdk_heatmap_render(sd,data,type,url);
33013302
}
3302-
},0)
3303-
3303+
},0);
33043304
},
33053305
error:function(){},
33063306
type:'js',
33073307
url: sd.para.heatmap_url
3308-
})
3308+
});
3309+
}else{
3310+
logger.info('没有指定heatmap_url的路径');
3311+
}
33093312

33103313
}
33113314
// 如果有id，才有可能是首次，首次的时候把web_url存进去

‎src/sensorsdata.full.js‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,10 @@ sd.initPara = function(para){
9999
sd.para[i] = sd.para_default[i];
100100
}
101101
}
102-
103-
sd.para.heatmap_url = sd.para.heatmap_url || sd.para.sdk_url.replace(/[^\/]+\.min\.js/,'heatmap.min.js');
102+
//优化自动取heatmap.min.js
103+
if(!sd.para.heatmap_url && sd.para.sdk_url){
104+
sd.para.heatmap_url = sd.para.sdk_url.replace(/[^\/]+\.js$/,'heatmap.min.js');
105+
}
104106

105107
if(_.isObject(sd.para.heatmap)) {
106108
if(_.isEmptyObject(sd.para.heatmap)){
@@ -139,7 +141,7 @@ var ObjProto = Object.prototype;
139141
var slice = ArrayProto.slice;
140142
var toString = ObjProto.toString;
141143
var hasOwnProperty = ObjProto.hasOwnProperty;
142-
var LIB_VERSION = '1.9.4';
144+
var LIB_VERSION = '1.9.5';
143145

144146
sd.lib_version = LIB_VERSION;
145147

@@ -3288,21 +3290,22 @@ saEvent.send = function(p, callback) {
32883290

32893291
var me = this;
32903292
function isReady(data,type,url){
3291-
3292-
_.loadScript({
3293+
if(sd.para.heatmap_url){
3294+
_.loadScript({
32933295
success:function(){
3294-
32953296
setTimeout(function(){
32963297
if(typeof sa_jssdk_heatmap_render !== 'undefined'){
32973298
sa_jssdk_heatmap_render(sd,data,type,url);
32983299
}
3299-
},0)
3300-
3300+
},0);
33013301
},
33023302
error:function(){},
33033303
type:'js',
33043304
url: sd.para.heatmap_url
3305-
})
3305+
});
3306+
}else{
3307+
logger.info('没有指定heatmap_url的路径');
3308+
}
33063309

33073310
}
33083311
// 如果有id，才有可能是首次，首次的时候把web_url存进去

‎src/sensorsdata.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,10 @@ sd.initPara = function(para){
107107
sd.para[i] = sd.para_default[i];
108108
}
109109
}
110-
111-
sd.para.heatmap_url = sd.para.heatmap_url || sd.para.sdk_url.replace(/[^\/]+\.min\.js/,'heatmap.min.js');
110+
//优化自动取heatmap.min.js
111+
if(!sd.para.heatmap_url && sd.para.sdk_url){
112+
sd.para.heatmap_url = sd.para.sdk_url.replace(/[^\/]+\.js$/,'heatmap.min.js');
113+
}
112114

113115
if(_.isObject(sd.para.heatmap)) {
114116
if(_.isEmptyObject(sd.para.heatmap)){

‎version.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
var sensorsdata_js_sdk_latest_version = '1.9.4';
1+
var sensorsdata_js_sdk_latest_version = '1.9.5';

‎vtrack.min.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)