@zgfe/modules-dm 1.0.56-zhongyuan.15 → 1.0.56-zhongyuan.16

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

@@ -40,6 +40,7 @@ var DrawerAdd = function DrawerAdd(props) {
   }, [props.open]);
   var closeDrawer = function closeDrawer() {
     setIsOpen(false);
+    setEvent({});
     form.resetFields(); // 表单重置
     conditionRef.current.deleteAll(); // 重置固定筛选数组
     props.handleClose();
@@ -183,6 +184,7 @@ var DrawerAdd = function DrawerAdd(props) {
     placement: "right",
     onClose: onClose,
     open: isOpen,
+    destroyOnClose: true,
     width: "800px",
     footer: /*#__PURE__*/React.createElement("div", {
       className: "".concat(pageClassName, "_footer")

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

@@ -194,7 +194,7 @@ var RightDetail = function RightDetail(props) {
           pageName: currentTreeData === null || currentTreeData === void 0 ? void 0 : currentTreeData.pageAttrName
         }
       }).then(function (res) {
-        var _res$data, _res$data2, _res$data3, _res$data4, _res$data5;
+        var _res$data, _res$data2, _res$data3, _res$data4, _res$data5, _res$data6;
         setLoadingDetail(false);
         if (!res) return;
         setCurrentTreeDetail(res === null || res === void 0 ? void 0 : res.data);
@@ -204,11 +204,11 @@ var RightDetail = function RightDetail(props) {
           description: (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.pageDescribe) || ''
         });
         setImagePath(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.pagePath);
-        setImageUrl([{
+        (res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.pageUrl) && setImageUrl([{
           status: 'done',
           name: '',
-          url: (res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.pageUrl) && getImgUrl(res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.pageUrl, '-99'),
-          uid: res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.pagePath
+          url: (res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.pageUrl) && getImgUrl(res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.pageUrl, '-99'),
+          uid: res === null || res === void 0 ? void 0 : (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.pagePath
         }]);
       });
     }
@@ -493,59 +493,11 @@ var RightDetail = function RightDetail(props) {
           userGroup: [0]
         }
       }).then(function (res) {
-        var _res$data6, _res$data6$series, _res$data6$series$, _res$data6$series$$va;
-        resolve((res === null || res === void 0 ? void 0 : (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : (_res$data6$series = _res$data6.series) === null || _res$data6$series === void 0 ? void 0 : (_res$data6$series$ = _res$data6$series[0]) === null || _res$data6$series$ === void 0 ? void 0 : (_res$data6$series$$va = _res$data6$series$.values) === null || _res$data6$series$$va === void 0 ? void 0 : _res$data6$series$$va[0]) || 0);
+        var _res$data7, _res$data7$series, _res$data7$series$, _res$data7$series$$va;
+        resolve((res === null || res === void 0 ? void 0 : (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : (_res$data7$series = _res$data7.series) === null || _res$data7$series === void 0 ? void 0 : (_res$data7$series$ = _res$data7$series[0]) === null || _res$data7$series$ === void 0 ? void 0 : (_res$data7$series$$va = _res$data7$series$.values) === null || _res$data7$series$$va === void 0 ? void 0 : _res$data7$series$$va[0]) || 0);
       });
     });
   };
-  var getPageView = function getPageView(params) {
-    return new Promise(function (resolve, reject) {
-      // console.log(eventNameMap);
-      var haveEventName = eventNameMap === null || eventNameMap === void 0 ? void 0 : eventNameMap[params.name];
-      if (haveEventName) {
-        var haveFilter = haveEventName.attrList.filter(function (m) {
-          var _params$attrs$filters;
-          return (_params$attrs$filters = params.attrs.filters) === null || _params$attrs$filters === void 0 ? void 0 : _params$attrs$filters.includes(m.label);
-        });
-        var pinParams = [];
-        haveFilter.forEach(function (o) {
-          pinParams.push({
-            propCategory: 'eventProp',
-            type: 1,
-            attrId: o.id,
-            attrName: o.label
-          });
-        });
-        // console.log(pinParams, 'pinParams');
-        var pageId = haveEventName.attrList.filter(function (m) {
-          return (m === null || m === void 0 ? void 0 : m.key) == params.attrs.page;
-        });
-        var resultParams = {
-          data: {
-            chartType: 'line',
-            module: 'insight',
-            userGroup: [0],
-            globalDimensions: pinParams,
-            targets: [{
-              alias: haveEventName.name,
-              filters: (currentMap === null || currentMap === void 0 ? void 0 : currentMap.filterJson) && JSON.parse(currentMap === null || currentMap === void 0 ? void 0 : currentMap.filterJson),
-              analysisDimension: {
-                analysisIndex: 'number'
-              },
-              eventGroupId: 0,
-              eventId: haveEventName.id,
-              eventName: haveEventName.name,
-              type: 'event'
-            }]
-          }
-        };
-        resolve(resultParams);
-        throw Error('用来终止循环的');
-      } else {
-        resolve(false);
-      }
-    });
-  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, loadingDetail ? (/*#__PURE__*/React.createElement(Spin, {
     tip: "\u52A0\u8F7D\u4E2D"
   })) : (currentTreeData === null || currentTreeData === void 0 ? void 0 : currentTreeData.pageAttrName) ? (/*#__PURE__*/React.createElement(Card, {
@@ -558,13 +510,13 @@ var RightDetail = function RightDetail(props) {
     bordered: false,
     extra: isEdit ? (/*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
       onClick: function onClick() {
-        (currentTreeDetail === null || currentTreeDetail === void 0 ? void 0 : currentTreeDetail.pageUrl) && setImageUrl([{
+        (currentTreeDetail === null || currentTreeDetail === void 0 ? void 0 : currentTreeDetail.pageUrl) ? setImageUrl([{
           status: 'done',
           // name: currentTreeDetail?.pageUrl,
           name: '',
           url: (currentTreeDetail === null || currentTreeDetail === void 0 ? void 0 : currentTreeDetail.pageUrl) && getImgUrl(currentTreeDetail === null || currentTreeDetail === void 0 ? void 0 : currentTreeDetail.pageUrl, '-99'),
           uid: currentTreeDetail === null || currentTreeDetail === void 0 ? void 0 : currentTreeDetail.pagePath
-        }]);
+        }]) : setImageUrl([]);
         setIsEdit(false);
       }
     }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {

package/es/modules/dataMap/mapSetting.js

@@ -152,7 +152,7 @@ var MapSetting = function MapSetting(props) {
     value: searchName,
     allowClear: true,
     onChange: onChange
-  }), "\u517120\u6761"), /*#__PURE__*/React.createElement(Button, {
+  }), "\u5171 ", mapData === null || mapData === void 0 ? void 0 : mapData.length, " \u6761"), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: function onClick() {
       return setOpenMapAdd(true);

package/es/modules/dataReal/css/index.css

@@ -16,10 +16,12 @@
 .dataReal_table_tip {
   margin: 0px 0px 16px;
   color: #021429;
+  font-weight: bold;
 }
 .dataReal_table_tip span {
   margin: 0px 0px 0px 6px;
   color: #67727f;
+  font-weight: 400;
 }
 .dataReal-infoData {
   display: flex;

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

@@ -15,9 +15,11 @@
     &_tip {
       margin: 0px 0px 16px;
       color: #021429;
+      font-weight: bold;
       span {
         margin: 0px 0px 0px 6px;
         color: #67727f;
+        font-weight: 400;
       }
     }
   }

package/es/modules/dataReal/index1.js

@@ -15,7 +15,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import { BizGlobalDataContext, IconFont } from '@zgfe/business-lib';
 import { Button, Form, Input } from 'antd';
-import React, { useContext, useEffect, useMemo, useState } from 'react';
+import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import moment from 'moment';
 import { getAppID } from '../../utils';
 import './css/index.less';
@@ -32,22 +32,16 @@ var DataRealView = function DataRealView() {
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     currentUser = _useContext.currentUser;
-  var _useState = useState(false),
+  var textStatus = useRef(false);
+  var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
-    textStatus = _useState2[0],
-    setTextStatus = _useState2[1];
+    oldList = _useState2[0],
+    setOldList = _useState2[1]; // 未筛选的数据
   var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
-    oldList = _useState4[0],
-    setOldList = _useState4[1]; // 未筛选的数据
-  var _useState5 = useState([]),
-    _useState6 = _slicedToArray(_useState5, 2),
-    list = _useState6[0],
-    setList = _useState6[1]; // 表格筛选完成的数据
-  var _useState7 = useState(null),
-    _useState8 = _slicedToArray(_useState7, 2),
-    ws = _useState8[0],
-    setWs = _useState8[1];
+    list = _useState4[0],
+    setList = _useState4[1]; // 表格筛选完成的数据
+  var ws = useRef(null);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -55,10 +49,10 @@ var DataRealView = function DataRealView() {
   var eventName = Form.useWatch('eventName', form);
   var searchUserId = Form.useWatch('searchUserId', form);
   var filterData = Form.useWatch('filterData', form);
-  var _useState9 = useState(),
-    _useState10 = _slicedToArray(_useState9, 2),
-    currentMessageObj = _useState10[0],
-    setCurrentMessageObj = _useState10[1];
+  var _useState5 = useState(),
+    _useState6 = _slicedToArray(_useState5, 2),
+    currentMessageObj = _useState6[0],
+    setCurrentMessageObj = _useState6[1];
   var initWebsocket = function initWebsocket(params) {
     // 创建 WebSocket 连接
     var socket = new WebSocket(webSocketUrl);
@@ -112,7 +106,7 @@ var DataRealView = function DataRealView() {
       console.log('WebSocket disconnected:', event.reason);
     };
     // 设置 WebSocket
-    setWs(socket);
+    ws.current = socket;
   };
   var filterPro = function filterPro(str, event) {
     // 定义正则表达式，匹配"$eid":"具体值"这种格式中的具体值部分
@@ -148,17 +142,17 @@ var DataRealView = function DataRealView() {
   };
   var handleRefresh = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var params;
+      var _ws$current, params;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            setTextStatus(!textStatus);
-            if (!textStatus) {
+            textStatus.current = !textStatus.current;
+            if (textStatus.current) {
               _context.next = 5;
               break;
             }
-            ws === null || ws === void 0 ? void 0 : ws.close(); // 停止刷新 关闭链接
-            setWs(null);
+            (_ws$current = ws.current) === null || _ws$current === void 0 ? void 0 : _ws$current.close(); // 停止刷新 关闭链接
+            ws.current = null;
             return _context.abrupt("return");
           case 5:
             // const data = form.getFieldsValue(true); // 表单数据
@@ -181,15 +175,35 @@ var DataRealView = function DataRealView() {
   }();
   useEffect(function () {
     // 组件挂载时执行的操作
-    console.log('组件挂载');
     // 返回一个清理函数，在组件卸载时执行
     return function () {
-      if (textStatus) {
-        setTextStatus(false);
-        ws === null || ws === void 0 ? void 0 : ws.close(); // 停止刷新 关闭链接
-        setWs(null);
-        return;
-      }
+      // 模拟异步保存数据到本地存储
+      var unloadWs = /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.prev = 0;
+                _context2.next = 3;
+                return handleRefresh();
+              case 3:
+                _context2.next = 8;
+                break;
+              case 5:
+                _context2.prev = 5;
+                _context2.t0 = _context2["catch"](0);
+                console.error('websocket:', _context2.t0);
+              case 8:
+              case "end":
+                return _context2.stop();
+            }
+          }, _callee2, null, [[0, 5]]);
+        }));
+        return function unloadWs() {
+          return _ref2.apply(this, arguments);
+        };
+      }();
+      unloadWs();
     };
   }, []);
   useMemo(function () {
@@ -273,12 +287,12 @@ var DataRealView = function DataRealView() {
   }))), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: handleRefresh,
-    icon: textStatus ? /*#__PURE__*/React.createElement(IconFont, {
+    icon: textStatus.current ? /*#__PURE__*/React.createElement(IconFont, {
       type: "zanting"
     }) : /*#__PURE__*/React.createElement(IconFont, {
       type: "bofang"
     })
-  }, textStatus ? '停止刷新' : '开始刷新')), /*#__PURE__*/React.createElement("div", {
+  }, textStatus.current ? '停止刷新' : '开始刷新')), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classNameBase, "_table")
   }, /*#__PURE__*/React.createElement("h4", {
     className: "".concat(classNameBase, "_table_tip")

package/es/modules/dataReal/table.js

@@ -13,15 +13,30 @@ var DataRealViewTable = function DataRealViewTable(_ref) {
     title: '触发时间',
     field: 'time',
     width: 160,
-    sort: true
+    sort: true,
+    headerStyle: {
+      fontSize: 14,
+      color: '#021429',
+      fontWeight: 400
+    }
   }, {
     title: '事件名',
     field: 'eventName',
-    width: 160
+    width: 160,
+    headerStyle: {
+      fontSize: 14,
+      color: '#021429',
+      fontWeight: 400
+    }
   }, {
     title: '用户ID',
     field: 'userId',
-    width: 160
+    width: 160,
+    headerStyle: {
+      fontSize: 14,
+      color: '#021429',
+      fontWeight: 400
+    }
   }, {
     title: '数据',
     field: 'data',
@@ -29,6 +44,11 @@ var DataRealViewTable = function DataRealViewTable(_ref) {
     style: {
       autoWrapText: true,
       lineHeight: 30
+    },
+    headerStyle: {
+      fontSize: 14,
+      color: '#021429',
+      fontWeight: 400
     }
     // customRender(args: any) {
     //   const { dataValue } = args;
@@ -139,11 +159,16 @@ var DataRealViewTable = function DataRealViewTable(_ref) {
     maxCharactersNumber: 1000000,
     autoWrapText: true,
     defaultHeaderRowHeight: 70,
-    // defaultRowHeight: 'auto', // 默认单元格行高
-    defaultRowHeight: 470,
+    defaultRowHeight: 'auto',
+    // defaultRowHeight: 470,
     enableLineBreak: true,
     rowSeriesNumber: {
-      title: '序号'
+      title: '序号',
+      headerStyle: {
+        fontSize: 14,
+        color: '#021429',
+        fontWeight: 400
+      }
     },
     keyboardOptions: {
       // 快捷键配置
@@ -151,7 +176,15 @@ var DataRealViewTable = function DataRealViewTable(_ref) {
       copySelected: true,
       pasteValueToCell: true
     },
-    editor: '',
+    editor: function editor(args) {
+      var tempInput = document.createElement('input');
+      tempInput.value = args.value;
+      document.body.appendChild(tempInput);
+      tempInput.select();
+      document.execCommand('copy');
+      document.body.removeChild(tempInput);
+      return args.value;
+    },
     autoFillWidth: true,
     emptyTip: {
       // 空数据提示

package/package.json

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