@zgfe/business-lib 1.1.30-insight.0 → 1.1.31-alpha.0

package/es/assets/styles/resetAntd.less

@@ -16,8 +16,12 @@
     border-color: @primary-color!important;
   }
 
-  &.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless):not(.ant-input-affix-wrapper-focused).ant-input-affix-wrapper,
-  &.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless):not(.ant-input-affix-wrapper-focused).ant-input-affix-wrapper:hover {
+  &.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(
+      .ant-input-affix-wrapper-borderless
+    ):not(.ant-input-affix-wrapper-focused).ant-input-affix-wrapper,
+  &.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(
+      .ant-input-affix-wrapper-borderless
+    ):not(.ant-input-affix-wrapper-focused).ant-input-affix-wrapper:hover {
     background-color: @background-color-base!important;
   }
 }
@@ -31,8 +35,12 @@
   }
 }
 
-.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper,
-.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper:hover {
+.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(
+    .ant-input-affix-wrapper-borderless
+  ).ant-input-affix-wrapper,
+.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(
+    .ant-input-affix-wrapper-borderless
+  ).ant-input-affix-wrapper:hover {
   border-color: @error-color!important;
 }
 // 输入框
@@ -62,7 +70,9 @@
   background-color: @background-color-base!important;
 }
 
-.ant-select:not(.ant-select-customize-input):not(.ant-pagination-size-changer):not(.ant-select-status-error)
+.ant-select:not(.ant-select-customize-input):not(.ant-pagination-size-changer):not(
+    .ant-select-status-error
+  )
   .ant-select-selector {
   background: #fafafb;
   border-color: rgba(0, 0, 0, 0);
@@ -229,7 +239,9 @@
     /*日期hover*/
     &:hover {
       &:not(.ant-picker-cell-in-view) .ant-picker-cell-inner,
-      &:not(.ant-picker-cell-selected):not(.ant-picker-cell-range-start):not(.ant-picker-cell-range-end):not(.ant-picker-cell-range-hover-start):not(.ant-picker-cell-range-hover-end)
+      &:not(.ant-picker-cell-selected):not(.ant-picker-cell-range-start):not(
+          .ant-picker-cell-range-end
+        ):not(.ant-picker-cell-range-hover-start):not(.ant-picker-cell-range-hover-end)
         .ant-picker-cell-inner {
         background-color: transparent !important;
         border: 1px solid @primary-color!important;
@@ -239,9 +251,13 @@
 
   /*选中的日期范围*/
   /* 日期范围的起始时间radius */
-  .ant-picker-cell-in-view.ant-picker-cell-range-start:not(.ant-picker-cell-range-start-single):not(.ant-picker-cell-range-end)
+  .ant-picker-cell-in-view.ant-picker-cell-range-start:not(.ant-picker-cell-range-start-single):not(
+      .ant-picker-cell-range-end
+    )
     .ant-picker-cell-inner,
-  .ant-picker-cell-in-view.ant-picker-cell-range-end:not(.ant-picker-cell-range-end-single):not(.ant-picker-cell-range-start)
+  .ant-picker-cell-in-view.ant-picker-cell-range-end:not(.ant-picker-cell-range-end-single):not(
+      .ant-picker-cell-range-start
+    )
     .ant-picker-cell-inner {
     border-radius: 50% !important;
   }
@@ -272,8 +288,12 @@
   .ant-picker-cell-in-view.ant-picker-cell-in-range.ant-picker-cell-range-hover::before,
   .ant-picker-cell-in-view.ant-picker-cell-range-start.ant-picker-cell-range-hover::before,
   .ant-picker-cell-in-view.ant-picker-cell-range-end.ant-picker-cell-range-hover::before,
-  .ant-picker-cell-in-view.ant-picker-cell-range-start:not(.ant-picker-cell-range-start-single).ant-picker-cell-range-hover-start::before,
-  .ant-picker-cell-in-view.ant-picker-cell-range-end:not(.ant-picker-cell-range-end-single).ant-picker-cell-range-hover-end::before,
+  .ant-picker-cell-in-view.ant-picker-cell-range-start:not(
+      .ant-picker-cell-range-start-single
+    ).ant-picker-cell-range-hover-start::before,
+  .ant-picker-cell-in-view.ant-picker-cell-range-end:not(
+      .ant-picker-cell-range-end-single
+    ).ant-picker-cell-range-hover-end::before,
   .ant-picker-panel
     > :not(.ant-picker-date-panel)
     .ant-picker-cell-in-view.ant-picker-cell-in-range.ant-picker-cell-range-hover-start::before,
@@ -296,8 +316,12 @@
       }
     }
   }
