ztxkui 3.0.3 → 3.0.6

package/dist/DemoCom/BasicDemo.js

@@ -2,6 +2,7 @@ import InputNumber from 'components/InputNumber';
 import Tag from 'components/Tag';
 import Input from 'components/Input';
 import { FormList, RangePicker, Button } from '../index';
+import { InputNumber as AntInputNumber } from 'antd';
 import GridList from 'components/business/NewList';
 import { useState } from 'react';
 import './style.scss';
@@ -53,9 +54,15 @@ function BasicDemo() {
     ]), rangeValue = _b[0], setRangeValue = _b[1];
     return (React.createElement(React.Fragment, null,
         React.createElement(InputNumber, { value: value, onChange: function (value) {
-                console.log(value);
+                console.log(value, 1);
                 setValue(value);
-            }, min: 0, max: 10, formatterType: "percent" }),
+            }, precision: 4, formatterType: "currency", style: { width: '300px' } }),
+        React.createElement(AntInputNumber, { value: value, onChange: function (value) {
+                console.log(value, 1);
+                setValue(value);
+            }, formatter: function (value) {
+                return ("$ " + value).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+            }, parser: function (value) { return value.replace(/\$\s?|(,*)/g, ''); }, style: { width: '300px' } }),
         React.createElement("div", null,
             React.createElement(Tag, null, "\u4F60\u597D"),
             React.createElement(Tag, { type: "normal" }, "\u4F60\u597D"),
@@ -117,7 +124,6 @@ function BasicDemo() {
             } }, "\u8DF3\u8F6C"),
         React.createElement(Button, { type: "link", onClick: function () {
                 console.log(111);
-            }, showCopy: true, style: { width: '200px' } },
-            React.createElement("span", null, "\u6211\u662F\u4E00\u4E2A\u94FE\u63A51111111111111111111"))));
+            }, showCopy: true }, "\u6211\u662F\u4E00\u4E2A\u94FE\u63A51111111111111111111")));
 }
 export default BasicDemo;

package/dist/DemoCom/TableDemo.js

@@ -435,14 +435,15 @@ var list1 = [
 var TableDemo = function () {
     var _a = useGetTableRecords(), records = _a.records, setRecords = _a.setRecords;
     var _b = useGetSelectList(), list = _b.list, loading = _b.loading, setLoading = _b.setLoading;
+    var _c = useState(false), btnLoading = _c[0], setBtnLoading = _c[1];
     // 表格数据引用
     var recordsRef = useRef([]);
     // 初始化渲染，针对配置了editable、editableConfig的列配置
-    var _c = useState(false), firstRender = _c[0], setFirstRender = _c[1];
+    var _d = useState(false), firstRender = _d[0], setFirstRender = _d[1];
     // 新增删除行改变
-    var _d = useState(false), lengthChange = _d[0], setLengthChange = _d[1];
+    var _e = useState(false), lengthChange = _e[0], setLengthChange = _e[1];
     // 表格行拖拽改变
-    var _e = useState(false), moveChange = _e[0], setMoveChange = _e[1];
+    var _f = useState(false), moveChange = _f[0], setMoveChange = _f[1];
     useEffect(function () {
         setFirstRender(true);
     }, []);
@@ -580,12 +581,21 @@ var TableDemo = function () {
                     return "\u7B2C" + (index + 1) + "\u884C\uFF0C\u8D85\u51FA\u6700\u5927\u503C\uFF0C\u5DF2\u4FEE\u6539\u6210\u6700\u5927\u503C";
                 },
                 maxHandle: function (record) {
-                    return 10;
+                    return 10000;
                 },
                 lowMinTip: function (record, index) {
                     return "\u7B2C" + (index + 1) + "\u884C\uFF0C\u4F4E\u4E8E\u6700\u5C0F\u503C\uFF0C\u5DF2\u4FEE\u6539\u6210\u6700\u5C0F\u503C";
                 },
                 precision: 3,
+                formatterType: 'currency',
+                onBlur: function () {
+                    setBtnLoading(false);
+                    console.log('失去焦点了');
+                },
+                onFocus: function () {
+                    setBtnLoading(true);
+                    console.log('获得焦点了');
+                },
             },
         },
         {
@@ -714,7 +724,7 @@ var TableDemo = function () {
         },
     ];
     // 本地偏好设置相关
