@zgfe/modules-event 1.0.5-bug.0 → 1.0.5-heyh.0

package/es/components/eventFilter/index.js

@@ -102,6 +102,7 @@ var EventFilter = function EventFilter(props) {
     }
   }, [selectEventData]);
   var onAdd = function onAdd() {
+    var _conditionRef$current;
     if ((event === null || event === void 0 ? void 0 : event.id) === -1) {
       return;
     }
@@ -109,9 +110,7 @@ var EventFilter = function EventFilter(props) {
       return;
     }
     setIsAdd(true);
-    setTimeout(function () {
-      conditionRef.current.add();
-    }, 0);
+    conditionRef === null || conditionRef === void 0 ? void 0 : (_conditionRef$current = conditionRef.current) === null || _conditionRef$current === void 0 ? void 0 : _conditionRef$current.add();
   };
   var onChangeFilters = function onChangeFilters(data) {
     setFilter(data);

package/es/components/searchPanel/index.js

@@ -11,7 +11,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { BizDatePicker, BizSelect, BizTargetDimension, useChanged } from '@zgfe/business-lib';
-import React, { useContext, useEffect, useState, useMemo } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { chartTypeOptions, getInitDate } from '../../constants';
 import { EventContext } from '../../types';
 import { normalOptions, normalEventOptions } from '../../modules/content/utils';
@@ -32,21 +32,12 @@ var SearchPanel = function SearchPanel(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     chart = _useState4[0],
     setChart = _useState4[1];
-  var _useState5 = useState(true),
+  var _useState5 = useState(0),
     _useState6 = _slicedToArray(_useState5, 2),
-    timeFlag = _useState6[0],
-    setTimeFlag = _useState6[1];
-  var _useState7 = useState(0),
-    _useState8 = _slicedToArray(_useState7, 2),
-    timer = _useState8[0],
-    setTimer = _useState8[1];
-  var currentNormalOptions = useMemo(function () {
-    setTimeFlag(false);
-    setTimeout(function () {
-      setTimeFlag(true);
-    }, 0);
-    return analysisSubjectType === 'user' ? normalOptions : normalEventOptions;
-  }, [analysisSubjectType]);
+    timer = _useState6[0],
+    setTimer = _useState6[1];
+  var currentNormalOptions = analysisSubjectType === 'user' ? normalOptions : normalEventOptions;
+  console.log('analysisSubjectType: ', analysisSubjectType);
   useEffect(function () {
     if (searchData.chartType && searchData.chartType !== chart.value) {
       if (searchData.chartType.indexOf(',') !== -1) {
@@ -110,8 +101,8 @@ var SearchPanel = function SearchPanel(props) {
     defaultValue: time,
     onChange: onChangeTime,
     selectRange: 365
-  }), timeFlag && /*#__PURE__*/React.createElement(BizTargetDimension, {
-    normalOptions: currentNormalOptions,
+  }), /*#__PURE__*/React.createElement(BizTargetDimension, {
+    normalOptions: analysisSubjectType === 'user' ? normalOptions : normalEventOptions,
     value: dimension,
     eventId: props.eventId,
     isExtend: true,

package/es/modules/content/index.js

@@ -140,9 +140,7 @@ var EventContent = function EventContent(props) {
       }
       var result = res.data;
       var _data = searchData.dimension ? result : getChartDataEventAliasName(result, eventGroupList);
-      var list = _data ? getDefaultShow(_data) : [];
-      setShowList(list);
-      props.onChangeShow && props.onChangeShow(list);
+      setShowList(_data ? getDefaultShow(_data) : []);
       if (['bar', 'pie', 'map'].indexOf(searchData.chartType) !== -1) {
         _data = getSortData(_data);
       }
@@ -153,25 +151,20 @@ var EventContent = function EventContent(props) {
       }
       setFinalSearchData(_objectSpread({}, searchData));
       onChangeUrlParam(searchData);
-      setTimeout(function () {
-        setLoading(false);
-      }, 0);
+      setLoading(false);
     });
   };
   var onChangeContent = function onChangeContent(data) {
     ajaxFlag = true;
-    setTimeout(function () {
-      setSearchData(function (value) {
-        return _objectSpread(_objectSpread(_objectSpread({}, value), data), {}, {
-          analysisAttr: data.analysisAttr,
-          analysisIndex: data.analysisIndex
-        });
+    setSearchData(function (value) {
+      return _objectSpread(_objectSpread(_objectSpread({}, value), data), {}, {
+        analysisAttr: data.analysisAttr,
+        analysisIndex: data.analysisIndex
       });
     });
   };
   var onChangeShow = function onChangeShow(data) {
     setShowList(data);
-    props.onChangeShow && props.onChangeShow(data);
   };
   var platformChange = function platformChange(data) {
     ajaxFlag = true;

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

@@ -6,6 +6,5 @@ export declare namespace EventContentProps {
         show?: string[];
         onSearching?: (flag: boolean) => void;
         initSearch?: () => void;
-        onChangeShow?: (data: string[]) => void;
     }
 }

package/es/modules/home/demo/create.js

@@ -43,7 +43,7 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 502306
+    defaultApp: 461
   }, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       return setIsDetail(false);

package/es/modules/home/index.js

@@ -127,8 +127,7 @@ var ModuleEvent = function ModuleEvent(props) {
         params: _objectSpread({
           app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
           module: 'event'
-        }, searchData),
-        showList: showList
+        }, searchData)
       }
     } : undefined,
     disabled: props === null || props === void 0 ? void 0 : props.panelDisabled,
@@ -164,8 +163,7 @@ var ModuleEvent = function ModuleEvent(props) {
     elementId: elementId,
     value: searchData,
     show: showList,
-    initSearch: initSearch,
-    onChangeShow: setShowList
+    initSearch: initSearch
   })));
 };
 ModuleEvent.defaultProps = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "1.0.5-bug.0",
+  "version": "1.0.5-heyh.0",
   "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.1.99",
+    "@zgfe/business-lib": "1.2.17-heyh.1",
     "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": "c547470b1d32499155edbb36a23e1d9677ea2503",
+  "gitHead": "9c1230709eccd14352e1c71e194f0f7088c27cb5",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"