@zgfe/business-lib 1.0.25-layers.1 → 1.0.25-layers.4
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/attrConditions/components/valuesList.js +7 -5
- package/es/userCondition/demo/index.js +0 -1
- package/es/userCondition/demo/mockData.d.ts +60 -8
- package/es/userCondition/demo/mockData.js +395 -51
- package/es/userCondition/util.d.ts +3 -0
- package/es/userCondition/util.js +2 -1
- package/es/userTagsSelector/groups/groupOption.js +2 -1
- package/es/userTagsSelector/groups/index.js +2 -4
- package/es/userTagsSelector/multipleCheckPanel/checkOption.js +2 -1
- package/es/userTagsSelector/multipleCheckPanel/index.js +3 -2
- package/es/userTagsSelector/util.d.ts +1 -1
- package/es/userTagsSelector/util.js +6 -2
- package/package.json +2 -2
|
@@ -42,8 +42,8 @@ var ValuesList = function ValuesList(props) {
|
|
|
42
42
|
|
|
43
43
|
var _useState5 = useState(true),
|
|
44
44
|
_useState6 = _slicedToArray(_useState5, 2),
|
|
45
|
-
|
|
46
|
-
|
|
45
|
+
isFirst = _useState6[0],
|
|
46
|
+
setIsFirst = _useState6[1];
|
|
47
47
|
|
|
48
48
|
useEffect(function () {
|
|
49
49
|
if (defaultValue) {
|
|
@@ -55,16 +55,18 @@ var ValuesList = function ValuesList(props) {
|
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
|
|
58
|
-
|
|
58
|
+
setIsFirst(false);
|
|
59
59
|
}, []);
|
|
60
60
|
useEffect(function () {
|
|
61
|
+
if (isFirst) return;
|
|
62
|
+
|
|
61
63
|
if (operate === OperateTypes.Absolute || operate === OperateTypes.Relative) {
|
|
62
64
|
var data = operate === OperateTypes.Absolute ? initValue : ['30', '1'];
|
|
63
65
|
onChange(data);
|
|
64
66
|
}
|
|
65
67
|
}, [operate]);
|
|
66
68
|
useEffect(function () {
|
|
67
|
-
if (!
|
|
69
|
+
if (!isFirst && (attr === null || attr === void 0 ? void 0 : attr.type) !== PropType.DATE) {
|
|
68
70
|
onChange([]);
|
|
69
71
|
setCurrent([]);
|
|
70
72
|
}
|
|
@@ -115,7 +117,7 @@ var ValuesList = function ValuesList(props) {
|
|
|
115
117
|
return current && current > moment().endOf('day');
|
|
116
118
|
};
|
|
117
119
|
|
|
118
|
-
if (!attr || !operate ||
|
|
120
|
+
if (!attr || !operate || isFirst) {
|
|
119
121
|
return /*#__PURE__*/React.createElement(BizSelect, {
|
|
120
122
|
disable: true,
|
|
121
123
|
className: "".concat(classPrefix, "-multi-select"),
|
|
@@ -1,12 +1,24 @@
|
|
|
1
|
-
export declare const tagList: {
|
|
1
|
+
export declare const tagList: ({
|
|
2
2
|
dataStatus: number;
|
|
3
|
+
endProcessTime: string;
|
|
3
4
|
id: number;
|
|
4
5
|
labelGroup: string;
|
|
5
6
|
labelName: string;
|
|
6
7
|
labelRemark: string;
|
|
7
8
|
labelType: number;
|
|
8
9
|
layers: {
|
|
9
|
-
layerCondition: {
|
|
10
|
+
layerCondition: ({
|
|
11
|
+
eventId: number;
|
|
12
|
+
runPeriod: {
|
|
13
|
+
values: string[];
|
|
14
|
+
operator: string;
|
|
15
|
+
};
|
|
16
|
+
runTimes: {
|
|
17
|
+
values: string[];
|
|
18
|
+
operator: string;
|
|
19
|
+
};
|
|
20
|
+
attrs: never[];
|
|
21
|
+
}[] | {
|
|
10
22
|
eventId: string;
|
|
11
23
|
runPeriod: {
|
|
12
24
|
values: string[];
|
|
@@ -17,17 +29,57 @@ export declare const tagList: {
|
|
|
17
29
|
operator: string;
|
|
18
30
|
};
|
|
19
31
|
attrs: never[];
|
|
20
|
-
}[][];
|
|
32
|
+
}[])[];
|
|
21
33
|
layerLabelId: number;
|
|
22
34
|
layerLabelName: string;
|
|
23
35
|
layerRemark: string;
|
|
24
36
|
sequence: number;
|
|
25
37
|
}[];
|
|
26
|
-
|
|
38
|
+
startProcessTime: string;
|
|
39
|
+
} | {
|
|
40
|
+
dataStatus: number;
|
|
41
|
+
endProcessTime: string;
|
|
42
|
+
id: number;
|
|
43
|
+
labelGroup: string;
|
|
44
|
+
labelName: string;
|
|
45
|
+
labelRemark: string;
|
|
46
|
+
labelType: number;
|
|
47
|
+
layers: {
|
|
48
|
+
layerCondition: ({
|
|
49
|
+
attrs: {
|
|
50
|
+
attrId: number;
|
|
51
|
+
category: string;
|
|
52
|
+
params: string[];
|
|
53
|
+
attrName: string;
|
|
54
|
+
operator: string;
|
|
55
|
+
attrType: string;
|
|
56
|
+
}[];
|
|
57
|
+
}[] | {
|
|
58
|
+
eventId: string;
|
|
59
|
+
runPeriod: {
|
|
60
|
+
values: string[];
|
|
61
|
+
operator: string;
|
|
62
|
+
};
|
|
63
|
+
runTimes: {
|
|
64
|
+
values: string[];
|
|
65
|
+
operator: string;
|
|
66
|
+
};
|
|
67
|
+
attrs: never[];
|
|
68
|
+
}[])[];
|
|
69
|
+
layerLabelId: number;
|
|
70
|
+
layerLabelName: string;
|
|
71
|
+
layerRemark: string;
|
|
72
|
+
sequence: number;
|
|
73
|
+
}[];
|
|
74
|
+
startProcessTime: string;
|
|
75
|
+
})[];
|
|
27
76
|
export declare const conditions: {
|
|
28
|
-
attrs:
|
|
29
|
-
|
|
77
|
+
attrs: {
|
|
78
|
+
attrId: number;
|
|
79
|
+
attrName: string;
|
|
80
|
+
category: string;
|
|
30
81
|
operator: string;
|
|
31
|
-
|
|
32
|
-
|
|
82
|
+
params: string[];
|
|
83
|
+
attrType: string;
|
|
84
|
+
}[];
|
|
33
85
|
}[][];
|
|
@@ -1,13 +1,153 @@
|
|
|
1
1
|
export var tagList = [{
|
|
2
2
|
dataStatus: 1,
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
endProcessTime: '2022-09-08T10:00:28',
|
|
4
|
+
id: 176,
|
|
5
|
+
labelGroup: '其它标签',
|
|
6
|
+
labelName: '测试一个分层分群',
|
|
6
7
|
labelRemark: '',
|
|
7
8
|
labelType: 0,
|
|
8
9
|
layers: [{
|
|
9
10
|
layerCondition: [[{
|
|
10
|
-
eventId: '-
|
|
11
|
+
eventId: '-4',
|
|
12
|
+
runPeriod: {
|
|
13
|
+
values: ['1', '0'],
|
|
14
|
+
operator: 'relative'
|
|
15
|
+
},
|
|
16
|
+
runTimes: {
|
|
17
|
+
values: ['1'],
|
|
18
|
+
operator: '>='
|
|
19
|
+
},
|
|
20
|
+
attrs: []
|
|
21
|
+
}]],
|
|
22
|
+
layerLabelId: 156761640992768,
|
|
23
|
+
layerLabelName: '分层1',
|
|
24
|
+
layerRemark: '',
|
|
25
|
+
sequence: 1
|
|
26
|
+
}],
|
|
27
|
+
startProcessTime: '2022-09-08T10:00:21'
|
|
28
|
+
}, {
|
|
29
|
+
dataStatus: 1,
|
|
30
|
+
endProcessTime: '2022-09-06T20:14:05',
|
|
31
|
+
id: 172,
|
|
32
|
+
labelGroup: '活跃标签',
|
|
33
|
+
labelName: '每月更新-全更',
|
|
34
|
+
labelRemark: '',
|
|
35
|
+
labelType: 0,
|
|
36
|
+
layers: [{
|
|
37
|
+
layerCondition: [[{
|
|
38
|
+
eventId: 5603,
|
|
39
|
+
runPeriod: {
|
|
40
|
+
values: ['30', '0'],
|
|
41
|
+
operator: 'relative'
|
|
42
|
+
},
|
|
43
|
+
runTimes: {
|
|
44
|
+
values: ['1'],
|
|
45
|
+
operator: '>='
|
|
46
|
+
},
|
|
47
|
+
attrs: []
|
|
48
|
+
}], [{
|
|
49
|
+
eventId: '-4',
|
|
50
|
+
runPeriod: {
|
|
51
|
+
values: ['1', '0'],
|
|
52
|
+
operator: 'relative'
|
|
53
|
+
},
|
|
54
|
+
runTimes: {
|
|
55
|
+
values: ['1'],
|
|
56
|
+
operator: '>='
|
|
57
|
+
},
|
|
58
|
+
attrs: []
|
|
59
|
+
}]],
|
|
60
|
+
layerLabelId: 155848230436873,
|
|
61
|
+
layerLabelName: '分层10',
|
|
62
|
+
layerRemark: '',
|
|
63
|
+
sequence: 10
|
|
64
|
+
}, {
|
|
65
|
+
layerCondition: [[{
|
|
66
|
+
eventId: 5613,
|
|
67
|
+
runPeriod: {
|
|
68
|
+
values: ['30', '0'],
|
|
69
|
+
operator: 'relative'
|
|
70
|
+
},
|
|
71
|
+
runTimes: {
|
|
72
|
+
values: ['1'],
|
|
73
|
+
operator: '>='
|
|
74
|
+
},
|
|
75
|
+
attrs: []
|
|
76
|
+
}], [{
|
|
77
|
+
eventId: '-4',
|
|
78
|
+
runPeriod: {
|
|
79
|
+
values: ['1', '0'],
|
|
80
|
+
operator: 'relative'
|
|
81
|
+
},
|
|
82
|
+
runTimes: {
|
|
83
|
+
values: ['1'],
|
|
84
|
+
operator: '>='
|
|
85
|
+
},
|
|
86
|
+
attrs: []
|
|
87
|
+
}]],
|
|
88
|
+
layerLabelId: 155848230436872,
|
|
89
|
+
layerLabelName: '分层9',
|
|
90
|
+
layerRemark: '',
|
|
91
|
+
sequence: 9
|
|
92
|
+
}, {
|
|
93
|
+
layerCondition: [[{
|
|
94
|
+
eventId: 5621,
|
|
95
|
+
runPeriod: {
|
|
96
|
+
values: ['30', '0'],
|
|
97
|
+
operator: 'relative'
|
|
98
|
+
},
|
|
99
|
+
runTimes: {
|
|
100
|
+
values: ['1'],
|
|
101
|
+
operator: '>='
|
|
102
|
+
},
|
|
103
|
+
attrs: []
|
|
104
|
+
}], [{
|
|
105
|
+
eventId: '-4',
|
|
106
|
+
runPeriod: {
|
|
107
|
+
values: ['1', '0'],
|
|
108
|
+
operator: 'relative'
|
|
109
|
+
},
|
|
110
|
+
runTimes: {
|
|
111
|
+
values: ['1'],
|
|
112
|
+
operator: '>='
|
|
113
|
+
},
|
|
114
|
+
attrs: []
|
|
115
|
+
}]],
|
|
116
|
+
layerLabelId: 155848230436871,
|
|
117
|
+
layerLabelName: '分层8',
|
|
118
|
+
layerRemark: '',
|
|
119
|
+
sequence: 8
|
|
120
|
+
}, {
|
|
121
|
+
layerCondition: [[{
|
|
122
|
+
eventId: 5625,
|
|
123
|
+
runPeriod: {
|
|
124
|
+
values: ['30', '0'],
|
|
125
|
+
operator: 'relative'
|
|
126
|
+
},
|
|
127
|
+
runTimes: {
|
|
128
|
+
values: ['1'],
|
|
129
|
+
operator: '>='
|
|
130
|
+
},
|
|
131
|
+
attrs: []
|
|
132
|
+
}], [{
|
|
133
|
+
eventId: '-4',
|
|
134
|
+
runPeriod: {
|
|
135
|
+
values: ['1', '0'],
|
|
136
|
+
operator: 'relative'
|
|
137
|
+
},
|
|
138
|
+
runTimes: {
|
|
139
|
+
values: ['1'],
|
|
140
|
+
operator: '>='
|
|
141
|
+
},
|
|
142
|
+
attrs: []
|
|
143
|
+
}]],
|
|
144
|
+
layerLabelId: 155848230436870,
|
|
145
|
+
layerLabelName: '分层7',
|
|
146
|
+
layerRemark: '',
|
|
147
|
+
sequence: 7
|
|
148
|
+
}, {
|
|
149
|
+
layerCondition: [[{
|
|
150
|
+
eventId: 5630,
|
|
11
151
|
runPeriod: {
|
|
12
152
|
values: ['30', '0'],
|
|
13
153
|
operator: 'relative'
|
|
@@ -17,14 +157,25 @@ export var tagList = [{
|
|
|
17
157
|
operator: '>='
|
|
18
158
|
},
|
|
19
159
|
attrs: []
|
|
160
|
+
}], [{
|
|
161
|
+
eventId: '-4',
|
|
162
|
+
runPeriod: {
|
|
163
|
+
values: ['1', '0'],
|
|
164
|
+
operator: 'relative'
|
|
165
|
+
},
|
|
166
|
+
runTimes: {
|
|
167
|
+
values: ['1'],
|
|
168
|
+
operator: '>='
|
|
169
|
+
},
|
|
170
|
+
attrs: []
|
|
20
171
|
}]],
|
|
21
|
-
layerLabelId:
|
|
172
|
+
layerLabelId: 155848230436869,
|
|
22
173
|
layerLabelName: '分层6',
|
|
23
174
|
layerRemark: '',
|
|
24
175
|
sequence: 6
|
|
25
176
|
}, {
|
|
26
177
|
layerCondition: [[{
|
|
27
|
-
eventId:
|
|
178
|
+
eventId: 5630,
|
|
28
179
|
runPeriod: {
|
|
29
180
|
values: ['30', '0'],
|
|
30
181
|
operator: 'relative'
|
|
@@ -34,14 +185,25 @@ export var tagList = [{
|
|
|
34
185
|
operator: '>='
|
|
35
186
|
},
|
|
36
187
|
attrs: []
|
|
188
|
+
}], [{
|
|
189
|
+
eventId: '-4',
|
|
190
|
+
runPeriod: {
|
|
191
|
+
values: ['1', '0'],
|
|
192
|
+
operator: 'relative'
|
|
193
|
+
},
|
|
194
|
+
runTimes: {
|
|
195
|
+
values: ['1'],
|
|
196
|
+
operator: '>='
|
|
197
|
+
},
|
|
198
|
+
attrs: []
|
|
37
199
|
}]],
|
|
38
|
-
layerLabelId:
|
|
200
|
+
layerLabelId: 155848230436868,
|
|
39
201
|
layerLabelName: '分层5',
|
|
40
202
|
layerRemark: '',
|
|
41
203
|
sequence: 5
|
|
42
204
|
}, {
|
|
43
205
|
layerCondition: [[{
|
|
44
|
-
eventId:
|
|
206
|
+
eventId: 5625,
|
|
45
207
|
runPeriod: {
|
|
46
208
|
values: ['30', '0'],
|
|
47
209
|
operator: 'relative'
|
|
@@ -51,14 +213,25 @@ export var tagList = [{
|
|
|
51
213
|
operator: '>='
|
|
52
214
|
},
|
|
53
215
|
attrs: []
|
|
216
|
+
}], [{
|
|
217
|
+
eventId: '-4',
|
|
218
|
+
runPeriod: {
|
|
219
|
+
values: ['1', '0'],
|
|
220
|
+
operator: 'relative'
|
|
221
|
+
},
|
|
222
|
+
runTimes: {
|
|
223
|
+
values: ['1'],
|
|
224
|
+
operator: '>='
|
|
225
|
+
},
|
|
226
|
+
attrs: []
|
|
54
227
|
}]],
|
|
55
|
-
layerLabelId:
|
|
228
|
+
layerLabelId: 155848230436867,
|
|
56
229
|
layerLabelName: '分层4',
|
|
57
230
|
layerRemark: '',
|
|
58
231
|
sequence: 4
|
|
59
232
|
}, {
|
|
60
233
|
layerCondition: [[{
|
|
61
|
-
eventId:
|
|
234
|
+
eventId: 5621,
|
|
62
235
|
runPeriod: {
|
|
63
236
|
values: ['30', '0'],
|
|
64
237
|
operator: 'relative'
|
|
@@ -68,14 +241,25 @@ export var tagList = [{
|
|
|
68
241
|
operator: '>='
|
|
69
242
|
},
|
|
70
243
|
attrs: []
|
|
244
|
+
}], [{
|
|
245
|
+
eventId: '-4',
|
|
246
|
+
runPeriod: {
|
|
247
|
+
values: ['1', '0'],
|
|
248
|
+
operator: 'relative'
|
|
249
|
+
},
|
|
250
|
+
runTimes: {
|
|
251
|
+
values: ['1'],
|
|
252
|
+
operator: '>='
|
|
253
|
+
},
|
|
254
|
+
attrs: []
|
|
71
255
|
}]],
|
|
72
|
-
layerLabelId:
|
|
256
|
+
layerLabelId: 155848230436866,
|
|
73
257
|
layerLabelName: '分层3',
|
|
74
258
|
layerRemark: '',
|
|
75
259
|
sequence: 3
|
|
76
260
|
}, {
|
|
77
261
|
layerCondition: [[{
|
|
78
|
-
eventId:
|
|
262
|
+
eventId: 5613,
|
|
79
263
|
runPeriod: {
|
|
80
264
|
values: ['30', '0'],
|
|
81
265
|
operator: 'relative'
|
|
@@ -85,14 +269,25 @@ export var tagList = [{
|
|
|
85
269
|
operator: '>='
|
|
86
270
|
},
|
|
87
271
|
attrs: []
|
|
272
|
+
}], [{
|
|
273
|
+
eventId: '-4',
|
|
274
|
+
runPeriod: {
|
|
275
|
+
values: ['1', '0'],
|
|
276
|
+
operator: 'relative'
|
|
277
|
+
},
|
|
278
|
+
runTimes: {
|
|
279
|
+
values: ['1'],
|
|
280
|
+
operator: '>='
|
|
281
|
+
},
|
|
282
|
+
attrs: []
|
|
88
283
|
}]],
|
|
89
|
-
layerLabelId:
|
|
284
|
+
layerLabelId: 155848230436865,
|
|
90
285
|
layerLabelName: '分层2',
|
|
91
286
|
layerRemark: '',
|
|
92
287
|
sequence: 2
|
|
93
288
|
}, {
|
|
94
289
|
layerCondition: [[{
|
|
95
|
-
eventId:
|
|
290
|
+
eventId: 5603,
|
|
96
291
|
runPeriod: {
|
|
97
292
|
values: ['30', '0'],
|
|
98
293
|
operator: 'relative'
|
|
@@ -102,24 +297,46 @@ export var tagList = [{
|
|
|
102
297
|
operator: '>='
|
|
103
298
|
},
|
|
104
299
|
attrs: []
|
|
300
|
+
}], [{
|
|
301
|
+
eventId: '-4',
|
|
302
|
+
runPeriod: {
|
|
303
|
+
values: ['1', '0'],
|
|
304
|
+
operator: 'relative'
|
|
305
|
+
},
|
|
306
|
+
runTimes: {
|
|
307
|
+
values: ['1'],
|
|
308
|
+
operator: '>='
|
|
309
|
+
},
|
|
310
|
+
attrs: []
|
|
105
311
|
}]],
|
|
106
|
-
layerLabelId:
|
|
312
|
+
layerLabelId: 155848230436864,
|
|
107
313
|
layerLabelName: '分层1',
|
|
108
314
|
layerRemark: '',
|
|
109
315
|
sequence: 1
|
|
110
|
-
}]
|
|
316
|
+
}],
|
|
317
|
+
startProcessTime: '2022-09-06T20:13:51'
|
|
111
318
|
}, {
|
|
112
319
|
dataStatus: 1,
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
320
|
+
endProcessTime: '2022-09-06T21:08:37',
|
|
321
|
+
id: 85,
|
|
322
|
+
labelGroup: '行为标签',
|
|
323
|
+
labelName: '场景01-2',
|
|
116
324
|
labelRemark: '',
|
|
117
|
-
labelType:
|
|
325
|
+
labelType: 1,
|
|
118
326
|
layers: [{
|
|
119
327
|
layerCondition: [[{
|
|
328
|
+
attrs: [{
|
|
329
|
+
attrId: 584,
|
|
330
|
+
category: 'custom',
|
|
331
|
+
params: ['80'],
|
|
332
|
+
attrName: '年龄',
|
|
333
|
+
operator: '>',
|
|
334
|
+
attrType: 'cont-num'
|
|
335
|
+
}]
|
|
336
|
+
}], [{
|
|
120
337
|
eventId: '-4',
|
|
121
338
|
runPeriod: {
|
|
122
|
-
values: ['
|
|
339
|
+
values: ['1', '0'],
|
|
123
340
|
operator: 'relative'
|
|
124
341
|
},
|
|
125
342
|
runTimes: {
|
|
@@ -128,15 +345,24 @@ export var tagList = [{
|
|
|
128
345
|
},
|
|
129
346
|
attrs: []
|
|
130
347
|
}]],
|
|
131
|
-
layerLabelId:
|
|
132
|
-
layerLabelName: '分层
|
|
348
|
+
layerLabelId: 154375754039303,
|
|
349
|
+
layerLabelName: '分层8',
|
|
133
350
|
layerRemark: '',
|
|
134
|
-
sequence:
|
|
351
|
+
sequence: 8
|
|
135
352
|
}, {
|
|
136
353
|
layerCondition: [[{
|
|
354
|
+
attrs: [{
|
|
355
|
+
attrId: 584,
|
|
356
|
+
category: 'custom',
|
|
357
|
+
params: ['70'],
|
|
358
|
+
attrName: '年龄',
|
|
359
|
+
operator: '>',
|
|
360
|
+
attrType: 'cont-num'
|
|
361
|
+
}]
|
|
362
|
+
}], [{
|
|
137
363
|
eventId: '-4',
|
|
138
364
|
runPeriod: {
|
|
139
|
-
values: ['
|
|
365
|
+
values: ['1', '0'],
|
|
140
366
|
operator: 'relative'
|
|
141
367
|
},
|
|
142
368
|
runTimes: {
|
|
@@ -145,15 +371,24 @@ export var tagList = [{
|
|
|
145
371
|
},
|
|
146
372
|
attrs: []
|
|
147
373
|
}]],
|
|
148
|
-
layerLabelId:
|
|
149
|
-
layerLabelName: '分层
|
|
374
|
+
layerLabelId: 154375754039302,
|
|
375
|
+
layerLabelName: '分层7',
|
|
150
376
|
layerRemark: '',
|
|
151
|
-
sequence:
|
|
377
|
+
sequence: 7
|
|
152
378
|
}, {
|
|
153
379
|
layerCondition: [[{
|
|
154
|
-
|
|
380
|
+
attrs: [{
|
|
381
|
+
attrId: 584,
|
|
382
|
+
category: 'custom',
|
|
383
|
+
params: ['60'],
|
|
384
|
+
attrName: '年龄',
|
|
385
|
+
operator: '>',
|
|
386
|
+
attrType: 'cont-num'
|
|
387
|
+
}]
|
|
388
|
+
}], [{
|
|
389
|
+
eventId: '-4',
|
|
155
390
|
runPeriod: {
|
|
156
|
-
values: ['
|
|
391
|
+
values: ['1', '0'],
|
|
157
392
|
operator: 'relative'
|
|
158
393
|
},
|
|
159
394
|
runTimes: {
|
|
@@ -162,23 +397,24 @@ export var tagList = [{
|
|
|
162
397
|
},
|
|
163
398
|
attrs: []
|
|
164
399
|
}]],
|
|
165
|
-
layerLabelId:
|
|
166
|
-
layerLabelName: '分层
|
|
400
|
+
layerLabelId: 154375754039301,
|
|
401
|
+
layerLabelName: '分层6',
|
|
167
402
|
layerRemark: '',
|
|
168
|
-
sequence:
|
|
169
|
-
}
|
|
170
|
-
}, {
|
|
171
|
-
dataStatus: 1,
|
|
172
|
-
id: 28,
|
|
173
|
-
labelGroup: '基本标签',
|
|
174
|
-
labelName: 'test1',
|
|
175
|
-
labelRemark: '',
|
|
176
|
-
labelType: 0,
|
|
177
|
-
layers: [{
|
|
403
|
+
sequence: 6
|
|
404
|
+
}, {
|
|
178
405
|
layerCondition: [[{
|
|
179
|
-
|
|
406
|
+
attrs: [{
|
|
407
|
+
attrId: 584,
|
|
408
|
+
category: 'custom',
|
|
409
|
+
params: ['50'],
|
|
410
|
+
attrName: '年龄',
|
|
411
|
+
operator: '>',
|
|
412
|
+
attrType: 'cont-num'
|
|
413
|
+
}]
|
|
414
|
+
}], [{
|
|
415
|
+
eventId: '-4',
|
|
180
416
|
runPeriod: {
|
|
181
|
-
values: ['
|
|
417
|
+
values: ['1', '0'],
|
|
182
418
|
operator: 'relative'
|
|
183
419
|
},
|
|
184
420
|
runTimes: {
|
|
@@ -187,16 +423,124 @@ export var tagList = [{
|
|
|
187
423
|
},
|
|
188
424
|
attrs: []
|
|
189
425
|
}]],
|
|
190
|
-
layerLabelId:
|
|
426
|
+
layerLabelId: 154375754039300,
|
|
427
|
+
layerLabelName: '分层5',
|
|
428
|
+
layerRemark: '',
|
|
429
|
+
sequence: 5
|
|
430
|
+
}, {
|
|
431
|
+
layerCondition: [[{
|
|
432
|
+
attrs: [{
|
|
433
|
+
attrId: 584,
|
|
434
|
+
category: 'custom',
|
|
435
|
+
params: ['40'],
|
|
436
|
+
attrName: '年龄',
|
|
437
|
+
operator: '>',
|
|
438
|
+
attrType: 'cont-num'
|
|
439
|
+
}]
|
|
440
|
+
}], [{
|
|
441
|
+
eventId: '-4',
|
|
442
|
+
runPeriod: {
|
|
443
|
+
values: ['1', '0'],
|
|
444
|
+
operator: 'relative'
|
|
445
|
+
},
|
|
446
|
+
runTimes: {
|
|
447
|
+
values: ['1'],
|
|
448
|
+
operator: '>='
|
|
449
|
+
},
|
|
450
|
+
attrs: []
|
|
451
|
+
}]],
|
|
452
|
+
layerLabelId: 154375754039299,
|
|
453
|
+
layerLabelName: '分层4',
|
|
454
|
+
layerRemark: '',
|
|
455
|
+
sequence: 4
|
|
456
|
+
}, {
|
|
457
|
+
layerCondition: [[{
|
|
458
|
+
attrs: [{
|
|
459
|
+
attrId: 584,
|
|
460
|
+
category: 'custom',
|
|
461
|
+
params: ['30'],
|
|
462
|
+
attrName: '年龄',
|
|
463
|
+
operator: '>',
|
|
464
|
+
attrType: 'cont-num'
|
|
465
|
+
}]
|
|
466
|
+
}], [{
|
|
467
|
+
eventId: '-4',
|
|
468
|
+
runPeriod: {
|
|
469
|
+
values: ['1', '0'],
|
|
470
|
+
operator: 'relative'
|
|
471
|
+
},
|
|
472
|
+
runTimes: {
|
|
473
|
+
values: ['1'],
|
|
474
|
+
operator: '>='
|
|
475
|
+
},
|
|
476
|
+
attrs: []
|
|
477
|
+
}]],
|
|
478
|
+
layerLabelId: 154375754039298,
|
|
479
|
+
layerLabelName: '分层3',
|
|
480
|
+
layerRemark: '',
|
|
481
|
+
sequence: 3
|
|
482
|
+
}, {
|
|
483
|
+
layerCondition: [[{
|
|
484
|
+
attrs: [{
|
|
485
|
+
attrId: 584,
|
|
486
|
+
category: 'custom',
|
|
487
|
+
params: ['20'],
|
|
488
|
+
attrName: '年龄',
|
|
489
|
+
operator: '>',
|
|
490
|
+
attrType: 'cont-num'
|
|
491
|
+
}]
|
|
492
|
+
}], [{
|
|
493
|
+
eventId: '-4',
|
|
494
|
+
runPeriod: {
|
|
495
|
+
values: ['1', '0'],
|
|
496
|
+
operator: 'relative'
|
|
497
|
+
},
|
|
498
|
+
runTimes: {
|
|
499
|
+
values: ['1'],
|
|
500
|
+
operator: '>='
|
|
501
|
+
},
|
|
502
|
+
attrs: []
|
|
503
|
+
}]],
|
|
504
|
+
layerLabelId: 154375754039297,
|
|
505
|
+
layerLabelName: '分层2',
|
|
506
|
+
layerRemark: '',
|
|
507
|
+
sequence: 2
|
|
508
|
+
}, {
|
|
509
|
+
layerCondition: [[{
|
|
510
|
+
attrs: [{
|
|
511
|
+
attrId: 584,
|
|
512
|
+
category: 'custom',
|
|
513
|
+
params: ['0'],
|
|
514
|
+
attrName: '年龄',
|
|
515
|
+
operator: '>',
|
|
516
|
+
attrType: 'cont-num'
|
|
517
|
+
}]
|
|
518
|
+
}], [{
|
|
519
|
+
eventId: '-4',
|
|
520
|
+
runPeriod: {
|
|
521
|
+
values: ['1', '0'],
|
|
522
|
+
operator: 'relative'
|
|
523
|
+
},
|
|
524
|
+
runTimes: {
|
|
525
|
+
values: ['1'],
|
|
526
|
+
operator: '>='
|
|
527
|
+
},
|
|
528
|
+
attrs: []
|
|
529
|
+
}]],
|
|
530
|
+
layerLabelId: 154375754039296,
|
|
191
531
|
layerLabelName: '分层1',
|
|
192
532
|
layerRemark: '',
|
|
193
533
|
sequence: 1
|
|
194
|
-
}]
|
|
534
|
+
}],
|
|
535
|
+
startProcessTime: '2022-09-06T21:08:28'
|
|
195
536
|
}];
|
|
196
537
|
export var conditions = [[{
|
|
197
|
-
attrs: [
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
538
|
+
attrs: [{
|
|
539
|
+
attrId: 0,
|
|
540
|
+
attrName: 'last_visit_time',
|
|
541
|
+
category: 'fixed',
|
|
542
|
+
operator: 'absolute',
|
|
543
|
+
params: ['2022-09-07', '2022-09-08'],
|
|
544
|
+
attrType: 'cont-date'
|
|
545
|
+
}]
|
|
202
546
|
}]];
|
|
@@ -6,10 +6,12 @@ export declare function findEvent(eventId: number, eventGroupList: Unpacked<Glob
|
|
|
6
6
|
export declare function findPropAndEnv(name: string, list: Unpacked<GlobalContextProps, 'userPropList' | 'eventEnvList'>): import("../attributeSelector/types").UserProp | import("../attributeSelector/types").EnvProp | null;
|
|
7
7
|
export declare function buildSelectLayer(data: BizUserConditionT.UserTagsDataI[]): (layerLabelId: number) => ({
|
|
8
8
|
labelGroup: string;
|
|
9
|
+
id?: undefined;
|
|
9
10
|
labelName?: undefined;
|
|
10
11
|
layerLabelId?: undefined;
|
|
11
12
|
layerLabelName?: undefined;
|
|
12
13
|
} | {
|
|
14
|
+
id: number;
|
|
13
15
|
labelName: string;
|
|
14
16
|
labelGroup?: undefined;
|
|
15
17
|
layerLabelId?: undefined;
|
|
@@ -18,6 +20,7 @@ export declare function buildSelectLayer(data: BizUserConditionT.UserTagsDataI[]
|
|
|
18
20
|
layerLabelId: number;
|
|
19
21
|
layerLabelName: string;
|
|
20
22
|
labelGroup?: undefined;
|
|
23
|
+
id?: undefined;
|
|
21
24
|
labelName?: undefined;
|
|
22
25
|
})[] | null;
|
|
23
26
|
export declare function buildTagsGroup(list: BizUserConditionT.UserTagsDataI[]): {
|
package/es/userCondition/util.js
CHANGED
|
@@ -119,6 +119,7 @@ export function buildSelectLayer(data) {
|
|
|
119
119
|
return [{
|
|
120
120
|
labelGroup: data[j].labelGroup
|
|
121
121
|
}, {
|
|
122
|
+
id: data[j].id,
|
|
122
123
|
labelName: data[j].labelName
|
|
123
124
|
}, {
|
|
124
125
|
layerLabelId: data[j].layers[i].layerLabelId,
|
|
@@ -127,7 +128,7 @@ export function buildSelectLayer(data) {
|
|
|
127
128
|
};
|
|
128
129
|
}
|
|
129
130
|
export function buildTagsGroup(list) {
|
|
130
|
-
var groupOrder = ['基本标签', '活跃标签', '行为标签', '预测标签', '
|
|
131
|
+
var groupOrder = ['基本标签', '活跃标签', '行为标签', '预测标签', '其它标签'];
|
|
131
132
|
var groupsMap = {};
|
|
132
133
|
var options = [];
|
|
133
134
|
list.forEach(function (label) {
|
|
@@ -30,7 +30,8 @@ var GroupOption = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
30
30
|
return _onClick(value);
|
|
31
31
|
},
|
|
32
32
|
className: ["".concat(classPrefix, "-group-option"), actived ? 'active' : '', checked ? 'checked' : ''].join(' '),
|
|
33
|
-
ref: ref
|
|
33
|
+
ref: ref,
|
|
34
|
+
title: label
|
|
34
35
|
}, /*#__PURE__*/React.createElement("div", {
|
|
35
36
|
className: "".concat(classPrefix, "-group-option-label")
|
|
36
37
|
}, renderLabel()), /*#__PURE__*/React.createElement("div", {
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
2
|
-
|
|
3
1
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
4
2
|
|
|
5
3
|
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
@@ -71,14 +69,14 @@ var Groups = function Groups(props) {
|
|
|
71
69
|
itemHeight: 48,
|
|
72
70
|
itemKey: keyField
|
|
73
71
|
}, function (item, index) {
|
|
74
|
-
var
|
|
72
|
+
var _props$highlightText;
|
|
75
73
|
|
|
76
74
|
return /*#__PURE__*/React.createElement(GroupOption, {
|
|
77
75
|
onClick: function onClick() {
|
|
78
76
|
return _onClick(index);
|
|
79
77
|
},
|
|
80
78
|
actived: item[valueField] === active,
|
|
81
|
-
checked: isChecked(
|
|
79
|
+
checked: isChecked(item, valueField),
|
|
82
80
|
count: item[childField].length,
|
|
83
81
|
label: item[labelField],
|
|
84
82
|
value: item[valueField],
|
|
@@ -33,7 +33,8 @@ var CheckOption = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
33
33
|
|
|
34
34
|
return /*#__PURE__*/React.createElement("div", {
|
|
35
35
|
ref: ref,
|
|
36
|
-
className: ["".concat(classPrefix, "-check-option"), disabled ? "".concat(classPrefix, "-check-option-disabled") : ''].join(' ')
|
|
36
|
+
className: ["".concat(classPrefix, "-check-option"), disabled ? "".concat(classPrefix, "-check-option-disabled") : ''].join(' '),
|
|
37
|
+
title: label
|
|
37
38
|
}, /*#__PURE__*/React.createElement(Checkbox, {
|
|
38
39
|
onChange: onChange,
|
|
39
40
|
disabled: disabled,
|
|
@@ -20,7 +20,8 @@ var MultipleCheckPanel = function MultipleCheckPanel(props) {
|
|
|
20
20
|
var data = props.data,
|
|
21
21
|
labelField = props.labelField,
|
|
22
22
|
level = props.level,
|
|
23
|
-
currentValue = props.currentValue
|
|
23
|
+
currentValue = props.currentValue,
|
|
24
|
+
valueField = props.valueField;
|
|
24
25
|
|
|
25
26
|
var _useState = useState(''),
|
|
26
27
|
_useState2 = _slicedToArray(_useState, 1),
|
|
@@ -50,7 +51,7 @@ var MultipleCheckPanel = function MultipleCheckPanel(props) {
|
|
|
50
51
|
itemKey: labelField,
|
|
51
52
|
height: 360
|
|
52
53
|
}, function (item, index) {
|
|
53
|
-
var checked = isChecked(item);
|
|
54
|
+
var checked = isChecked(item, valueField);
|
|
54
55
|
return /*#__PURE__*/React.createElement(CheckOption, {
|
|
55
56
|
checked: checked,
|
|
56
57
|
highlightText: searchValue,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export declare function curry(fn: Function): (...arg1: any[]) => (...arg2: any[]) => any;
|
|
2
2
|
export declare function filterFactory(labelField: string, searchValue: string): (item: any) => boolean;
|
|
3
|
-
export declare function isCheckedFactory(currentValue: any[], level: number): (
|
|
3
|
+
export declare function isCheckedFactory(currentValue: any[], level: number): (option: any, valueFiled: string) => boolean;
|
|
4
4
|
export declare function getFieldFactory(fields: string[]): () => string;
|
|
@@ -22,9 +22,13 @@ export function filterFactory(labelField, searchValue) {
|
|
|
22
22
|
};
|
|
23
23
|
}
|
|
24
24
|
export function isCheckedFactory(currentValue, level) {
|
|
25
|
-
return function (
|
|
25
|
+
return function (option, valueFiled) {
|
|
26
26
|
return currentValue.some(function (value) {
|
|
27
|
-
|
|
27
|
+
if (value[level][valueFiled] !== undefined) {
|
|
28
|
+
return value[level][valueFiled] === option[valueFiled];
|
|
29
|
+
} else {
|
|
30
|
+
return value[level] === option[valueFiled];
|
|
31
|
+
}
|
|
28
32
|
});
|
|
29
33
|
};
|
|
30
34
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/business-lib",
|
|
3
|
-
"version": "1.0.25-layers.
|
|
3
|
+
"version": "1.0.25-layers.4",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"start": "dumi dev",
|
|
6
6
|
"docs:build": "dumi build",
|
|
@@ -58,5 +58,5 @@
|
|
|
58
58
|
"react": "^16.12.0 || ^17.0.0",
|
|
59
59
|
"yorkie": "^2.0.0"
|
|
60
60
|
},
|
|
61
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "6ab09c91a4d207f170faccc2205dfc4a3f1495a1"
|
|
62
62
|
}
|