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

package/es/attrConditions/index.js

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

@@ -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

@@ -217,7 +217,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.0",
+  "version": "1.1.29-alpha.2",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -59,5 +59,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "82c988eaa3782ab52001ddcbf335fb3d2e05056f"
+  "gitHead": "5fc87bd92fdba876713199dcb2b874c6156ea03c"
 }