@zgfe/modules-attribution 1.0.1-alpha.5 → 1.0.1-alpha.8
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.
- package/es/components/searchTime/index.js +2 -1
- package/es/components/title/index.js +1 -1
- package/es/modules/content/index.js +11 -2
- package/es/modules/home/demo/create.js +1 -1
- package/es/modules/home/demo/edit.js +105 -122
- package/es/modules/home/demo/index.js +1 -1
- package/es/modules/home/demo/scene.js +1 -1
- package/es/modules/searchPanel/components/attributableEvents.js +52 -15
- package/es/modules/searchPanel/components/targetEvent.js +19 -14
- package/es/modules/searchPanel/index.js +18 -15
- package/es/modules/searchPanel/types.d.ts +4 -1
- package/package.json +2 -2
|
@@ -13,7 +13,7 @@ var classPrefix = 'search-panel';
|
|
|
13
13
|
var SearchTime = function SearchTime(props) {
|
|
14
14
|
var _useContext = useContext(AttributableContext),
|
|
15
15
|
includeToday = _useContext.includeToday;
|
|
16
|
-
console.log('当前时间段', getInitDate(includeToday));
|
|
16
|
+
console.log('当前时间段', getInitDate(includeToday), props.time);
|
|
17
17
|
var _useState = useState(props.time || getInitDate(includeToday)),
|
|
18
18
|
_useState2 = _slicedToArray(_useState, 2),
|
|
19
19
|
time = _useState2[0],
|
|
@@ -23,6 +23,7 @@ var SearchTime = function SearchTime(props) {
|
|
|
23
23
|
timer = _useState4[0],
|
|
24
24
|
setTimer = _useState4[1];
|
|
25
25
|
var onChangeTime = function onChangeTime(val) {
|
|
26
|
+
console.log(333, val);
|
|
26
27
|
if (timer) clearTimeout(timer);
|
|
27
28
|
setTimer(setTimeout(function () {
|
|
28
29
|
setTime(val);
|
|
@@ -16,6 +16,7 @@ import './styles/index.less';
|
|
|
16
16
|
import { Apis } from '../../constants';
|
|
17
17
|
import { handleTableData } from './utils';
|
|
18
18
|
import { TableList, OptionGroup, SearchTime } from '../../components';
|
|
19
|
+
import util from '../../utils/util';
|
|
19
20
|
var CancelToken = Request.CancelToken;
|
|
20
21
|
var cancel;
|
|
21
22
|
var classPrefix = 'attribution-content';
|
|
@@ -62,9 +63,16 @@ var InsightContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
62
63
|
if (typeof cancel === 'function') {
|
|
63
64
|
cancel();
|
|
64
65
|
}
|
|
66
|
+
var _searchData;
|
|
67
|
+
if (util.isArray(searchData.targetFilters) && searchData.targetFilters) {
|
|
68
|
+
_searchData = _objectSpread(_objectSpread({}, searchData), {}, {
|
|
69
|
+
targetFilters: searchData.targetFilters[0]
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
console.log('请求表格数据:', _searchData);
|
|
65
73
|
request(Apis.getAnalyseData, {
|
|
66
74
|
method: 'post',
|
|
67
|
-
data: _objectSpread(_objectSpread(_objectSpread({}, currentApp),
|
|
75
|
+
data: _objectSpread(_objectSpread(_objectSpread({}, currentApp), _searchData), time),
|
|
68
76
|
cancelToken: new CancelToken(function executor(c) {
|
|
69
77
|
cancel = c;
|
|
70
78
|
})
|
|
@@ -91,6 +99,7 @@ var InsightContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
91
99
|
});
|
|
92
100
|
};
|
|
93
101
|
var onChangeContent = function onChangeContent(data) {
|
|
102
|
+
console.log('改变时间和图表类型', data);
|
|
94
103
|
setTime(data);
|
|
95
104
|
setSearchData(function (value) {
|
|
96
105
|
return _objectSpread(_objectSpread({}, value), data);
|
|
@@ -112,7 +121,7 @@ var InsightContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
112
121
|
}, /*#__PURE__*/React.createElement("div", {
|
|
113
122
|
className: "".concat(classPrefix, "-bottom-content-box-times")
|
|
114
123
|
}, /*#__PURE__*/React.createElement(SearchTime, {
|
|
115
|
-
time: time,
|
|
124
|
+
time: searchData === null || searchData === void 0 ? void 0 : searchData.time,
|
|
116
125
|
onChange: onChangeContent
|
|
117
126
|
}), searchData && /*#__PURE__*/React.createElement(OptionGroup, {
|
|
118
127
|
ref: ref,
|
|
@@ -40,7 +40,7 @@ export default (function () {
|
|
|
40
40
|
};
|
|
41
41
|
return /*#__PURE__*/React.createElement(DemoWrapper, {
|
|
42
42
|
needMeta: true,
|
|
43
|
-
defaultApp:
|
|
43
|
+
defaultApp: 21
|
|
44
44
|
}, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
|
|
45
45
|
onClick: function onClick() {
|
|
46
46
|
return setIsDetail(false);
|
|
@@ -11,144 +11,127 @@ import { requestConfig } from '../../../utils/ajaxConfig';
|
|
|
11
11
|
import { Button } from 'antd';
|
|
12
12
|
var defaultValue = {
|
|
13
13
|
id: 1426,
|
|
14
|
-
name: '
|
|
14
|
+
name: '999',
|
|
15
15
|
type: 0,
|
|
16
16
|
enlarged: 0,
|
|
17
17
|
panelId: 438,
|
|
18
18
|
panelType: 'edit',
|
|
19
19
|
data: {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
filters: {
|
|
37
|
-
relation: 'and',
|
|
38
|
-
conditions: [{
|
|
39
|
-
attrId: 263,
|
|
40
|
-
propCategory: 'eventProp',
|
|
41
|
-
type: 1,
|
|
42
|
-
operator: 'equal',
|
|
43
|
-
values: ['事件属性1', '事件属性2'],
|
|
44
|
-
dimensionSub: 'event_attr',
|
|
45
|
-
label: '机身宽度',
|
|
46
|
-
attrName: '机身宽度'
|
|
47
|
-
}, {
|
|
48
|
-
attrId: 3,
|
|
49
|
-
propCategory: 'userProp',
|
|
50
|
-
type: 1,
|
|
51
|
-
operator: 'equal',
|
|
52
|
-
values: ['用户属性【名称1】', '用户属性【名称2】'],
|
|
53
|
-
dimensionSub: 'name',
|
|
54
|
-
label: '名称',
|
|
55
|
-
attrName: 'name',
|
|
56
|
-
category: 'fixed'
|
|
20
|
+
"app_id": 21,
|
|
21
|
+
"module": "attribution",
|
|
22
|
+
"targetFilters": {
|
|
23
|
+
"eventId": 6078,
|
|
24
|
+
"eventName": "埋点事件-11",
|
|
25
|
+
"filters": {
|
|
26
|
+
"relation": "and",
|
|
27
|
+
"conditions": [{
|
|
28
|
+
"attrId": 139498,
|
|
29
|
+
"propCategory": "eventProp",
|
|
30
|
+
"type": 2,
|
|
31
|
+
"operator": "gt",
|
|
32
|
+
"values": ["99"],
|
|
33
|
+
"dimensionSub": "event_attr",
|
|
34
|
+
"label": "商品总价",
|
|
35
|
+
"attrName": "商品总价"
|
|
57
36
|
}, {
|
|
58
|
-
attrId:
|
|
59
|
-
propCategory:
|
|
60
|
-
type: 1,
|
|
61
|
-
operator:
|
|
62
|
-
values: [
|
|
63
|
-
dimensionSub:
|
|
64
|
-
label:
|
|
65
|
-
attrName:
|
|
66
|
-
category: 'fixed'
|
|
37
|
+
"attrId": 139372,
|
|
38
|
+
"propCategory": "eventProp",
|
|
39
|
+
"type": 1,
|
|
40
|
+
"operator": "equal",
|
|
41
|
+
"values": ["12"],
|
|
42
|
+
"dimensionSub": "event_attr",
|
|
43
|
+
"label": "机身宽度",
|
|
44
|
+
"attrName": "机身宽度"
|
|
67
45
|
}]
|
|
68
46
|
}
|
|
69
47
|
},
|
|
70
|
-
sourceFilters: [{
|
|
71
|
-
eventId:
|
|
72
|
-
eventName:
|
|
73
|
-
|
|
74
|
-
relation:
|
|
75
|
-
conditions: [{
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
48
|
+
"sourceFilters": [{
|
|
49
|
+
"eventId": 6090,
|
|
50
|
+
"eventName": "间隔事件-01",
|
|
51
|
+
"filters": {
|
|
52
|
+
"relation": "and",
|
|
53
|
+
"conditions": [{
|
|
54
|
+
"attrId": 139498,
|
|
55
|
+
"propCategory": "eventProp",
|
|
56
|
+
"type": 2,
|
|
57
|
+
"operator": "gt",
|
|
58
|
+
"values": ["11"],
|
|
59
|
+
"dimensionSub": "event_attr",
|
|
60
|
+
"label": "商品总价",
|
|
61
|
+
"attrName": "商品总价"
|
|
62
|
+
}, {
|
|
63
|
+
"attrId": 139488,
|
|
64
|
+
"propCategory": "eventProp",
|
|
65
|
+
"type": 2,
|
|
66
|
+
"operator": "gt",
|
|
67
|
+
"values": ["77"],
|
|
68
|
+
"dimensionSub": "event_attr",
|
|
69
|
+
"label": "商品单价",
|
|
70
|
+
"attrName": "商品单价"
|
|
81
71
|
}]
|
|
82
72
|
},
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
attrName: 'name',
|
|
103
|
-
category: 'fixed'
|
|
73
|
+
"propfilters": {
|
|
74
|
+
"propCategory": "eventProp",
|
|
75
|
+
"type": 1,
|
|
76
|
+
"attrId": 139499
|
|
77
|
+
}
|
|
78
|
+
}, {
|
|
79
|
+
"eventId": 6088,
|
|
80
|
+
"eventName": "间隔事件-02",
|
|
81
|
+
"filters": {
|
|
82
|
+
"relation": "and",
|
|
83
|
+
"conditions": [{
|
|
84
|
+
"attrId": 139494,
|
|
85
|
+
"propCategory": "eventProp",
|
|
86
|
+
"type": 2,
|
|
87
|
+
"operator": "gt",
|
|
88
|
+
"values": ["22"],
|
|
89
|
+
"dimensionSub": "event_attr",
|
|
90
|
+
"label": "商品总价",
|
|
91
|
+
"attrName": "商品总价"
|
|
104
92
|
}, {
|
|
105
|
-
attrId:
|
|
106
|
-
propCategory:
|
|
107
|
-
type:
|
|
108
|
-
operator:
|
|
109
|
-
values: [
|
|
110
|
-
dimensionSub:
|
|
111
|
-
label:
|
|
112
|
-
attrName:
|
|
113
|
-
category: 'fixed'
|
|
93
|
+
"attrId": 139493,
|
|
94
|
+
"propCategory": "eventProp",
|
|
95
|
+
"type": 2,
|
|
96
|
+
"operator": "gt",
|
|
97
|
+
"values": ["33"],
|
|
98
|
+
"dimensionSub": "event_attr",
|
|
99
|
+
"label": "商品单价",
|
|
100
|
+
"attrName": "商品单价"
|
|
114
101
|
}]
|
|
102
|
+
},
|
|
103
|
+
"propfilters": {
|
|
104
|
+
"propCategory": "eventProp",
|
|
105
|
+
"type": 1,
|
|
106
|
+
"attrId": 139490
|
|
115
107
|
}
|
|
116
108
|
}],
|
|
117
|
-
globalFilters: {
|
|
118
|
-
relation:
|
|
119
|
-
conditions: [{
|
|
120
|
-
attrId:
|
|
121
|
-
propCategory:
|
|
122
|
-
type:
|
|
123
|
-
operator:
|
|
124
|
-
values: [
|
|
125
|
-
dimensionSub:
|
|
126
|
-
label:
|
|
127
|
-
attrName:
|
|
128
|
-
}, {
|
|
129
|
-
attrId: 3,
|
|
130
|
-
propCategory: 'userProp',
|
|
131
|
-
type: 1,
|
|
132
|
-
operator: 'equal',
|
|
133
|
-
values: ['用户属性【名称1】', '用户属性【名称2】'],
|
|
134
|
-
dimensionSub: 'name',
|
|
135
|
-
label: '名称',
|
|
136
|
-
attrName: 'name',
|
|
137
|
-
category: 'fixed'
|
|
138
|
-
}, {
|
|
139
|
-
attrId: 0,
|
|
140
|
-
propCategory: 'envProp',
|
|
141
|
-
type: 1,
|
|
142
|
-
operator: 'equal',
|
|
143
|
-
values: ['触发环境1', '触发环境2'],
|
|
144
|
-
dimensionSub: 'utm_source',
|
|
145
|
-
label: 'utm_source',
|
|
146
|
-
attrName: 'utm_source',
|
|
147
|
-
category: 'fixed'
|
|
109
|
+
"globalFilters": {
|
|
110
|
+
"relation": "and",
|
|
111
|
+
"conditions": [{
|
|
112
|
+
"attrId": 139300,
|
|
113
|
+
"propCategory": "eventProp",
|
|
114
|
+
"type": 2,
|
|
115
|
+
"operator": "gt",
|
|
116
|
+
"values": ["87"],
|
|
117
|
+
"dimensionSub": "event_attr",
|
|
118
|
+
"label": "商品价格",
|
|
119
|
+
"attrName": "商品价格"
|
|
148
120
|
}]
|
|
149
|
-
}
|
|
121
|
+
},
|
|
122
|
+
"attributionType": 3,
|
|
123
|
+
"otherEvent": true,
|
|
124
|
+
"windowCnt": 2,
|
|
125
|
+
"windowType": "hour",
|
|
126
|
+
"time": {
|
|
127
|
+
"unit": "day",
|
|
128
|
+
"relative": [14, 0],
|
|
129
|
+
"begin": "2023-05-17",
|
|
130
|
+
"end": "2023-05-31"
|
|
131
|
+
},
|
|
132
|
+
"chartType": "grid"
|
|
150
133
|
},
|
|
151
|
-
chosen_data: [
|
|
134
|
+
chosen_data: []
|
|
152
135
|
};
|
|
153
136
|
export default (function () {
|
|
154
137
|
var _useState = useState(false),
|
|
@@ -177,7 +160,7 @@ export default (function () {
|
|
|
177
160
|
};
|
|
178
161
|
return /*#__PURE__*/React.createElement(DemoWrapper, {
|
|
179
162
|
needMeta: true,
|
|
180
|
-
defaultApp:
|
|
163
|
+
defaultApp: 21
|
|
181
164
|
}, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
|
|
182
165
|
onClick: function onClick() {
|
|
183
166
|
return setIsDetail(false);
|
|
@@ -37,7 +37,7 @@ export default (function () {
|
|
|
37
37
|
};
|
|
38
38
|
return /*#__PURE__*/React.createElement(DemoWrapper, {
|
|
39
39
|
needMeta: true,
|
|
40
|
-
defaultApp:
|
|
40
|
+
defaultApp: 21
|
|
41
41
|
}, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
|
|
42
42
|
onClick: function onClick() {
|
|
43
43
|
return setIsDetail(false);
|
|
@@ -61,7 +61,7 @@ export default (function () {
|
|
|
61
61
|
};
|
|
62
62
|
return /*#__PURE__*/React.createElement(DemoWrapper, {
|
|
63
63
|
needMeta: true,
|
|
64
|
-
defaultApp:
|
|
64
|
+
defaultApp: 21
|
|
65
65
|
}, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
|
|
66
66
|
onClick: function onClick() {
|
|
67
67
|
return setIsDetail(false);
|
|
@@ -8,12 +8,12 @@ import React, { useEffect, useRef, useState, useContext } from 'react';
|
|
|
8
8
|
import { BizAttributeSelector, BizAttrConditionGroup, BizEventSelector, IconFont } from '@zgfe/business-lib';
|
|
9
9
|
import { AttributableContext } from '../../../types';
|
|
10
10
|
import _ from 'lodash';
|
|
11
|
-
import { Tooltip } from 'antd';
|
|
11
|
+
import { Tooltip, message } from 'antd';
|
|
12
12
|
var AttributableEvents = function AttributableEvents(props) {
|
|
13
13
|
var value = props.value,
|
|
14
|
-
verify = props.verify,
|
|
15
14
|
setAttrSourceCount = props.setAttrSourceCount,
|
|
16
15
|
showOverview = props.showOverview,
|
|
16
|
+
eventIdList = props.eventIdList,
|
|
17
17
|
onDelete = props.onDelete;
|
|
18
18
|
var _useContext = useContext(AttributableContext),
|
|
19
19
|
setButtonDisable = _useContext.setButtonDisable;
|
|
@@ -29,11 +29,14 @@ var AttributableEvents = function AttributableEvents(props) {
|
|
|
29
29
|
_useState6 = _slicedToArray(_useState5, 2),
|
|
30
30
|
filters = _useState6[0],
|
|
31
31
|
setFilters = _useState6[1];
|
|
32
|
+
useEffect(function () {
|
|
33
|
+
console.log('初始化-filters', filters);
|
|
34
|
+
}, [filters]);
|
|
32
35
|
var _useState7 = useState(0),
|
|
33
36
|
_useState8 = _slicedToArray(_useState7, 2),
|
|
34
37
|
count = _useState8[0],
|
|
35
38
|
setCount = _useState8[1];
|
|
36
|
-
var _useState9 = useState(
|
|
39
|
+
var _useState9 = useState(false),
|
|
37
40
|
_useState10 = _slicedToArray(_useState9, 2),
|
|
38
41
|
isAdd = _useState10[0],
|
|
39
42
|
setIsAdd = _useState10[1];
|
|
@@ -46,10 +49,34 @@ var AttributableEvents = function AttributableEvents(props) {
|
|
|
46
49
|
_useState14 = _slicedToArray(_useState13, 2),
|
|
47
50
|
aloneAttr = _useState14[0],
|
|
48
51
|
setAloneAttr = _useState14[1];
|
|
52
|
+
var bizEventSelectorDefaultValue;
|
|
53
|
+
if (value.eventId && value.eventId != -100) {
|
|
54
|
+
bizEventSelectorDefaultValue = {
|
|
55
|
+
event: {
|
|
56
|
+
id: value.eventId,
|
|
57
|
+
name: value.eventName
|
|
58
|
+
}
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
var _useState15 = useState(),
|
|
62
|
+
_useState16 = _slicedToArray(_useState15, 2),
|
|
63
|
+
bizAttributeSelectorValue = _useState16[0],
|
|
64
|
+
setBizAttributeSelectorValue = _useState16[1];
|
|
49
65
|
useEffect(function () {
|
|
66
|
+
console.log('初始化-123', value);
|
|
50
67
|
if (value) {
|
|
51
68
|
var _value$filters;
|
|
52
69
|
setFilters(value.filters);
|
|
70
|
+
if (eventIdList && eventIdList.length >= 0) {
|
|
71
|
+
setEventId(eventIdList[0]);
|
|
72
|
+
}
|
|
73
|
+
if (value.propfilters) {
|
|
74
|
+
setBizAttributeSelectorValue({
|
|
75
|
+
id: value.propfilters.attrId,
|
|
76
|
+
propCategory: value.propfilters.propCategory
|
|
77
|
+
});
|
|
78
|
+
setAttrSelectShow(true);
|
|
79
|
+
}
|
|
53
80
|
if ((_value$filters = value.filters) === null || _value$filters === void 0 ? void 0 : _value$filters.conditions) {
|
|
54
81
|
setCount(value.filters.conditions.length);
|
|
55
82
|
}
|
|
@@ -68,12 +95,18 @@ var AttributableEvents = function AttributableEvents(props) {
|
|
|
68
95
|
onChangeHandle(ReasonData, data, aloneAttr);
|
|
69
96
|
};
|
|
70
97
|
var onAdd = function onAdd() {
|
|
71
|
-
if (ReasonData
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
98
|
+
if (ReasonData === undefined && bizEventSelectorDefaultValue === undefined) {
|
|
99
|
+
message.error('请先选择待归因事件');
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
if (count >= 10) {
|
|
103
|
+
message.error('最多可添加10条属性筛选');
|
|
104
|
+
return;
|
|
76
105
|
}
|
|
106
|
+
setIsAdd(true);
|
|
107
|
+
setTimeout(function () {
|
|
108
|
+
conditionRef.current.add();
|
|
109
|
+
}, 0);
|
|
77
110
|
};
|
|
78
111
|
var onChangeReason = function onChangeReason(reason) {
|
|
79
112
|
var _reason$event;
|
|
@@ -85,6 +118,10 @@ var AttributableEvents = function AttributableEvents(props) {
|
|
|
85
118
|
};
|
|
86
119
|
var onChangeAttr = function onChangeAttr(attr) {
|
|
87
120
|
console.log('归因事件-3', attr);
|
|
121
|
+
setBizAttributeSelectorValue({
|
|
122
|
+
id: attr.id,
|
|
123
|
+
propCategory: attr.propCategory
|
|
124
|
+
});
|
|
88
125
|
var _aloneAttr = attr === undefined ? undefined : {
|
|
89
126
|
propCategory: attr.propCategory,
|
|
90
127
|
type: attr.type,
|
|
@@ -114,19 +151,19 @@ var AttributableEvents = function AttributableEvents(props) {
|
|
|
114
151
|
className: "attributable-events-box"
|
|
115
152
|
}, /*#__PURE__*/React.createElement("div", {
|
|
116
153
|
className: "select-and-attr"
|
|
117
|
-
}, /*#__PURE__*/React.createElement("div", {
|
|
118
|
-
className: "".concat(verify && ReasonData === undefined ? 'verify-error' : '')
|
|
119
154
|
}, /*#__PURE__*/React.createElement(BizEventSelector, {
|
|
120
155
|
showBuiltInTarget: true,
|
|
121
156
|
showAllEvent: showOverview,
|
|
122
157
|
popupContainer: false,
|
|
123
158
|
defaultSelectAble: false,
|
|
124
|
-
onChange: onChangeReason
|
|
125
|
-
|
|
159
|
+
onChange: onChangeReason,
|
|
160
|
+
defaultValue: bizEventSelectorDefaultValue
|
|
161
|
+
}), attrSelectShow && /*#__PURE__*/React.createElement(BizAttributeSelector, {
|
|
126
162
|
enableEventProp: true,
|
|
127
163
|
enableUserProp: true,
|
|
128
164
|
enableEnvProp: true,
|
|
129
165
|
eventIdList: [eventId],
|
|
166
|
+
value: bizAttributeSelectorValue,
|
|
130
167
|
enableDelete: true,
|
|
131
168
|
onChange: onChangeAttr,
|
|
132
169
|
onDelete: function onDelete() {
|
|
@@ -142,10 +179,10 @@ var AttributableEvents = function AttributableEvents(props) {
|
|
|
142
179
|
placement: "top",
|
|
143
180
|
title: '添加属性细分'
|
|
144
181
|
}, /*#__PURE__*/React.createElement(IconFont, {
|
|
145
|
-
className: "".concat(attrSelectShow || ReasonData === undefined ? 'disable' : ''),
|
|
182
|
+
className: "".concat(attrSelectShow || ReasonData === undefined && bizEventSelectorDefaultValue === undefined ? 'disable' : ''),
|
|
146
183
|
type: "tianjia2",
|
|
147
184
|
onClick: function onClick() {
|
|
148
|
-
if (ReasonData !== undefined) {
|
|
185
|
+
if (ReasonData !== undefined || bizEventSelectorDefaultValue !== undefined) {
|
|
149
186
|
setAttrSelectShow(true);
|
|
150
187
|
setButtonDisable(true);
|
|
151
188
|
}
|
|
@@ -154,7 +191,7 @@ var AttributableEvents = function AttributableEvents(props) {
|
|
|
154
191
|
placement: "top",
|
|
155
192
|
title: '添加属性筛选'
|
|
156
193
|
}, /*#__PURE__*/React.createElement(IconFont, {
|
|
157
|
-
className: "".concat(count >= 10 || ReasonData === undefined ? 'disable' : ''),
|
|
194
|
+
className: "".concat(count >= 10 || ReasonData === undefined && bizEventSelectorDefaultValue === undefined ? 'disable' : ''),
|
|
158
195
|
type: "shaixuan",
|
|
159
196
|
onClick: function onClick() {
|
|
160
197
|
return onAdd();
|
|
@@ -10,9 +10,9 @@ import _ from 'lodash';
|
|
|
10
10
|
import { Select, Tooltip, message } from 'antd';
|
|
11
11
|
var TargetEvent = function TargetEvent(props) {
|
|
12
12
|
var value = props.value,
|
|
13
|
-
verify = props.verify,
|
|
14
13
|
setAttrTargetCount = props.setAttrTargetCount,
|
|
15
|
-
showOverview = props.showOverview
|
|
14
|
+
showOverview = props.showOverview,
|
|
15
|
+
eventIdList = props.eventIdList;
|
|
16
16
|
var _useState = useState(),
|
|
17
17
|
_useState2 = _slicedToArray(_useState, 2),
|
|
18
18
|
targetData = _useState2[0],
|
|
@@ -34,26 +34,34 @@ var TargetEvent = function TargetEvent(props) {
|
|
|
34
34
|
_useState10 = _slicedToArray(_useState9, 2),
|
|
35
35
|
eventId = _useState10[0],
|
|
36
36
|
setEventId = _useState10[1];
|
|
37
|
+
var bizEventSelectorDefaultValue;
|
|
38
|
+
if (value.eventId && value.eventId != -100) {
|
|
39
|
+
bizEventSelectorDefaultValue = {
|
|
40
|
+
event: {
|
|
41
|
+
id: value.eventId,
|
|
42
|
+
name: value.eventName
|
|
43
|
+
}
|
|
44
|
+
};
|
|
45
|
+
}
|
|
37
46
|
useEffect(function () {
|
|
38
47
|
if (value) {
|
|
39
48
|
var _value$filters;
|
|
40
|
-
console.log(123);
|
|
41
49
|
setFilters(value.filters);
|
|
50
|
+
if (eventIdList && eventIdList.length >= 0) {
|
|
51
|
+
setEventId(eventIdList[0]);
|
|
52
|
+
}
|
|
42
53
|
if ((_value$filters = value.filters) === null || _value$filters === void 0 ? void 0 : _value$filters.conditions) {
|
|
43
54
|
setCount(value.filters.conditions.length);
|
|
44
55
|
}
|
|
45
56
|
}
|
|
46
57
|
}, []);
|
|
47
|
-
useEffect(function () {
|
|
48
|
-
console.log('verify', verify);
|
|
49
|
-
}, [verify]);
|
|
50
58
|
var onChangeFilters = function onChangeFilters(data) {
|
|
51
59
|
console.log('归因事件-2', data);
|
|
52
60
|
setFilters(data);
|
|
53
61
|
onChangeHandle(targetData, data);
|
|
54
62
|
};
|
|
55
63
|
var onAdd = function onAdd() {
|
|
56
|
-
if (targetData === undefined) {
|
|
64
|
+
if (targetData === undefined && bizEventSelectorDefaultValue === undefined) {
|
|
57
65
|
message.error('请先选择目标事件');
|
|
58
66
|
return;
|
|
59
67
|
}
|
|
@@ -102,15 +110,14 @@ var TargetEvent = function TargetEvent(props) {
|
|
|
102
110
|
className: "target-events-box"
|
|
103
111
|
}, /*#__PURE__*/React.createElement("div", {
|
|
104
112
|
className: "selector-content"
|
|
105
|
-
}, /*#__PURE__*/React.createElement("div", {
|
|
106
|
-
className: "".concat(verify && targetData === undefined ? 'verify-error' : '')
|
|
107
113
|
}, /*#__PURE__*/React.createElement(BizEventSelector, {
|
|
108
114
|
showBuiltInTarget: true,
|
|
109
115
|
showAllEvent: showOverview,
|
|
110
116
|
popupContainer: false,
|
|
111
117
|
defaultSelectAble: false,
|
|
118
|
+
defaultValue: bizEventSelectorDefaultValue,
|
|
112
119
|
onChange: onChangeTarget
|
|
113
|
-
})
|
|
120
|
+
}), /*#__PURE__*/React.createElement(Select, {
|
|
114
121
|
defaultValue: 1,
|
|
115
122
|
style: {
|
|
116
123
|
width: 88
|
|
@@ -129,14 +136,12 @@ var TargetEvent = function TargetEvent(props) {
|
|
|
129
136
|
placement: "top",
|
|
130
137
|
title: '添加属性筛选'
|
|
131
138
|
}, /*#__PURE__*/React.createElement(IconFont, {
|
|
132
|
-
className: "".concat(count >= 5 || targetData === undefined ? 'disable' : ''),
|
|
139
|
+
className: "".concat(count >= 5 || targetData === undefined && bizEventSelectorDefaultValue === undefined ? 'disable' : ''),
|
|
133
140
|
type: "shaixuan",
|
|
134
141
|
onClick: function onClick() {
|
|
135
142
|
return onAdd();
|
|
136
143
|
}
|
|
137
|
-
}))),
|
|
138
|
-
className: "error-tips"
|
|
139
|
-
}, "\u8BF7\u9009\u62E9\u76EE\u6807\u4E8B\u4EF6"), /*#__PURE__*/React.createElement("div", null, (filters || isAdd) && /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
|
|
144
|
+
}))), /*#__PURE__*/React.createElement("div", null, (filters || isAdd) && /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
|
|
140
145
|
ref: conditionRef,
|
|
141
146
|
value: filters,
|
|
142
147
|
enableEventProp: true,
|
|
@@ -21,6 +21,7 @@ import { AttributableContext } from '../../types';
|
|
|
21
21
|
export var classPrefix = 'mi-left-form';
|
|
22
22
|
var SearchPanel = function SearchPanel(props) {
|
|
23
23
|
var defaultValue = props.defaultValue;
|
|
24
|
+
console.log('SearchPanel', defaultValue);
|
|
24
25
|
var _useContext = useContext(AttributableContext),
|
|
25
26
|
buttonDisable = _useContext.buttonDisable,
|
|
26
27
|
setButtonDisable = _useContext.setButtonDisable;
|
|
@@ -46,7 +47,7 @@ var SearchPanel = function SearchPanel(props) {
|
|
|
46
47
|
setEventIdList = _useState8[1];
|
|
47
48
|
var _useContext2 = useContext(BizGlobalDataContext),
|
|
48
49
|
eventGroupList = _useContext2.eventGroupList;
|
|
49
|
-
var _useState9 = useState(
|
|
50
|
+
var _useState9 = useState(0),
|
|
50
51
|
_useState10 = _slicedToArray(_useState9, 2),
|
|
51
52
|
windowCnt = _useState10[0],
|
|
52
53
|
setWindowCnt = _useState10[1];
|
|
@@ -73,7 +74,14 @@ var SearchPanel = function SearchPanel(props) {
|
|
|
73
74
|
eList.push(target.eventId);
|
|
74
75
|
}
|
|
75
76
|
});
|
|
77
|
+
console.log('初始化11', eList);
|
|
76
78
|
setEventIdList(eList);
|
|
79
|
+
if (defaultValue.windowType !== undefined) {
|
|
80
|
+
setOtherEvent(defaultValue.otherEvent);
|
|
81
|
+
setWindowCnt(defaultValue.windowCnt);
|
|
82
|
+
setwindowTypeUnit(defaultValue.windowType);
|
|
83
|
+
defaultValue.windowCnt == 0 ? setWindowType(1) : setWindowType(2);
|
|
84
|
+
}
|
|
77
85
|
}
|
|
78
86
|
setLoading(false);
|
|
79
87
|
}, []);
|
|
@@ -103,12 +111,7 @@ var SearchPanel = function SearchPanel(props) {
|
|
|
103
111
|
var reason = form.getFieldValue('reason');
|
|
104
112
|
console.log('细分属性变化:', e, reason);
|
|
105
113
|
};
|
|
106
|
-
var _useState17 = useState(false),
|
|
107
|
-
_useState18 = _slicedToArray(_useState17, 2),
|
|
108
|
-
verify = _useState18[0],
|
|
109
|
-
setVerify = _useState18[1];
|
|
110
114
|
var onFinish = function onFinish() {
|
|
111
|
-
setVerify(true);
|
|
112
115
|
form.validateFields().then(function (res) {
|
|
113
116
|
if (verifyHandle(res)) {
|
|
114
117
|
console.log('表单检验通过', res);
|
|
@@ -129,13 +132,12 @@ var SearchPanel = function SearchPanel(props) {
|
|
|
129
132
|
var onReset = function onReset() {
|
|
130
133
|
setButtonDisable(true);
|
|
131
134
|
form.resetFields();
|
|
132
|
-
setVerify(false);
|
|
133
135
|
setWindowType(1);
|
|
134
136
|
};
|
|
135
|
-
var
|
|
136
|
-
|
|
137
|
-
windowType =
|
|
138
|
-
setWindowType =
|
|
137
|
+
var _useState17 = useState(1),
|
|
138
|
+
_useState18 = _slicedToArray(_useState17, 2),
|
|
139
|
+
windowType = _useState18[0],
|
|
140
|
+
setWindowType = _useState18[1];
|
|
139
141
|
return /*#__PURE__*/React.createElement("div", {
|
|
140
142
|
className: classPrefix
|
|
141
143
|
}, /*#__PURE__*/React.createElement(Skeleton, {
|
|
@@ -193,7 +195,6 @@ var SearchPanel = function SearchPanel(props) {
|
|
|
193
195
|
enableDelete: fields.length > 1,
|
|
194
196
|
eventIdList: eventIdList,
|
|
195
197
|
allValues: formData,
|
|
196
|
-
verify: verify,
|
|
197
198
|
onDelete: function onDelete() {
|
|
198
199
|
return remove(index);
|
|
199
200
|
},
|
|
@@ -213,6 +214,7 @@ var SearchPanel = function SearchPanel(props) {
|
|
|
213
214
|
}), /*#__PURE__*/React.createElement("div", {
|
|
214
215
|
className: "".concat(classPrefix, "-otherEvent")
|
|
215
216
|
}, /*#__PURE__*/React.createElement(Checkbox, {
|
|
217
|
+
checked: otherEvent,
|
|
216
218
|
onChange: otherEventChange
|
|
217
219
|
}, "\u4E5F\u8BA1\u7B97\u5176\u4ED6\u8F6C\u5316\u4E8B\u4EF6"), /*#__PURE__*/React.createElement(Tooltip, {
|
|
218
220
|
placement: "right",
|
|
@@ -268,7 +270,8 @@ var SearchPanel = function SearchPanel(props) {
|
|
|
268
270
|
width: 208
|
|
269
271
|
},
|
|
270
272
|
onChange: function onChange(e) {
|
|
271
|
-
|
|
273
|
+
setWindowType(e);
|
|
274
|
+
e === 1 ? setWindowCnt(0) : setWindowCnt(1);
|
|
272
275
|
},
|
|
273
276
|
options: [{
|
|
274
277
|
value: 1,
|
|
@@ -282,12 +285,12 @@ var SearchPanel = function SearchPanel(props) {
|
|
|
282
285
|
style: {
|
|
283
286
|
width: 80
|
|
284
287
|
},
|
|
285
|
-
|
|
288
|
+
value: windowCnt,
|
|
286
289
|
onChange: function onChange(e) {
|
|
287
290
|
return setWindowCnt(e);
|
|
288
291
|
}
|
|
289
292
|
}), /*#__PURE__*/React.createElement(Select, {
|
|
290
|
-
|
|
293
|
+
value: windowTypeUnit,
|
|
291
294
|
style: {
|
|
292
295
|
width: 80
|
|
293
296
|
},
|
|
@@ -24,8 +24,11 @@ export declare namespace SearchPanelTypes {
|
|
|
24
24
|
onChange?: (data: any) => void;
|
|
25
25
|
onDelete?: () => void;
|
|
26
26
|
attrChange?: (data: any) => void;
|
|
27
|
-
verify: boolean;
|
|
28
27
|
setAttrTargetCount: Function;
|
|
29
28
|
setAttrSourceCount: Function;
|
|
30
29
|
}
|
|
30
|
+
interface bizAttributeSelectorValueProp {
|
|
31
|
+
id?: number;
|
|
32
|
+
propCategory?: string;
|
|
33
|
+
}
|
|
31
34
|
}
|
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.8",
|
|
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": "ed715d0eb88e960714ab9c780da60de1bbd17dec"
|
|
54
54
|
}
|