@zgfe/business-lib 1.1.32 → 1.1.33-alpha.0

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.
Files changed (13) hide show
  1. package/es/attrConditions/index.js +2 -0
  2. package/es/attributeSelector/types.d.ts +2 -0
  3. package/es/constants/common.d.ts +11 -0
  4. package/es/constants/common.js +35 -0
  5. package/es/eventSelector/demo/index.js +1 -0
  6. package/es/eventSelector/index.js +5 -2
  7. package/es/eventSelector/listPanel.js +22 -3
  8. package/es/eventSelector/types.d.ts +2 -0
  9. package/es/targetConditionGroup/data/operates.js +0 -3
  10. package/es/targetConditionGroup/demo/index.js +2 -1
  11. package/es/targetConditionGroup/index.js +65 -34
  12. package/es/targetConditionGroup/types.d.ts +1 -0
  13. package/package.json +2 -2
package/es/attrConditions/index.js CHANGED
@@ -50,6 +50,7 @@ var BizConditionItem = function BizConditionItem(props) {
50
50
  propCategory: data.propCategory,
51
51
  type: data.type,
52
52
  key: data.attrId,
53
+ label: data.label,
53
54
  dimensionSub: data.dimensionSub || 'event_attr'
54
55
  };
55
56
  }
@@ -59,6 +60,7 @@ var BizConditionItem = function BizConditionItem(props) {
59
60
  attrData = {
60
61
  id: aId,
61
62
  name: data.attrName,
63
+ label: data.label,
62
64
  propCategory: data.propCategory,
63
65
  type: data.type,
64
66
  category: data.category,
package/es/attributeSelector/types.d.ts CHANGED
@@ -24,6 +24,8 @@ export interface AnalysisEvent {
24
24
  isOverview?: boolean;
25
25
  eventHidden?: ShowStatus;
26
26
  marked?: boolean;
27
+ isBuiltIn?: boolean;
28
+ type?: string;
27
29
  }
28
30
  export interface EventGroup {
29
31
  id: number;
package/es/constants/common.d.ts ADDED
@@ -0,0 +1,11 @@
1
+ export declare const BuiltinIndicators: {
2
+ id: number;
3
+ name: string;
4
+ eventList: {
5
+ name: string;
6
+ id: number;
7
+ type: string;
8
+ isBuiltIn: boolean;
9
+ attrList: never[];
10
+ }[];
11
+ };
package/es/constants/common.js ADDED
@@ -0,0 +1,35 @@
1
+ export var BuiltinIndicators = {
2
+ id: -2,
3
+ name: '整体',
4
+ eventList: [{
5
+ name: '新增用户',
6
+ id: -201,
7
+ type: 'add',
8
+ isBuiltIn: true,
9
+ attrList: []
10
+ }, {
11
+ name: '活跃用户',
12
+ id: -202,
13
+ type: 'active',
14
+ isBuiltIn: true,
15
+ attrList: []
16
+ }, {
17
+ name: '访问次数',
18
+ id: -203,
19
+ type: 'times',
20
+ isBuiltIn: true,
21
+ attrList: []
22
+ }, {
23
+ name: '平均使用时长',
24
+ id: -204,
25
+ type: 'duration_avg',
26
+ isBuiltIn: true,
27
+ attrList: []
28
+ }, {
29
+ name: '使用时长分布',
30
+ id: -205,
31
+ type: 'duration',
32
+ isBuiltIn: true,
33
+ attrList: []
34
+ }]
35
+ };
package/es/eventSelector/demo/index.js CHANGED
@@ -39,6 +39,7 @@ var EventDemo = function EventDemo() {
39
39
  eventGroupList: store.eventGroupList
40
40
  }
41
41
  }, /*#__PURE__*/React.createElement(BizEventSelector, {
42
+ showBuiltInTarget: true,
42
43
  defaultValue: value,
43
44
  alias: "\u522B\u540D",
44
45
  onChange: onChange
package/es/eventSelector/index.js CHANGED
@@ -10,6 +10,7 @@ import SelectHandle from '../select/handle';
10
10
  import BizGlobalDataContext from '../context';
11
11
  import EventListPanel from './listPanel';
12
12
  import './styles/index.less';
13
+ import { BuiltinIndicators } from '../constants/common';
13
14
  export var classPrefix = 'biz-event-select';
14
15
  var BizEventSelector = function BizEventSelector(props) {
15
16
  var alias = props.alias,
@@ -42,13 +43,14 @@ var BizEventSelector = function BizEventSelector(props) {
42
43
  var getValue = function getValue(param) {
43
44
  var _param$group, _param$event;
44
45
  var res = {};
46
+ var allEvents = props.showBuiltInTarget ? eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.concat(BuiltinIndicators) : eventGroupList;
45
47
  if (!((_param$group = param.group) === null || _param$group === void 0 ? void 0 : _param$group.id)) {
46
48
  res.group = {
47
49
  id: 0,
48
50
  name: '所有分组',
49
51
  eventList: function () {
50
52
  var list = [];
51
- eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
53
+ allEvents === null || allEvents === void 0 ? void 0 : allEvents.forEach(function (group) {
52
54
  list = list.concat(group.eventList);
53
55
  });
54
56
  return list;
@@ -62,7 +64,7 @@ var BizEventSelector = function BizEventSelector(props) {
62
64
  attrList: []
63
65
  };
64
66
  }
65
- eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
67
+ allEvents === null || allEvents === void 0 ? void 0 : allEvents.forEach(function (group) {
66
68
  var _param$group2;
67
69
  if (group.id === ((_param$group2 = param.group) === null || _param$group2 === void 0 ? void 0 : _param$group2.id)) res.group = group;
68
70
  group.eventList.forEach(function (event) {
@@ -104,6 +106,7 @@ var BizEventSelector = function BizEventSelector(props) {
104
106
  value: currentValue,
105
107
  onChange: onChange,
106
108
  showOverview: showAllEvent,
109
+ showBuiltInTarget: props.showBuiltInTarget,
107
110
  defaultSelectAble: defaultSelectAble
108
111
  }),
109
112
  trigger: ['click'],
package/es/eventSelector/listPanel.js CHANGED
@@ -15,6 +15,7 @@ import InfiniteScroll from 'react-infinite-scroll-component';
15
15
  import { classPrefix } from '.';
16
16
  import { BizGlobalDataContext } from '..';
17
17
  import { ShowStatus } from '../attributeSelector/types';
18
+ import { BuiltinIndicators } from '../constants/common';
18
19
  import BizSearchInput from '../searchInput';
19
20
  import EventListOption from './option';
20
21
  var EventListPanel = function EventListPanel(props) {
@@ -68,15 +69,33 @@ var EventListPanel = function EventListPanel(props) {
68
69
  }
69
70
  });
70
71
  });
71
- list = [].concat(markList, _toConsumableArray(list));
72
+ list = props.showBuiltInTarget ? [].concat(_toConsumableArray(BuiltinIndicators.eventList), markList, _toConsumableArray(list)) : [].concat(markList, _toConsumableArray(list));
72
73
  return list;
73
74
  }(),
74
75
  name: '所有分组'
75
76
  };
76
77
  setGroupList(function (list) {
77
- return [group].concat(_toConsumableArray(list));
78
+ return props.showBuiltInTarget ? [group, BuiltinIndicators].concat(_toConsumableArray(list)) : [group].concat(_toConsumableArray(list));
79
+ });
80
+ setCurrentGroup(function () {
81
+ var _props$value;
82
+ if (props.defaultSelectAble && ((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.group)) {
83
+ if (props.showBuiltInTarget && props.value.group.id === -2) {
84
+ return BuiltinIndicators;
85
+ } else {
86
+ var _currentGroup = group;
87
+ eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (eGroup) {
88
+ var _props$value2, _props$value2$group;
89
+ if (eGroup.id === ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : (_props$value2$group = _props$value2.group) === null || _props$value2$group === void 0 ? void 0 : _props$value2$group.id)) {
90
+ _currentGroup = eGroup;
91
+ return;
92
+ }
93
+ });
94
+ return _currentGroup;
95
+ }
96
+ }
97
+ return group;
78
98
  });
79
- setCurrentGroup(group);
80
99
  }, []);
81
100
  useEffect(function () {
82
101
  setCurrentValue(props.value);
package/es/eventSelector/types.d.ts CHANGED
@@ -23,6 +23,7 @@ export declare namespace EventSelectTypes {
23
23
  showAllEvent?: boolean;
24
24
  defaultSelectAble?: boolean;
25
25
  popupContainer?: boolean;
26
+ showBuiltInTarget?: boolean;
26
27
  onVisibleChange?: (visible: boolean) => void;
27
28
  border?: boolean;
28
29
  theme?: string;
@@ -33,6 +34,7 @@ export declare namespace EventSelectTypes {
33
34
  interface DropdownProps {
34
35
  value?: Value;
35
36
  showOverview?: boolean;
37
+ showBuiltInTarget?: boolean;
36
38
  defaultSelectAble?: boolean;
37
39
  onChange?: (value: Value, isOverview?: boolean) => void;
38
40
  }
package/es/targetConditionGroup/data/operates.js CHANGED
@@ -43,9 +43,6 @@ export var attrOptions = [{
43
43
  }, {
44
44
  label: '均值',
45
45
  value: 'avg'
46
- }, {
47
- label: '分布',
48
- value: 'duration_times'
49
46
  }, {
50
47
  label: '中位数',
51
48
  value: 'median'
package/es/targetConditionGroup/demo/index.js CHANGED
@@ -51,6 +51,7 @@ export default (function () {
51
51
  max: 3
52
52
  }, /*#__PURE__*/React.createElement(BizEventSelector, {
53
53
  showAllEvent: true,
54
- border: false
54
+ border: false,
55
+ showBuiltInTarget: true
55
56
  }))), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(target)));
56
57
  });
package/es/targetConditionGroup/index.js CHANGED
@@ -1,3 +1,9 @@
1
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
2
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
3
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
4
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
5
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
6
+ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
1
7
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
2
8
  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."); }
3
9
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -12,9 +18,10 @@ import BizConditionGroup from '../attrConditions/group';
12
18
  import { Skeleton } from 'antd';
13
19
  import _ from 'lodash';
14
20
  import BizGlobalDataContext from '../context';
21
+ import { BuiltinIndicators } from '../constants/common';
15
22
  export var classPrefix = 'biz-target';
16
23
  var BizTargetCondition = function BizTargetCondition(props) {
17
- var _targetData$value2, _targetData$value2$ev, _targetData$value3, _targetData$value3$ev, _targetData$value4, _targetData$value4$ev, _targetData$value5, _targetData$value5$ev;
24
+ var _targetData$value2, _targetData$value2$gr, _targetData$value3, _targetData$value3$ev, _targetData$value4, _targetData$value4$ev, _targetData$value5, _targetData$value5$ev, _targetData$value6, _targetData$value6$ev, _targetData$value7, _targetData$value7$ev;
18
25
  var max = props.max;
19
26
  var _useState = useState(),
20
27
  _useState2 = _slicedToArray(_useState, 2),
@@ -69,14 +76,14 @@ var BizTargetCondition = function BizTargetCondition(props) {
69
76
  }, []);
70
77
  useEffect(function () {
71
78
  if (targetData === null || targetData === void 0 ? void 0 : targetData.value) {
72
- var _targetData$value$eve;
79
+ var _targetData$value$eve, _targetData$value$eve2, _targetData$value$eve3;
73
80
  var canAdd = true,
74
81
  canDelete = true;
75
- if (((_targetData$value$eve = targetData.value.event) === null || _targetData$value$eve === void 0 ? void 0 : _targetData$value$eve.id) === -100) {
76
- var _targetData$value$gro;
82
+ if (((_targetData$value$eve = targetData.value.event) === null || _targetData$value$eve === void 0 ? void 0 : _targetData$value$eve.id) === -100 || ((_targetData$value$eve2 = targetData.value.event) === null || _targetData$value$eve2 === void 0 ? void 0 : _targetData$value$eve2.id) === -204 || ((_targetData$value$eve3 = targetData.value.event) === null || _targetData$value$eve3 === void 0 ? void 0 : _targetData$value$eve3.id) === -205) {
83
+ var _targetData$value$gro, _targetData$value$eve4;
77
84
  canAdd = false;
78
85
  setFilters(undefined);
79
- if (!((_targetData$value$gro = targetData.value.group) === null || _targetData$value$gro === void 0 ? void 0 : _targetData$value$gro.id)) {
86
+ if (!((_targetData$value$gro = targetData.value.group) === null || _targetData$value$gro === void 0 ? void 0 : _targetData$value$gro.id) && ((_targetData$value$eve4 = targetData.value.event) === null || _targetData$value$eve4 === void 0 ? void 0 : _targetData$value$eve4.id) === -100) {
80
87
  canDelete = false;
81
88
  }
82
89
  } else {
@@ -109,37 +116,55 @@ var BizTargetCondition = function BizTargetCondition(props) {
109
116
  eventList: []
110
117
  };
111
118
  }
112
- if (data.eventId === -100) {
113
- target.value.event = {
114
- id: -100,
115
- name: '事件概览',
116
- attrList: []
117
- };
119
+ var hasEvent = false;
120
+ if (data.isBuiltIn || data.eventId < 0) {
121
+ if (data.eventGroupId) {
122
+ target.value.group = {
123
+ id: data.eventGroupId,
124
+ name: data.eventGroupId === -2 ? '整体' : '所有分组',
125
+ eventList: []
126
+ };
127
+ }
128
+ BuiltinIndicators.eventList.forEach(function (item) {
129
+ if (item.id === data.eventId) {
130
+ target.value.event = _objectSpread({}, item);
131
+ hasEvent = true;
132
+ }
133
+ });
118
134
  }
119
- for (var i = 0; i < eventGroupList.length; i++) {
120
- var group = eventGroupList[i];
121
- if (data.eventId !== -100) {
122
- for (var j = 0; j < group.eventList.length; j++) {
123
- var event = group.eventList[j];
124
- if (event.id === data.eventId) {
125
- target.value.event = event;
126
- break;
135
+ if (!hasEvent) {
136
+ if (data.eventId === -100) {
137
+ target.value.event = {
138
+ id: -100,
139
+ name: '事件概览',
140
+ attrList: []
141
+ };
142
+ }
143
+ for (var i = 0; i < eventGroupList.length; i++) {
144
+ var group = eventGroupList[i];
145
+ if (data.eventId !== -100) {
146
+ for (var j = 0; j < group.eventList.length; j++) {
147
+ var event = group.eventList[j];
148
+ if (event.id === data.eventId) {
149
+ target.value.event = event;
150
+ break;
151
+ }
127
152
  }
128
153
  }
129
- }
130
- if (data.eventGroupId && data.eventGroupId === group.id) {
131
- target.value.group = group;
132
- break;
154
+ if (data.eventGroupId && data.eventGroupId === group.id) {
155
+ target.value.group = group;
156
+ break;
157
+ }
133
158
  }
134
159
  }
135
160
  }
136
161
  return target;
137
162
  };
138
163
  var onChangeTarget = function onChangeTarget(target) {
139
- var _target$value, _target$value$event, _targetData$value, _targetData$value$eve2;
164
+ var _target$value, _target$value$event, _targetData$value, _targetData$value$eve5;
140
165
  setTargetData(target);
141
166
  var filterData = _.cloneDeep(filters);
142
- if (((_target$value = target.value) === null || _target$value === void 0 ? void 0 : (_target$value$event = _target$value.event) === null || _target$value$event === void 0 ? void 0 : _target$value$event.id) !== (targetData === null || targetData === void 0 ? void 0 : (_targetData$value = targetData.value) === null || _targetData$value === void 0 ? void 0 : (_targetData$value$eve2 = _targetData$value.event) === null || _targetData$value$eve2 === void 0 ? void 0 : _targetData$value$eve2.id)) {
167
+ if (((_target$value = target.value) === null || _target$value === void 0 ? void 0 : (_target$value$event = _target$value.event) === null || _target$value$event === void 0 ? void 0 : _target$value$event.id) !== (targetData === null || targetData === void 0 ? void 0 : (_targetData$value = targetData.value) === null || _targetData$value === void 0 ? void 0 : (_targetData$value$eve5 = _targetData$value.event) === null || _targetData$value$eve5 === void 0 ? void 0 : _targetData$value$eve5.id)) {
143
168
  filterData = undefined;
144
169
  setFilters(undefined);
145
170
  setIsAdd(false);
@@ -163,19 +188,25 @@ var BizTargetCondition = function BizTargetCondition(props) {
163
188
  setFilters(data);
164
189
  onChange(dimension, targetData, data);
165
190
  };
166
- var onChange = function onChange(analysisDimension, target, filterDatas) {
191
+ var onChange = function onChange(analysisDimension, target, filterData) {
167
192
  if (props.onChange) {
168
- var _target$value$event2, _target$value$event3, _target$value$event4, _target$value$event5, _target$value$event6, _target$value$group;
193
+ var _target$value$event2, _target$value$event3, _target$value$event4, _target$value$event5, _target$value$event6, _target$value$group2;
169
194
  if (!target || !target.value || !((_target$value$event2 = target.value.event) === null || _target$value$event2 === void 0 ? void 0 : _target$value$event2.id)) return;
195
+ var type = target.value.event.type;
196
+ if (!type) {
197
+ var _target$value$group;
198
+ type = ((_target$value$group = target.value.group) === null || _target$value$group === void 0 ? void 0 : _target$value$group.id) === -2 ? 'whole' : 'event';
199
+ }
170
200
  var data = {
171
- type: 'event',
201
+ type: type,
172
202
  alias: (target === null || target === void 0 ? void 0 : target.alias) || target.value.event.alias || ((_target$value$event3 = target.value.event) === null || _target$value$event3 === void 0 ? void 0 : _target$value$event3.name) || '',
173
203
  eventId: (_target$value$event4 = target.value.event) === null || _target$value$event4 === void 0 ? void 0 : _target$value$event4.id,
174
204
  eventName: ((_target$value$event5 = target.value.event) === null || _target$value$event5 === void 0 ? void 0 : _target$value$event5.alias) || ((_target$value$event6 = target.value.event) === null || _target$value$event6 === void 0 ? void 0 : _target$value$event6.name),
175
- eventGroupId: (_target$value$group = target.value.group) === null || _target$value$group === void 0 ? void 0 : _target$value$group.id,
205
+ eventGroupId: (_target$value$group2 = target.value.group) === null || _target$value$group2 === void 0 ? void 0 : _target$value$group2.id,
176
206
  analysisDimension: analysisDimension,
177
- filters: filterDatas,
178
- marked: target.value.event.marked
207
+ filters: filterData,
208
+ marked: target.value.event.marked,
209
+ isBuiltIn: target.value.event.isBuiltIn
179
210
  };
180
211
  props.onChange(data);
181
212
  }
@@ -206,8 +237,8 @@ var BizTargetCondition = function BizTargetCondition(props) {
206
237
  onAdd: onAdd,
207
238
  onDelete: onDelete,
208
239
  onChange: onChangeTarget
209
- }, props.children), /*#__PURE__*/React.createElement(BizTargetDimension, {
210
- eventId: (targetData === null || targetData === void 0 ? void 0 : (_targetData$value2 = targetData.value) === null || _targetData$value2 === void 0 ? void 0 : (_targetData$value2$ev = _targetData$value2.event) === null || _targetData$value2$ev === void 0 ? void 0 : _targetData$value2$ev.id) ? targetData === null || targetData === void 0 ? void 0 : (_targetData$value3 = targetData.value) === null || _targetData$value3 === void 0 ? void 0 : (_targetData$value3$ev = _targetData$value3.event) === null || _targetData$value3$ev === void 0 ? void 0 : _targetData$value3$ev.id : undefined,
240
+ }, props.children), (targetData === null || targetData === void 0 ? void 0 : (_targetData$value2 = targetData.value) === null || _targetData$value2 === void 0 ? void 0 : (_targetData$value2$gr = _targetData$value2.group) === null || _targetData$value2$gr === void 0 ? void 0 : _targetData$value2$gr.id) === -2 || (targetData === null || targetData === void 0 ? void 0 : (_targetData$value3 = targetData.value) === null || _targetData$value3 === void 0 ? void 0 : (_targetData$value3$ev = _targetData$value3.event) === null || _targetData$value3$ev === void 0 ? void 0 : _targetData$value3$ev.isBuiltIn) ? null : /*#__PURE__*/React.createElement(BizTargetDimension, {
241
+ eventId: (targetData === null || targetData === void 0 ? void 0 : (_targetData$value4 = targetData.value) === null || _targetData$value4 === void 0 ? void 0 : (_targetData$value4$ev = _targetData$value4.event) === null || _targetData$value4$ev === void 0 ? void 0 : _targetData$value4$ev.id) ? targetData === null || targetData === void 0 ? void 0 : (_targetData$value5 = targetData.value) === null || _targetData$value5 === void 0 ? void 0 : (_targetData$value5$ev = _targetData$value5.event) === null || _targetData$value5$ev === void 0 ? void 0 : _targetData$value5$ev.id : undefined,
211
242
  value: dimension,
212
243
  onChange: onChangeDimension
213
244
  })), (filters || isAdd) && /*#__PURE__*/React.createElement(BizConditionGroup, {
@@ -216,7 +247,7 @@ var BizTargetCondition = function BizTargetCondition(props) {
216
247
  onlyAnd: props.onlyAnd,
217
248
  enableEventProp: true,
218
249
  enableDelete: true,
219
- eventIdList: (targetData === null || targetData === void 0 ? void 0 : (_targetData$value4 = targetData.value) === null || _targetData$value4 === void 0 ? void 0 : (_targetData$value4$ev = _targetData$value4.event) === null || _targetData$value4$ev === void 0 ? void 0 : _targetData$value4$ev.id) ? [targetData === null || targetData === void 0 ? void 0 : (_targetData$value5 = targetData.value) === null || _targetData$value5 === void 0 ? void 0 : (_targetData$value5$ev = _targetData$value5.event) === null || _targetData$value5$ev === void 0 ? void 0 : _targetData$value5$ev.id] : undefined,
250
+ eventIdList: (targetData === null || targetData === void 0 ? void 0 : (_targetData$value6 = targetData.value) === null || _targetData$value6 === void 0 ? void 0 : (_targetData$value6$ev = _targetData$value6.event) === null || _targetData$value6$ev === void 0 ? void 0 : _targetData$value6$ev.id) ? [targetData === null || targetData === void 0 ? void 0 : (_targetData$value7 = targetData.value) === null || _targetData$value7 === void 0 ? void 0 : (_targetData$value7$ev = _targetData$value7.event) === null || _targetData$value7$ev === void 0 ? void 0 : _targetData$value7$ev.id] : undefined,
220
251
  onChange: onChangeFilters,
221
252
  onConditionsCount: setCount
222
253
  })));
package/es/targetConditionGroup/types.d.ts CHANGED
@@ -20,6 +20,7 @@ export declare namespace TargetConditionTypes {
20
20
  eventId: number;
21
21
  eventName?: string;
22
22
  eventGroupId?: number;
23
+ isBuiltIn?: boolean;
23
24
  }
24
25
  interface Props {
25
26
  defaultValue?: Value;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/business-lib",
3
- "version": "1.1.32",
3
+ "version": "1.1.33-alpha.0",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
@@ -59,5 +59,5 @@
59
59
  "react": "^16.12.0 || ^17.0.0",
60
60
  "yorkie": "^2.0.0"
61
61
  },
62
- "gitHead": "768a74651153c58b9b05a2661eb3fe37c2c48109"
62
+ "gitHead": "63d54d0166ad0b0c494457f25a2af6dd8a9ccc62"
63
63
  }