ztxkui 2.9.8 → 3.0.1

package/dist/DemoCom/FormDemo.js

@@ -92,7 +92,7 @@ var FormDemo = function () {
     return (React.createElement(React.Fragment, null,
         React.createElement(Form, { name: "test-list", form: form },
             React.createElement(SearchContainer, { dark: true },
-                React.createElement(SearchLeft, { configInfo: configInfoMemo },
+                React.createElement(SearchLeft, { isDynamic: true, dynamicStorageKey: "symbol-key-00001" },
                     React.createElement(SearchItem, { width: "half", name: "pwNo", configname: "pwNoCopy", label: "\u5165\u5E93\u5355\u53F7", rules: [
                             {
                                 required: true,
@@ -127,7 +127,7 @@ var FormDemo = function () {
                         React.createElement(Select, { allowClear: true },
                             React.createElement(Select.Option, { value: "1" }, "\u662F"),
                             React.createElement(Select.Option, { value: "0" }, "\u5426"))),
-                    React.createElement(SearchItem, { name: "test1", label: "\u90E8\u95E8\u540D\u79F0" },
+                    React.createElement(SearchItem, { name: "test1", label: "", hiddenLabelName: "\u6D4B\u8BD5\u90E8\u95E8\u4E0D\u663E\u793A" },
                         React.createElement(Checkbox.Group, null,
                             React.createElement(Checkbox, { value: "1" }, "\u662F"),
                             React.createElement(Checkbox, { value: "2" }, "\u5426"))),

package/dist/components/Button/button.js

@@ -20,29 +20,30 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React from 'react';
+import React, { useRef } from 'react';
 import { Button as AntButton } from 'antd';
 import classNames from 'classnames';
 var maxClickTime = 1000;
 var Button = function (props) {
     var _a;
     var children = props.children, type = props.type, size = props.size, disabled = props.disabled, danger = props.danger, className = props.className, onClick = props.onClick, _b = props.agentClick, agentClick = _b === void 0 ? true : _b, restProps = __rest(props, ["children", "type", "size", "disabled", "danger", "className", "onClick", "agentClick"]);
+    var startTimeRef = useRef(0);
     var classes = classNames('zt-btn', className, (_a = {},
         _a["zt-btn-" + type] = type,
         _a["zt-btn-disabled"] = disabled,
         _a["zt-btn-" + size] = size,
         _a["zt-btn-dangerous"] = danger,
         _a));
-    var startTime = 0;
     var myOnClick = function (event) {
         if (agentClick) {
             var nowDateTime = Date.now();
-            if (startTime === 0 || nowDateTime - startTime > maxClickTime) {
-                startTime = nowDateTime;
+            if (startTimeRef.current === 0 ||
+                nowDateTime - startTimeRef.current > maxClickTime) {
+                startTimeRef.current = nowDateTime;
                 onClick && onClick(event);
             }
             else {
-                startTime = nowDateTime;
+                startTimeRef.current = nowDateTime;
                 console.log('点击按钮过于频繁');
             }
         }

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/dist/components/business/SearchContainer/hooks/useDynamic.d.ts

@@ -4,6 +4,8 @@ export interface ISearchLayout {
     label?: string;
     show?: boolean;
     disabled?: boolean;
+    hiddenLabelName?: string;
+    [props: string]: any;
 }
 /**
  * @description 将动态配置存在本地存储中

package/dist/components/business/SearchContainer/hooks/useDynamic.js

@@ -98,10 +98,11 @@ dynamicStorageKey // 动态列配置的key值
             // 遍历当前子元素
             React.Children.forEach(children, function (item) {
                 if (item === null || item === void 0 ? void 0 : item.props) {
-                    var _a = item.props, name_2 = _a.name, label = _a.label, disabled = _a.disabled;
+                    var _a = item.props, name_2 = _a.name, label = _a.label, hiddenLabelName = _a.hiddenLabelName, disabled = _a.disabled;
                     _initDynamicList_1.push({
                         name: name_2,
                         label: label,
+                        hiddenLabelName: hiddenLabelName,
                         show: true,
                         disabled: disabled,
                     });
@@ -109,6 +110,7 @@ dynamicStorageKey // 动态列配置的key值
                         _currentDynamicList_1.push({
                             name: name_2,
                             label: label,
+                            hiddenLabelName: hiddenLabelName,
                             show: true,
                             disabled: disabled,
                         });

package/dist/components/business/SearchContainer/search-drawer.js

@@ -60,6 +60,6 @@ var SearchDrawer = function (_a) {
     return (React.createElement(Drawer, { className: "search-drawer", title: "\u67E5\u8BE2\u6761\u4EF6\u5207\u6362", placement: "right", visible: visible, closable: false, maskClosable: false, footer: renderFooter() },
         React.createElement(DndProvider, { backend: HTML5Backend, context: window },
             React.createElement(Checkbox.Group, { value: checkedValues, onChange: onCheckboxChange }, dynamicList.map(function (item, index) { return (React.createElement(Sortable, { key: item.name, type: "search-drawer", index: index, onMoveItem: onMoveItem },
-                React.createElement(Checkbox, { value: item.name }, item.label || item.name))); })))));
+                React.createElement(Checkbox, { value: item.name }, item.label || item.hiddenLabelName || item.name))); })))));
 };
 export default memo(SearchDrawer);

package/dist/components/business/SearchContainer/search-item.d.ts

@@ -14,6 +14,8 @@ export interface ISearchItem extends FormItemProps {
     configname?: string;
     /**不需要自动配置 */
     noauto?: string;
+    /**不显示label，但是作为动态表单配置启用 */
+    hiddenLabelName?: string;
 }
 declare const SearchItem: React.FC<ISearchItem>;
 export default SearchItem;

package/dist/components/business/SearchContainer/search-left.d.ts

@@ -4,6 +4,8 @@ export interface ISearchLayout {
     label?: string;
     show?: boolean;
     disabled?: boolean;
+    hiddenLabelName?: string;
+    [props: string]: any;
 }
 export interface ISearchLeft {
     isDynamic?: boolean;

package/package.json

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