@zgfe/business-lib 1.1.34-insight.0 → 1.1.34-visual.10

package/es/attrConditions/demo/group.js

@@ -7,11 +7,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useRef, useState } from 'react';
 import { BizConditionGroup, DemoWrapper } from '@zgfe/business-lib';
 import { Button } from 'antd';
+import { OperateTypes } from '../types';
 var conditions = [{
   propCategory: 'userProp',
   attrId: 0,
   type: 2,
-  operator: 'gt',
+  operator: OperateTypes.GT,
   values: ['25200', '1'],
   attrName: 'duration',
   category: 'fixed',
@@ -19,7 +20,7 @@ var conditions = [{
 }, {
   propCategory: 'eventProp',
   type: 1,
-  operator: 'equal',
+  operator: OperateTypes.Equal,
   values: ['Safari', 'Apple WebKit'],
   attrId: 30183426
 }];

package/es/attrConditions/index.d.ts

@@ -1,6 +1,8 @@
 import React from 'react';
+import { AttributeSelect } from '../attributeSelector/types';
 import './styles/index.less';
-import { AttrConditionTypes } from './types';
+import { AttrConditionTypes, OperateTypes } from './types';
 export declare const classPrefix = "biz-condition-item";
+export declare function getCondition(attr: AttributeSelect.Value, operate: OperateTypes, values: string[]): AttrConditionTypes.ItemValue | undefined;
 declare const BizConditionItem: React.FC<AttrConditionTypes.ItemProp>;
 export default BizConditionItem;

package/es/attrConditions/index.js

@@ -12,6 +12,28 @@ import BizOperateList from './components/operateList';
 import ValuesList from './components/valuesList';
 import { Skeleton } from 'antd';
 export var classPrefix = 'biz-condition-item';
+export function getCondition(attr, operate, values) {
+  if (!attr) return;
+  var responseData = {
+    attrId: attr.id,
+    propCategory: attr.propCategory,
+    type: attr.type,
+    operator: operate,
+    values: values || [],
+    dimensionSub: attr.dimensionSub,
+    label: attr.label
+  };
+  if (attr.propCategory === PropCategory.EventProp) {
+    responseData.attrName = attr.label;
+  } else {
+    responseData.attrName = attr.name;
+    responseData.category = attr.category;
+    if (attr.propCategory === PropCategory.UserProp && attr.subtype) {
+      responseData.subtype = attr.subtype;
+    }
+  }
+  return responseData;
+}
 var BizConditionItem = function BizConditionItem(props) {
   var _props$defaultValue, _props$value, _props$defaultValue2, _props$value2;
   var defaultValue = props.defaultValue,
@@ -79,25 +101,7 @@ var BizConditionItem = function BizConditionItem(props) {
   useEffect(function () {
     if (props.onChange) {
       if (!attr) return;
-      var responseData = {
-        attrId: attr.id,
-        propCategory: attr.propCategory,
-        type: attr.type,
-        operator: operate,
-        values: values || [],
-        dimensionSub: attr.dimensionSub,
-        label: attr.alias || attr.label
-      };
-      if (attr.propCategory === PropCategory.EventProp) {
-        responseData.attrName = attr.label;
-      } else {
-        responseData.attrName = attr.name;
-        responseData.category = attr.category;
-        if (attr.propCategory === PropCategory.UserProp && attr.subtype) {
-          responseData.subtype = attr.subtype;
-        }
-      }
-      props.onChange(responseData);
+      props.onChange(getCondition(attr, operate, values));
     }
   }, [attr, operate, values]);
   var onChangeAttr = function onChangeAttr(attrData) {

package/es/attrConditions/types.d.ts

@@ -18,7 +18,7 @@ export declare namespace AttrConditionTypes {
         propCategory?: 'userProp' | 'eventProp' | 'envProp';
         category?: 'fixed' | 'custom';
         dimensionSub?: string;
-        operator?: string;
+        operator?: OperateTypes;
         values?: string[];
     }
     interface GroupValue {

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;
@@ -63,6 +61,8 @@ export interface PropGroups {
     eventGroupList?: EventGroup[];
     userPropList?: UserProp[];
     envPropList?: EnvProp[];
+    eventNameMap?: Record<string, AnalysisEvent>;
+    eventIdMap?: Record<number, AnalysisEvent>;
 }
 export declare namespace AttributeSelect {
     type Value = EventProp | UserProp | EnvProp | null;

package/es/attributeSelector/util.js

@@ -3,7 +3,9 @@ export default function convertAttributeData(store) {
   var res = {
     envPropList: [],
     eventGroupList: [],
-    userPropList: []
+    userPropList: [],
+    eventNameMap: {},
+    eventIdMap: {}
   };
   (_store$eventList = store.eventList) === null || _store$eventList === void 0 ? void 0 : _store$eventList.forEach(function (group_) {
     var _res$eventGroupList;
@@ -39,6 +41,8 @@ export default function convertAttributeData(store) {
         eventHidden: e.event_hidden,
         marked: Boolean(e.mark_type)
       };
+      res.eventNameMap[event.name] = event;
+      res.eventIdMap[event.id] = event;
       if (event.marked) {
         markList.push(event);
       } else {

package/es/context/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { EventGroup, UserProp, EnvProp } from '../attributeSelector/types';
+import { EventGroup, UserProp, EnvProp, AnalysisEvent } from '../attributeSelector/types';
 export interface AppInfoProps {
     appId?: string | number;
     platform?: string | number;
@@ -24,6 +24,8 @@ export interface Menu {
 export interface GlobalContextProps {
     userGroupList?: Array<any>;
     eventGroupList?: EventGroup[];
+    eventNameMap?: Record<string, AnalysisEvent>;
+    eventIdMap?: Record<number, AnalysisEvent>;
     userPropList?: UserProp[];
     eventEnvList?: EnvProp[];
     menuNameMap?: {

package/es/demoWrapper/content.js

@@ -175,6 +175,8 @@ var DemoContent = function DemoContent(_ref3) {
       eventGroupList: store === null || store === void 0 ? void 0 : store.eventGroupList,
       userPropList: store === null || store === void 0 ? void 0 : store.userPropList,
       eventEnvList: store === null || store === void 0 ? void 0 : store.envPropList,
+      eventIdMap: store === null || store === void 0 ? void 0 : store.eventIdMap,
+      eventNameMap: store === null || store === void 0 ? void 0 : store.eventNameMap,
       userGroupList: userGroups
     }
   }, children));

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);

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/socket/index.d.ts

@@ -8,11 +8,12 @@ declare class SocketClient {
     private showLog;
     private pingTimer?;
     private appkey?;
+    private token?;
     constructor(url: string, appkey: string, params?: Record<string, any>);
     emit(event: string, payload?: SocketClientTypes.Message['data']['payload']): void;
     on<T>(type: SocketClientTypes.EventType | string, handle: (data?: T) => void): void;
-    onConnected(handle: () => void): void;
-    onDisconnected(handle: () => void): void;
+    onConnected(handle: (data?: any) => void): void;
+    onDisconnected(handle: (data?: any) => void): void;
     onError(handle: (data?: Error) => void): void;
     private _onError;
     private _onClose;
@@ -21,11 +22,12 @@ declare class SocketClient {
     private ping;
     removeAllListeners(): void;
     removeListener(event: string, handle?: (data?: any) => void): void;
-    private getToken;
+    private _getToken;
     open(url?: string, params?: Record<string, any>): void;
     close(): void;
     destroy(): void;
     private log;
     openLog(open: boolean): void;
+    getToken(): string | undefined;
 }
 export default SocketClient;

package/es/socket/index.js

@@ -29,6 +29,7 @@ var SocketClient = /*#__PURE__*/function () {
     this.showLog = false;
     this.pingTimer = void 0;
     this.appkey = void 0;
+    this.token = void 0;
     this.appkey = appkey;
     this.url = url;
     this.params = params;
@@ -122,7 +123,7 @@ var SocketClient = /*#__PURE__*/function () {
         _this = this;
       this.log('info', 'socket连接成功', event);
       (_this$listeners$conne = this.listeners['connected']) === null || _this$listeners$conne === void 0 ? void 0 : _this$listeners$conne.forEach(function (handle) {
-        handle.call(undefined);
+        handle.call(undefined, _this.token);
       });
       this.log('info', 'clear catch', this.catch);
       this.catch.forEach(function (_ref) {
@@ -137,7 +138,7 @@ var SocketClient = /*#__PURE__*/function () {
   }, {
     key: "onMessage",
     value: function onMessage(event) {
-      var _this$listeners$Socke, _this$listeners$Socke2, _this$listeners$Socke3;
+      var _this$listeners$Socke, _this$listeners$Socke2, _this$listeners$Socke3, _this$listeners$unkno;
       var res = JSON.parse(event.data);
       if (res.code) {
         switch (Number(res.code)) {
@@ -158,6 +159,10 @@ var SocketClient = /*#__PURE__*/function () {
             break;
           case SocketClientTypes.ResponseCode.paramError:
             this._onError(new Error('参数缺失或错误'));
+          default:
+            (_this$listeners$unkno = this.listeners['unknownCode']) === null || _this$listeners$unkno === void 0 ? void 0 : _this$listeners$unkno.forEach(function (handle) {
+              handle.call(undefined, res);
+            });
         }
       } else if (res.type === SocketClientTypes.RequestType.pong) {
         return;
@@ -191,7 +196,8 @@ var SocketClient = /*#__PURE__*/function () {
     value: function removeListener(event, handle) {
       var _this3 = this;
       if (handle) {
-        this.listeners[event].forEach(function (item, i) {
+        var _this$listeners$event;
+        (_this$listeners$event = this.listeners[event]) === null || _this$listeners$event === void 0 ? void 0 : _this$listeners$event.forEach(function (item, i) {
           if (item === handle) {
             _this3.listeners[event].splice(i, 1);
           }
@@ -201,9 +207,9 @@ var SocketClient = /*#__PURE__*/function () {
       }
     }
   }, {
-    key: "getToken",
+    key: "_getToken",
     value: function () {
-      var _getToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _getToken2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var res;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -224,21 +230,23 @@ var SocketClient = /*#__PURE__*/function () {
           }
         }, _callee, this);
       }));
-      function getToken() {
-        return _getToken.apply(this, arguments);
+      function _getToken() {
+        return _getToken2.apply(this, arguments);
       }
-      return getToken;
+      return _getToken;
     }()
   }, {
     key: "open",
     value: function open(url, params) {
       var _this4 = this;
-      this.getToken().then(function (token) {
+      this._getToken().then(function (token) {
         _this4.params = params || _this4.params;
+        _this4.token = token;
         if (_this4.client) _this4.close();
         var paramUrl = ["socketToken=".concat(token)];
         if (_this4.params) {
-          Object.keys(_this4.params || {}).forEach(function (key) {
+          var _Object$keys;
+          (_Object$keys = Object.keys(_this4.params || {})) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (key) {
             if (_.isObject(_this4.params[key]) || _.isArray(_this4.params[key])) {
               paramUrl.push("".concat(key, "=").concat(JSON.stringify(_this4.params[key])));
             } else {
@@ -285,6 +293,11 @@ var SocketClient = /*#__PURE__*/function () {
     value: function openLog(open) {
       this.showLog = open;
     }
+  }, {
+    key: "getToken",
+    value: function getToken() {
+      return this.token;
+    }
   }]);
   return SocketClient;
 }();

package/es/targetConditionGroup/data/operates.js

@@ -43,6 +43,9 @@ export var attrOptions = [{
 }, {
   label: '均值',
   value: 'avg'
+}, {
+  label: '分布',
+  value: 'duration_times'
 }, {
   label: '中位数',
   value: 'median'

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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.34-insight.0",
+  "version": "1.1.34-visual.10",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -59,5 +59,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "185b4ce5d7e0357c05227260e024659d88b31547"
+  "gitHead": "211636a80ee9071213fc580c4473aafef846f2a5"
 }

package/es/constants/common.d.ts

@@ -1,11 +0,0 @@
-export declare const BuiltinIndicators: {
-    id: number;
-    name: string;
-    eventList: {
-        name: string;
-        id: number;
-        type: string;
-        isBuiltIn: boolean;
-        attrList: never[];
-    }[];
-};

package/es/constants/common.js

@@ -1,35 +0,0 @@
-export var BuiltinIndicators = {
-  id: -2,
-  name: '整体',
-  eventList: [{
-    name: '新增用户',
-    id: -201,
-    type: 'add',
-    isBuiltIn: true,
-    attrList: []
-  }, {
-    name: '活跃用户',
-    id: -202,
-    type: 'active',
-    isBuiltIn: true,
-    attrList: []
-  }, {
-    name: '访问次数',
-    id: -203,
-    type: 'times',
-    isBuiltIn: true,
-    attrList: []
-  }, {
-    name: '平均使用时长',
-    id: -204,
-    type: 'duration_avg',
-    isBuiltIn: true,
-    attrList: []
-  }, {
-    name: '使用时长分布',
-    id: -205,
-    type: 'duration',
-    isBuiltIn: true,
-    attrList: []
-  }]
-};