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

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) {
@@ -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;
+          }
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.29-alpha.2",
+  "version": "1.1.29-alpha.3",
   "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": "940068acefe01cd22f273ef59d3a51637919d5ff"
 }