@zgfe/modules-dm 1.0.56-zhongyuan.6 → 1.0.56-zhongyuan.8

package/es/modules/dataMap/css/index.css

@@ -74,6 +74,11 @@
 }
 .leftTreePage {
   background-color: white;
+  display: flex;
+  flex-direction: column;
+}
+.leftTreePage-top {
+  flex: 1;
 }
 .leftTreePage_selectMap {
   display: grid;
@@ -110,7 +115,7 @@
   display: grid;
   grid-template-columns: 1fr 60px;
   align-items: center;
-  padding: 16px;
+  padding: 20px;
   background-color: #fafafb;
   border: 1px solid #eee;
 }
@@ -150,14 +155,14 @@
   background-color: transparent;
 }
 .mapSetting .ant-dropdown-trigger.biz-select-handle.biz-condition-item-single-select::after {
-  content: "是";
-  display: inline-block;
   position: absolute;
-  width: 100%;
-  background-color: white;
   top: 0px;
   left: 0;
+  display: inline-block;
+  width: 100%;
+  padding-top: 8px;
   text-align: center;
   vertical-align: middle;
-  padding-top: 8px;
+  background-color: white;
+  content: '是';
 }

package/es/modules/dataMap/css/index.less

@@ -78,7 +78,15 @@
 }
 
 .leftTreePage {
+  display: flex;
+  flex-direction: column;
   background-color: white;
+  &-top {
+    flex: 1;
+  }
+  &-tree {
+    // max-height: 100%;
+  }
   &_selectMap {
     display: grid;
     grid-gap: 10px;
@@ -115,7 +123,7 @@
     display: grid;
     grid-template-columns: 1fr 60px;
     align-items: center;
-    padding: 16px;
+    padding: 20px;
     background-color: #fafafb;
     border: 1px solid #eee;
   }

package/es/modules/dataMap/mapDetail.js

@@ -23,6 +23,13 @@ var MapDetail = function MapDetail() {
   var onCurrentMap = function onCurrentMap(value) {
     setCurrentMap(value);
   };
+  var _useState5 = useState(),
+    _useState6 = _slicedToArray(_useState5, 2),
+    filterValue = _useState6[0],
+    setFilterValue = _useState6[1];
+  var onFilterValue = function onFilterValue(searchValue) {
+    setFilterValue(searchValue);
+  };
   return /*#__PURE__*/React.createElement(Row, {
     gutter: 24
   }, /*#__PURE__*/React.createElement(Col, {
@@ -33,12 +40,14 @@ var MapDetail = function MapDetail() {
     }
   }, /*#__PURE__*/React.createElement(LeftTree, {
     onChangeTree: onChangeTree,
-    onCurrentMap: onCurrentMap
+    onCurrentMap: onCurrentMap,
+    onFilterValue: onFilterValue
   })), /*#__PURE__*/React.createElement(Col, {
     span: 16
   }, /*#__PURE__*/React.createElement(RightDetail, {
     currentTreeData: currentTreeData && JSON.stringify(currentTreeData) != '{}' && currentTreeData,
-    currentMap: currentMap
+    currentMap: currentMap,
+    filterValue: filterValue
   })));
 };
 export default MapDetail;

package/es/modules/dataReal/index1.js

@@ -64,13 +64,19 @@ var DataRealView = function DataRealView() {
     };
     // 监听消息事件
     socket.onmessage = function (event) {
-      var _message$detail, _message$detail$0$pr, _message$detail2, _message$detail2$, _message$detail2$$pr;
+      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 === 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') || filterPro('$ct', event),
-        eventName: filterPro('$eid', event),
-        userId: (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.$cuid) || filterPro('$cuid', event),
-        data: event.data
+        // 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))
       };
       // 最多为500条 超出去掉第一条
       // setOldList((prev: any) => {
@@ -121,7 +127,8 @@ var DataRealView = function DataRealView() {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var match = _step.value;
         if (match && match[1]) {
-          eidValues.push(match[1]);
+          // 事件名去重
+          !eidValues.includes(match[1]) && eidValues.push(match[1]);
         }
       }
     } catch (err) {

package/es/modules/dataReal/table.js

@@ -139,6 +139,7 @@ var DataRealViewTable = function DataRealViewTable(_ref) {
     maxCharactersNumber: 1000000,
     autoWrapText: true,
     defaultHeaderRowHeight: 70,
+    // defaultRowHeight: 'auto', // 默认单元格行高
     defaultRowHeight: 470,
     enableLineBreak: true,
     rowSeriesNumber: {

package/package.json

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

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

@@ -1,7 +0,0 @@
-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

@@ -1,92 +0,0 @@
-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;