-    var _f = useState(getStorage('test-table') || []), tableLayout = _f[0], setTableLayout = _f[1];
+    var _g = useState(getStorage('test-table') || []), tableLayout = _g[0], setTableLayout = _g[1];
     var onDynamicChange = useCallback(function (tableLayout) {
         // 剔除调一些可能不可序列化的字段，只保留关键数据
         var newTableLayout = tableLayout.map(function (item) { return ({
@@ -789,7 +799,10 @@ var TableDemo = function () {
             // 表格行拖拽
             onMoveRow: onMoveRowHandle }),
         React.createElement("div", null,
-            React.createElement("button", { onClick: function () { return console.log(records); } }, "\u83B7\u53D6\u6570\u636E")),
+            React.createElement("button", { onClick: function () { return console.log(records); } }, "\u83B7\u53D6\u6570\u636E"),
+            React.createElement(Button, { loading: btnLoading, onClick: function () {
+                    console.log(111);
+                } }, "\u70B9\u51FB")),
         React.createElement(Empty, null)));
 };
 function getStorage(key) {

package/dist/components/EnhanceSelect/index.js

@@ -28,7 +28,6 @@ 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';
 /**
  * 组件缓存的数据格式，在当前浏览器运行内，能保证是唯一的引用，用来缓存数据用
  * {
@@ -262,7 +261,6 @@ function EnhanceSelect(_a) {
         if (!url || remoteSearch) {
             return;
         }
-        var source = null;
         // console.log('TEST: 异步获取');
         if (isCatch) {
             // 如果是走缓存的话，那么先往缓存数据中取，有没有当前数据，如果没有就发请求
@@ -278,45 +276,24 @@ function EnhanceSelect(_a) {
                 }
                 else {
                     // 发送接口请求，并设置缓存数据
-                    source = axios.CancelToken.source();
-                    getDataHandle(request, { url: url, params: params, method: method, timeout: timeout, cancelToken: source.token }, {
+                    getDataHandle(request, { url: url, params: params, method: method, timeout: timeout }, {
                         appointObj: {
                             obj: catchData,
                             key: catchDataKey,
                         },
-                        successCallback: function () {
-                            source = null;
-                        },
-                        errorCallback: function () {
-                            source = null;
-                        },
                     });
                 }
             }
         }
         else {
             // 直接发送接口请求
-            source = axios.CancelToken.source();
             getDataHandle(request, {
                 url: url,
                 params: params,
                 method: method,
                 timeout: timeout,
-                cancelToken: source.token,
-            }, {
-                successCallback: function () {
-                    source = null;
-                },
-                errorCallback: function () {
-                    source = null;
-                },
             });
         }
-        return function () {
-            if (source) {
-                source.cancel();
-            }
-        };
     }, [
         url,
         params,
@@ -335,7 +312,6 @@ function EnhanceSelect(_a) {
         if (!url || !remoteSearch) {
             return;
         }
-        var source = null;
         // console.log('TEST: 远程搜索');
         // 如果初始化请求已经做过了，那么这个副作用直接返回
         if (firstLoading) {
@@ -350,39 +326,16 @@ function EnhanceSelect(_a) {
         }
         if (!restProps.value) {
             // console.log('第一次请求数据');
-            source = axios.CancelToken.source();
-            getRemoteDataHandle('', '', {
-                options: { cancelToken: source.token },
-                successCallback: function () {
-                    source = null;
-                },
-                errorCallback: function () {
-                    source = null;
-                },
-            });
+            getRemoteDataHandle('', '');
         }
         else {
             if (typeof restProps.value === 'string' ||
                 (Array.isArray(restProps.value) && restProps.value.length > 0)) {
                 // console.log('第二次请求数据，默认为需要根据主键去请求', restProps.value);
                 setFirstLoading(true);
-                source = axios.CancelToken.source();
-                getRemoteDataHandle('', restProps.value, {
-                    options: { cancelToken: source.token },
-                    successCallback: function () {
-                        source = null;
-                    },
-                    errorCallback: function () {
-                        source = null;
-                    },
-                });
+                getRemoteDataHandle('', restProps.value);
             }
         }
-        return function () {
-            if (source) {
-                source.cancel();
-            }
-        };
     }, [
         url,
         remoteSearch,
@@ -396,27 +349,12 @@ function EnhanceSelect(_a) {
         if (!url || !remoteSearch) {
             return;
         }
-        var source = null;
         // console.log('TEST: 远程搜索');
         // 这种情况不需要启用远程搜索key值
         if (!isRemoteSearchDataKey) {
-            source = axios.CancelToken.source();
-            getRemoteDataHandle('', '', {
-                options: { cancelToken: source.token },
-                successCallback: function () {
-                    source = null;
-                },
-                errorCallback: function () {
-                    source = null;
-                },
-            });
+            getRemoteDataHandle('', '');
             setFirstLoading(true);
         }
-        return function () {
-            if (source) {
-                source.cancel();
-            }
-        };
     }, [
         url,
         remoteSearch,

package/dist/components/InputNumber/input-number.js

@@ -23,11 +23,11 @@ var __rest = (this && this.__rest) || function (s, e) {
 import React, { useRef } from 'react';
 import { InputNumber as AntInputNumber } from 'antd';
 import { message } from '../../index';
-import useFormatter from '../../hooks/useFormatter';
+import { getFormatter, } from '../../hooks/useFormatter';
 function InputNumber(props) {
     var formatterType = props.formatterType, currencySymbol = props.currencySymbol, formatter = props.formatter, parser = props.parser, precision = props.precision, max = props.max, min = props.min, onChange = props.onChange, onBlur = props.onBlur, onPressEnter = props.onPressEnter, onOverRange = props.onOverRange, overMaxTip = props.overMaxTip, lowMinTip = props.lowMinTip, restProps = __rest(props, ["formatterType", "currencySymbol", "formatter", "parser", "precision", "max", "min", "onChange", "onBlur", "onPressEnter", "onOverRange", "overMaxTip", "lowMinTip"]);
     var selfValue = useRef();
-    var _a = useFormatter(formatterType, currencySymbol), _formatter = _a.formatter, _parser = _a.parser, _precision = _a.precision;
+    var _a = getFormatter(formatterType, currencySymbol), _formatter = _a.formatter, _parser = _a.parser, _precision = _a.precision;
     var onChangeHandle = function (value) {
         selfValue.current = value;
         onChange && onChange(value);

package/dist/components/Table/table-enhance-cell.js

@@ -180,7 +180,15 @@ var TableEnhanceCell = memo(function (_a) {
         }
         else if (type === 'inputNumber') {
             return (React.createElement(Form.Item, { className: "zt-table__enhance-cell", name: dataIndex },
-                React.createElement(InputNumber, __assign({ autoComplete: "new-password", maxLength: 50 }, inputNumMaxMin, editableProps, inputNumberRangeTip, { disabled: disabledResult, onPressEnter: function () { return save({ maxResult: maxResult, minResult: minResult }); }, onBlur: function () { return save({ maxResult: maxResult, minResult: minResult }); } }))));
+                React.createElement(InputNumber, __assign({ autoComplete: "new-password", maxLength: 50 }, inputNumMaxMin, editableProps, inputNumberRangeTip, { disabled: disabledResult, onPressEnter: function (e) {
+                        editableProps.onPressEnter && editableProps.onPressEnter(e);
+                        save({ maxResult: maxResult, minResult: minResult });
+                    }, onBlur: function (e) {
+                        editableProps.onBlur && editableProps.onBlur(e);
+                        save({ maxResult: maxResult, minResult: minResult });
+                    }, onFocus: function (e) {
+                        editableProps.onFocus(e);
+                    } }))));
         }
         else if (type === 'textArea') {
             return (React.createElement(Form.Item, { className: "zt-table__enhance-cell", name: dataIndex },

package/dist/hooks/useFormatter.d.ts

@@ -16,4 +16,9 @@ declare function useFormatter(formatterType: IFormatterType | undefined, currenc
     parser: IParserFuc;
     precision: number;
 };
+export declare function getFormatter(formatterType: IFormatterType | undefined, currencySymbol?: ICurrencySymbol): {
+    formatter: IFormatterFuc;
+    parser: IParserFuc;
+    precision: number;
+};
 export default useFormatter;

package/dist/hooks/useFormatter.js

@@ -20,7 +20,7 @@ function useFormatter(formatterType, currencySymbol) {
                 // /\$\s?|(,*)/g
                 return value
                     ? // eslint-disable-next-line no-eval
-                        value.replace(eval("/" + currencySymbol + "s?|(,*)/g"), '')
+                        value.replace(eval("/${currencySymbol}\\s?|(,*)/g"), '')
                     : Number(value);
             };
             setFormatter(function () {
@@ -64,4 +64,45 @@ function useFormatter(formatterType, currencySymbol) {
         precision: precision,
     };
 }
+export function getFormatter(formatterType, currencySymbol) {
+    if (currencySymbol === void 0) { currencySymbol = '$'; }
+    if (formatterType === 'currency') {
+        var formatterFn = function (value) {
+            return ("" + value).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+        };
+        var parserFn = function (value) { return value.replace(/(,*)/g, ''); };
+        return {
+            formatter: formatterFn,
+            parser: parserFn,
+            precision: MONEY_PRECISION,
+        };
+    }
+    if (formatterType === 'percent') {
+        var formatterFn = function (value) { return value + "%"; };
+        var parserFn = function (value) {
+            return value ? value.replace('%', '') : Number(value);
+        };
+        return {
+            formatter: formatterFn,
+            parser: parserFn,
+            precision: QUANTITY_PRECISION,
+        };
+    }
+    if (formatterType === 'thousands') {
+        var formatterFn = function (value) { return value + "\u2030"; };
+        var parserFn = function (value) {
+            return value ? value.replace('‰', '') : Number(value);
+        };
+        return {
+            formatter: formatterFn,
+            parser: parserFn,
+            precision: QUANTITY_PRECISION,
+        };
+    }
+    return {
+        formatter: undefined,
+        parser: undefined,
+        precision: undefined,
+    };
+}
 export default useFormatter;

package/package.json

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