@zgfe/business-lib 1.1.29-alpha.3 → 1.1.29-event.0

package/es/attrConditions/index.js

@@ -65,7 +65,6 @@ var BizConditionItem = function BizConditionItem(props) {
             propCategory: data.propCategory,
             type: data.type,
             key: data.attrId,
-            label: data.label,
             dimensionSub: data.dimensionSub || 'event_attr'
           };
         }
@@ -75,7 +74,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/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

@@ -49,7 +49,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

@@ -16,7 +16,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) {
@@ -56,7 +55,6 @@ var BizEventSelector = function BizEventSelector(props) {
     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 = {
@@ -64,7 +62,7 @@ var BizEventSelector = function BizEventSelector(props) {
         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;
@@ -80,7 +78,7 @@ var BizEventSelector = function BizEventSelector(props) {
       };
     }
 
-    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;
@@ -133,7 +131,6 @@ var BizEventSelector = function BizEventSelector(props) {
       value: currentValue,
       onChange: onChange,
       showOverview: showAllEvent,
-      showBuiltInTarget: props.showBuiltInTarget,
       defaultSelectAble: defaultSelectAble
     }),
     trigger: ['click'],

package/es/eventSelector/listPanel.js

@@ -25,7 +25,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';
 
@@ -88,36 +87,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);
@@ -218,12 +196,21 @@ var InfiniteScrollList = function InfiniteScrollList(_ref) {
       showList = _useState12[0],
       setShowList = _useState12[1];
 
+  var _useState13 = useState([]),
+      _useState14 = _slicedToArray(_useState13, 2),
+      canShowList = _useState14[0],
+      setCanShowList = _useState14[1];
+
   useEffect(function () {
-    setShowList(searchEventList.slice(0, 10));
+    var data = searchEventList.filter(function (item) {
+      return item.eventHidden !== ShowStatus.hidden;
+    });
+    setCanShowList(data);
+    setShowList(data.slice(0, 10));
   }, [searchEventList]);
 
   var loadMoreData = function loadMoreData() {
-    var moreData = searchEventList.slice(showList.length, showList.length + 10);
+    var moreData = canShowList.slice(showList.length, showList.length + 10);
     setShowList(function (list) {
       return [].concat(_toConsumableArray(list), _toConsumableArray(moreData));
     });
@@ -231,7 +218,7 @@ var InfiniteScrollList = function InfiniteScrollList(_ref) {
 
   return /*#__PURE__*/React.createElement(InfiniteScroll, {
     dataLength: showList.length,
-    hasMore: showList.length < searchEventList.length,
+    hasMore: showList.length < canShowList.length,
     loader: /*#__PURE__*/React.createElement(Skeleton, {
       paragraph: {
         rows: 1
@@ -245,7 +232,6 @@ var InfiniteScrollList = function InfiniteScrollList(_ref) {
   }, 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

@@ -59,7 +59,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 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."); }
@@ -24,11 +18,10 @@ 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$ev, _targetData$value3, _targetData$value3$ev, _targetData$value4, _targetData$value4$ev, _targetData$value5, _targetData$value5$ev, _targetData$value6, _targetData$value6$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;
 
@@ -99,12 +92,12 @@ 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) {
+      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;
@@ -149,52 +142,31 @@ var BizTargetCondition = function BizTargetCondition(props) {
         };
       }
 
-      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];
+      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;
         }
       }
     }
@@ -203,13 +175,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$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$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$eve2 = _targetData$value.event) === null || _targetData$value$eve2 === void 0 ? void 0 : _targetData$value$eve2.id)) {
       filterData = undefined;
       setFilters(undefined);
       setIsAdd(false);
@@ -239,21 +211,20 @@ var BizTargetCondition = function BizTargetCondition(props) {
     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$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 data = {
-        type: target.value.event.type || 'event',
+        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$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);
     }
@@ -287,17 +258,17 @@ 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$ev = _targetData$value2.event) === null || _targetData$value2$ev === void 0 ? void 0 : _targetData$value2$ev.isBuiltIn) ? /*#__PURE__*/React.createElement(BizTargetDimension, {
-    eventId: (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) ? 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 : 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
-  }) : null), (filters || isAdd) && /*#__PURE__*/React.createElement(BizConditionGroup, {
+  })), (filters || isAdd) && /*#__PURE__*/React.createElement(BizConditionGroup, {
     ref: conditionRef,
     value: filters,
     onlyAnd: props.onlyAnd,
     enableEventProp: true,
     enableDelete: true,
-    eventIdList: (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) ? [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] : 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.29-alpha.3",
+  "version": "1.1.29-event.0",
   "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": "c4a8d584a2272975b8bb38a2bca14aca7272012a"
 }

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: []
-  }]
-};