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

package/es/attributeSelector/types.d.ts

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

package/es/constants/common.d.ts

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

package/es/constants/common.js

@@ -4,26 +4,31 @@ export var BuiltinIndicators = {
   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: []
   }]

package/es/eventSelector/listPanel.js

@@ -96,7 +96,28 @@ var EventListPanel = function EventListPanel(props) {
     setGroupList(function (list) {
       return props.showBuiltInTarget ? [group, BuiltinIndicators].concat(_toConsumableArray(list)) : [group].concat(_toConsumableArray(list));
     });
-    setCurrentGroup(group);
+    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;
+    });
   }, []);
   useEffect(function () {
     setCurrentValue(props.value);

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;
+          }
         }
       }
     }
@@ -217,7 +245,7 @@ var BizTargetCondition = function BizTargetCondition(props) {
 
       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: 'event',
+        type: target.value.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),

package/package.json

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