Skip to content

Commit 3fbc2cc

Browse files
author
shengyonggen
committed
Release 1.17.2
1 parent b1eeb2c commit 3fbc2cc

14 files changed

+85
-85
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 1.17.2 (2021-5-31)
2+
1. 修复
3+
- 修复触发弹窗时切换用户，弹窗事件 `distinct_id` 不正确问题
14

25
## 1.17.1 (2021-05-24)
36
1. 新增

‎core/sensorsdata.amd.min.js‎

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

‎core/sensorsdata.es6.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.

‎core/sensorsdata.min.js‎

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

‎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.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sa-sdk-javascript",
3-
"version": "1.17.1",
3+
"version": "1.17.2",
44
"description": "official sensorsdata javascript sdk",
55
"main": "sensorsdata.min.js",
66
"scripts": {

‎product/heatmap.full.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9405,7 +9405,7 @@
94059405

94069406
window.sa_jssdk_heatmap_render = function(se, data, type, url) {
94079407
sd = se;
9408-
sd.heatmap_version = '1.17.1';
9408+
sd.heatmap_version = '1.17.2';
94099409
_ = sd._;
94109410

94119411
_.bindReady = function(fn, win) {

‎product/sensorsdata.amd.full.js‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3229,7 +3229,7 @@
32293229

32303230
sd.setInitVar = function() {
32313231
sd._t = sd._t || 1 * new Date();
3232-
sd.lib_version = '1.17.1';
3232+
sd.lib_version = '1.17.2';
32333233
sd.is_first_visitor = false;
32343234
sd.source_channel_standard = 'utm_source utm_medium utm_campaign utm_content utm_term';
32353235
};
@@ -4134,7 +4134,7 @@
41344134
source: 'sa-web-sdk',
41354135
type: 'v-is-vtrack',
41364136
data: {
4137-
sdkversion: '1.17.1'
4137+
sdkversion: '1.17.2'
41384138
}
41394139
},
41404140
'*'
@@ -4679,8 +4679,6 @@
46794679
sd.events = new _.eventEmitter();
46804680
sendState.queue = _.autoExeQueue();
46814681

4682-
sendState.requestData = null;
4683-
46844682
sendState.getSendCall = function(data, config, callback) {
46854683
if (sd.is_heatmap_render_mode) {
46864684
return false;
@@ -4700,7 +4698,7 @@
47004698

47014699
data = JSON.stringify(data);
47024700

4703-
this.requestData = {
4701+
var requestData = {
47044702
data: originData,
47054703
config: config,
47064704
callback: callback
@@ -4710,35 +4708,35 @@
47104708

47114709
if (!sd.para.app_js_bridge && sd.para.batch_send && localStorage.length < 200) {
47124710
sd.log(originData);
4713-
sd.batchSend.add(this.requestData.data);
4711+
sd.batchSend.add(requestData.data);
47144712
return false;
47154713
}
47164714

4717-
sd.bridge.dataSend(originData, this, callback);
4715+
sd.bridge.dataSend(requestData, this, callback);
47184716

47194717
sd.log(originData);
47204718
};
47214719

4722-
sendState.prepareServerUrl = function() {
4723-
if (typeof this.requestData.config === 'object' && this.requestData.config.server_url) {
4724-
this.sendCall(this.requestData.config.server_url, this.requestData.callback);
4720+
sendState.prepareServerUrl = function(requestData) {
4721+
if (typeof requestData.config === 'object' && requestData.config.server_url) {
4722+
this.sendCall(requestData, requestData.config.server_url, requestData.callback);
47254723
} else if (_.isArray(sd.para.server_url) && sd.para.server_url.length) {
47264724
for (var i = 0; i < sd.para.server_url.length; i++) {
4727-
this.sendCall(sd.para.server_url[i]);
4725+
this.sendCall(requestData, sd.para.server_url[i]);
47284726
}
47294727
} else if (typeof sd.para.server_url === 'string' && sd.para.server_url !== '') {
4730-
this.sendCall(sd.para.server_url, this.requestData.callback);
4728+
this.sendCall(requestData, sd.para.server_url, requestData.callback);
47314729
} else {
47324730
sd.log('当前 server_url 为空或不正确，只在控制台打印日志，network 中不会发数据，请配置正确的 server_url！');
47334731
}
47344732
};
47354733

4736-
sendState.sendCall = function(server_url, callback) {
4734+
sendState.sendCall = function(requestData, server_url, callback) {
47374735
var data = {
47384736
server_url: server_url,
4739-
data: JSON.stringify(this.requestData.data),
4737+
data: JSON.stringify(requestData.data),
47404738
callback: callback,
4741-
config: this.requestData.config
4739+
config: requestData.config
47424740
};
47434741
if (_.isObject(sd.para.jsapp) && !sd.para.jsapp.isOnline && typeof sd.para.jsapp.setData === 'function') {
47444742
delete data.callback;
@@ -5462,7 +5460,8 @@
54625460
return false;
54635461
}
54645462
},
5465-
dataSend: function(originData, that, callback) {
5463+
dataSend: function(requestData, that, callback) {
5464+
var originData = requestData.data;
54665465
if (_.isObject(sd.para.app_js_bridge) && !sd.para.app_js_bridge.is_mui) {
54675466
if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.sensorsdataNativeTracker && window.webkit.messageHandlers.sensorsdataNativeTracker.postMessage && _.isObject(window.SensorsData_iOS_JS_Bridge) && window.SensorsData_iOS_JS_Bridge.sensorsdata_app_server_url) {
54685467
if (sd.bridge.is_verify_success) {
@@ -5480,7 +5479,7 @@
54805479
step: '4.1',
54815480
output: 'all'
54825481
});
5483-
that.prepareServerUrl();
5482+
that.prepareServerUrl(requestData);
54845483
} else {
54855484
typeof callback === 'function' && callback();
54865485
}
@@ -5498,7 +5497,7 @@
54985497
step: '4.2',
54995498
output: 'all'
55005499
});
5501-
that.prepareServerUrl();
5500+
that.prepareServerUrl(requestData);
55025501
} else {
55035502
typeof callback === 'function' && callback();
55045503
}
@@ -5514,7 +5513,7 @@
55145513
step: '3.1',
55155514
output: 'all'
55165515
});
5517-
that.prepareServerUrl();
5516+
that.prepareServerUrl(requestData);
55185517
} else {
55195518
typeof callback === 'function' && callback();
55205519
}
@@ -5553,7 +5552,7 @@
55535552
step: '3.2',
55545553
output: 'all'
55555554
});
5556-
that.prepareServerUrl();
5555+
that.prepareServerUrl(requestData);
55575556
} else {
55585557
typeof callback === 'function' && callback();
55595558
}
@@ -5565,7 +5564,7 @@
55655564
step: '2',
55665565
output: 'all'
55675566
});
5568-
that.prepareServerUrl();
5567+
that.prepareServerUrl(requestData);
55695568
} else {
55705569
typeof callback === 'function' && callback();
55715570
}
@@ -5576,7 +5575,7 @@
55765575
typeof callback === 'function' && callback();
55775576
} else {
55785577
if (_.isObject(sd.para.app_js_bridge) && sd.para.app_js_bridge.is_send === true) {
5579-
that.prepareServerUrl();
5578+
that.prepareServerUrl(requestData);
55805579
} else {
55815580
typeof callback === 'function' && callback();
55825581
}
@@ -5587,7 +5586,7 @@
55875586
step: '1',
55885587
output: 'code'
55895588
});
5590-
that.prepareServerUrl();
5589+
that.prepareServerUrl(requestData);
55915590
}
55925591
},
55935592
app_js_bridge_v1: function() {

‎product/sensorsdata.es6.full.js‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3223,7 +3223,7 @@ sd.setPreConfig = function(sa) {
32233223

32243224
sd.setInitVar = function() {
32253225
sd._t = sd._t || 1 * new Date();
3226-
sd.lib_version = '1.17.1';
3226+
sd.lib_version = '1.17.2';
32273227
sd.is_first_visitor = false;
32283228
sd.source_channel_standard = 'utm_source utm_medium utm_campaign utm_content utm_term';
32293229
};
@@ -4128,7 +4128,7 @@ sd.detectMode = function() {
41284128
source: 'sa-web-sdk',
41294129
type: 'v-is-vtrack',
41304130
data: {
4131-
sdkversion: '1.17.1'
4131+
sdkversion: '1.17.2'
41324132
}
41334133
},
41344134
'*'
@@ -4673,8 +4673,6 @@ sd.sendState = sendState;
46734673
sd.events = new _.eventEmitter();
46744674
sendState.queue = _.autoExeQueue();
46754675

4676-
sendState.requestData = null;
4677-
46784676
sendState.getSendCall = function(data, config, callback) {
46794677
if (sd.is_heatmap_render_mode) {
46804678
return false;
@@ -4694,7 +4692,7 @@ sendState.getSendCall = function(data, config, callback) {
46944692

46954693
data = JSON.stringify(data);
46964694

4697-
this.requestData = {
4695+
var requestData = {
46984696
data: originData,
46994697
config: config,
47004698
callback: callback
@@ -4704,35 +4702,35 @@ sendState.getSendCall = function(data, config, callback) {
47044702

47054703
if (!sd.para.app_js_bridge && sd.para.batch_send && localStorage.length < 200) {
47064704
sd.log(originData);
4707-
sd.batchSend.add(this.requestData.data);
4705+
sd.batchSend.add(requestData.data);
47084706
return false;
47094707
}
47104708

4711-
sd.bridge.dataSend(originData, this, callback);
4709+
sd.bridge.dataSend(requestData, this, callback);
47124710

47134711
sd.log(originData);
47144712
};
47154713

4716-
sendState.prepareServerUrl = function() {
4717-
if (typeof this.requestData.config === 'object' && this.requestData.config.server_url) {
4718-
this.sendCall(this.requestData.config.server_url, this.requestData.callback);
4714+
sendState.prepareServerUrl = function(requestData) {
4715+
if (typeof requestData.config === 'object' && requestData.config.server_url) {
4716+
this.sendCall(requestData, requestData.config.server_url, requestData.callback);
47194717
} else if (_.isArray(sd.para.server_url) && sd.para.server_url.length) {
47204718
for (var i = 0; i < sd.para.server_url.length; i++) {
4721-
this.sendCall(sd.para.server_url[i]);
4719+
this.sendCall(requestData, sd.para.server_url[i]);
47224720
}
47234721
} else if (typeof sd.para.server_url === 'string' && sd.para.server_url !== '') {
4724-
this.sendCall(sd.para.server_url, this.requestData.callback);
4722+
this.sendCall(requestData, sd.para.server_url, requestData.callback);
47254723
} else {
47264724
sd.log('当前 server_url 为空或不正确，只在控制台打印日志，network 中不会发数据，请配置正确的 server_url！');
47274725
}
47284726
};
47294727

4730-
sendState.sendCall = function(server_url, callback) {
4728+
sendState.sendCall = function(requestData, server_url, callback) {
47314729
var data = {
47324730
server_url: server_url,
4733-
data: JSON.stringify(this.requestData.data),
4731+
data: JSON.stringify(requestData.data),
47344732
callback: callback,
4735-
config: this.requestData.config
4733+
config: requestData.config
47364734
};
47374735
if (_.isObject(sd.para.jsapp) && !sd.para.jsapp.isOnline && typeof sd.para.jsapp.setData === 'function') {
47384736
delete data.callback;
@@ -5456,7 +5454,8 @@ sd.bridge = {
54565454
return false;
54575455
}
54585456
},
5459-
dataSend: function(originData, that, callback) {
5457+
dataSend: function(requestData, that, callback) {
5458+
var originData = requestData.data;
54605459
if (_.isObject(sd.para.app_js_bridge) && !sd.para.app_js_bridge.is_mui) {
54615460
if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.sensorsdataNativeTracker && window.webkit.messageHandlers.sensorsdataNativeTracker.postMessage && _.isObject(window.SensorsData_iOS_JS_Bridge) && window.SensorsData_iOS_JS_Bridge.sensorsdata_app_server_url) {
54625461
if (sd.bridge.is_verify_success) {
@@ -5474,7 +5473,7 @@ sd.bridge = {
54745473
step: '4.1',
54755474
output: 'all'
54765475
});
5477-
that.prepareServerUrl();
5476+
that.prepareServerUrl(requestData);
54785477
} else {
54795478
typeof callback === 'function' && callback();
54805479
}
@@ -5492,7 +5491,7 @@ sd.bridge = {
54925491
step: '4.2',
54935492
output: 'all'
54945493
});
5495-
that.prepareServerUrl();
5494+
that.prepareServerUrl(requestData);
54965495
} else {
54975496
typeof callback === 'function' && callback();
54985497
}
@@ -5508,7 +5507,7 @@ sd.bridge = {
55085507
step: '3.1',
55095508
output: 'all'
55105509
});
5511-
that.prepareServerUrl();
5510+
that.prepareServerUrl(requestData);
55125511
} else {
55135512
typeof callback === 'function' && callback();
55145513
}
@@ -5547,7 +5546,7 @@ sd.bridge = {
55475546
step: '3.2',
55485547
output: 'all'
55495548
});
5550-
that.prepareServerUrl();
5549+
that.prepareServerUrl(requestData);
55515550
} else {
55525551
typeof callback === 'function' && callback();
55535552
}
@@ -5559,7 +5558,7 @@ sd.bridge = {
55595558
step: '2',
55605559
output: 'all'
55615560
});
5562-
that.prepareServerUrl();
5561+
that.prepareServerUrl(requestData);
55635562
} else {
55645563
typeof callback === 'function' && callback();
55655564
}
@@ -5570,7 +5569,7 @@ sd.bridge = {
55705569
typeof callback === 'function' && callback();
55715570
} else {
55725571
if (_.isObject(sd.para.app_js_bridge) && sd.para.app_js_bridge.is_send === true) {
5573-
that.prepareServerUrl();
5572+
that.prepareServerUrl(requestData);
55745573
} else {
55755574
typeof callback === 'function' && callback();
55765575
}
@@ -5581,7 +5580,7 @@ sd.bridge = {
55815580
step: '1',
55825581
output: 'code'
55835582
});
5584-
that.prepareServerUrl();
5583+
that.prepareServerUrl(requestData);
55855584
}
55865585
},
55875586
app_js_bridge_v1: function() {

0 commit comments

Comments
 (0)