@zgfe/modules-attribution 1.0.1-alpha.30 → 1.0.1-alpha.31
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -99,19 +99,6 @@ var defaultValue = {
|
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
101
|
}],
|
|
102
|
-
"globalFilters": {
|
|
103
|
-
"relation": "and",
|
|
104
|
-
"conditions": [{
|
|
105
|
-
"attrId": 31331,
|
|
106
|
-
"propCategory": "eventProp",
|
|
107
|
-
"type": 2,
|
|
108
|
-
"operator": "gt",
|
|
109
|
-
"values": ["55"],
|
|
110
|
-
"dimensionSub": "event_attr",
|
|
111
|
-
"label": "price",
|
|
112
|
-
"attrName": "price"
|
|
113
|
-
}]
|
|
114
|
-
},
|
|
115
102
|
"attributionType": 3,
|
|
116
103
|
"otherEvent": true,
|
|
117
104
|
"windowCnt": 2,
|
|
@@ -41,10 +41,11 @@ var judgeAttrInEvents = function judgeAttrInEvents(elds, attrId, eventGroupList)
|
|
|
41
41
|
export function operableOrNotHandle(data, attrSourceCount, attrTargetCount, mincePropCount, attrGlobalCount) {
|
|
42
42
|
var flag = false;
|
|
43
43
|
data.attributionType === undefined ? flag = true : null;
|
|
44
|
-
subsetHandle(data, 'sourceFilters', attrSourceCount, mincePropCount)
|
|
45
|
-
subsetHandle(data, 'targetFilters', attrTargetCount)
|
|
46
|
-
if (data.globalFilters)
|
|
47
|
-
|
|
44
|
+
if (subsetHandle(data, 'sourceFilters', attrSourceCount, mincePropCount)) flag = true;
|
|
45
|
+
if (subsetHandle(data, 'targetFilters', attrTargetCount)) flag = true;
|
|
46
|
+
if (attrGlobalCount && data.globalFilters === undefined) flag = true;
|
|
47
|
+
if (data.globalFilters && conditionsHandle('globalFilters', data.globalFilters, attrGlobalCount, 0)) {
|
|
48
|
+
flag = true;
|
|
48
49
|
}
|
|
49
50
|
return flag;
|
|
50
51
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/modules-attribution",
|
|
3
|
-
"version": "1.0.1-alpha.
|
|
3
|
+
"version": "1.0.1-alpha.31",
|
|
4
4
|
"module": "es/index.js",
|
|
5
5
|
"typings": "es/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -50,5 +50,5 @@
|
|
|
50
50
|
"react": "^16.12.0 || ^17.0.0",
|
|
51
51
|
"yorkie": "^2.0.0"
|
|
52
52
|
},
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "6e8a5d0c3cfddc86db0f1928ac2f670afa6e0974"
|
|
54
54
|
}
|