@zgfe/modules-event 1.0.5-heyh.8 → 1.0.5

package/es/components/renderContent/index.js

@@ -1,14 +1,30 @@
-import React, { useContext } from 'react';
+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 { 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;
+    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);
+  };
   if (loading) {
     return /*#__PURE__*/React.createElement(BizLoading, {
       className: "".concat(classPrefix, "-loading")
@@ -18,6 +34,21 @@ 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/components/table/index.js

@@ -44,8 +44,7 @@ var EventTable = function EventTable(props) {
     onUserDrill = _useContext2.onUserDrill,
     _useContext2$defaultS = _useContext2.defaultSearch,
     defaultSearch = _useContext2$defaultS === void 0 ? {} : _useContext2$defaultS,
-    panelName = _useContext2.panelName,
-    setFinalSearchData = _useContext2.setFinalSearchData;
+    panelName = _useContext2.panelName;
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
     sqlModal = _useState4[0],
@@ -93,7 +92,6 @@ var EventTable = function EventTable(props) {
           });
         });
       }
-      setFinalSearchData({});
       onUserDrill && onUserDrill({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: (searchData === null || searchData === void 0 ? void 0 : searchData.platform) || 0,

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/home/index.js

@@ -19,8 +19,8 @@ import { getInitDate } from '../../constants/initData';
 import EventContent from '../content';
 import { chartTypes } from '../../constants';
 var classPrefix = 'event-module-container';
+var onChangeTimer = -1;
 var ModuleEvent = function ModuleEvent(props) {
-  console.log('ModuleEvent-props', props);
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     eventGroupList = _useContext.eventGroupList,
@@ -31,46 +31,42 @@ var ModuleEvent = function ModuleEvent(props) {
     _useState2 = _slicedToArray(_useState, 2),
     searchData = _useState2[0],
     setSearchData = _useState2[1];
-  useEffect(function () {
-    console.log('searchData变更: ', searchData);
-  }, [searchData]);
-  var _useState3 = useState(),
-    _useState4 = _slicedToArray(_useState3, 2),
-    finalSearchData = _useState4[0],
-    setFinalSearchData = _useState4[1];
   var onChangeUrlParam = function onChangeUrlParam(data) {
-    props.onChange({
-      data: data
-    });
+    clearTimeout(onChangeTimer);
+    onChangeTimer = setTimeout(function () {
+      props.onChange({
+        data: data
+      });
+    }, 500);
   };
-  var _useState5 = useState(),
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectEventData = _useState4[0],
+    setSelectEventData = _useState4[1];
+  var _useState5 = useState(true),
     _useState6 = _slicedToArray(_useState5, 2),
-    selectEventData = _useState6[0],
-    setSelectEventData = _useState6[1];
+    loading = _useState6[0],
+    setLoading = _useState6[1];
   var _useState7 = useState(true),
     _useState8 = _slicedToArray(_useState7, 2),
-    loading = _useState8[0],
-    setLoading = _useState8[1];
-  var _useState9 = useState(true),
+    pageLoading = _useState8[0],
+    setPageLoading = _useState8[1];
+  var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
-    pageLoading = _useState10[0],
-    setPageLoading = _useState10[1];
+    title = _useState10[0],
+    setTitle = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    title = _useState12[0],
-    setTitle = _useState12[1];
+    panelId = _useState12[0],
+    setPanelId = _useState12[1];
   var _useState13 = useState(),
     _useState14 = _slicedToArray(_useState13, 2),
-    panelId = _useState14[0],
-    setPanelId = _useState14[1];
+    elementId = _useState14[0],
+    setElementId = _useState14[1];
   var _useState15 = useState(),
     _useState16 = _slicedToArray(_useState15, 2),
-    elementId = _useState16[0],
-    setElementId = _useState16[1];
-  var _useState17 = useState(),
-    _useState18 = _slicedToArray(_useState17, 2),
-    showList = _useState18[0],
-    setShowList = _useState18[1];
+    showList = _useState16[0],
+    setShowList = _useState16[1];
   useEffect(function () {
     setPageLoading(true);
     if (props.defaultValue) {
@@ -144,8 +140,6 @@ var ModuleEvent = function ModuleEvent(props) {
       userPropList: userPropList,
       searchData: searchData,
       setSearchData: setSearchData,
-      finalSearchData: finalSearchData,
-      setFinalSearchData: setFinalSearchData,
       onChangeUrlParam: onChangeUrlParam,
       selectEventData: selectEventData,
       onSelectEvent: onSelectEvent,

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.8",
+  "version": "1.0.5",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -36,7 +36,7 @@
     "@types/lodash": "^4.14.191",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.2.17-heyh.2",
+    "@zgfe/business-lib": "1.2.17",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "echarts": "^5.3.2",
@@ -49,7 +49,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "1413b77f8d7d0b13b4ca34c9cdee91aa558a9eb6",
+  "gitHead": "b3d13b1509334739bcf179bbd3aaf64829c82c48",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"