@zgfe/business-lib 1.2.5 → 1.2.6

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "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": "bb5b2f8b3375ca2c9c2ee54d2261461471c36f3a",
+  "gitHead": "0ac381908b90c9ed5743655821fb348c6c7a645a",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }