ztxkui 2.6.9 → 2.7.2

package/dist/Demo.js

@@ -86,7 +86,7 @@ function Demo() {
         React.createElement(EnhanceSelect, { style: selectStyle, defaultList: [
                 { id: 1, empName: '21' },
                 { id: 2, empName: '33' },
-            ], placeholder: "\u53EF\u8FDC\u7A0B\u6A21\u7CCA\u641C\u7D22", url: "http://192.168.0.83:8000/api/zmdms-system/employee/page", request: request, remoteSearch: true, dataKey: "id", titleKey: "empName", value: value, showAll: true, onChange: function (value, option, fullData) {
+            ], placeholder: "\u53EF\u8FDC\u7A0B\u6A21\u7CCA\u641C\u7D22", url: "http://192.168.0.83:8000/api/zmdms-system/employee/page", request: request, remoteSearch: true, isRemoteSearchDataKey: false, dataKey: "id", titleKey: "empName", value: value, showAll: true, onChange: function (value, option, fullData) {
                 setValue(value);
             }, params: JSON.stringify(params), 
             // value={value}

package/dist/DemoCom/BasicDemo.js

@@ -7,7 +7,7 @@ function BasicDemo() {
         React.createElement(InputNumber, { value: value, onChange: function (value) {
                 console.log(value);
                 setValue(value);
-            }, formatterType: "percent" }),
+            }, min: 0, max: 10, formatterType: "percent" }),
         React.createElement("div", null,
             React.createElement(Tag, null, "\u4F60\u597D"),
             React.createElement(Tag, { type: "normal" }, "\u4F60\u597D"),

package/dist/DemoCom/TableDemo.js

@@ -568,14 +568,16 @@ var TableDemo = function () {
                 type: 'inputNumber',
                 // min: 0,
                 minHandle: function (record) {
-                    return {
-                        number: 0,
-                    };
+                    return 0;
+                },
+                overMaxTip: function (record, index) {
+                    return "\u7B2C" + (index + 1) + "\u884C\uFF0C\u8D85\u51FA\u6700\u5927\u503C\uFF0C\u5DF2\u4FEE\u6539\u6210\u6700\u5927\u503C";
                 },
                 maxHandle: function (record) {
-                    return {
-                        number: 10,
-                    };
+                    return 10;
+                },
+                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,
             },

package/dist/components/EnhanceSelect/index.js

@@ -76,7 +76,7 @@ function getData(request, options) {
  * 如果数据不能在接口层面满足以上形式，那么组件提供transformData属性，转换接口数据格式
  */
 function EnhanceSelect(_a) {
-    var list = _a.list, defaultList = _a.defaultList, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, _c = _a.timeout, timeout = _c === void 0 ? 10000 : _c, _d = _a.dataKey, dataKey = _d === void 0 ? 'id' : _d, componentKey = _a.componentKey, _e = _a.titleKey, titleKey = _e === void 0 ? 'name' : _e, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, remoteSearchDataKey = _a.remoteSearchDataKey, _f = _a.isRemoteSearchDataKey, isRemoteSearchDataKey = _f === void 0 ? true : _f, transformData = _a.transformData, joinKey = _a.joinKey, _g = _a.joinStr, joinStr = _g === void 0 ? '-' : _g, mustHasParams = _a.mustHasParams, disabledValues = _a.disabledValues, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "timeout", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "request", "remoteSearch", "remoteSearchKey", "remoteSearchDataKey", "isRemoteSearchDataKey", "transformData", "joinKey", "joinStr", "mustHasParams", "disabledValues"]);
+    var list = _a.list, defaultList = _a.defaultList, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, _c = _a.timeout, timeout = _c === void 0 ? 30000 : _c, _d = _a.dataKey, dataKey = _d === void 0 ? 'id' : _d, componentKey = _a.componentKey, _e = _a.titleKey, titleKey = _e === void 0 ? 'name' : _e, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, remoteSearchDataKey = _a.remoteSearchDataKey, _f = _a.isRemoteSearchDataKey, isRemoteSearchDataKey = _f === void 0 ? true : _f, transformData = _a.transformData, joinKey = _a.joinKey, _g = _a.joinStr, joinStr = _g === void 0 ? '-' : _g, mustHasParams = _a.mustHasParams, disabledValues = _a.disabledValues, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "timeout", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "request", "remoteSearch", "remoteSearchKey", "remoteSearchDataKey", "isRemoteSearchDataKey", "transformData", "joinKey", "joinStr", "mustHasParams", "disabledValues"]);
     var currentClick = useRef(true);
     // 下拉数据源
     var _h = useFetchState([]), selectList = _h[0], setSelectList = _h[1];

package/dist/components/InputNumber/input-number.d.ts

@@ -13,6 +13,18 @@ interface IProps extends InputNumberProps {
      * 货币转换符号
      */
     currencySymbol?: ICurrencySymbol;
+    /**
+     * 超出最大值提示
+     */
+    overMaxTip?: string;
+    /**
+     * 低于最小值提示
+     */
+    lowMinTip?: string;
+    /**
+     * 超出最大值或最小值触发得事件
+     */
+    onOverRange?: (type: 'maxType' | 'minType') => void;
 }
 declare function InputNumber(props: IProps): JSX.Element;
 export default InputNumber;

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

@@ -20,12 +20,43 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React from 'react';
+import React, { useRef } from 'react';
 import { InputNumber as AntInputNumber } from 'antd';
+import { message } from '../../index';
 import useFormatter from '../../hooks/useFormatter';
 function InputNumber(props) {
-    var formatterType = props.formatterType, currencySymbol = props.currencySymbol, formatter = props.formatter, parser = props.parser, precision = props.precision, restProps = __rest(props, ["formatterType", "currencySymbol", "formatter", "parser", "precision"]);
+    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;
-    return (React.createElement(AntInputNumber, __assign({ formatter: formatter || _formatter, parser: parser || _parser, precision: precision || _precision }, restProps)));
+    var onChangeHandle = function (value) {
+        selfValue.current = value;
+        onChange && onChange(value);
+    };
+    /**
+     * 超出范围触发得事件
+     */
+    var onOverRangeHandle = function () {
+        if (typeof min === 'number' && selfValue.current < min) {
+            selfValue.current = min;
+            onChange && onChange(min);
+            onOverRange && onOverRange('minType');
+            message.info(lowMinTip || '低于最小值，已修改成最小值!');
+        }
+        if (typeof max === 'number' && selfValue.current > max) {
+            selfValue.current = max;
+            onChange && onChange(max);
+            onOverRange && onOverRange('maxType');
+            message.info(overMaxTip || '高于最大值，已修改成最大值!');
+        }
+    };
+    var onBlurHandle = function (e) {
+        onOverRangeHandle();
+        onBlur && onBlur(e);
+    };
+    var onPressEnterHandle = function (e) {
+        onOverRangeHandle();
+        onPressEnter && onPressEnter(e);
+    };
+    return (React.createElement(AntInputNumber, __assign({ formatter: formatter || _formatter, parser: parser || _parser, precision: precision || _precision, onChange: onChangeHandle, onBlur: onBlurHandle, onPressEnter: onPressEnterHandle }, restProps)));
 }
 export default InputNumber;

package/dist/components/Select/select.js

@@ -20,20 +20,59 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React, { useState } from 'react';
+import React, { useState, useRef } from 'react';
 import { Select as AntSelect } from 'antd';
 function Select(props) {
-    var children = props.children, restProps = __rest(props, ["children"]);
+    var children = props.children, onChange = props.onChange, restProps = __rest(props, ["children", "onChange"]);
     // 获得焦点选中
     var _a = useState(false), isOpen = _a[0], setIsOpen = _a[1];
+    var currentClick = useRef(true);
+    var onChangeHandle = function (value, option) {
+        if ((Array.isArray(value) && value.length === 0) || !value) {
+            currentClick.current = true;
+        }
+        else {
+            currentClick.current = false;
+        }
+        onChange && onChange(value, option);
+    };
     // 焦点事件
-    var onFocusHandle = function () {
+    var onFocusHandle = function (e) {
+        // console.log('焦点事件');
         setIsOpen(true);
+        currentClick.current = false;
     };
     var onBlurHandle = function () {
+        // console.log('失去焦点事件');
+        setIsOpen(false);
+        currentClick.current = false;
+    };
+    // 清空数据时
+    var onClearHandle = function () {
+        // console.log('清空数据事件');
         setIsOpen(false);
     };
-    return (React.createElement(AntSelect, __assign({ onFocus: onFocusHandle, onBlur: onBlurHandle, open: isOpen }, restProps), children));
+    // 选中时
+    var onSelectHandle = function () {
+        // console.log('选中数据事件');
+        if (!restProps.mode) {
+            setIsOpen(false);
+        }
+    };
+    // 点击时
+    var onClickHandle = function (e) {
+        // console.log('点击事件', currentClick.current);
+        if (currentClick.current) {
+            if (isOpen) {
+                setIsOpen(false);
+            }
+            else {
+                setIsOpen(true);
+            }
+        }
+        currentClick.current = true;
+    };
+    return (React.createElement(AntSelect, __assign({ onChange: onChangeHandle, onFocus: onFocusHandle, onBlur: onBlurHandle, onClear: onClearHandle, onSelect: onSelectHandle, onClick: onClickHandle, open: isOpen }, restProps), children));
 }
 Select.Option = AntSelect.Option;
 Select.OptGroup = AntSelect.OptGroup;

package/dist/components/Table/table-enhance-cell.d.ts

@@ -10,6 +10,10 @@ export interface IEditableConfig {
     };
     maxHandle?: (record: any) => any;
     minHandle?: (record: any) => any;
+    /** 超出最大值提示 */
+    overMaxTip?: string | ((record: any, index: any) => string);
+    /** 低于最小值提示 */
+    lowMinTip?: string | ((record: any, index: any) => string);
     /**是否禁用 */
     disabledHandle?: (record: any, index?: number) => boolean;
     /**数字输入框的转换类型：内置 货币和百分比 */

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

@@ -124,7 +124,7 @@ var TableEnhanceCell = memo(function (_a) {
                         }
                     } })));
         }
-        var type = editableConfig.type, data = editableConfig.data, keyValue = editableConfig.keyValue, maxHandle = editableConfig.maxHandle, minHandle = editableConfig.minHandle, disabledHandle = editableConfig.disabledHandle, editableProps = __rest(editableConfig, ["type", "data", "keyValue", "maxHandle", "minHandle", "disabledHandle"]);
+        var type = editableConfig.type, data = editableConfig.data, keyValue = editableConfig.keyValue, maxHandle = editableConfig.maxHandle, minHandle = editableConfig.minHandle, overMaxTip = editableConfig.overMaxTip, lowMinTip = editableConfig.lowMinTip, disabledHandle = editableConfig.disabledHandle, editableProps = __rest(editableConfig, ["type", "data", "keyValue", "maxHandle", "minHandle", "overMaxTip", "lowMinTip", "disabledHandle"]);
         var selectData = data; // 下拉框使用到得数据
         // 下拉框键值对对象
         var selectKeyValue = keyValue || {
@@ -144,7 +144,7 @@ var TableEnhanceCell = memo(function (_a) {
                 inputNumMaxMin.max = result;
             }
             else {
-                maxResult = result;
+                inputNumMaxMin.max = result === null || result === void 0 ? void 0 : result.number;
             }
         }
         if (minHandle && minHandle instanceof Function) {
@@ -153,9 +153,22 @@ var TableEnhanceCell = memo(function (_a) {
                 inputNumMaxMin.min = result;
             }
             else {
-                minResult = result;
+                inputNumMaxMin.min = result === null || result === void 0 ? void 0 : result.number;
             }
         }
+        var inputNumberRangeTip = {};
+        if (typeof overMaxTip === 'string') {
+            inputNumberRangeTip.overMaxTip = overMaxTip;
+        }
+        else if (typeof overMaxTip === 'function') {
+            inputNumberRangeTip.overMaxTip = overMaxTip(record, index);
+        }
+        if (typeof lowMinTip === 'string') {
+            inputNumberRangeTip.lowMinTip = lowMinTip;
+        }
+        else if (typeof lowMinTip === 'function') {
+            inputNumberRangeTip.lowMinTip = lowMinTip(record, index);
+        }
         if (disabledHandle && disabledHandle instanceof Function) {
             disabledResult = disabledHandle(record, index);
         }
@@ -167,7 +180,7 @@ 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, { 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 () { return save({ maxResult: maxResult, minResult: minResult }); }, onBlur: function () { return save({ maxResult: maxResult, minResult: minResult }); } }))));
         }
         else if (type === 'textArea') {
             return (React.createElement(Form.Item, { className: "zt-table__enhance-cell", name: dataIndex },

package/package.json

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