-  .ant-picker-cell-in-view.ant-picker-cell-range-start:not(.ant-picker-cell-range-start-single)::before,
-  .ant-picker-cell-in-view.ant-picker-cell-range-end:not(.ant-picker-cell-range-end-single)::before {
+  .ant-picker-cell-in-view.ant-picker-cell-range-start:not(
+      .ant-picker-cell-range-start-single
+    )::before,
+  .ant-picker-cell-in-view.ant-picker-cell-range-end:not(
+      .ant-picker-cell-range-end-single
+    )::before {
     background: @primary-color-hover !important;
   }
 }

package/es/attrConditions/index.js

@@ -50,7 +50,6 @@ var BizConditionItem = function BizConditionItem(props) {
             propCategory: data.propCategory,
             type: data.type,
             key: data.attrId,
-            label: data.label,
             dimensionSub: data.dimensionSub || 'event_attr'
           };
         }
@@ -60,7 +59,6 @@ var BizConditionItem = function BizConditionItem(props) {
           attrData = {
             id: aId,
             name: data.attrName,
-            label: data.label,
             propCategory: data.propCategory,
             type: data.type,
             category: data.category,

package/es/attrConditions/utils/operates.d.ts

@@ -6,6 +6,56 @@ export declare const numberOperate: {
     name: string;
     value: string;
 }[];
+export declare const computeTypeList: {
+    value: string;
+    name: string;
+}[];
+export declare const typeList: {
+    'cont-string': {
+        name: string;
+        value: string;
+    }[];
+    'cont-date': {
+        name: string;
+        value: string;
+    }[];
+    'cont-num': {
+        name: string;
+        value: string;
+    }[];
+};
+export declare const timeDimensionType: {
+    name: string;
+    value: number;
+}[];
+export declare const orderTypeList: {
+    name: string;
+    value: string;
+}[];
+export declare const skyTimeOperatorType: {
+    name: string;
+    value: string;
+}[];
+export declare const weekTimeOperatorType: {
+    name: string;
+    value: string;
+}[];
+export declare const monthTimeOperatorType: {
+    name: string;
+    value: string;
+}[];
+export declare const timeValuesType: {
+    name: string;
+    value: any;
+}[];
+export declare const weekValuesType: {
+    name: string;
+    value: number;
+}[];
+export declare const monthValuesType: {
+    name: string;
+    value: any;
+}[];
 export declare const dateOperate: {
     name: string;
     value: string;

package/es/attrConditions/utils/operates.js

@@ -1,3 +1,4 @@
+var _Array$from, _Array$from2;
 export var stringOperate = [{
   name: '是',
   value: 'equal'
@@ -48,6 +49,131 @@ export var numberOperate = [{
   name: '≠',
   value: 'not equal'
 }];
+export var computeTypeList = [{
+  value: 'origin',
+  name: '原值'
+}, {
+  value: 'max',
+  name: '最大值'
+}, {
+  value: 'min',
+  name: '最小值'
+}, {
+  value: 'sum',
+  name: '累计值'
+}, {
+  value: 'avg',
+  name: '平均值'
+}];
+export var typeList = {
+  'cont-string': stringOperate,
+  'cont-date': [{
+    name: '最近',
+    value: 'relative'
+  }, {
+    name: '最近区间',
+    value: 'relativeInterval'
+  }, {
+    name: '未来',
+    value: 'future'
+  }, {
+    name: '未来区间',
+    value: 'futureInterval'
+  }, {
+    name: '固定时段',
+    value: 'absolute'
+  }],
+  'cont-num': [{
+    name: '>',
+    value: '>'
+  }, {
+    name: '=',
+    value: '='
+  }, {
+    name: '<',
+    value: '<'
+  }, {
+    name: '>=',
+    value: '>='
+  }, {
+    name: '<=',
+    value: '<='
+  }, {
+    name: '≠',
+    value: 'not equal'
+  }, {
+    name: '区间',
+    value: 'between'
+  }]
+};
+export var timeDimensionType = [{
+  name: '每天',
+  value: 1
+}, {
+  name: '每周',
+  value: 2
+}, {
+  name: '每月',
+  value: 3
+}];
+export var orderTypeList = [{
+  name: '主订单',
+  value: 'master'
+}, {
+  name: '子订单',
+  value: 'son'
+}];
+export var skyTimeOperatorType = [{
+  name: '整天',
+  value: 'all'
+}, {
+  name: '在',
+  value: 'in'
+}, {
+  name: '在区间',
+  value: 'between'
+}];
+export var weekTimeOperatorType = [{
+  name: '整周',
+  value: 'all'
+}, {
+  name: '在',
+  value: 'in'
+}, {
+  name: '在区间',
+  value: 'between'
+}];
+export var monthTimeOperatorType = [{
+  name: '整月',
+  value: 'all'
+}, {
+  name: '在',
+  value: 'in'
+}, {
+  name: '在区间',
+  value: 'between'
+}];
+var arr1 = new Array(24).keys();
+export var timeValuesType = (_Array$from = Array.from(arr1)) === null || _Array$from === void 0 ? void 0 : _Array$from.map(function (item) {
+  return {
+    name: item + '时',
+    value: item
+  };
+});
+var arr2 = ['一', '二', '三', '四', '五', '六', '日'];
+export var weekValuesType = arr2.map(function (item, index) {
+  return {
+    name: '周' + item,
+    value: index + 1
+  };
+});
+var arr3 = new Array(31).keys();
+export var monthValuesType = (_Array$from2 = Array.from(arr3)) === null || _Array$from2 === void 0 ? void 0 : _Array$from2.map(function (item) {
+  return {
+    name: item + 1 + '号',
+    value: item + 1
+  };
+});
 export var dateOperate = [{
   name: '最近',
   value: 'relative'

package/es/attributeSelector/types.d.ts

@@ -24,8 +24,6 @@ export interface AnalysisEvent {
     isOverview?: boolean;
     eventHidden?: ShowStatus;
     marked?: boolean;
-    isBuiltIn?: boolean;
-    type?: string;
 }
 export interface EventGroup {
     id: number;

package/es/eventSelector/demo/index.js

@@ -39,7 +39,6 @@ var EventDemo = function EventDemo() {
       eventGroupList: store.eventGroupList
     }
   }, /*#__PURE__*/React.createElement(BizEventSelector, {
-    showBuiltInTarget: true,
     defaultValue: value,
     alias: "\u522B\u540D",
     onChange: onChange

package/es/eventSelector/index.js

@@ -10,7 +10,6 @@ import SelectHandle from '../select/handle';
 import BizGlobalDataContext from '../context';
 import EventListPanel from './listPanel';
 import './styles/index.less';
-import { BuiltinIndicators } from '../constants/common';
 export var classPrefix = 'biz-event-select';
 var BizEventSelector = function BizEventSelector(props) {
   var alias = props.alias,
@@ -43,14 +42,13 @@ var BizEventSelector = function BizEventSelector(props) {
   var getValue = function getValue(param) {
     var _param$group, _param$event;
     var res = {};
-    var allEvents = props.showBuiltInTarget ? eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.concat(BuiltinIndicators) : eventGroupList;
     if (!((_param$group = param.group) === null || _param$group === void 0 ? void 0 : _param$group.id)) {
       res.group = {
         id: 0,
         name: '所有分组',
         eventList: function () {
           var list = [];
-          allEvents === null || allEvents === void 0 ? void 0 : allEvents.forEach(function (group) {
+          eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
             list = list.concat(group.eventList);
           });
           return list;
@@ -64,7 +62,7 @@ var BizEventSelector = function BizEventSelector(props) {
         attrList: []
       };
     }
-    allEvents === null || allEvents === void 0 ? void 0 : allEvents.forEach(function (group) {
+    eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
       var _param$group2;
       if (group.id === ((_param$group2 = param.group) === null || _param$group2 === void 0 ? void 0 : _param$group2.id)) res.group = group;
       group.eventList.forEach(function (event) {
@@ -106,7 +104,6 @@ var BizEventSelector = function BizEventSelector(props) {
       value: currentValue,
       onChange: onChange,
       showOverview: showAllEvent,
-      showBuiltInTarget: props.showBuiltInTarget,
       defaultSelectAble: defaultSelectAble
     }),
     trigger: ['click'],

package/es/eventSelector/listPanel.js

@@ -15,7 +15,6 @@ import InfiniteScroll from 'react-infinite-scroll-component';
 import { classPrefix } from '.';
 import { BizGlobalDataContext } from '..';
 import { ShowStatus } from '../attributeSelector/types';
-import { BuiltinIndicators } from '../constants/common';
 import BizSearchInput from '../searchInput';
 import EventListOption from './option';
 var EventListPanel = function EventListPanel(props) {
@@ -69,33 +68,15 @@ var EventListPanel = function EventListPanel(props) {
             }
           });
         });
-        list = props.showBuiltInTarget ? [].concat(_toConsumableArray(BuiltinIndicators.eventList), markList, _toConsumableArray(list)) : [].concat(markList, _toConsumableArray(list));
+        list = [].concat(markList, _toConsumableArray(list));
         return list;
       }(),
       name: '所有分组'
     };
     setGroupList(function (list) {
-      return props.showBuiltInTarget ? [group, BuiltinIndicators].concat(_toConsumableArray(list)) : [group].concat(_toConsumableArray(list));
-    });
-    setCurrentGroup(function () {
-      var _props$value;
-      if (props.defaultSelectAble && ((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.group)) {
-        if (props.showBuiltInTarget && props.value.group.id === -2) {
-          return BuiltinIndicators;
-        } else {
-          var _currentGroup = group;
-          eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (eGroup) {
-            var _props$value2, _props$value2$group;
-            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)) {
-              _currentGroup = eGroup;
-              return;
-            }
-          });
-          return _currentGroup;
-        }
-      }
-      return group;
+      return [group].concat(_toConsumableArray(list));
     });
+    setCurrentGroup(group);
   }, []);
   useEffect(function () {
     setCurrentValue(props.value);
@@ -185,26 +166,18 @@ var InfiniteScrollList = function InfiniteScrollList(_ref) {
     _useState12 = _slicedToArray(_useState11, 2),
     showList = _useState12[0],
     setShowList = _useState12[1];
-  var _useState13 = useState([]),
-    _useState14 = _slicedToArray(_useState13, 2),
-    canShowList = _useState14[0],
-    setCanShowList = _useState14[1];
   useEffect(function () {
-    var data = searchEventList.filter(function (item) {
-      return item.eventHidden !== ShowStatus.hidden;
-    });
-    setCanShowList(data);
-    setShowList(data.slice(0, 10));
+    setShowList(searchEventList.slice(0, 10));
   }, [searchEventList]);
   var loadMoreData = function loadMoreData() {
-    var moreData = canShowList.slice(showList.length, showList.length + 10);
+    var moreData = searchEventList.slice(showList.length, showList.length + 10);
     setShowList(function (list) {
       return [].concat(_toConsumableArray(list), _toConsumableArray(moreData));
     });
   };
   return /*#__PURE__*/React.createElement(InfiniteScroll, {
     dataLength: showList.length,
-    hasMore: showList.length < canShowList.length,
+    hasMore: showList.length < searchEventList.length,
     loader: /*#__PURE__*/React.createElement(Skeleton, {
       paragraph: {
         rows: 1
@@ -217,6 +190,7 @@ var InfiniteScrollList = function InfiniteScrollList(_ref) {
     key: Math.random()
   }, showList.map(function (e) {
     var _currentValue$event2;
+    if (e.eventHidden === ShowStatus.hidden) return null;
     return /*#__PURE__*/React.createElement(EventListOption, {
       label: e.alias || e.name,
       key: "".concat(currentGroup === null || currentGroup === void 0 ? void 0 : currentGroup.id, "-").concat(e.id),

package/es/eventSelector/types.d.ts

@@ -23,7 +23,6 @@ export declare namespace EventSelectTypes {
         showAllEvent?: boolean;
         defaultSelectAble?: boolean;
         popupContainer?: boolean;
-        showBuiltInTarget?: boolean;
         onVisibleChange?: (visible: boolean) => void;
         border?: boolean;
         theme?: string;
@@ -34,7 +33,6 @@ export declare namespace EventSelectTypes {
     interface DropdownProps {
         value?: Value;
         showOverview?: boolean;
-        showBuiltInTarget?: boolean;
         defaultSelectAble?: boolean;
         onChange?: (value: Value, isOverview?: boolean) => void;
     }

package/es/targetConditionGroup/demo/index.js

@@ -51,7 +51,6 @@ export default (function () {
     max: 3
   }, /*#__PURE__*/React.createElement(BizEventSelector, {
     showAllEvent: true,
-    border: false,
-    showBuiltInTarget: true
+    border: false
   }))), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(target)));
 });

package/es/targetConditionGroup/index.js

@@ -1,9 +1,3 @@
-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); }
-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) { 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; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-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); }
 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."); }
 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); }
@@ -18,10 +12,9 @@ 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) {
-  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;
+  var _targetData$value2, _targetData$value2$ev, _targetData$value3, _targetData$value3$ev, _targetData$value4, _targetData$value4$ev, _targetData$value5, _targetData$value5$ev;
   var max = props.max;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -76,14 +69,14 @@ var BizTargetCondition = function BizTargetCondition(props) {
   }, []);
   useEffect(function () {
     if (targetData === null || targetData === void 0 ? void 0 : targetData.value) {
-      var _targetData$value$eve, _targetData$value$eve2, _targetData$value$eve3;
+      var _targetData$value$eve;
       var canAdd = true,
         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, _targetData$value$eve4;
+      if (((_targetData$value$eve = targetData.value.event) === null || _targetData$value$eve === void 0 ? void 0 : _targetData$value$eve.id) === -100) {
+        var _targetData$value$gro;
         canAdd = false;
         setFilters(undefined);
-        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) {
+        if (!((_targetData$value$gro = targetData.value.group) === null || _targetData$value$gro === void 0 ? void 0 : _targetData$value$gro.id)) {
           canDelete = false;
         }
       } else {
@@ -116,55 +109,37 @@ var BizTargetCondition = function BizTargetCondition(props) {
           eventList: []
         };
       }
-      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;
-          }
-        });
+      if (data.eventId === -100) {
+        target.value.event = {
+          id: -100,
+          name: '事件概览',
+          attrList: []
+        };
       }
-      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 (event.id === data.eventId) {
-                target.value.event = event;
-                break;
-              }
+      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 (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;
         }
       }
     }
     return target;
   };
   var onChangeTarget = function onChangeTarget(target) {
-    var _target$value, _target$value$event, _targetData$value, _targetData$value$eve5;
+    var _target$value, _target$value$event, _targetData$value, _targetData$value$eve2;
     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$eve5 = _targetData$value.event) === null || _targetData$value$eve5 === void 0 ? void 0 : _targetData$value$eve5.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$eve2 = _targetData$value.event) === null || _targetData$value$eve2 === void 0 ? void 0 : _targetData$value$eve2.id)) {
       filterData = undefined;
       setFilters(undefined);
       setIsAdd(false);
@@ -188,25 +163,19 @@ var BizTargetCondition = function BizTargetCondition(props) {
     setFilters(data);
     onChange(dimension, targetData, data);
   };
-  var onChange = function onChange(analysisDimension, target, filterData) {
+  var onChange = function onChange(analysisDimension, target, filterDatas) {
     if (props.onChange) {
-      var _target$value$event2, _target$value$event3, _target$value$event4, _target$value$event5, _target$value$event6, _target$value$group2;
+      var _target$value$event2, _target$value$event3, _target$value$event4, _target$value$event5, _target$value$event6, _target$value$group;
       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: type,
+        type: 'event',
         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$group2 = target.value.group) === null || _target$value$group2 === void 0 ? void 0 : _target$value$group2.id,
+        eventGroupId: (_target$value$group = target.value.group) === null || _target$value$group === void 0 ? void 0 : _target$value$group.id,
         analysisDimension: analysisDimension,
-        filters: filterData,
-        marked: target.value.event.marked,
-        isBuiltIn: target.value.event.isBuiltIn
+        filters: filterDatas,
+        marked: target.value.event.marked
       };
       props.onChange(data);
     }
@@ -237,8 +206,8 @@ var BizTargetCondition = function BizTargetCondition(props) {
     onAdd: onAdd,
     onDelete: onDelete,
     onChange: onChangeTarget
-  }, 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, {
-    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,
+  }, props.children), /*#__PURE__*/React.createElement(BizTargetDimension, {
+    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,
     value: dimension,
     onChange: onChangeDimension
   })), (filters || isAdd) && /*#__PURE__*/React.createElement(BizConditionGroup, {
@@ -247,7 +216,7 @@ var BizTargetCondition = function BizTargetCondition(props) {
     onlyAnd: props.onlyAnd,
     enableEventProp: true,
     enableDelete: true,
-    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,
+    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,
     onChange: onChangeFilters,
     onConditionsCount: setCount
   })));

package/es/targetConditionGroup/types.d.ts

@@ -20,7 +20,6 @@ export declare namespace TargetConditionTypes {
         eventId: number;
         eventName?: string;
         eventGroupId?: number;
-        isBuiltIn?: boolean;
     }
     interface Props {
         defaultValue?: Value;