@zgfe/business-lib 1.0.18 → 1.0.21-cdp.0

package/es/attrConditions/components/valuesList.js

@@ -27,8 +27,8 @@ var ValuesList = function ValuesList(props) {
   var attr = props.attr,
       defaultValue = props.defaultValue,
       operate = props.operate,
-      includeToday = props.includeToday;
-  var initValue = [moment().subtract(1, 'weeks').format('YYYY-MM-DD'), moment().subtract(includeToday ? 0 : 1, 'days').format('YYYY-MM-DD')];
+      theme = props.theme;
+  var initValue = [moment().subtract(1, 'weeks').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')];
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -119,14 +119,14 @@ var ValuesList = function ValuesList(props) {
     return /*#__PURE__*/React.createElement(BizSelect, {
       disable: true,
       className: "".concat(classPrefix, "-multi-select"),
-      theme: "secondary",
-      size: "base",
+      theme: theme,
       options: []
     });
   }
 
   if (attr.type === PropType.STRING) {
     return /*#__PURE__*/React.createElement(StringList, {
+      theme: theme,
       attr: attr,
       operate: operate,
       value: current,
@@ -139,19 +139,21 @@ var ValuesList = function ValuesList(props) {
       },
       keyField: "value",
       labelField: "label",
-      theme: "secondary",
+      theme: props.theme,
       className: "".concat(classPrefix, "-input-select"),
       onChange: onChangeUnit,
       options: propSubtype
     });
-    return /*#__PURE__*/React.createElement(Input, {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-value-content")
+    }, /*#__PURE__*/React.createElement(Input, {
       className: "".concat(classPrefix, "-input"),
       value: current && current.length ? current[0] : '',
       placeholder: "\u8BF7\u8F93\u5165",
       type: "number",
       onChange: onChangeNumber,
-      addonAfter: attr.propCategory === 'userProp' && attr.subtype === 1 ? '%' : attr.propCategory === 'userProp' && attr.subtype === 2 ? numberAfter : null
-    });
+      suffix: attr.propCategory === 'userProp' && attr.subtype === 1 ? '%' : null
+    }), attr.propCategory === 'userProp' && attr.subtype === 2 && numberAfter);
   } else {
     if (operate === OperateTypes.Absolute) {
       return /*#__PURE__*/React.createElement(RangePicker, {
@@ -175,14 +177,11 @@ var ValuesList = function ValuesList(props) {
         value: current && current[0] ? current[0] : 30,
         placeholder: "\u8BF7\u8F93\u5165",
         type: "number",
-        addonAfter: "\u5929",
+        suffix: "\u5929",
         onChange: onChangeDate
       });
     }
   }
 };
 
-ValuesList.defaultProps = {
-  includeToday: false
-};
 export default ValuesList;

package/es/attrConditions/demo/group.js

@@ -62,6 +62,13 @@ export default (function () {
     conditionRef.current.add();
   };
 
+  var onClear = function onClear() {
+    conditionRef.current.setValue();
+    setData({
+      conditions: []
+    });
+  };
+
   return /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
     value: {
       eventGroupList: store.eventGroupList,
@@ -79,5 +86,10 @@ export default (function () {
     onConditionsCount: setCount
   }), /*#__PURE__*/React.createElement("br", null), count < 3 && /*#__PURE__*/React.createElement(Button, {
     onClick: onClick
-  }, "\u6DFB\u52A0"), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(data)));
+  }, "\u6DFB\u52A0"), count > 0 && /*#__PURE__*/React.createElement(Button, {
+    onClick: onClear,
+    style: {
+      marginLeft: '20px'
+    }
+  }, "\u6E05\u7A7A"), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(data)));
 });

package/es/attrConditions/group.js

@@ -74,6 +74,20 @@ var BizConditionGroup = function BizConditionGroup(props, ref) {
           });
           return _toConsumableArray(conditions);
         });
+      },
+      setValue: function setValue(data) {
+        if (data) {
+          if (data.relation) setRelation(data.relation);
+
+          if (data.conditions) {
+            setConditions(function () {
+              return addKeyToGroup(data.conditions);
+            });
+          }
+        } else {
+          setRelation('and');
+          setConditions([]);
+        }
       }
     };
   });

package/es/attrConditions/index.js

