@zgfe/business-lib 1.2.6-session.1 → 1.2.7

package/es/attrCondition/demo/group.js

@@ -1,25 +1,6 @@
 import React, { useRef } from 'react';
 import { BizAttrConditionGroup, DemoWrapper } from '@zgfe/business-lib';
 import { Button } from 'antd';
-var extraList = [{
-  type: 'sessionProp',
-  name: 'Session属性',
-  attrList: [{
-    id: 'sa_duration',
-    label: 'Session时长',
-    propCategory: 'extraProp',
-    key: 'extraProp-sa_duration',
-    type: 2,
-    subtype: 2
-  }, {
-    id: 'se_duration',
-    label: '事件使用时长',
-    propCategory: 'extraProp',
-    key: 'extraProp-se_duration',
-    type: 2,
-    subtype: 2
-  }]
-}];
 export default (function () {
   var groupRef = useRef(null);
   var filter = {
@@ -34,14 +15,15 @@ export default (function () {
       operator: 'equal',
       attrName: 'is_anonymous'
     }, {
-      attrId: 'sa_duration',
-      propCategory: 'extraProp',
-      type: 2,
-      operator: 'gt',
-      values: ['158400', '1'],
-      label: 'Session时长',
-      attrName: 'Session时长',
-      subtype: 2
+      attrId: 0,
+      propCategory: 'userProp',
+      values: ['30', '1'],
+      dimensionSub: 'last_visit_time',
+      label: '最后一次访问时间',
+      type: 3,
+      category: 'fixed',
+      operator: 'relative',
+      attrName: 'last_visit_time'
     }],
     relation: 'and'
   };
@@ -56,7 +38,6 @@ export default (function () {
   }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     value: filter,
     ref: groupRef,
-    extra: extraList,
     enableDelete: true
   }), /*#__PURE__*/React.createElement("div", {
     style: {

package/es/attrCondition/demo/index.js

@@ -1,24 +1,5 @@
 import React from 'react';
 import { BizAttrCondition, DemoWrapper } from '@zgfe/business-lib';
-var extraList = [{
-  type: 'sessionProp',
-  name: 'Session属性',
-  attrList: [{
-    id: 'sa_duration',
-    label: 'Session时长',
-    propCategory: 'extraProp',
-    key: 'extraProp-sa_duration',
-    type: 2,
-    subtype: 2
-  }, {
-    id: 'se_duration',
-    label: '事件使用时长',
-    propCategory: 'extraProp',
-    key: 'extraProp-se_duration',
-    type: 2,
-    subtype: 2
-  }]
-}];
 export default (function () {
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true
@@ -28,7 +9,6 @@ export default (function () {
       background: '#fff'
     }
   }, /*#__PURE__*/React.createElement(BizAttrCondition, {
-    extra: extraList,
     onChange: function onChange(condition) {
       console.log(condition);
     }

package/es/attrCondition/group.js

@@ -9,8 +9,7 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
     enableEventProp = props.enableEventProp,
     enableUserProp = props.enableUserProp,
     enableEnvProp = props.enableEnvProp,
-    disableItemList = props.disableItemList,
-    extra = props.extra;
+    disableItemList = props.disableItemList;
   var _useConditionGroup = useConditionGroup(props, ref),
     loading = _useConditionGroup.loading,
     conditions = _useConditionGroup.conditions,
@@ -53,7 +52,6 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
       enableUserProp: enableUserProp,
       enableEnvProp: enableEnvProp,
       disableItemList: disableItemList,
-      extra: extra,
       onChange: function onChange(data) {
         return _onChange(data, index);
       },

package/es/attrCondition/index.js

@@ -65,8 +65,7 @@ var BizAttrCondition = function BizAttrCondition(props) {
     theme: theme,
     destroyPopupOnHide: props.destroyPopupOnHide,
     placeholder: "\u8BF7\u9009\u62E9\u5C5E\u6027",
-    status: isAttrError ? 'error' : '',
-    extra: props.extra
+    status: isAttrError ? 'error' : ''
   }), isAttrError ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-error")
   }, "\u5C5E\u6027\u4E0D\u53EF\u4E3A\u7A7A") : null), /*#__PURE__*/React.createElement(BizOperateList, {

package/es/attrCondition/useAttrCondition.js

@@ -55,17 +55,6 @@ var useAttrCondition = function useAttrCondition(props) {
             dimensionSub: data.dimensionSub || data.attrName
           };
         }
-      } else if (data.propCategory === PropCategory.ExtraProp) {
-        if (data.attrId) {
-          attrData = {
-            id: data.attrId,
-            propCategory: data.propCategory,
-            type: data.type,
-            key: "".concat(data.propCategory, "-").concat(data.attrId),
-            label: data.attrNameStr || data.label,
-            subtype: data.subtype
-          };
-        }
       }
       setAttr(attrData);
     }

package/es/attrConditions/components/valuesList.js

@@ -37,7 +37,7 @@ var ValuesList = function ValuesList(props) {
     setIsFirst = _useState6[1];
   useEffect(function () {
     if (defaultValue) {
-      if (((attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.UserProp || (attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.ExtraProp) && (attr === null || attr === void 0 ? void 0 : attr.subtype) === 2) {
+      if ((attr === null || attr === void 0 ? void 0 : attr.propCategory) === 'userProp' && (attr === null || attr === void 0 ? void 0 : attr.subtype) === 2) {
         var num = String(parseFloat(defaultValue[0]) / getUnitCount(defaultValue[1]));
         setCurrent([num, defaultValue[1]]);
       } else {
@@ -72,7 +72,7 @@ var ValuesList = function ValuesList(props) {
   };
   var onChangeNumber = function onChangeNumber(e) {
     var data = [e.target.value];
-    if (((attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.UserProp || (attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.ExtraProp) && (attr === null || attr === void 0 ? void 0 : attr.subtype) === 2) {
+    if ((attr === null || attr === void 0 ? void 0 : attr.propCategory) === PropCategory.UserProp && (attr === null || attr === void 0 ? void 0 : attr.subtype) === 2) {
       var num = String(parseFloat(e.target.value) * getUnitCount(unit));
       data = [num, unit];
       setCurrent([e.target.value, unit]);
@@ -144,7 +144,7 @@ var ValuesList = function ValuesList(props) {
       status: status,
       onChange: onChangeNumber,
       suffix: attr.propCategory === 'userProp' && attr.subtype === 1 ? '%' : null
-    }), (attr.propCategory === PropCategory.UserProp || attr.propCategory === PropCategory.ExtraProp) && attr.subtype === 2 && numberAfter);
+    }), attr.propCategory === 'userProp' && attr.subtype === 2 && numberAfter);
   } else {
     if (operate === OperateTypes.Absolute) {
       return /*#__PURE__*/React.createElement(RangePicker, {

package/es/attrConditions/group.js

@@ -9,8 +9,7 @@ var BizConditionGroup = function BizConditionGroup(props, ref) {
     enableEventProp = props.enableEventProp,
     enableUserProp = props.enableUserProp,
     enableEnvProp = props.enableEnvProp,
-    disableItemList = props.disableItemList,
-    extra = props.extra;
+    disableItemList = props.disableItemList;
   var _useConditionGroup = useConditionGroup(props, ref),
     loading = _useConditionGroup.loading,
     conditions = _useConditionGroup.conditions,
@@ -48,7 +47,6 @@ var BizConditionGroup = function BizConditionGroup(props, ref) {
       enableUserProp: enableUserProp,
       enableEnvProp: enableEnvProp,
       disableItemList: disableItemList,
-      extra: extra,
       onChange: function onChange(data) {
         return _onChange(data, index);
       },

package/es/attrConditions/index.js

@@ -20,11 +20,6 @@ export function getCondition(attr, operate, values) {
   };
   if (attr.propCategory === PropCategory.EventProp) {
     responseData.attrName = attr.label;
-  } else if (attr.propCategory === PropCategory.ExtraProp) {
-    responseData.attrName = attr.label;
-    if (attr.propCategory === PropCategory.ExtraProp && attr.subtype) {
-      responseData.subtype = attr.subtype;
-    }
   } else {
     responseData.attrName = attr.name;
     responseData.category = attr.category;
@@ -73,8 +68,7 @@ var BizConditionItem = function BizConditionItem(props) {
       return _onDelete(e);
     },
     theme: theme,
-    destroyPopupOnHide: props.destroyPopupOnHide,
-    extra: props.extra
+    destroyPopupOnHide: props.destroyPopupOnHide
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel")
   }, /*#__PURE__*/React.createElement(BizOperateList, {

package/es/attrConditions/types.d.ts

@@ -1,4 +1,4 @@
-import { AttributeSelect, EnvProp, EventProp, PropType, UserProp } from '../attributeSelector/types';
+import { EnvProp, EventProp, PropType, UserProp } from '../attributeSelector/types';
 import { BizSelectTypes } from '../select/types';
 interface BasicAttrTypes {
     eventIdList?: number[];
@@ -8,17 +8,16 @@ interface BasicAttrTypes {
     enableEnvProp?: boolean;
     disableItemList?: (EventProp | UserProp | EnvProp)[];
     theme?: BizSelectTypes.Props['theme'];
-    extra?: AttributeSelect.AttributeExtra[];
 }
 export declare namespace AttrConditionTypes {
     interface ItemValue {
         subtype?: number;
-        attrId?: number | string;
+        attrId?: number;
         attrName?: string;
         label?: string;
         attrNameStr?: string;
         type?: PropType;
-        propCategory?: 'userProp' | 'eventProp' | 'envProp' | 'extraProp';
+        propCategory?: 'userProp' | 'eventProp' | 'envProp';
         category?: 'fixed' | 'custom';
         dimensionSub?: string;
         operator?: OperateTypes;

package/es/attributeSelector/index.js

@@ -22,7 +22,6 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
   var enableDelete = props.enableDelete,
     placeholder = props.placeholder,
     theme = props.theme,
-    extra = props.extra,
     isNumber = props.isNumber;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -85,16 +84,6 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
           if (attr.name === param.name && attr.category === param.category) res = attr;
         }
       });
-    } else if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'extraProp') {
-      extra === null || extra === void 0 ? void 0 : extra.forEach(function (item) {
-        item.attrList.forEach(function (attr) {
-          if (hasKey) {
-            if (attr.key === param.key) res = _.cloneDeep(attr);
-          } else {
-            if (attr.id === param.id) res = _.cloneDeep(attr);
-          }
-        });
-      });
     }
     return res;
   }
@@ -125,7 +114,8 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     },
     trigger: ['click'],
     overlayStyle: {
-      minWidth: width < 284 ? 284 : width > 520 ? 520 : width
+      minWidth: 284,
+      width: width
     },
     open: visible,
     onOpenChange: onVisibleChange,

package/es/attributeSelector/listPanel.js

@@ -23,7 +23,6 @@ var AttrListPanel = function AttrListPanel(props) {
     enableUserProp = props.enableUserProp,
     eventIdList = props.eventIdList,
     funnelEventIdList = props.funnelEventIdList,
-    extra = props.extra,
     isNumber = props.isNumber;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
@@ -59,71 +58,18 @@ var AttrListPanel = function AttrListPanel(props) {
       item.key = "eventProp-".concat(item.id);
     } else if (item.propCategory === 'userProp') {
       item.key = "userProp-".concat(item.name);
-    } else if (item.propCategory === 'extraProp') {
-      item.key = "extraProp-".concat(item.id);
     }
     return item;
   });
-  var _useState7 = useState({
-      container: "container-".concat(id)
-    }),
-    _useState8 = _slicedToArray(_useState7, 2),
-    anchor = _useState8[0],
-    stAnchor = _useState8[1];
-  var _useState9 = useState([]),
-    _useState10 = _slicedToArray(_useState9, 2),
-    anchorList = _useState10[0],
-    setAnchorList = _useState10[1];
-  useEffect(function () {
-    var data = {
-      container: "container-".concat(id),
-      event: "event".concat(id),
-      user: "user".concat(id),
-      env: "env".concat(id)
-    };
-    var list = [];
-    extra === null || extra === void 0 ? void 0 : extra.forEach(function (item) {
-      data[item.type] = "".concat(item.type).concat(id);
-      list.push({
-        id: "".concat(item.type).concat(id),
-        name: item.name
-      });
-    });
-    stAnchor(data);
-    if (enableEventProp) {
-      list.push({
-        id: data.event,
-        name: '事件属性'
-      });
-    }
-    if (enableUserProp) {
-      list.push({
-        id: data.user,
-        name: '用户属性'
-      });
-    }
-    if (enableEnvProp) {
-      list.push({
-        id: data.env,
-        name: '触发环境'
-      });
-    }
-    setAnchorList(list);
-  }, [id]);
+  var anchor = {
+    container: "container-".concat(id),
+    event: "event".concat(id),
+    user: "user".concat(id),
+    env: "env".concat(id)
+  };
   var classPrefix = 'biz-attr-select';
   useEffect(function () {
     var list = [];
-    if (extra) {
-      extra.forEach(function (item) {
-        list.push({
-          isEvent: false,
-          groupName: item.name,
-          key: item.type,
-          anchor: anchor[item.type],
-          children: item.attrList
-        });
-      });
-    }
     if (enableEventProp) {
       if (props.showCommonProp) {
         var group = {
@@ -202,7 +148,7 @@ var AttrListPanel = function AttrListPanel(props) {
       });
     }
     setOptionList(list);
-  }, [anchor, eventIdMap, userPropList, eventEnvList, eventIdList, props.showCommonProp]);
+  }, [eventIdMap, userPropList, eventEnvList, eventIdList, props.showCommonProp]);
   useEffect(function () {
     setCurrentAttr(props.value);
   }, [props.value]);
@@ -267,14 +213,22 @@ var AttrListPanel = function AttrListPanel(props) {
     getContainer: function getContainer() {
       return document.getElementById(anchor.container);
     }
-  }, anchorList.map(function (item) {
-    return /*#__PURE__*/React.createElement(Link, {
-      key: item.id,
-      href: "#".concat(item.id),
-      title: /*#__PURE__*/React.createElement(Button, {
-        size: "small"
-      }, item.name)
-    });
+  }, enableEventProp && /*#__PURE__*/React.createElement(Link, {
+    href: "#".concat(anchor.event),
+    title: /*#__PURE__*/React.createElement(Button, {
+      size: "small"
+    }, "\u4E8B\u4EF6\u5C5E\u6027")
+  }), enableUserProp && /*#__PURE__*/React.createElement(Link, {
+    href: "#".concat(anchor.user),
+    title: /*#__PURE__*/React.createElement(Button, {
+      size: "small"
+    }, "\u7528\u6237\u5C5E\u6027")
+  }), enableEnvProp && /*#__PURE__*/React.createElement(Link, {
+    "data-type": 'event',
+    href: "#".concat(anchor.env),
+    title: /*#__PURE__*/React.createElement(Button, {
+      size: "small"
+    }, "\u89E6\u53D1\u73AF\u5883")
   }))) : null, /*#__PURE__*/React.createElement("div", {
     id: anchor.container,
     className: "".concat(classPrefix, "-container")

package/es/attributeSelector/styles/index.less

@@ -44,7 +44,6 @@
   }
 
   &-anchor-panel {
-    max-width: 496px;
     padding: 12px 0;
 
     .ant-anchor {

package/es/attributeSelector/types.d.ts

@@ -8,8 +8,7 @@ export declare enum PropType {
 export declare enum PropCategory {
     EventProp = "eventProp",
     UserProp = "userProp",
-    EnvProp = "envProp",
-    ExtraProp = "extraProp"
+    EnvProp = "envProp"
 }
 export declare enum ShowStatus {
     show = 0,
@@ -38,7 +37,7 @@ export interface EventGroup {
     eventList: AnalysisEvent[];
 }
 export interface BasicProp {
-    id?: number | string;
+    id?: number;
     label?: string;
     alias?: string;
     type?: PropType;
@@ -72,12 +71,12 @@ export interface PropGroups {
     eventIdMap?: Record<number, AnalysisEvent>;
 }
 export declare namespace AttributeSelect {
-    type Value = EventProp | UserProp | EnvProp | ExtraProp | null;
+    type Value = EventProp | UserProp | EnvProp | null;
     interface Props {
         id?: string;
         value?: Value;
         defaultValue?: Value;
-        disableItemList?: (EventProp | UserProp | EnvProp | ExtraProp)[];
+        disableItemList?: (EventProp | UserProp | EnvProp)[];
         enableDelete?: boolean;
         placeholder?: string;
         enableEventProp?: boolean;
@@ -94,20 +93,8 @@ export declare namespace AttributeSelect {
         destroyPopupOnHide?: boolean;
         size?: SizeType;
         status?: string;
-        extra?: AttributeExtra[];
         isNumber?: Boolean;
     }
-    interface AttributeExtra {
-        type: string;
-        name: string;
-        attrList: ExtraProp[];
-    }
-    interface ExtraProp extends BasicProp {
-        propCategory: 'extraProp';
-        key?: number | string;
-        name?: string;
-        subtype?: number;
-    }
     interface Option {
         groupName: string;
         isEvent: boolean;

package/es/attributeSelector/types.js

@@ -9,7 +9,6 @@ export var PropCategory;
   PropCategory["EventProp"] = "eventProp";
   PropCategory["UserProp"] = "userProp";
   PropCategory["EnvProp"] = "envProp";
-  PropCategory["ExtraProp"] = "extraProp";
 })(PropCategory || (PropCategory = {}));
 export var ShowStatus;
 (function (ShowStatus) {

package/es/datePicker/index.js

@@ -140,13 +140,16 @@ var BizDatePicker = function BizDatePicker(_ref) {
         setDateRange(getDateRange(DatePickerTypes.Unit.day, 1, includeToday));
       }
       if (type.value === 'day') {
-        setDateRange(getDateRange(DatePickerTypes.Unit.day, 1, includeToday));
+        setDateRange(getDateRange(DatePickerTypes.Unit.day, 7, includeToday));
+        setRelative([7, includeToday ? 0 : 1]);
       }
       if (type.value === 'week') {
-        setDateRange(getDateRange(DatePickerTypes.Unit.day, 7, includeToday));
+        setDateRange(getDateRange(DatePickerTypes.Unit.week, 4, includeToday));
+        setRelative([4, includeToday ? 0 : 1]);
       }
       if (type.value === 'month') {
-        setDateRange(getDateRange(DatePickerTypes.Unit.day, 30, includeToday));
+        setDateRange(getDateRange(DatePickerTypes.Unit.month, 1, includeToday));
+        setRelative([1, includeToday ? 0 : 1]);
       }
     }
   }), /*#__PURE__*/React.createElement(PickerShortcut, null), /*#__PURE__*/React.createElement(BizDate, {

package/es/eventSelector/demo/index.js

@@ -38,7 +38,8 @@ var EventDemo = function EventDemo() {
       id: -2,
       name: '会话结束',
       attrList: []
-    }]
+    }],
+    disableVirtualEventShow: true
   }));
 };
 export default (function () {

package/es/eventSelector/listPanel.js

@@ -35,30 +35,51 @@ var EventListPanel = function EventListPanel(props) {
     setSearchValue = _useState2[1];
   var _useContext = useContext(BizGlobalDataContext),
     eventGroupList = _useContext.eventGroupList;
-  var _useState3 = useState(eventGroupList || []),
+  var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
-    groupList = _useState4[0],
-    setGroupList = _useState4[1];
-  var _useState5 = useState(),
+    eventGroupListData = _useState4[0],
+    setEventGroupListData = _useState4[1];
+  useEffect(function () {
+    if (disableVirtualEventShow && eventGroupList) {
+      var _eventGroupList = _.cloneDeep(eventGroupList);
+      _eventGroupList && _eventGroupList.map(function (item) {
+        if (item.eventList.length > 0) {
+          item.eventList = item.eventList.filter(function (_item) {
+            return _item.owner !== 'zg_vtl';
+          });
+        }
+      });
+      setEventGroupListData(_eventGroupList);
+      setGroupList(_eventGroupList);
+    } else {
+      setEventGroupListData(eventGroupList || []);
+      setGroupList(eventGroupList || []);
+    }
+  }, [eventGroupList, disableVirtualEventShow]);
+  var _useState5 = useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
-    currentGroup = _useState6[0],
-    setCurrentGroup = _useState6[1];
-  var _useState7 = useState([]),
+    groupList = _useState6[0],
+    setGroupList = _useState6[1];
+  var _useState7 = useState(),
     _useState8 = _slicedToArray(_useState7, 2),
-    searchEventList = _useState8[0],
-    setSearchEventList = _useState8[1];
-  var _useState9 = useState(props.multiple ? props.value : undefined),
+    currentGroup = _useState8[0],
+    setCurrentGroup = _useState8[1];
+  var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    currentValue = _useState10[0],
-    setCurrentValue = _useState10[1];
-  var _useState11 = useState(props.multiple ? props.value || [] : []),
+    searchEventList = _useState10[0],
+    setSearchEventList = _useState10[1];
+  var _useState11 = useState(props.multiple ? props.value : undefined),
     _useState12 = _slicedToArray(_useState11, 2),
-    checkedEventList = _useState12[0],
-    setCheckedEventList = _useState12[1];
-  var _useState13 = useState(false),
+    currentValue = _useState12[0],
+    setCurrentValue = _useState12[1];
+  var _useState13 = useState(props.multiple ? props.value || [] : []),
     _useState14 = _slicedToArray(_useState13, 2),
-    ready = _useState14[0],
-    setReady = _useState14[1];
+    checkedEventList = _useState14[0],
+    setCheckedEventList = _useState14[1];
+  var _useState15 = useState(false),
+    _useState16 = _slicedToArray(_useState15, 2),
+    ready = _useState16[0],
+    setReady = _useState16[1];
   var scrollableId = 'scrollableDiv' + Math.random();
   var overviewData = {
     id: -100,
@@ -67,15 +88,16 @@ var EventListPanel = function EventListPanel(props) {
     isOverview: true
   };
   useEffect(function () {
+    if (eventGroupListData.length <= 0) return;
     var group = {
       id: 0,
       eventList: function () {
         var list = [];
         var listObj = {};
         var markList = [];
-        eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
+        eventGroupListData === null || eventGroupListData === void 0 ? void 0 : eventGroupListData.forEach(function (group) {
           group.eventList.forEach(function (item) {
-            if (!listObj[item.id] && (disableVirtualEventShow ? item.owner !== 'zg_vtl' : true)) {
+            if (!listObj[item.id]) {
               if (item.marked) {
                 markList.push(item);
               } else {
@@ -100,7 +122,7 @@ var EventListPanel = function EventListPanel(props) {
       result.forEach(function (group) {
         var evtList = [];
         group.eventList.forEach(function (event) {
-          if (disableVirtualEventShow && event.owner === 'zg_vtl') return;
+          if (disableVirtualEventShow) return;
           if (props.filter(event)) {
             evtList.push(event);
           }
@@ -123,7 +145,7 @@ var EventListPanel = function EventListPanel(props) {
             resultGroup = BuiltinIndicators;
           } else {
             var _currentGroup = group;
-            eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (eGroup) {
+            eventGroupListData === null || eventGroupListData === void 0 ? void 0 : eventGroupListData.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;
@@ -141,7 +163,7 @@ var EventListPanel = function EventListPanel(props) {
       }
     });
     setReady(true);
-  }, []);
+  }, [eventGroupListData]);
   useChanged(function () {
     if (props.multiple) {
       setCheckedEventList(_.cloneDeep(props.value) || []);
@@ -152,7 +174,7 @@ var EventListPanel = function EventListPanel(props) {
   useEffect(function () {
     var list = [];
     currentGroup === null || currentGroup === void 0 ? void 0 : currentGroup.eventList.forEach(function (event) {
-      if (searchValue && !new RegExp(_.escapeRegExp(searchValue), 'i').test(event.alias || event.name)) return;
+      if (searchValue && !new RegExp(_.escapeRegExp(searchValue), 'i').test("".concat(event.owner === 'zg_vtl' ? '虚拟事件' : '元事件', " | ").concat(event.alias || event.name))) return;
       list.push(event);
     });
     if (showOverview) list.unshift(overviewData);
@@ -271,14 +293,14 @@ export var InfiniteScrollList = function InfiniteScrollList(_ref) {
     multiple = _ref.multiple,
     maxEventCount = _ref.maxEventCount,
     checkedIdList = _ref.checkedIdList;
-  var _useState15 = useState([]),
-    _useState16 = _slicedToArray(_useState15, 2),
-    showList = _useState16[0],
-    setShowList = _useState16[1];
   var _useState17 = useState([]),
     _useState18 = _slicedToArray(_useState17, 2),
-    canShowList = _useState18[0],
-    setCanShowList = _useState18[1];
+    showList = _useState18[0],
+    setShowList = _useState18[1];
+  var _useState19 = useState([]),
+    _useState20 = _slicedToArray(_useState19, 2),
+    canShowList = _useState20[0],
+    setCanShowList = _useState20[1];
   useEffect(function () {
     var data = searchEventList.filter(function (item) {
       return item.eventHidden !== ShowStatus.hidden;
@@ -321,7 +343,7 @@ export var InfiniteScrollList = function InfiniteScrollList(_ref) {
       _disable = true;
     }
     return /*#__PURE__*/React.createElement(EventListOption, {
-      label: e.alias || e.name,
+      label: "".concat(e.owner === 'zg_vtl' ? '虚拟事件' : '元事件', " | ").concat(e.alias || e.name),
       key: "".concat(groupId, "-").concat(e.id),
       checked: multiple ? checkedIdList === null || checkedIdList === void 0 ? void 0 : checkedIdList.includes(e.id) : currentId === e.id,
       disable: _disable,

package/es/productCondition/types.d.ts

@@ -101,7 +101,7 @@ export declare namespace BizProductConditionT {
         }[];
     }
     interface AttrCondition {
-        attrId: number | string;
+        attrId: number;
         attrName: string;
         operator: AttrConditionOperator;
         params: string[];

package/es/select/demo/index.js

@@ -72,7 +72,6 @@ export default (function () {
     theme: "secondary",
     onChange: onChange,
     disableItemList: disabledList,
-    dropdownExtra: /*#__PURE__*/React.createElement(Button, null, "+ \u6DFB\u52A0"),
-    extraLabel: ' (别名)'
+    dropdownExtra: /*#__PURE__*/React.createElement(Button, null, "+ \u6DFB\u52A0")
   }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u9009\u62E9\u7684\u503C\u662F\uFF1A", JSON.stringify(data)));
 });

package/es/select/handle.js

@@ -17,8 +17,7 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     keyField = props.keyField,
     border = props.border,
     showSelectIcon = props.showSelectIcon,
-    disable = props.disable,
-    extraLabel = props.extraLabel;
+    disable = props.disable;
   var classPrefix = 'biz-select-handle';
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -146,7 +145,7 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement("div", {
     ref: handleRef,
     className: "".concat(classPrefix, "-input ").concat(props.theme ? props.theme : '', "\n      ").concat(props.disable ? 'disable' : '', " ").concat(focus ? 'active' : '', " \n      ").concat(mergedStatus ? "".concat(classPrefix, "-status-").concat(mergedStatus) : '', "\n      ").concat(border ? '' : 'borderless', " ").concat(props.size ? props.size : 'middle'),
-    title: "".concat(props.label || (optionData === null || optionData === void 0 ? void 0 : optionData[aliasField || '']) || (optionData === null || optionData === void 0 ? void 0 : optionData[labelField]) || '').concat(extraLabel)
+    title: props.label || (optionData === null || optionData === void 0 ? void 0 : optionData[aliasField || '']) || (optionData === null || optionData === void 0 ? void 0 : optionData[labelField])
   }, /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-content")
   }, /*#__PURE__*/React.createElement("span", {
@@ -155,7 +154,7 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     className: "".concat(classPrefix, "-icon")
   }, props.value.icon), props.children || props.label || (optionData === null || optionData === void 0 ? void 0 : optionData[aliasField || '']) || (optionData === null || optionData === void 0 ? void 0 : optionData[labelField]) || /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-holder")
-  }, placeholder || '请选择'), extraLabel)), /*#__PURE__*/React.createElement(IconFont, {
+  }, placeholder || '请选择'))), /*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-expand-icon").concat(props.open ? ' open' : ''),
     type: 'xiangxia'
   }));
@@ -164,7 +163,6 @@ SelectHandle.defaultProps = {
   labelField: 'label',
   keyField: 'id',
   border: true,
-  showSelectIcon: true,
-  extraLabel: ''
+  showSelectIcon: true
 };
 export default SelectHandle;

package/es/select/index.js

@@ -191,7 +191,6 @@ var BizSelect = function BizSelect(props) {
     showSelectIcon: props.showSelectIcon,
     status: props.status,
     open: visible,
-    extraLabel: props.extraLabel,
     onDelete: onDelete,
     onSearch: function onSearch(v) {
       setSearchValue(v);

package/es/select/types.d.ts

@@ -26,7 +26,6 @@ export declare namespace BizSelectTypes {
         minDropdownWidth?: number;
         options: Group[] | Option[];
         extra?: (option: Option) => ReactNode;
-        extraLabel?: ReactNode;
         dropdownExtra?: ReactNode;
         enableSearch?: boolean;
         enableCreate?: boolean;
@@ -76,7 +75,6 @@ export declare namespace BizSelectTypes {
 }
 export interface HandlerTypes {
     label?: string;
-    extraLabel?: ReactNode;
     children?: ReactNode;
     placeholder?: string;
     value?: BizSelectTypes.Option | BizSelectTypes.Option[];

package/es/userCondition/types.d.ts

@@ -100,7 +100,7 @@ export declare namespace BizUserConditionT {
         }[];
     }
     interface AttrCondition {
-        attrId: number | string;
+        attrId: number;
         attrName: string;
         operator: 'is not null' | 'is null' | 'not contains' | 'contains' | 'equal' | 'not equal' | 'begin with' | 'not begin with' | 'end with' | 'not end with' | Unpacked<RunTimesI, 'operator'>;
         params: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.2.6-session.1",
+  "version": "1.2.7",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -55,7 +55,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "f431ccb7e125dd99d3bc80693dfc6e2c5b5adbfd",
+  "gitHead": "26ac18987a5c98f9b4500c282673b98c7e481cf4",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }

package/es/attributeSelector/demo/extra.d.ts

@@ -1,4 +0,0 @@
-import React from 'react';
-import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
-declare const _default: () => React.JSX.Element;
-export default _default;

package/es/attributeSelector/demo/extra.js

@@ -1,80 +0,0 @@
-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); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState } from 'react';
-import { BizAttributeSelector, BizGlobalDataContext } from '@zgfe/business-lib';
-import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
-import eventData from '../../mock/event';
-import envData from '../../mock/env';
-import userData from './userData.js';
-import convertAttributeData from '../util';
-var extraList = [{
-  type: 'sessionProp',
-  name: 'Session属性',
-  attrList: [{
-    id: 'sa_duration',
-    label: 'Session时长',
-    propCategory: 'extraProp',
-    key: 'extraProp-sa_duration'
-  }, {
-    id: 'se_duration',
-    label: '事件使用时长',
-    propCategory: 'extraProp',
-    key: 'extraProp-se_duration'
-  }]
-}, {
-  type: 'pageProp',
-  name: '页面属性',
-  attrList: [{
-    id: 'page_duration',
-    label: '页面访问时长',
-    propCategory: 'extraProp',
-    key: 'extraProp-page_duration'
-  }, {
-    id: 'click',
-    label: '页面点击次数',
-    propCategory: 'extraProp',
-    key: 'extraProp-click'
-  }]
-}];
-export default (function () {
-  var _useState = useState({
-      propCategory: 'extraProp',
-      key: 'extraProp-click',
-      id: 'page_duration'
-    }),
-    _useState2 = _slicedToArray(_useState, 2),
-    attribute = _useState2[0],
-    setAttribute = _useState2[1];
-  var store = convertAttributeData({
-    eventList: eventData,
-    userPropList: userData,
-    envPropList: envData
-  });
-  function onChange(val) {
-    setAttribute(val);
-  }
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", null, "\u9009\u62E9\u7684\u5C5E\u6027\u662F\uFF1A", JSON.stringify(attribute)), /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
-    value: {
-      eventGroupList: store.eventGroupList,
-      userPropList: store.userPropList,
-      eventEnvList: store.envPropList
-    }
-  }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
-    enableEventProp: true,
-    enableUserProp: true,
-    eventIdList: [24143016],
-    value: attribute,
-    onChange: onChange,
-    enableDelete: true,
-    enableEnvProp: true,
-    extra: extraList,
-    disableItemList: [{
-      id: 'click',
-      propCategory: 'extraProp'
-    }]
-  })));
-});