Skip to content

Commit 353e351

Browse files
author
shengyonggen
committed
Release 1.14.28
1 parent 15fe076 commit 353e351

14 files changed

+179
-139
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.14.28（2021-11-24）
2+
1. 优化
3+
- 优化 `$referrer` 取值为 `url` 完整路径带 `query` 参数
4+
15
## 1.14.27（2021-11-23）
26
1. 新增
37
- 数据发送模块重构

‎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-miniprogram",
3-
"version": "1.14.27",
3+
"version": "1.14.28",
44
"description": "sensorsdata miniprogram sdk",
55
"main": "sensorsdata.min.js",
66
"scripts": {

‎product/sensorsdata.custom.es6.full.js‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ kit.buildData = function(p) {
6767
}
6868

6969
var refPage = _.getRefPage();
70-
if (!data.properties.hasOwnProperty.call('$referrer')) {
70+
if (!data.properties.hasOwnProperty('$referrer')) {
7171
data.properties.$referrer = refPage.route;
7272
}
7373

74-
if (!data.properties.hasOwnProperty.call('$referrer_title')) {
74+
if (!data.properties.hasOwnProperty('$referrer_title')) {
7575
data.properties.$referrer_title = refPage.title;
7676
}
7777
}
@@ -469,7 +469,7 @@ var ArrayProto = Array.prototype,
469469
slice = ArrayProto.slice,
470470
toString$1 = ObjProto.toString,
471471
hasOwnProperty = ObjProto.hasOwnProperty,
472-
LIB_VERSION = '1.14.27',
472+
LIB_VERSION = '1.14.28',
473473
LIB_NAME = 'MiniProgram';
474474

475475
var source_channel_standard = 'utm_source utm_medium utm_campaign utm_content utm_term';
@@ -1431,25 +1431,19 @@ _.setRefPage = function() {
14311431
try {
14321432
var pages = _.getCurrentPage();
14331433
if (pages && pages.route) {
1434+
var url_query = pages.sensors_mp_url_query ? '?' + pages.sensors_mp_url_query : '';
14341435
var current_path = pages.route;
14351436
var current_title = _.getPageTitle(current_path);
1436-
_refInfo.route = current_path;
1437+
_refInfo.route = current_path + url_query;
14371438
_refInfo.title = current_title;
14381439

1439-
var len = page_route_map.length,
1440-
path = '';
1440+
var len = page_route_map.length;
14411441

1442-
if (len >= 1) {
1443-
path = page_route_map[len - 1].route;
1444-
}
1445-
1446-
if (path !== current_path) {
1447-
if (len >= 2) {
1448-
page_route_map.shift();
1449-
page_route_map.push(_refInfo);
1450-
} else {
1451-
page_route_map.push(_refInfo);
1452-
}
1442+
if (len >= 2) {
1443+
page_route_map.shift();
1444+
page_route_map.push(_refInfo);
1445+
} else {
1446+
page_route_map.push(_refInfo);
14531447
}
14541448
}
14551449
} catch (error) {
@@ -1471,11 +1465,21 @@ _.getRefPage = function() {
14711465
return _refInfo;
14721466
};
14731467

1474-
_.setPageRefData = function(prop) {
1468+
_.setPageRefData = function(prop, path, query) {
14751469
var refPage = _.getRefPage();
1470+
14761471
if (_.isObject(prop)) {
1477-
prop.$referrer = refPage.route;
1478-
prop.$referrer_title = refPage.title;
1472+
if (!path) {
1473+
prop.$referrer = refPage.route;
1474+
prop.$referrer_title = refPage.title;
1475+
} else if (page_route_map.length > 0 && path) {
1476+
query = query ? '?' + query : '';
1477+
prop.$referrer = _.getPath(path) + query;
1478+
prop.$referrer_title = _.getPageTitle(path);
1479+
} else {
1480+
prop.$referrer = '直接打开';
1481+
prop.$referrer_title = '';
1482+
}
14791483
}
14801484
};
14811485

@@ -2456,11 +2460,13 @@ sa.autoTrackCustom = {
24562460

24572461
_.setLatestChannel(utms.pre2);
24582462
_.setSfSource(para, prop);
2459-
_.setPageRefData(prop);
2463+
24602464
sa.registerApp({
24612465
$latest_scene: prop.$scene
24622466
});
24632467
prop.$url_query = _.setQuery(para.query);
2468+
_.setPageRefData(prop, para.path, prop.$url_query);
2469+
24642470
if (not_use_auto_track) {
24652471
prop = _.extend(prop, not_use_auto_track);
24662472
sa.track('$MPShow', prop);
@@ -2712,7 +2718,7 @@ sa.appShow = function(option, prop) {
27122718
$latest_scene: obj.$scene
27132719
});
27142720
obj.$url_query = _.setQuery(option.query);
2715-
_.setPageRefData(obj);
2721+
_.setPageRefData(obj, option.path, obj.$url_query);
27162722
if (_.isObject(prop)) {
27172723
obj = _.extend(obj, prop);
27182724
}

‎product/sensorsdata.custom.full.js‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ kit.buildData = function(p) {
7070
}
7171

7272
var refPage = _.getRefPage();
73-
if (!data.properties.hasOwnProperty.call('$referrer')) {
73+
if (!data.properties.hasOwnProperty('$referrer')) {
7474
data.properties.$referrer = refPage.route;
7575
}
7676

77-
if (!data.properties.hasOwnProperty.call('$referrer_title')) {
77+
if (!data.properties.hasOwnProperty('$referrer_title')) {
7878
data.properties.$referrer_title = refPage.title;
7979
}
8080
}
@@ -472,7 +472,7 @@ var ArrayProto = Array.prototype,
472472
slice = ArrayProto.slice,
473473
toString$1 = ObjProto.toString,
474474
hasOwnProperty = ObjProto.hasOwnProperty,
475-
LIB_VERSION = '1.14.27',
475+
LIB_VERSION = '1.14.28',
476476
LIB_NAME = 'MiniProgram';
477477

478478
var source_channel_standard = 'utm_source utm_medium utm_campaign utm_content utm_term';
@@ -1434,25 +1434,19 @@ _.setRefPage = function() {
14341434
try {
14351435
var pages = _.getCurrentPage();
14361436
if (pages && pages.route) {
1437+
var url_query = pages.sensors_mp_url_query ? '?' + pages.sensors_mp_url_query : '';
14371438
var current_path = pages.route;
14381439
var current_title = _.getPageTitle(current_path);
1439-
_refInfo.route = current_path;
1440+
_refInfo.route = current_path + url_query;
14401441
_refInfo.title = current_title;
14411442

1442-
var len = page_route_map.length,
1443-
path = '';
1443+
var len = page_route_map.length;
14441444

1445-
if (len >= 1) {
1446-
path = page_route_map[len - 1].route;
1447-
}
1448-
1449-
if (path !== current_path) {
1450-
if (len >= 2) {
1451-
page_route_map.shift();
1452-
page_route_map.push(_refInfo);
1453-
} else {
1454-
page_route_map.push(_refInfo);
1455-
}
1445+
if (len >= 2) {
1446+
page_route_map.shift();
1447+
page_route_map.push(_refInfo);
1448+
} else {
1449+
page_route_map.push(_refInfo);
14561450
}
14571451
}
14581452
} catch (error) {
@@ -1474,11 +1468,21 @@ _.getRefPage = function() {
14741468
return _refInfo;
14751469
};
14761470

1477-
_.setPageRefData = function(prop) {
1471+
_.setPageRefData = function(prop, path, query) {
14781472
var refPage = _.getRefPage();
1473+
14791474
if (_.isObject(prop)) {
1480-
prop.$referrer = refPage.route;
1481-
prop.$referrer_title = refPage.title;
1475+
if (!path) {
1476+
prop.$referrer = refPage.route;
1477+
prop.$referrer_title = refPage.title;
1478+
} else if (page_route_map.length > 0 && path) {
1479+
query = query ? '?' + query : '';
1480+
prop.$referrer = _.getPath(path) + query;
1481+
prop.$referrer_title = _.getPageTitle(path);
1482+
} else {
1483+
prop.$referrer = '直接打开';
1484+
prop.$referrer_title = '';
1485+
}
14821486
}
14831487
};
14841488

@@ -2459,11 +2463,13 @@ sa.autoTrackCustom = {
24592463

24602464
_.setLatestChannel(utms.pre2);
24612465
_.setSfSource(para, prop);
2462-
_.setPageRefData(prop);
2466+
24632467
sa.registerApp({
24642468
$latest_scene: prop.$scene
24652469
});
24662470
prop.$url_query = _.setQuery(para.query);
2471+
_.setPageRefData(prop, para.path, prop.$url_query);
2472+
24672473
if (not_use_auto_track) {
24682474
prop = _.extend(prop, not_use_auto_track);
24692475
sa.track('$MPShow', prop);
@@ -2715,7 +2721,7 @@ sa.appShow = function(option, prop) {
27152721
$latest_scene: obj.$scene
27162722
});
27172723
obj.$url_query = _.setQuery(option.query);
2718-
_.setPageRefData(obj);
2724+
_.setPageRefData(obj, option.path, obj.$url_query);
27192725
if (_.isObject(prop)) {
27202726
obj = _.extend(obj, prop);
27212727
}

‎product/sensorsdata.es6.full.js‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ kit.buildData = function(p) {
6767
}
6868

6969
var refPage = _.getRefPage();
70-
if (!data.properties.hasOwnProperty.call('$referrer')) {
70+
if (!data.properties.hasOwnProperty('$referrer')) {
7171
data.properties.$referrer = refPage.route;
7272
}
7373

74-
if (!data.properties.hasOwnProperty.call('$referrer_title')) {
74+
if (!data.properties.hasOwnProperty('$referrer_title')) {
7575
data.properties.$referrer_title = refPage.title;
7676
}
7777
}
@@ -473,7 +473,7 @@ var ArrayProto = Array.prototype,
473473
slice = ArrayProto.slice,
474474
toString$1 = ObjProto.toString,
475475
hasOwnProperty = ObjProto.hasOwnProperty,
476-
LIB_VERSION = '1.14.27',
476+
LIB_VERSION = '1.14.28',
477477
LIB_NAME = 'MiniProgram';
478478

479479
var source_channel_standard = 'utm_source utm_medium utm_campaign utm_content utm_term';
@@ -1435,25 +1435,19 @@ _.setRefPage = function() {
14351435
try {
14361436
var pages = _.getCurrentPage();
14371437
if (pages && pages.route) {
1438+
var url_query = pages.sensors_mp_url_query ? '?' + pages.sensors_mp_url_query : '';
14381439
var current_path = pages.route;
14391440
var current_title = _.getPageTitle(current_path);
1440-
_refInfo.route = current_path;
1441+
_refInfo.route = current_path + url_query;
14411442
_refInfo.title = current_title;
14421443

1443-
var len = page_route_map.length,
1444-
path = '';
1444+
var len = page_route_map.length;
14451445

1446-
if (len >= 1) {
1447-
path = page_route_map[len - 1].route;
1448-
}
1449-
1450-
if (path !== current_path) {
1451-
if (len >= 2) {
1452-
page_route_map.shift();
1453-
page_route_map.push(_refInfo);
1454-
} else {
1455-
page_route_map.push(_refInfo);
1456-
}
1446+
if (len >= 2) {
1447+
page_route_map.shift();
1448+
page_route_map.push(_refInfo);
1449+
} else {
1450+
page_route_map.push(_refInfo);
14571451
}
14581452
}
14591453
} catch (error) {
@@ -1475,11 +1469,21 @@ _.getRefPage = function() {
14751469
return _refInfo;
14761470
};
14771471

1478-
_.setPageRefData = function(prop) {
1472+
_.setPageRefData = function(prop, path, query) {
14791473
var refPage = _.getRefPage();
1474+
14801475
if (_.isObject(prop)) {
1481-
prop.$referrer = refPage.route;
1482-
prop.$referrer_title = refPage.title;
1476+
if (!path) {
1477+
prop.$referrer = refPage.route;
1478+
prop.$referrer_title = refPage.title;
1479+
} else if (page_route_map.length > 0 && path) {
1480+
query = query ? '?' + query : '';
1481+
prop.$referrer = _.getPath(path) + query;
1482+
prop.$referrer_title = _.getPageTitle(path);
1483+
} else {
1484+
prop.$referrer = '直接打开';
1485+
prop.$referrer_title = '';
1486+
}
14831487
}
14841488
};
14851489

@@ -2574,11 +2578,13 @@ sa.autoTrackCustom = {
25742578

25752579
_.setLatestChannel(utms.pre2);
25762580
_.setSfSource(para, prop);
2577-
_.setPageRefData(prop);
2581+
25782582
sa.registerApp({
25792583
$latest_scene: prop.$scene
25802584
});
25812585
prop.$url_query = _.setQuery(para.query);
2586+
_.setPageRefData(prop, para.path, prop.$url_query);
2587+
25822588
if (not_use_auto_track) {
25832589
prop = _.extend(prop, not_use_auto_track);
25842590
sa.track('$MPShow', prop);
@@ -2830,7 +2836,7 @@ sa.appShow = function(option, prop) {
28302836
$latest_scene: obj.$scene
28312837
});
28322838
obj.$url_query = _.setQuery(option.query);
2833-
_.setPageRefData(obj);
2839+
_.setPageRefData(obj, option.path, obj.$url_query);
28342840
if (_.isObject(prop)) {
28352841
obj = _.extend(obj, prop);
28362842
}

0 commit comments

Comments
 (0)