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

package/es/targetConditionGroup/index.js

@@ -1,3 +1,9 @@
+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; }
+
+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; }
+
+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; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 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."); }
@@ -18,6 +24,7 @@ import BizConditionGroup from '../attrConditions/group';
 import { Skeleton } from 'antd';
 import _ from 'lodash';
 import BizGlobalDataContext from '../context';
+import { BuiltinIndicators } from '../constants/common';
 export var classPrefix = 'biz-target';
 
 var BizTargetCondition = function BizTargetCondition(props) {
@@ -98,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 {
@@ -142,31 +149,52 @@ var BizTargetCondition = function BizTargetCondition(props) {
         };
       }
 
-      if (data.eventId === -100) {
-        target.value.event = {
-          id: -100,
-          name: '事件概览',
-          attrList: []
-        };
+      var hasEvent = false;
+
+      if (data.isBuiltIn || data.eventId < 0) {
+        if (data.eventGroupId) {
+          target.value.group = {
+            id: data.eventGroupId,
+            name: data.eventGroupId === -2 ? '整体' : '所有分组',
+            eventList: []
+          };
+        }
+
+        BuiltinIndicators.eventList.forEach(function (item) {
+          if (item.id === data.eventId) {
+            target.value.event = _objectSpread({}, item);
+            hasEvent = true;
+          }
+        });
       }
 
-      for (var i = 0; i < eventGroupList.length; i++) {
-        var group = eventGroupList[i];
+      if (!hasEvent) {
+        if (data.eventId === -100) {
+          target.value.event = {
+            id: -100,
+            name: '事件概览',
+            attrList: []
+          };
+        }
+
+        for (var i = 0; i < eventGroupList.length; i++) {
+          var group = eventGroupList[i];
 
-        if (data.eventId !== -100) {
-          for (var j = 0; j < group.eventList.length; j++) {
-            var event = group.eventList[j];
+          if (data.eventId !== -100) {
+            for (var j = 0; j < group.eventList.length; j++) {
+              var event = group.eventList[j];
 
-            if (event.id === data.eventId) {
-              target.value.event = event;
-              break;
+              if (event.id === data.eventId) {
+                target.value.event = event;
+                break;
+              }
             }
           }
-        }
 
-        if (data.eventGroupId && data.eventGroupId === group.id) {
-          target.value.group = group;
-          break;
+          if (data.eventGroupId && data.eventGroupId === group.id) {
+            target.value.group = group;
+            break;
+          }
         }
       }
     }
@@ -175,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);
@@ -213,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.2",
+  "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": "5fc87bd92fdba876713199dcb2b874c6156ea03c"
+  "gitHead": "92c367ccc1eddc3387d4cc8da77fff9b4f1a6f24"
 }