@zgfe/modules-dm 1.0.56-zhongyuan.36 → 1.0.56-zhongyuan.39

package/es/modules/dataReal/index1.js

@@ -26,7 +26,7 @@ var webSocketUrl = "".concat(location.protocol == 'http:' ? 'ws' : 'wss', "://")
 // const webSocketUrl = 'ws://172.31.31.50:19898/eventtracking/ws?type=realTime';
 // 点击单元格 添加悬浮框  2。看宽度是否可自适应，可能需要适应大屏
 function matchesFilterData(o, filterData) {
-  return new RegExp(_.escapeRegExp(filterData), 'i').test(JSON.stringify(o === null || o === void 0 ? void 0 : o.data));
+  return new RegExp(_.escapeRegExp(filterData), 'i').test(o.data);
 }
 var DataRealView = function DataRealView() {
   var _useContext = useContext(BizGlobalDataContext),
@@ -71,34 +71,12 @@ var DataRealView = function DataRealView() {
       var _message$detail, _message$detail$0$pr, _message$detail2, _message$detail2$, _message$detail2$$pr, _message$detail3, _message$detail3$, _message$detail3$$pr;
       var message = JSON.parse(event.data);
       var obj = {
-        // time:
-        //   moment(message?.detail?.[0].pr?.$ct).format('YYYY-MM-DD HH:mm:ss') ||
-        //   filterPro('$ct', event),
-        // eventName: filterPro('$eid', event),
-        // userId: message?.detail?.[0]?.pr?.$cuid || filterPro('$cuid', event),
-        // data: event.data,
         time: moment(message === null || message === void 0 ? void 0 : (_message$detail = message.detail) === null || _message$detail === void 0 ? void 0 : (_message$detail$0$pr = _message$detail[0].pr) === null || _message$detail$0$pr === void 0 ? void 0 : _message$detail$0$pr.$ct).format('YYYY-MM-DD HH:mm:ss'),
         eventName: (message === null || message === void 0 ? void 0 : (_message$detail2 = message.detail) === null || _message$detail2 === void 0 ? void 0 : (_message$detail2$ = _message$detail2[0]) === null || _message$detail2$ === void 0 ? void 0 : (_message$detail2$$pr = _message$detail2$.pr) === null || _message$detail2$$pr === void 0 ? void 0 : _message$detail2$$pr.$eid) || filterPro('$eid', event),
         userId: (message === null || message === void 0 ? void 0 : (_message$detail3 = message.detail) === null || _message$detail3 === void 0 ? void 0 : (_message$detail3$ = _message$detail3[0]) === null || _message$detail3$ === void 0 ? void 0 : (_message$detail3$$pr = _message$detail3$.pr) === null || _message$detail3$$pr === void 0 ? void 0 : _message$detail3$$pr.$cuid) || filterPro('$cuid', event),
         data: "".concat(JSON.stringify(message))
       };
       setCurrentMessageObj(obj);
-      // 最多为500条 超出去掉第一条
-      // setOldList((prev: any) => {
-      //   if (prev.length <= 49) {
-      //     return [obj, ...prev];
-      //   }
-      //   prev.pop();
-      //   return [obj, ...prev];
-      // });
-      // 最多1000条数据
-      // setOldList((prev: any) => {
-      //   if (prev.length <= 200) {
-      //     return [obj, ...prev];
-      //   }
-      //   prev.pop();
-      //   return [obj, ...prev];
-      // });
     };
     // 监听错误事件
     socket.onerror = function (error) {
@@ -208,7 +186,7 @@ var DataRealView = function DataRealView() {
       var _currentMessageObj$ev, _currentMessageObj$us, _currentMessageObj$us2;
       var hasEventName = !eventName || (currentMessageObj === null || currentMessageObj === void 0 ? void 0 : (_currentMessageObj$ev = currentMessageObj.eventName) === null || _currentMessageObj$ev === void 0 ? void 0 : _currentMessageObj$ev.includes(eventName));
       var hasUserId = !searchUserId || (currentMessageObj === null || currentMessageObj === void 0 ? void 0 : (_currentMessageObj$us = currentMessageObj.userId) === null || _currentMessageObj$us === void 0 ? void 0 : (_currentMessageObj$us2 = _currentMessageObj$us.toString()) === null || _currentMessageObj$us2 === void 0 ? void 0 : _currentMessageObj$us2.includes(searchUserId));
-      var hasFilterData = !filterData || matchesFilterData(currentMessageObj, filterData);
+      var hasFilterData = !filterData || matchesFilterData(currentMessageObj, "".concat(filterData));
       if (hasEventName && hasUserId && hasFilterData) {
         setOldList(function (prev) {
           if (prev.length < 51) {
@@ -227,7 +205,7 @@ var DataRealView = function DataRealView() {
         var _o$eventName, _o$userId, _o$userId$toString;
         var hasEventName = !eventName || (o === null || o === void 0 ? void 0 : (_o$eventName = o.eventName) === null || _o$eventName === void 0 ? void 0 : _o$eventName.includes(eventName));
         var hasUserId = !searchUserId || (o === null || o === void 0 ? void 0 : (_o$userId = o.userId) === null || _o$userId === void 0 ? void 0 : (_o$userId$toString = _o$userId.toString()) === null || _o$userId$toString === void 0 ? void 0 : _o$userId$toString.includes(searchUserId));
-        var hasFilterData = !filterData || matchesFilterData(o, filterData);
+        var hasFilterData = !filterData || matchesFilterData(o, "".concat(filterData));
         return hasEventName && hasUserId && hasFilterData;
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.56-zhongyuan.36",
+  "version": "1.0.56-zhongyuan.39",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -57,7 +57,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "146fe18d6f86573e6fa4184b470d2f4fceb5881c",
+  "gitHead": "53d3ea156afb85026ed98f153a3a528dc9a2c98c",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }