ztxkui 3.0.0 → 3.0.1

package/dist/components/EnhanceSelect/index.js

@@ -28,6 +28,7 @@ import React, { useCallback, useEffect, memo, useRef, useState } from 'react';
 import { Select } from 'antd';
 import { useFetchState } from 'ztxkutils/dist/hooks';
 import debounce from 'lodash/debounce';
+import axios from 'axios';
 /**
  * 组件缓存的数据格式，在当前浏览器运行内，能保证是唯一的引用，用来缓存数据用
  * {
@@ -154,7 +155,8 @@ function EnhanceSelect(_a) {
         });
     }, [setSelectList, setLoading, transformData, mustHasParams]);
     // 远程搜索
-    var getRemoteDataHandle = useCallback(function (value, dataKeyValue) {
+    var getRemoteDataHandle = useCallback(function (value, dataKeyValue, options) {
+        if (options === void 0) { options = {}; }
         var searchKey = remoteSearchKey ? remoteSearchKey : titleKey;
         var searchDataKey = remoteSearchDataKey ? remoteSearchDataKey : dataKey;
         var outParams = params;
@@ -177,13 +179,10 @@ function EnhanceSelect(_a) {
         if (dataKeyValue) {
             searchParams[searchDataKey] = dataKeyValue + '';
         }
-        getData(request, {
-            url: url,
-            method: method,
-            params: __assign(__assign({ size: Array.isArray(dataKeyValue) && dataKeyValue.length > 30
+        getData(request, __assign({ url: url,
+            method: method, params: __assign(__assign({ size: Array.isArray(dataKeyValue) && dataKeyValue.length > 30
                     ? dataKeyValue.length
-                    : 30, page: 1 }, outParams), searchParams),
-        })
+                    : 30, page: 1 }, outParams), searchParams) }, options))
             .then(function (resData) {
             var _a, _b, _c, _d;
             if (fetchIdClosure < fetchId.current) {
@@ -256,6 +255,7 @@ function EnhanceSelect(_a) {
         if (!url || remoteSearch) {
             return;
         }
+        var source = null;
         // console.log('TEST: 异步获取');
         if (isCatch) {
             // 如果是走缓存的话，那么先往缓存数据中取，有没有当前数据，如果没有就发请求
@@ -271,7 +271,8 @@ function EnhanceSelect(_a) {
                 }
                 else {
                     // 发送接口请求，并设置缓存数据
-                    getDataHandle(request, { url: url, params: params, method: method, timeout: timeout }, {
+                    source = axios.CancelToken.source();
+                    getDataHandle(request, { url: url, params: params, method: method, timeout: timeout, cancelToken: source.token }, {
                         obj: catchData,
                         key: catchDataKey,
                     });
@@ -280,8 +281,20 @@ function EnhanceSelect(_a) {
         }
         else {
             // 直接发送接口请求
-            getDataHandle(request, { url: url, params: params, method: method, timeout: timeout });
+            source = axios.CancelToken.source();
+            getDataHandle(request, {
+                url: url,
+                params: params,
+                method: method,
+                timeout: timeout,
+                cancelToken: source.token,
+            });
         }
+        return function () {
+            if (source) {
+                source.cancel();
+            }
+        };
     }, [
         url,
         params,
@@ -300,6 +313,7 @@ function EnhanceSelect(_a) {
         if (!url || !remoteSearch) {
             return;
         }
+        var source = null;
         // console.log('TEST: 远程搜索');
         // 如果初始化请求已经做过了，那么这个副作用直接返回
         if (firstLoading) {
@@ -314,16 +328,23 @@ function EnhanceSelect(_a) {
         }
         if (!restProps.value) {
             // console.log('第一次请求数据');
-            getRemoteDataHandle('', '');
+            source = axios.CancelToken.source();
+            getRemoteDataHandle('', '', { cancelToken: source.token });
         }
         else {
             if (typeof restProps.value === 'string' ||
                 (Array.isArray(restProps.value) && restProps.value.length > 0)) {
                 // console.log('第二次请求数据，默认为需要根据主键去请求', restProps.value);
                 setFirstLoading(true);
-                getRemoteDataHandle('', restProps.value);
+                source = axios.CancelToken.source();
+                getRemoteDataHandle('', restProps.value, { cancelToken: source.token });
             }
         }
+        return function () {
+            if (source) {
+                source.cancel();
+            }
+        };
     }, [
         url,
         remoteSearch,
@@ -337,13 +358,19 @@ function EnhanceSelect(_a) {
         if (!url || !remoteSearch) {
             return;
         }
+        var source = null;
         // console.log('TEST: 远程搜索');
         // 这种情况不需要启用远程搜索key值
         if (!isRemoteSearchDataKey) {
-            getRemoteDataHandle('', '');
+            source = axios.CancelToken.source();
+            getRemoteDataHandle('', '', { cancelToken: source.token });
             setFirstLoading(true);
-            return;
         }
+        return function () {
+            if (source) {
+                source.cancel();
+            }
+        };
     }, [
         url,
         remoteSearch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",