@zgfe/modules-event 1.0.5-heyh.7 → 1.0.5-heyh.9

package/es/components/renderContent/index.js

@@ -1,30 +1,14 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _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(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { Empty } from 'antd';
-import React, { useState, useContext } from 'react';
+import React, { useContext } from 'react';
 import { BizLoading } from '@zgfe/business-lib';
 import { EventContext } from '../../types';
 import './styles/index.less';
-import EventChart from '../../modules/chart';
 var classPrefix = 'render-content';
 var ContentPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var eventData = props.eventData,
     searchData = props.searchData;
+  console.log(eventData, searchData, ref);
   var _useContext = useContext(EventContext),
-    loading = _useContext.loading,
-    onSelectEvent = _useContext.onSelectEvent;
-  var _useState = useState(props.showList || []),
-    _useState2 = _slicedToArray(_useState, 2),
-    showList = _useState2[0],
-    setShowList = _useState2[1];
-  var onChangeShow = function onChangeShow(names) {
-    setShowList(names);
-    if (props.onChangeShow) props.onChangeShow(names);
-  };
+    loading = _useContext.loading;
   if (loading) {
     return /*#__PURE__*/React.createElement(BizLoading, {
       className: "".concat(classPrefix, "-loading")
@@ -34,21 +18,6 @@ var ContentPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-chart-container")
-  }, eventData ? /*#__PURE__*/React.createElement(EventChart, {
-    ref: ref,
-    dataSource: eventData,
-    params: searchData,
-    showList: showList
-  }) : /*#__PURE__*/React.createElement(Empty, {
-    image: Empty.PRESENTED_IMAGE_SIMPLE,
-    description: "\u6682\u65E0\u6570\u636E"
-  })), eventData && eventData.series.length > 0 ? /*#__PURE__*/React.createElement(EventChart, {
-    type: "grid",
-    dataSource: eventData,
-    params: searchData,
-    showList: showList,
-    onChangeShow: onChangeShow,
-    onSelectEvent: onSelectEvent
-  }) : null);
+  }));
 });
 export default ContentPanel;

package/es/modules/chart/index.js

@@ -127,7 +127,7 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
       className: "".concat(classPrefix, "-loading")
     });
   }
-  if (!dataSource || !(dataSource.xAxis.length || dataSource.series.length)) {
+  if (!dataSource || !dataSource.xAxis.length || !dataSource.series.length) {
     return /*#__PURE__*/React.createElement(Empty, {
       image: Empty.PRESENTED_IMAGE_SIMPLE,
       description: "\u6682\u65E0\u6570\u636E"
@@ -139,36 +139,14 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
       title: '当前图表数据实时更新，约每分钟更新一次'
     }, /*#__PURE__*/React.createElement("div", null, "\u6570\u636E\u66F4\u65B0\u65F6\u95F4\uFF1A", moment().format('YYYY-MM-DD HH:mm')));
   };
-  var chartBox = function chartBox() {
-    console.log('chartBox: ', chartBox);
-    if (dataSource.series.length <= 0) {
-      return /*#__PURE__*/React.createElement(Empty, {
-        image: Empty.PRESENTED_IMAGE_SIMPLE,
-        description: "\u6682\u65E0\u6570\u636E"
-      });
-    } else {
-      return /*#__PURE__*/React.createElement("div", {
-        className: "".concat(classPrefix, "-chart-box")
-      }, !!props.dataSource && dataUpdateTime(), /*#__PURE__*/React.createElement(BizChart, {
-        ref: ref,
-        key: chartType,
-        type: chartType,
-        data: chartType === 'map' ? getMapChartData(dataSource) : dataSource,
-        legendPosition: "bottom",
-        showList: showList,
-        colors: showColors,
-        xRotate: chartType === 'bar' && dataSource.series.length > 5 ? 40 : 0,
-        reverseXAxis: chartType === 'bar',
-        isCity: isCity
-      }));
-    }
-  };
   switch (chartType) {
     case 'line':
     case 'bar':
     case 'pie':
     case 'map':
-      return /*#__PURE__*/React.createElement(BizChart, {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "".concat(classPrefix, "-chart-box")
+      }, !!props.dataSource && dataUpdateTime(), /*#__PURE__*/React.createElement(BizChart, {
         ref: ref,
         key: chartType,
         type: chartType,
@@ -179,7 +157,7 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
         xRotate: chartType === 'bar' && dataSource.series.length > 5 ? 40 : 0,
         reverseXAxis: chartType === 'bar',
         isCity: isCity
-      });
+      }));
     case 'grid':
       return /*#__PURE__*/React.createElement(EventTable, {
         dataSource: dataSource,

package/es/modules/content/index.js

@@ -34,8 +34,6 @@ var EventContent = function EventContent(props) {
   var _useContext2 = useContext(EventContext),
     searchData = _useContext2.searchData,
     setSearchData = _useContext2.setSearchData,
-    finalSearchData = _useContext2.finalSearchData,
-    setFinalSearchData = _useContext2.setFinalSearchData,
     eventGroupList = _useContext2.eventGroupList,
     loading = _useContext2.loading,
     setLoading = _useContext2.setLoading,
@@ -149,7 +147,6 @@ var EventContent = function EventContent(props) {
       } else {
         setEventData(_data);
       }
-      setFinalSearchData(_objectSpread({}, searchData));
       onChangeUrlParam(searchData);
       setLoading(false);
     });
@@ -224,12 +221,9 @@ var EventContent = function EventContent(props) {
       onChange: onChangeSearch,
       loading: loading,
       value: searchData,
-      ajaxFlag: ajaxFlag,
       subDisplay: subDisplay,
       setIsCity: setIsCity,
       setEnableSelectChart: setEnableSelectChart,
-      finalSearchData: finalSearchData,
-      fetchRequest: fetchRequest,
       onChangeSubjectType: onChangeSubjectType
     })
   }, /*#__PURE__*/React.createElement("div", {
@@ -249,7 +243,7 @@ var EventContent = function EventContent(props) {
     ref: chartRef,
     isCity: isCity,
     eventData: eventData,
-    searchData: finalSearchData,
+    searchData: searchData,
     showList: showList,
     onChangeShow: onChangeShow
   }))));

package/es/modules/topPanel/types.d.ts

@@ -37,10 +37,7 @@ export interface TopPanelProps {
     value?: SearchValue;
     onChange: (data: SearchValue, flag: boolean) => void;
     loading?: boolean;
-    ajaxFlag: boolean;
     subDisplay?: boolean;
-    finalSearchData?: SearchValue;
-    fetchRequest: (flag?: boolean) => void;
     setIsCity?: Function;
     setEnableSelectChart?: Function;
     analysisSubjectType?: analysisSubjectType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "1.0.5-heyh.7",
+  "version": "1.0.5-heyh.9",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -49,7 +49,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "15a88377232f78224f4c955a3c7f79c09c15a10a",
+  "gitHead": "c28e7b33d2641b22b610a4d1572c31438041a5b3",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"