@zgfe/modules-attribution 1.0.1-alpha.26 → 1.0.1-alpha.29

package/es/modules/content/index.js

@@ -10,14 +10,11 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { BizGlobalDataContext } from '@zgfe/business-lib';
 import request from '../../utils/request';
 import React, { useContext, useEffect, useState, useRef } from 'react';
-import Request from 'umi-request';
 import SearchPanel from '../searchPanel';
 import './styles/index.less';
 import { Apis } from '../../constants';
 import { handleTableData } from './utils';
 import { TableList, OptionGroup, SearchTime } from '../../components';
-var CancelToken = Request.CancelToken;
-var cancel;
 var classPrefix = 'attribution-content';
 var AttributionContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _useState = useState(props.value),
@@ -28,59 +25,39 @@ var AttributionContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
-  var _useState5 = useState(0),
-    _useState6 = _slicedToArray(_useState5, 2),
-    timer = _useState6[0],
-    setTimer = _useState6[1];
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
-  var _useState7 = useState(true),
+  var _useState5 = useState(true),
+    _useState6 = _slicedToArray(_useState5, 2),
+    isFetchRequest = _useState6[0],
+    setIsFetchRequest = _useState6[1];
+  var _useState7 = useState(null),
     _useState8 = _slicedToArray(_useState7, 2),
-    isFetchRequest = _useState8[0],
-    setIsFetchRequest = _useState8[1];
-  var _useState9 = useState(null),
-    _useState10 = _slicedToArray(_useState9, 2),
-    time = _useState10[0],
-    setTime = _useState10[1];
+    time = _useState8[0],
+    setTime = _useState8[1];
   useEffect(function () {
     if (searchData.sourceFilters && searchData.sourceFilters[0].eventId === -100) return;
-    if (timer) clearTimeout(timer);
-    var flag = true;
-    setTimer(setTimeout(function () {
-      if (flag) {
-        fetchRequest();
-      }
-    }, 500));
-    return function () {
-      if (timer) clearTimeout(timer);
-      flag = false;
-    };
-  }, [searchData, time]);
+    fetchRequest();
+  }, [searchData]);
   useEffect(function () {
     props.onSearching && props.onSearching(loading);
   }, [loading]);
-  var _useState11 = useState(100),
-    _useState12 = _slicedToArray(_useState11, 2),
-    total = _useState12[0],
-    setTotal = _useState12[1];
+  var _useState9 = useState(100),
+    _useState10 = _slicedToArray(_useState9, 2),
+    total = _useState10[0],
+    setTotal = _useState10[1];
   var fetchRequest = function fetchRequest() {
     if (!isFetchRequest) {
       return;
     }
     setIsFetchRequest(false);
     setLoading(true);
-    if (typeof cancel === 'function') {
-      cancel();
-    }
     var _searchData = _objectSpread(_objectSpread({}, searchData), {}, {
       targetFilters: searchData.targetFilters[0]
     });
     request(Apis.getAnalyseData, {
       method: 'post',
-      data: _objectSpread(_objectSpread(_objectSpread({}, currentApp), _searchData), time),
-      cancelToken: new CancelToken(function executor(c) {
-        cancel = c;
-      })
+      data: _objectSpread(_objectSpread(_objectSpread({}, currentApp), _searchData), time)
     }).then(function (res) {
       if (res === null || res === void 0 ? void 0 : res.data) {
         var _data = handleTableData(res === null || res === void 0 ? void 0 : res.data);
@@ -89,7 +66,7 @@ var AttributionContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }
       setTimeout(function () {
         setLoading(false);
-      }, 0);
+      }, 20);
     }).catch(function () {
       setLoading(false);
     });
@@ -108,10 +85,10 @@ var AttributionContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
       return _objectSpread(_objectSpread({}, value), data);
     });
   };
-  var _useState13 = useState({}),
-    _useState14 = _slicedToArray(_useState13, 2),
-    tableDataList = _useState14[0],
-    setTableDataList = _useState14[1];
+  var _useState11 = useState({}),
+    _useState12 = _slicedToArray(_useState11, 2),
+    tableDataList = _useState12[0],
+    setTableDataList = _useState12[1];
   var SearchPanelRef = useRef(null);
   var onGetSearchData = function onGetSearchData() {
     if (SearchPanelRef) {

package/es/modules/searchPanel/index.js

@@ -24,7 +24,8 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     resetTime = props.resetTime;
   var _useContext = useContext(AttributableContext),
     buttonDisable = _useContext.buttonDisable,
-    setButtonDisable = _useContext.setButtonDisable;
+    setButtonDisable = _useContext.setButtonDisable,
+    searching = _useContext.searching;
   var _useContext2 = useContext(BizGlobalDataContext),
     eventGroupList = _useContext2.eventGroupList;
   var _Form$useForm = Form.useForm(),
@@ -108,12 +109,12 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
         setReset(null);
       }
       setFormData(data);
-      setSelectEventIdList(defaultValue);
-      if (defaultValue.windowType !== undefined) {
-        setOtherEvent(defaultValue.otherEvent);
-        setWindowCnt(defaultValue.windowCnt);
-        setwindowTypeUnit(defaultValue.windowType);
-        defaultValue.windowCnt == -1 ? setWindowType(1) : setWindowType(2);
+      setSelectEventIdList(data);
+      if (data.windowType !== undefined) {
+        setOtherEvent(data.otherEvent);
+        setWindowCnt(data.windowCnt);
+        setwindowTypeUnit(data.windowType);
+        data.windowCnt == -1 ? setWindowType(1) : setWindowType(2);
       }
       var _attrCount = {};
       var _sourceCount = {};
@@ -345,8 +346,8 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     type: "primary",
     onClick: onReset
   }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
-    className: "".concat(buttonDisable ? 'disable' : ''),
-    disabled: buttonDisable,
+    className: "".concat(searching || buttonDisable ? 'disable' : ''),
+    disabled: searching || buttonDisable,
     type: "primary",
     onClick: function onClick() {
       return onFinish(true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-attribution",
-  "version": "1.0.1-alpha.26",
+  "version": "1.0.1-alpha.29",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -50,5 +50,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "2ea8da6f86d57e0a2d303d750a3172f253d0d8c3"
+  "gitHead": "a81e8298a86e15554b7b057e78fb92d7000ee0e6"
 }