@zgfe/modules-dm 1.0.56-zhongyuan.11 → 1.0.56-zhongyuan.13

package/es/modules/CutsModal.d.ts

@@ -28,40 +28,6 @@ export interface mapDataType {
     remarkAttrName: string;
     updatedTime: string;
 }
-export interface mapFilterType {
-    attr1?: string | undefined;
-    attr2?: string | undefined;
-    attr3?: string | undefined;
-    attr4?: string | undefined;
-    attr5?: string | undefined;
-    mapId: Number;
-}
-export interface andFilterType {
-    relation: string;
-    conditions: andFilterConditionsType[];
-}
-export interface andFilterConditionsType {
-    attrId: number;
-    attrName: string;
-    dimensionSub: string;
-    label: string;
-    operator: string;
-    propCategory: string;
-    type: number;
-    values: string[];
-}
-export interface eventAttrListItemType {
-    alias: string;
-    dimensionSub: string;
-    eventId: number;
-    id: number;
-    isHidden: number;
-    key: string;
-    label: string;
-    propCategory: string;
-    realTime: boolean;
-    type: number;
-}
 export declare const mapContext: React.Context<{
     setMapViewFlg?: Function | undefined;
     mapData?: mapDataType[] | undefined;
@@ -98,3 +64,20 @@ export interface FiltersType {
     label: string;
     attrName: string;
 }
+export interface mapFilterType {
+    mapId: number;
+}
+export interface andFilterConditionsType {
+    attrId: number;
+    propCategory: string;
+    type: number;
+    operator: string;
+    values: any;
+    dimensionSub: string;
+    label: string;
+    attrName: string;
+}
+export interface andFilterType {
+    relation: string;
+    conditions: andFilterConditionsType[];
+}

package/es/modules/dataManage/components/tablePlus.js

@@ -28,7 +28,6 @@ import { getAppID, getTableScroll } from '../../../utils';
 import { DmContext } from '../../../store';
 var Text = Typography.Text;
 var TablePlus = function TablePlus(props) {
-  console.log(props, 'kkk');
   var classPrefix = 'table-plus';
   var tableHandleData = props.tableHandleData,
     queryPlanData = props.queryPlanData,

package/es/modules/dataManage/demo/index.js

@@ -80,11 +80,10 @@ export default (function () {
   return /*#__PURE__*/React.createElement(DemoWrapper, null, /*#__PURE__*/React.createElement(DataManage
   // isSelect={true}
   // isSelectTab={'1'}
-  // selectTreeName="新页面_点击"
   , {
     // isSelect={true}
     // isSelectTab={'1'}
-    // selectTreeName="新页面_点击"
+    selectTreeName: "\u65B0\u9875\u9762_\u70B9\u51FB",
     onChangeSelectObj: setSelectObj,
     selectObj: selectObj
   }));

package/es/modules/dataMap/component/selectAttr.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+declare const SelectAttr: React.FC<{
+    event: any;
+    onChange: Function;
+    onDelete: Function;
+}>;
+export default SelectAttr;

package/es/modules/dataMap/component/selectAttr.js

@@ -0,0 +1,92 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _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(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+import React, { useEffect, useState } from 'react';
+import { BizAttributeSelector, ValuesList } from '@zgfe/business-lib';
+var SelectAttr = function SelectAttr(_ref) {
+  var event = _ref.event,
+    onChange = _ref.onChange,
+    onDelete = _ref.onDelete;
+  console.log(event, 'event');
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    attrArr = _useState2[0],
+    setAttrArr = _useState2[1];
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    currentData = _useState4[0],
+    setCurrentData = _useState4[1];
+  var _useState5 = useState(),
+    _useState6 = _slicedToArray(_useState5, 2),
+    a = _useState6[0],
+    setA = _useState6[1];
+  var handleFlex = function handleFlex(value) {
+    setA(_objectSpread(_objectSpread({}, value), {}, {
+      operator: 'equal'
+    }));
+  };
+  var handleSelectFlexValues = function handleSelectFlexValues(value) {
+    console.log(value, 'ss');
+    value[0] && setCurrentData(function (pre) {
+      return _objectSpread(_objectSpread({}, a), {}, {
+        values: value
+      });
+    });
+  };
+  var deleteFlex = function deleteFlex() {
+    console.log(currentData, attrArr, 'current');
+    // onChange();
+  };
+  useEffect(function () {
+    console.log(currentData, attrArr);
+    // setAttrArr((pre) => [...pre, currentData]);
+  }, [currentData]);
+  var add = function add() {
+    attrArr ? setAttrArr(function (pre) {
+      return [].concat(_toConsumableArray(pre), [currentData]);
+    }) : setAttrArr([currentData]);
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, attrArr && attrArr.map(function (o, index) {
+    return /*#__PURE__*/React.createElement("div", {
+      key: index
+    }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
+      eventIdList: [event.id],
+      enableDelete: false,
+      enableEventProp: true,
+      enableEnvProp: true,
+      value: a,
+      enableUserProp: false,
+      placeholder: "\u8BF7\u9009\u62E9\u5C5E\u6027",
+      onChange: function onChange(e) {
+        handleFlex(e);
+      }
+    }), /*#__PURE__*/React.createElement("div", null, "\u662F"), /*#__PURE__*/React.createElement(ValuesList, {
+      theme: "secondary",
+      attr: a && a,
+      operate: "equal",
+      onChange: function onChange(value) {
+        handleSelectFlexValues(value);
+      }
+    }), /*#__PURE__*/React.createElement("a", {
+      onClick: deleteFlex
+    }, "\u5220\u9664"));
+  }), /*#__PURE__*/React.createElement("button", {
+    onClick: function onClick() {
+      return add();
+    }
+  }, "\u6DFB\u52A0"));
+};
+export default SelectAttr;

package/es/modules/dataReal/index1.js

@@ -22,10 +22,8 @@ import './css/index.less';
 import DataRealViewTable from './table';
 import * as _ from 'lodash';
 var classNameBase = 'dataReal';
-// const webSocketUrl = `${location.protocol == 'http:' ? 'ws' : 'wss'}://${
-//   location.host
-// }/eventtracking/ws?type=realTime`;
-var webSocketUrl = 'ws://172.31.31.50:19898/eventtracking/ws?type=realTime';
+var webSocketUrl = "".concat(location.protocol == 'http:' ? 'ws' : 'wss', "://").concat(location.host, "/eventtracking/ws?type=realTime");
+// 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));
@@ -88,9 +86,17 @@ var DataRealView = function DataRealView() {
         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 < 3) {
+      //   if (prev.length <= 200) {
       //     return [obj, ...prev];
       //   }
       //   prev.pop();
@@ -173,6 +179,19 @@ var DataRealView = function DataRealView() {
       return _ref.apply(this, arguments);
     };
   }();
+  useEffect(function () {
+    // 组件挂载时执行的操作
+    console.log('组件挂载');
+    // 返回一个清理函数，在组件卸载时执行
+    return function () {
+      if (textStatus) {
+        setTextStatus(false);
+        ws === null || ws === void 0 ? void 0 : ws.close(); // 停止刷新 关闭链接
+        setWs(null);
+        return;
+      }
+    };
+  }, []);
   useMemo(function () {
     if (currentMessageObj) {
       var _currentMessageObj$ev, _currentMessageObj$us, _currentMessageObj$us2;
@@ -181,7 +200,7 @@ var DataRealView = function DataRealView() {
       var hasFilterData = !filterData || matchesFilterData(currentMessageObj, filterData);
       if (hasEventName && hasUserId && hasFilterData) {
         setOldList(function (prev) {
-          if (prev.length < 3) {
+          if (prev.length < 51) {
             return [currentMessageObj].concat(_toConsumableArray(prev));
           }
           prev.pop();
@@ -202,7 +221,7 @@ var DataRealView = function DataRealView() {
       });
     }
     var newList = matchesSearchCriteria(oldList, eventName, searchUserId, filterData);
-    // const aa = newList?.slice(0, 2);
+    // const aa = newList?.slice(0, 50);
     setList(newList);
   }, [eventName, searchUserId, oldList, filterData]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.56-zhongyuan.11",
+  "version": "1.0.56-zhongyuan.13",
   "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": "d0e38f270e5a5edd9459cbedc0682272a22fa1be",
+  "gitHead": "d2dfa3c7a8f86fea47c792a28e9597a5801e4551",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }