@zgfe/business-lib 1.1.29-alpha.3 → 1.1.29-alpha.4

package/es/targetConditionGroup/index.js

@@ -105,12 +105,12 @@ var BizTargetCondition = function BizTargetCondition(props) {
           canDelete = true;
 
       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) {
-        var _targetData$value$gro;
+        var _targetData$value$gro, _targetData$value$eve4;
 
         canAdd = false;
         setFilters(undefined);
 
-        if (!((_targetData$value$gro = targetData.value.group) === null || _targetData$value$gro === void 0 ? void 0 : _targetData$value$gro.id)) {
+        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) {
           canDelete = false;
         }
       } else {
@@ -203,13 +203,13 @@ var BizTargetCondition = function BizTargetCondition(props) {
   };
 
   var onChangeTarget = function onChangeTarget(target) {
-    var _target$value, _target$value$event, _targetData$value, _targetData$value$eve4;
+    var _target$value, _target$value$event, _targetData$value, _targetData$value$eve5;
 
     setTargetData(target);
 
     var filterData = _.cloneDeep(filters);
 
-    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$eve4 = _targetData$value.event) === null || _targetData$value$eve4 === void 0 ? void 0 : _targetData$value$eve4.id)) {
+    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)) {
       filterData = undefined;
       setFilters(undefined);
       setIsAdd(false);
@@ -241,15 +241,23 @@ var BizTargetCondition = function BizTargetCondition(props) {
 
   var onChange = function onChange(analysisDimension, target, filterData) {
     if (props.onChange) {
-      var _target$value$event2, _target$value$event3, _target$value$event4, _target$value$event5, _target$value$event6, _target$value$group;
+      var _target$value$event2, _target$value$event3, _target$value$event4, _target$value$event5, _target$value$event6, _target$value$group2;
 
       if (!target || !target.value || !((_target$value$event2 = target.value.event) === null || _target$value$event2 === void 0 ? void 0 : _target$value$event2.id)) return;
+      var type = target.value.event.type;
+
+      if (!type) {
+        var _target$value$group;
+
+        type = ((_target$value$group = target.value.group) === null || _target$value$group === void 0 ? void 0 : _target$value$group.id) === -2 ? 'whole' : 'event';
+      }
+
       var data = {
-        type: target.value.event.type || 'event',
+        type: type,
         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) || '',
         eventId: (_target$value$event4 = target.value.event) === null || _target$value$event4 === void 0 ? void 0 : _target$value$event4.id,
         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),
-        eventGroupId: (_target$value$group = target.value.group) === null || _target$value$group === void 0 ? void 0 : _target$value$group.id,
+        eventGroupId: (_target$value$group2 = target.value.group) === null || _target$value$group2 === void 0 ? void 0 : _target$value$group2.id,
         analysisDimension: analysisDimension,
         filters: filterData,
         marked: target.value.event.marked,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.29-alpha.3",
+  "version": "1.1.29-alpha.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -59,5 +59,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "940068acefe01cd22f273ef59d3a51637919d5ff"
+  "gitHead": "92c367ccc1eddc3387d4cc8da77fff9b4f1a6f24"
 }