@@ -28,7 +28,9 @@ var BizConditionItem = function BizConditionItem(props) {
       enableEventProp = props.enableEventProp,
       enableUserProp = props.enableUserProp,
       enableEnvProp = props.enableEnvProp,
-      disableItemList = props.disableItemList;
+      disableItemList = props.disableItemList,
+      border = props.border,
+      theme = props.theme;
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -101,7 +103,8 @@ var BizConditionItem = function BizConditionItem(props) {
         type: attr.type,
         operator: operate,
         values: values || [],
-        dimensionSub: attr.dimensionSub
+        dimensionSub: attr.dimensionSub,
+        label: attr.label
       };
 
       if (attr.propCategory === PropCategory.EventProp) {
@@ -132,7 +135,7 @@ var BizConditionItem = function BizConditionItem(props) {
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: classPrefix
+    className: [classPrefix, border ? 'border' : ''].join(' ')
   }, /*#__PURE__*/React.createElement(Skeleton, {
     loading: ready,
     active: true,
@@ -148,10 +151,13 @@ var BizConditionItem = function BizConditionItem(props) {
     enableEnvProp: enableEnvProp,
     disableItemList: disableItemList,
     onChange: onChangeAttr,
-    onDelete: onDelete
+    onDelete: onDelete,
+    theme: theme,
+    destroyPopupOnHide: props.destroyPopupOnHide
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel")
   }, /*#__PURE__*/React.createElement(BizOperateList, {
+    theme: theme,
     attr: attr,
     defaultValue: operate,
     onChange: onChangeOperate
@@ -159,8 +165,13 @@ var BizConditionItem = function BizConditionItem(props) {
     attr: attr,
     operate: operate,
     defaultValue: values,
-    onChange: onChangeValues
+    onChange: onChangeValues,
+    theme: theme
   }))));
 };
 
+BizConditionItem.defaultProps = {
+  border: true,
+  theme: 'secondary'
+};
 export default BizConditionItem;

package/es/attrConditions/styles/index.less

@@ -2,8 +2,9 @@
 
 /* 筛选条件 */
 .biz-condition-item {
-  .__select-handle();
-
+  &.border {
+    .__select-handle();
+  }
   &-panel {
     display: flex;
     width: 100%;
@@ -48,7 +49,7 @@
 
   &-single-select {
     width: 100px;
-    margin-right: 8px;
+    margin-right: @margin-xs;
 
     &.gray {
       color: @text-color-secondary;
@@ -59,16 +60,49 @@
     }
   }
 
+  &-value-content {
+    display: flex;
+    flex: 1;
+
+    .biz-select-handle {
+      margin-left: @margin-xs;
+    }
+  }
+
   &-input {
-    .ant-input-group-addon {
+    border: none;
+
+    &.ant-input-affix-wrapper {
+      height: @height-base !important;
       background-color: @background-color-gray !important;
+
+      input {
+        background-color: @background-color-gray !important;
+      }
+
+      &.ant-input-affix-wrapper-focused {
+        background-color: #fff !important;
+        border: 1px solid @primary-color;
+
+        input {
+          background-color: #fff !important;
+        }
+      }
+    }
+
+    &:focus {
+      border: 1px solid @primary-color;
+    }
+
+    .ant-input-group-addon {
+      // background-color: @background-color-gray !important;
       border: none;
     }
 
     &-select {
       width: 60px;
       border: none;
-      border-left: 1px solid @border-color-split;
+      // border-left: 1px solid @border-color-split;
     }
   }
 

package/es/attrConditions/types.d.ts

@@ -6,12 +6,14 @@ interface BasicAttrTypes {
     enableUserProp?: boolean;
     enableEnvProp?: boolean;
     disableItemList?: (EventProp | UserProp | EnvProp)[];
+    theme?: string;
 }
 export declare namespace AttrConditionTypes {
     interface ItemValue {
         subtype?: number;
         attrId?: number;
         attrName?: string;
+        label?: string;
         type?: PropType;
         propCategory?: 'userProp' | 'eventProp' | 'envProp';
         category?: 'fixed' | 'custom';
@@ -28,6 +30,8 @@ export declare namespace AttrConditionTypes {
         value?: ItemValue;
         onChange?: (value: ItemValue) => void;
         onDelete?: (value?: ItemValue) => void;
+        border?: boolean;
+        destroyPopupOnHide?: boolean;
     }
     interface GroupProp extends BasicAttrTypes {
         defaultValue?: GroupValue;

package/es/attrConditions/utils/operates.js

@@ -39,10 +39,10 @@ export var numberOperate = [{
   name: '<',
   value: 'lt'
 }, {
-  name: '>=',
+  name: '≥',
   value: 'ge'
 }, {
-  name: '<=',
+  name: '≤',
   value: 'le'
 }, {
   name: '≠',

package/es/attributeSelector/index.js

@@ -26,7 +26,8 @@ import SelectHandle from '../select/handle';
 
 var BizAttributeSelector = function BizAttributeSelector(props) {
   var enableDelete = props.enableDelete,
-      placeholder = props.placeholder;
+      placeholder = props.placeholder,
+      theme = props.theme;
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -120,14 +121,15 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       width: width
     },
     visible: visible,
-    onVisibleChange: onVisibleChange
+    onVisibleChange: onVisibleChange,
+    destroyPopupOnHide: props.destroyPopupOnHide
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       width: '100%'
     }
   }, /*#__PURE__*/React.createElement(SelectHandle, {
     ref: boxRef,
-    theme: "secondary",
+    theme: theme,
     border: false,
     label: currentAttr === null || currentAttr === void 0 ? void 0 : currentAttr.label,
     placeholder: placeholder
@@ -145,7 +147,9 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
 BizAttributeSelector.defaultProps = {
   enableDelete: false,
   placeholder: '请选择',
+  theme: 'secondary',
   propSymbol: '*',
-  optionsHeaderTip: '带＊的属性每日凌晨更新'
+  optionsHeaderTip: '带＊的属性每日凌晨更新',
+  destroyPopupOnHide: false
 };
 export default BizAttributeSelector;

package/es/attributeSelector/listPanel.js

@@ -1,3 +1,11 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 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."); }
@@ -11,10 +19,11 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { Anchor, Button } from 'antd';
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext, useEffect, useMemo, useState } from 'react';
 import { BizGlobalDataContext } from '..';
 import BizSearchInput from '../searchInput';
 import Option from './option';
+import _ from 'lodash';
 var Link = Anchor.Link;
 
 var AttrListPanel = function AttrListPanel(props) {
@@ -46,6 +55,17 @@ var AttrListPanel = function AttrListPanel(props) {
       currentAttr = _useState6[0],
       setCurrentAttr = _useState6[1];
 
+  var eventIdMap = useMemo(function () {
+    var eventIdMap = {};
+    var eventList = (eventGroupList || []).reduce(function (pre, group) {
+      return [].concat(_toConsumableArray(pre), _toConsumableArray(group.eventList));
+    }, []);
+    eventList.forEach(function (event) {
+      if (eventIdMap[event.id]) return;
+      eventIdMap[event.id] = event;
+    });
+    return eventIdMap;
+  }, [eventGroupList]);
   var disableItemlist = (_props$disableItemLis = props.disableItemList) === null || _props$disableItemLis === void 0 ? void 0 : _props$disableItemLis.map(function (item) {
     if (item.propCategory === 'envProp') {
       item.key = "envProp-".concat(item.name);
@@ -69,23 +89,17 @@ var AttrListPanel = function AttrListPanel(props) {
 
     if (enableEventProp) {
       var hasAnchor = false;
-      eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
-        group.eventList.forEach(function (event) {
-          if (event.isDelete || event.isStop) return;
-          if (eventIdList && eventIdList.length && !eventIdList.includes(event.id)) return;
-          var group = {
-            isEvent: true,
-            groupName: event.alias || event.name,
-            anchor: hasAnchor ? String(Math.random()) : anchor.event,
-            key: "event-".concat(event.id),
-            children: []
-          };
-          hasAnchor = true;
-          event.attrList.forEach(function (attr) {
-            group.children.push(attr);
-          });
-          list.push(group);
-        });
+      eventIdList === null || eventIdList === void 0 ? void 0 : eventIdList.forEach(function (id) {
+        var event = eventIdMap[id];
+        if (!event) return;
+        var group = {
+          isEvent: true,
+          groupName: event.alias || event.name,
+          anchor: hasAnchor ? String(Math.random()) : anchor.event,
+          key: "event-".concat(event.id),
+          children: event.attrList.slice()
+        };
+        list.push(group);
       });
     }
 
@@ -110,7 +124,7 @@ var AttrListPanel = function AttrListPanel(props) {
     }
 
     setOptionList(list);
-  }, [eventGroupList, userPropList, eventEnvList, eventIdList]);
+  }, [eventIdMap, userPropList, eventEnvList, eventIdList]);
   useEffect(function () {
     setCurrentAttr(props.value);
   }, [props.value]);
@@ -130,7 +144,7 @@ var AttrListPanel = function AttrListPanel(props) {
       });
       var childList = [];
       group.children.forEach(function (option) {
-        if (searchValue && !new RegExp(searchValue, 'i').test(option === null || option === void 0 ? void 0 : option.label)) return;
+        if (searchValue && !new RegExp(_.escapeRegExp(searchValue), 'i').test(option === null || option === void 0 ? void 0 : option.label)) return;
         var disabled = false;
         disableItemlist === null || disableItemlist === void 0 ? void 0 : disableItemlist.forEach(function (item) {
           if (item.key === option.key) disabled = true;

package/es/attributeSelector/styles/index.less

@@ -5,7 +5,9 @@
     flex-direction: row;
     .__select-handle();
     &:hover .biz-attr-select-del-icon {
-      display: inline-block;
+      display: flex;
+      align-items: center;
+      justify-content: center;
     }
   }
   &-del-icon {
@@ -13,8 +15,6 @@
     flex: none;
     width: @icon-width;
     color: @text-color-secondary;
-    line-height: 2em;
-    text-align: center;
     border-radius: @border-radius-small;
 
     &:hover {

package/es/attributeSelector/types.d.ts

@@ -9,6 +9,10 @@ export declare enum PropCategory {
     UserProp = "userProp",
     EnvProp = "envProp"
 }
+export declare enum ShowStatus {
+    show = 0,
+    hidden = 1
+}
 export interface AnalysisEvent {
     id: number;
     name: string;
@@ -17,6 +21,7 @@ export interface AnalysisEvent {
     isDelete?: boolean;
     isStop?: boolean;
     isOverview?: boolean;
+    eventHidden?: ShowStatus;
 }
 export interface EventGroup {
     id: number;
@@ -72,6 +77,8 @@ export declare namespace AttributeSelect {
         optionsHeaderTip?: string;
         onChange?: (value: Value) => void;
         onDelete?: (value?: Value) => void;
+        theme?: string;
+        destroyPopupOnHide?: boolean;
     }
     interface Option {
         groupName: string;

package/es/attributeSelector/types.js

@@ -12,4 +12,11 @@ export var PropCategory;
   PropCategory["EventProp"] = "eventProp";
   PropCategory["UserProp"] = "userProp";
   PropCategory["EnvProp"] = "envProp";
-})(PropCategory || (PropCategory = {}));
+})(PropCategory || (PropCategory = {}));
+
+export var ShowStatus;
+
+(function (ShowStatus) {
+  ShowStatus[ShowStatus["show"] = 0] = "show";
+  ShowStatus[ShowStatus["hidden"] = 1] = "hidden";
+})(ShowStatus || (ShowStatus = {}));

package/es/attributeSelector/util.js

@@ -15,7 +15,7 @@ export default function convertAttributeData(store) {
       eventList: []
     };
     group_.eventList.forEach(function (e) {
-      if (e.is_delete || e.is_stop) return;
+      if (e.is_delete) return;
       var event = {
         alias: e.alias_name,
         attrList: e.event_attrs.map(function (item) {
@@ -35,7 +35,8 @@ export default function convertAttributeData(store) {
         id: e.event_id,
         isDelete: e.is_delete,
         isStop: e.is_stop,
-        name: e.event_name
+        name: e.event_name,
+        eventHidden: e.event_hidden
       };
       group.eventList.push(event);
     });

package/es/dialog/index.js

@@ -28,12 +28,7 @@ BizDialog.defaultProps = {
   okText: '确定',
   closable: false,
   centered: true,
-  okButtonProps: {
-    size: 'large'
-  },
-  cancelButtonProps: {
-    size: 'large',
-    type: 'text'
-  }
+  okButtonProps: {},
+  cancelButtonProps: {}
 };
 export default BizDialog;

package/es/eventSelector/index.js

@@ -22,6 +22,8 @@ var BizEventSelector = function BizEventSelector(props) {
   var alias = props.alias,
       placeholder = props.placeholder,
       showAllEvent = props.showAllEvent,
+      border = props.border,
+      theme = props.theme,
       defaultSelectAble = props.defaultSelectAble;
 
   var _useState = useState(),
@@ -123,7 +125,7 @@ var BizEventSelector = function BizEventSelector(props) {
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: classPrefix
+    className: [classPrefix, border ? 'border' : ''].join(' ')
   }, /*#__PURE__*/React.createElement(Dropdown, {
     overlay: /*#__PURE__*/React.createElement(EventListPanel, {
       value: currentValue,
@@ -140,12 +142,13 @@ var BizEventSelector = function BizEventSelector(props) {
     onVisibleChange: onVisibleChange,
     getPopupContainer: props.popupContainer ? function () {
       return document.getElementById(selectId);
-    } : undefined
+    } : undefined,
+    destroyPopupOnHide: props.defaultSelectAble
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-handle"),
     id: selectId
   }, /*#__PURE__*/React.createElement(SelectHandle, {
-    theme: "secondary",
+    theme: theme,
     border: false,
     label: getLabel(),
     placeholder: placeholder
@@ -155,6 +158,9 @@ var BizEventSelector = function BizEventSelector(props) {
 BizEventSelector.defaultProps = {
   showAllEvent: true,
   defaultSelectAble: true,
-  popupContainer: true
+  popupContainer: true,
+  border: true,
+  theme: 'secondary',
+  destroyPopupOnHide: false
 };
 export default BizEventSelector;

package/es/eventSelector/listPanel.js

@@ -24,6 +24,7 @@ import React, { useContext, useEffect, useState } from 'react';
 import InfiniteScroll from 'react-infinite-scroll-component';
 import { classPrefix } from '.';
 import { BizGlobalDataContext } from '..';
+import { ShowStatus } from '../attributeSelector/types';
 import BizSearchInput from '../searchInput';
 import EventListOption from './option';
 
@@ -49,25 +50,20 @@ var EventListPanel = function EventListPanel(props) {
       currentGroup = _useState6[0],
       setCurrentGroup = _useState6[1];
 
-  var _useState7 = useState(),
+  var _useState7 = useState([]),
       _useState8 = _slicedToArray(_useState7, 2),
-      currentSelectGroup = _useState8[0],
-      setCurrentSelectGroup = _useState8[1];
+      searchEventList = _useState8[0],
+      setSearchEventList = _useState8[1];
 
   var _useState9 = useState([]),
       _useState10 = _slicedToArray(_useState9, 2),
-      searchEventList = _useState10[0],
-      setSearchEventList = _useState10[1];
+      showList = _useState10[0],
+      setShowList = _useState10[1];
 
-  var _useState11 = useState([]),
+  var _useState11 = useState(),
       _useState12 = _slicedToArray(_useState11, 2),
-      showList = _useState12[0],
-      setShowList = _useState12[1];
-
-  var _useState13 = useState(),
-      _useState14 = _slicedToArray(_useState13, 2),
-      currentValue = _useState14[0],
-      setCurrentValue = _useState14[1];
+      currentValue = _useState12[0],
+      setCurrentValue = _useState12[1];
 
   var overviewData = {
     id: -100,
@@ -97,7 +93,6 @@ var EventListPanel = function EventListPanel(props) {
       return [group].concat(_toConsumableArray(list));
     });
     setCurrentGroup(group);
-    setCurrentSelectGroup(group);
   }, []);
   useEffect(function () {
     setCurrentValue(props.value);
@@ -105,7 +100,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(searchValue, 'i').test(event.alias || event.name)) return;
+      if (searchValue && !new RegExp(_.escapeRegExp(searchValue), 'i').test(event.alias || event.name)) return;
       list.push(event);
     });
     if (showOverview) list.unshift(overviewData);
@@ -139,10 +134,7 @@ var EventListPanel = function EventListPanel(props) {
       resVal.group = g;
       resVal.event = searchEventList[0];
       setCurrentValue(resVal);
-      setCurrentSelectGroup(g);
       if (props.onChange) props.onChange(resVal);
-    } else {
-      setCurrentSelectGroup(g);
     }
   }
 
@@ -165,7 +157,7 @@ var EventListPanel = function EventListPanel(props) {
       count: group.eventList.length,
       label: group.name || '未分组',
       key: group.id || 'overview',
-      checked: (currentSelectGroup === null || currentSelectGroup === void 0 ? void 0 : currentSelectGroup.id) === group.id,
+      checked: (currentGroup === null || currentGroup === void 0 ? void 0 : currentGroup.id) === group.id,
       data: group,
       onClick: onClickGroup
     });
@@ -178,21 +170,24 @@ var EventListPanel = function EventListPanel(props) {
     },
     placeholder: "\u641C\u7D22\u57CB\u70B9\u4E8B\u4EF6"
   }), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-list")
+    className: "".concat(classPrefix, "-list"),
+    id: "scrollableDiv"
   }, /*#__PURE__*/React.createElement(InfiniteScroll, {
-    dataLength: (showList === null || showList === void 0 ? void 0 : showList.length) || 0,
-    next: loadMoreData,
-    hasMore: (showList === null || showList === void 0 ? void 0 : showList.length) < searchEventList.length,
+    dataLength: showList.length,
+    hasMore: showList.length < searchEventList.length,
     loader: /*#__PURE__*/React.createElement(Skeleton, {
       paragraph: {
         rows: 1
       },
       active: true
     }),
-    scrollableTarget: "scrollableDiv"
+    next: loadMoreData,
+    scrollableTarget: "scrollableDiv",
+    key: Math.random()
   }, showList === null || showList === void 0 ? void 0 : showList.map(function (e) {
     var _currentValue$event;
 
+    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),