ztxkui 2.3.5 → 2.3.8

package/dist/DemoCom/TableDemo.js

@@ -195,7 +195,17 @@ var TableDemo = function () {
             },
             editableConfig: {
                 type: 'inputNumber',
-                min: 0,
+                // min: 0,
+                minHandle: function (record) {
+                    return {
+                        number: 0,
+                    };
+                },
+                maxHandle: function (record) {
+                    return {
+                        number: 10,
+                    };
+                },
                 precision: 3,
             },
         },

package/dist/UploadDemo.js

@@ -1,10 +1,48 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 import { Link } from 'react-router-dom';
 import Upload from 'components/Upload';
-import { useState, useEffect, useCallback } from 'react';
+import { useState, useEffect, useCallback, useRef } from 'react';
 var originFileList = [];
-var token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOiLpmYjkuprpm4QiLCJlbXBfbnVtYmVyIjoiWUcyMTA3MDA4IiwiaW10X2lkIjpudWxsLCJyZWFsX25hbWUiOiLpmYjkuprpm4QiLCJjbGllbnRfdHlwZSI6IndlYiIsImRhdGFfcm9sZV9pZCI6IjEzNDU5Nzg1MDUzMDIwNTY5NjIsMTQxMjYxNDExMDY0NzM4NjExNCwxNDEyNjE1Njc3MTE5MjY2ODE3LDE0NDgxMjEwODY1MDQzMDA1NDYsMTQ1MjgyMDI5MzgwMjcxMzA5MCwxNDUzOTI1MDAxNTMxNDc4MDE3LDE0NTg3MTIwODIwODIzNTcyNTAsMTQ1ODgyNjIzODE4NTg4OTc5NCwxNDU4ODI3NzAxMDEyMzI0MzUzLDE0NTg4MjgzNjA4MDE1MDkzNzcsMTQ2MDA4OTI2MjAxMjAzMDk3NywxNDYxMTM3Nzg4NjQ1MTI2MTQ2IiwiY2xpZW50X2lkIjoic3dvcmQiLCJ1c2VyX3R5cGUiOiJ3ZWIiLCJyb2xlX2lkIjoiMTQxMjYwODc0Mjk1MzI4NzY4MiwxNDM4MzIyNTQzMjk1OTI2Mjc0LDE0NDM0NzU0NzU5NzI3MzQ5NzcsMTQ0NjgxOTQ2MzY5Mzg0NDQ4MiwxNDYwMDg1NDI2ODE1OTUwODQ5LDE0NjI2MjI5OTIzNzUyMDk5ODYiLCJwb3N0X25hbWUiOm51bGwsInNjb3BlIjpbImFsbCJdLCJpbnRlcnZpZXdfaWQiOm51bGwsImV4cCI6MTY0MDc2OTQyMiwib3JnX25hbWUiOiLmuZbljZfkuK3mi5Pkv6Hmga_np5HmioDmnInpmZDlhazlj7giLCJqdGkiOiI1M2ZlMTAxMS1hNzFkLTRmZjAtYmQ2My1jYjkzMzcyM2NjZDAiLCJtZW1iZXJfaWQiOjE0MTI5NTMyMDUyNjk1MTYyOTAsImNvbXBhbnlfaWQiOjEzOTcwNzQ2MDU0MTI2OTYwNjYsInN5c3RlbV9pZCI6bnVsbCwiZGVwdF9uYW1lIjoi5Lia5Yqh5LiA6YOoIiwiYXZhdGFyIjoiIiwiZGF0YV9yb2xlX25hbWUiOiJhZG1pbix1c2VyLHVzZXIsYWRtaW4sYWRtaW4sYWRtaW4sdXNlcix1c2VyLHVzZXIsdXNlcix1c2VyLHVzZXIiLCJhdXRob3JpdGllcyI6WyJhZG1pbiIsInVzZXIiLCJhZG1pbmlzdHJhdG9yIl0sInJvbGVfbmFtZSI6InVzZXIsYWRtaW5pc3RyYXRvcixhZG1pbixhZG1pbmlzdHJhdG9yLHVzZXIsdXNlciIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE0MTI5NTM4MDQzMzM1NTU3MTQiLCJvcmdfaWQiOjE0NTc1Mjc3NjU5MTg1MTU1MzUsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6Iua1meWVhuS4reaLk-mbhuWboueJqea1geenkeaKgOaciemZkOWFrOWPuCIsImRlcHRfaWQiOiIxMzk3MDgxOTMwMzI4NDI0NDQ5IiwiaGFuZGxlX2hyX25hbWUiOm51bGwsImFjY291bnQiOiJjaGVueXgiLCJyZXN1bWVfaWQiOm51bGx9.59w7FkzK6z0FitLUaYcaE9rZLxvfZ8Xf6C_wR9lRzWs";
+var token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOiLpmYjkuprpm4QiLCJlbXBfbnVtYmVyIjoiWUcyMTA3MDA4IiwiaW10X2lkIjpudWxsLCJyZWFsX25hbWUiOiLpmYjkuprpm4QiLCJjbGllbnRfdHlwZSI6IndlYiIsImRhdGFfcm9sZV9pZCI6IjEzNDU5Nzg1MDUzMDIwNTY5NjIsMTQxMjYxNDExMDY0NzM4NjExNCwxNDEyNjE1Njc3MTE5MjY2ODE3LDE0NDgxMjEwODY1MDQzMDA1NDYsMTQ1MjgyMDI5MzgwMjcxMzA5MCwxNDUzOTI1MDAxNTMxNDc4MDE3LDE0NTg3MTIwODIwODIzNTcyNTAsMTQ1ODgyNjIzODE4NTg4OTc5NCwxNDU4ODI3NzAxMDEyMzI0MzUzLDE0NTg4MjgzNjA4MDE1MDkzNzcsMTQ2MDA4OTI2MjAxMjAzMDk3NywxNDYxMTM3Nzg4NjQ1MTI2MTQ2IiwiY2xpZW50X2lkIjoic3dvcmQiLCJ1c2VyX3R5cGUiOiJ3ZWIiLCJyb2xlX2lkIjoiMTQxMjYwODc0Mjk1MzI4NzY4MiwxNDM4MzIyNTQzMjk1OTI2Mjc0LDE0NDM0NzU0NzU5NzI3MzQ5NzcsMTQ0NjgxOTQ2MzY5Mzg0NDQ4MiwxNDYwMDg1NDI2ODE1OTUwODQ5LDE0NjI2MjI5OTIzNzUyMDk5ODYiLCJwb3N0X25hbWUiOm51bGwsInNjb3BlIjpbImFsbCJdLCJpbnRlcnZpZXdfaWQiOm51bGwsImV4cCI6MTY0NTE1NTExMiwib3JnX25hbWUiOiLmuZbljZfkuK3mi5Pkv6Hmga_np5HmioDmnInpmZDlhazlj7giLCJqdGkiOiJlYmNjZmU5Yi03YzBlLTQwOTItYWNhYy01NzU1ZWNlMDgyN2QiLCJtZW1iZXJfaWQiOjE0MTI5NTMyMDUyNjk1MTYyOTAsImNvbXBhbnlfaWQiOjEzOTcwNzQ2MDU0MTI2OTYwNjYsInN5c3RlbV9pZCI6bnVsbCwiZGVwdF9uYW1lIjoi5Lia5Yqh5LiA6YOoIiwiYXZhdGFyIjoiIiwiZGF0YV9yb2xlX25hbWUiOiJhZG1pbix1c2VyLHVzZXIsYWRtaW4sYWRtaW4sdXNlcix1c2VyLHVzZXIsdXNlcix1c2VyLHVzZXIsdXNlciIsImF1dGhvcml0aWVzIjpbImFkbWluIiwidXNlciIsImFkbWluaXN0cmF0b3IiXSwicm9sZV9uYW1lIjoidXNlcixhZG1pbmlzdHJhdG9yLGFkbWluLGFkbWluaXN0cmF0b3IsdXNlcix1c2VyIiwicmVzdW1lX3RlbXBsYXRlIjpudWxsLCJsaWNlbnNlIjoicG93ZXJlZCBieSB6bWRtcyIsInBvc3RfaWQiOiIiLCJ1c2VyX2lkIjoiMTQxMjk1MzgwNDMzMzU1NTcxNCIsIm9yZ19pZCI6MTQ1NzUyNzc2NTkxODUxNTUzNSwibmlja19uYW1lIjoi6ZmI5Lqa6ZuEIiwiY29tcGFueV9uYW1lIjoi5rWZ5ZWG5Lit5ouT6ZuG5Zui54mp5rWB56eR5oqA5pyJ6ZmQ5YWs5Y-4IiwiZGVwdF9pZCI6IjEzOTcwODE5MzAzMjg0MjQ0NDkiLCJoYW5kbGVfaHJfbmFtZSI6bnVsbCwiYWNjb3VudCI6ImNoZW55eCIsInJlc3VtZV9pZCI6bnVsbH0.wr6BV61OVYd-o9kccJJhWBGWzqyYyMTqdwd5qUxZlhM";
 function UploadDemo() {
+    var _this = this;
     var _a = useState(originFileList), fileList = _a[0], setFileList = _a[1];
+    var upload = useRef();
     useEffect(function () {
         setTimeout(function () {
             setFileList([
@@ -15,6 +53,27 @@ function UploadDemo() {
                     // percent: 100,
                     // status: 'done',
                 },
+                {
+                    attachId: '123',
+                    attachName: '123.jpg',
+                    fileSize: 36742,
+                    percent: 80,
+                    status: 'uploading',
+                },
+                {
+                    attachId: '1491978407680376833',
+                    attachName: '260929616_640_640.jpg',
+                    fileSize: 36742,
+                    percent: 80,
+                    status: 'error',
+                },
+                {
+                    attachId: '1492035772232466434',
+                    attachName: '260929610_640_640.jpg',
+                    fileSize: 36742,
+                    // percent: 100,
+                    // status: 'error',
+                },
                 // {
                 //   // uid可不传，这个应该时组件需要一个内部id，可以同attachId
                 //   uid: '1418469936545132546',
@@ -80,6 +139,29 @@ function UploadDemo() {
             setFileList(filelist);
         }
     }, []);
+    var checkHandle = function () { return __awaiter(_this, void 0, void 0, function () {
+        var err_1, errorFields;
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _c.trys.push([0, 2, , 3]);
+                    return [4 /*yield*/, ((_b = (_a = upload.current) === null || _a === void 0 ? void 0 : _a.validate) === null || _b === void 0 ? void 0 : _b.call(_a, { title: '测试下面的', isError: true }))];
+                case 1:
+                    _c.sent();
+                    return [3 /*break*/, 3];
+                case 2:
+                    err_1 = _c.sent();
+                    console.log(err_1);
+                    errorFields = err_1.errorFields;
+                    if (errorFields) {
+                        console.log(errorFields[0].errors + '');
+                    }
+                    return [2 /*return*/];
+                case 3: return [2 /*return*/];
+            }
+        });
+    }); };
     return (React.createElement("div", null,
         React.createElement(Link, { to: "/test" }, "test"),
         React.createElement(Upload, { method: "post", headers: {
@@ -96,7 +178,7 @@ function UploadDemo() {
                 system: '2',
             }, apiBaseUrl: "http://192.168.0.83:8888", fileBaseUrl: "http://192.168.0.83:88", originFileList: fileList, callback: uploadCallbackFn, onDeleteCallback: function (index, file) {
                 console.log(index, file);
-            } }),
+            }, upload: upload }),
         React.createElement(Upload, { maxSize: 200 * 1024, ztAccept: ['.jpg', '.jpeg', '.png', '.bmp', '.gif'], listType: "picture-card", method: "post", headers: {
                 'Zmdms-Auth': token,
             }, showUploadList: {
@@ -105,6 +187,7 @@ function UploadDemo() {
                 showRemoveIcon: true,
             }, apiBaseUrl: "http://192.168.0.83:8888", fileBaseUrl: "http://192.168.0.83:88", showTable: false, showTip: false, originFileList: fileList, maxCount: 1, callback: uploadCallbackFn, onDeleteCallback: function (index, file) {
                 console.log(index, file);
-            }, authToken: token })));
+            }, authToken: token }),
+        React.createElement("button", { onClick: checkHandle }, "\u68C0\u67E5")));
 }
 export default UploadDemo;

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

@@ -8,8 +8,10 @@ export interface IEditableConfig {
         key: string;
         label: string;
     };
-    maxHandle?: (record: any) => number;
-    minHandle?: (record: any) => number;
+    maxHandle?: (record: any) => any;
+    minHandle?: (record: any) => any;
+    /**是否禁用 */
+    disabledHandle?: (record: any) => boolean;
     /**数字输入框的转换类型：内置 货币和百分比 */
     formatterType?: IFormatterType;
     /**货币的前缀 可以为 $ 或 ￥ */

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

@@ -58,7 +58,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import React, { useContext, useEffect, memo } from 'react';
 import { EditableContext } from './table-enhance-row';
-import { Form, Input, InputNumber, Select } from '../../index';
+import { Form, Input, InputNumber, Select, message } from '../../index';
 var TableEnhanceCell = memo(function (_a) {
     var title = _a.title, index = _a.index, editable = _a.editable, editableConfig = _a.editableConfig, children = _a.children, dataIndex = _a.dataIndex, record = _a.record, handleSave = _a.handleSave, restProps = __rest(_a, ["title", "index", "editable", "editableConfig", "children", "dataIndex", "record", "handleSave"]);
     var form = useContext(EditableContext);
@@ -71,22 +71,41 @@ var TableEnhanceCell = memo(function (_a) {
     /**
      * @description 保存事件
      */
-    var save = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var values, err_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+    var save = function (info) { return __awaiter(void 0, void 0, void 0, function () {
+        var values, result, currentInputNumberValue, result, currentInputNumberValue, err_1;
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
-                    _a.trys.push([0, 2, , 3]);
+                    _c.trys.push([0, 2, , 3]);
                     return [4 /*yield*/, (form === null || form === void 0 ? void 0 : form.validateFields())];
                 case 1:
-                    values = _a.sent();
+                    values = _c.sent();
                     if (!handleSave) {
                         console.error('Table props onEditableSave is not a function');
                     }
+                    if (info && info.maxResult) {
+                        result = info.maxResult;
+                        currentInputNumberValue = values[dataIndex];
+                        if (currentInputNumberValue > (result === null || result === void 0 ? void 0 : result.number)) {
+                            message.warning((result.tableName ? "\u60A8\u4FEE\u6539" + result.tableName + "\u8868\u683C\u7684" : '表格') + " \u7B2C" + (typeof index === 'number' ? index + 1 : index) + "\u884C \u7684" + title + "\u5B57\u6BB5\uFF0C\u8F93\u5165\u7684\u6570\u503C\uFF0C\u5DF2\u8D85\u8FC7\u6700\u5927\u503C\uFF0C\u5DF2\u5E2E\u60A8\u4FEE\u6539\u4E3A\u6700\u5927\u503C!");
+                            handleSave(__assign(__assign(__assign({}, record), values), (_a = {}, _a[dataIndex] = result === null || result === void 0 ? void 0 : result.number, _a)), index, dataIndex);
+                            return [2 /*return*/];
+                        }
+                    }
+                    if (info && info.minResult) {
+                        result = info.minResult;
+                        currentInputNumberValue = values[dataIndex];
+                        if (currentInputNumberValue < (result === null || result === void 0 ? void 0 : result.number)) {
+                            message.warning((result.tableName ? "\u60A8\u4FEE\u6539" + result.tableName + "\u8868\u683C\u7684" : '表格') + " \u7B2C" + (index ? index + 1 : index) + "\u884C \u7684" + title + "\u5B57\u6BB5\uFF0C\u8F93\u5165\u7684\u6570\u503C\uFF0C\u5DF2\u4F4E\u4E8E\u6700\u5C0F\u503C\uFF0C\u5DF2\u5E2E\u60A8\u4FEE\u6539\u4E3A\u6700\u5C0F\u503C!");
+                            handleSave(__assign(__assign(__assign({}, record), values), (_b = {}, _b[dataIndex] = result === null || result === void 0 ? void 0 : result.number, _b)), index, dataIndex);
+                            return [2 /*return*/];
+                        }
+                    }
                     handleSave(__assign(__assign({}, record), values), index, dataIndex);
                     return [3 /*break*/, 3];
                 case 2:
-                    err_1 = _a.sent();
+                    err_1 = _c.sent();
                     console.error('Save failed:', err_1);
                     return [3 /*break*/, 3];
                 case 3: return [2 /*return*/];
@@ -113,15 +132,29 @@ var TableEnhanceCell = memo(function (_a) {
             label: 'dictValue',
         };
         var inputNumMaxMin = {}; // 数字input框最大最小值
+        var maxResult = {};
+        var minResult = {};
         var disabledResult = editableProps === null || editableProps === void 0 ? void 0 : editableProps.disabled;
         if (data && data instanceof Function) {
             selectData = data();
         }
         if (maxHandle && maxHandle instanceof Function) {
-            inputNumMaxMin.max = maxHandle(record);
+            var result = maxHandle(record);
+            if (typeof result === 'number') {
+                inputNumMaxMin.max = result;
+            }
+            else {
+                maxResult = result;
+            }
         }
         if (minHandle && minHandle instanceof Function) {
-            inputNumMaxMin.min = minHandle(record);
+            var result = minHandle(record);
+            if (typeof result === 'number') {
+                inputNumMaxMin.min = result;
+            }
+            else {
+                minResult = result;
+            }
         }
         if (disabledHandle && disabledHandle instanceof Function) {
             disabledResult = disabledHandle(record);
@@ -134,7 +167,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: save, onBlur: save }))));
+                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 }); } }))));
         }
         else if (type === 'textArea') {
             return (React.createElement(Form.Item, { className: "zt-table__enhance-cell", name: dataIndex },

package/dist/components/Upload/upload.d.ts

@@ -1,6 +1,9 @@
 import React from 'react';
 import { UploadProps } from 'antd/lib/upload';
 import { UploadFile } from './';
+export interface IUploadRef {
+    validate?: (info?: any) => any;
+}
 export interface IProps extends UploadProps {
     /**是否显示上传表格 */
     showTable?: boolean;
@@ -57,6 +60,8 @@ export interface IProps extends UploadProps {
     otherColumns?: any;
     /**是否直接替换 */
     isDirect?: boolean;
+    /**附件上传对象 */
+    upload?: any;
 }
 declare const Upload: React.FC<IProps>;
 export default Upload;

package/dist/components/Upload/upload.js

@@ -9,6 +9,42 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -44,9 +80,58 @@ var _accept = [
     '.gif',
 ];
 var Upload = function (props) {
-    var children = props.children, className = props.className, _a = props.showTip, showTip = _a === void 0 ? true : _a, _b = props.showUploadBtn, showUploadBtn = _b === void 0 ? true : _b, _c = props.showDeleteBtn, showDeleteBtn = _c === void 0 ? true : _c, onDownLoadCallbackBefore = props.onDownLoadCallbackBefore, _d = props.showDownloadBtn, showDownloadBtn = _d === void 0 ? true : _d, onDownLoadCallbackAfter = props.onDownLoadCallbackAfter, _e = props.showPreviewBtn, showPreviewBtn = _e === void 0 ? true : _e, onPreviewCallbackBefore = props.onPreviewCallbackBefore, _f = props.showTable, showTable = _f === void 0 ? true : _f, showUploadList = props.showUploadList, onChange = props.onChange, beforeUpload = props.beforeUpload, multiple = props.multiple, ztAccept = props.ztAccept, ztShowTipText = props.ztShowTipText, maxCount = props.maxCount, maxSize = props.maxSize, maxSizeStr = props.maxSizeStr, action = props.action, headers = props.headers, method = props.method, uploadUser = props.uploadUser, originFileList = props.originFileList, callback = props.callback, onDeleteCallback = props.onDeleteCallback, isAutoDelete = props.isAutoDelete, apiBaseUrl = props.apiBaseUrl, _g = props.fileBaseUrl, fileBaseUrl = _g === void 0 ? '' : _g, fileBtnText = props.fileBtnText, data = props.data, authToken = props.authToken, listType = props.listType, isPublic = props.isPublic, startColumns = props.startColumns, otherColumns = props.otherColumns, _h = props.isDirect, isDirect = _h === void 0 ? false : _h, restProps = __rest(props, ["children", "className", "showTip", "showUploadBtn", "showDeleteBtn", "onDownLoadCallbackBefore", "showDownloadBtn", "onDownLoadCallbackAfter", "showPreviewBtn", "onPreviewCallbackBefore", "showTable", "showUploadList", "onChange", "beforeUpload", "multiple", "ztAccept", "ztShowTipText", "maxCount", "maxSize", "maxSizeStr", "action", "headers", "method", "uploadUser", "originFileList", "callback", "onDeleteCallback", "isAutoDelete", "apiBaseUrl", "fileBaseUrl", "fileBtnText", "data", "authToken", "listType", "isPublic", "startColumns", "otherColumns", "isDirect"]);
+    var children = props.children, className = props.className, _a = props.showTip, showTip = _a === void 0 ? true : _a, _b = props.showUploadBtn, showUploadBtn = _b === void 0 ? true : _b, _c = props.showDeleteBtn, showDeleteBtn = _c === void 0 ? true : _c, onDownLoadCallbackBefore = props.onDownLoadCallbackBefore, _d = props.showDownloadBtn, showDownloadBtn = _d === void 0 ? true : _d, onDownLoadCallbackAfter = props.onDownLoadCallbackAfter, _e = props.showPreviewBtn, showPreviewBtn = _e === void 0 ? true : _e, onPreviewCallbackBefore = props.onPreviewCallbackBefore, _f = props.showTable, showTable = _f === void 0 ? true : _f, showUploadList = props.showUploadList, onChange = props.onChange, beforeUpload = props.beforeUpload, multiple = props.multiple, ztAccept = props.ztAccept, ztShowTipText = props.ztShowTipText, maxCount = props.maxCount, maxSize = props.maxSize, maxSizeStr = props.maxSizeStr, action = props.action, headers = props.headers, method = props.method, uploadUser = props.uploadUser, originFileList = props.originFileList, callback = props.callback, onDeleteCallback = props.onDeleteCallback, isAutoDelete = props.isAutoDelete, apiBaseUrl = props.apiBaseUrl, _g = props.fileBaseUrl, fileBaseUrl = _g === void 0 ? '' : _g, fileBtnText = props.fileBtnText, data = props.data, authToken = props.authToken, listType = props.listType, isPublic = props.isPublic, startColumns = props.startColumns, otherColumns = props.otherColumns, _h = props.isDirect, isDirect = _h === void 0 ? false : _h, upload = props.upload, restProps = __rest(props, ["children", "className", "showTip", "showUploadBtn", "showDeleteBtn", "onDownLoadCallbackBefore", "showDownloadBtn", "onDownLoadCallbackAfter", "showPreviewBtn", "onPreviewCallbackBefore", "showTable", "showUploadList", "onChange", "beforeUpload", "multiple", "ztAccept", "ztShowTipText", "maxCount", "maxSize", "maxSizeStr", "action", "headers", "method", "uploadUser", "originFileList", "callback", "onDeleteCallback", "isAutoDelete", "apiBaseUrl", "fileBaseUrl", "fileBtnText", "data", "authToken", "listType", "isPublic", "startColumns", "otherColumns", "isDirect", "upload"]);
     var _j = useState(originFileList || []), fileList = _j[0], setFileList = _j[1];
     var _k = useState('20M'), maxSizeTransStr = _k[0], setMaxSizeTransStr = _k[1];
+    useEffect(function () {
+        if (upload) {
+            upload.current = upload.current ? upload.current : {};
+            upload.current.validate = function (info) {
+                if (info === void 0) { info = { title: '', isError: false }; }
+                return __awaiter(this, void 0, void 0, function () {
+                    var i, fileItem;
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                if (!Array.isArray(fileList)) return [3 /*break*/, 6];
+                                i = 0;
+                                _a.label = 1;
+                            case 1:
+                                if (!(i < fileList.length)) return [3 /*break*/, 6];
+                                fileItem = fileList[i];
+                                if (!(fileItem.status !== 'done' && fileItem.status !== 'error')) return [3 /*break*/, 3];
+                                return [4 /*yield*/, Promise.reject({
+                                        errorFields: [
+                                            {
+                                                errors: (info.title || '') + " \u7B2C" + (i + 1) + "\u4E2A\u9644\u4EF6\u8FD8\u5728\u4E0A\u4F20\u4E2D\uFF0C\u8BF7\u7A0D\u7B49...",
+                                            },
+                                        ],
+                                    })];
+                            case 2:
+                                _a.sent();
+                                _a.label = 3;
+                            case 3:
+                                if (!(info.isError && fileItem.status === 'error')) return [3 /*break*/, 5];
+                                return [4 /*yield*/, Promise.reject({
+                                        errorFields: [
+                                            {
+                                                errors: (info.title || '') + " \u7B2C" + (i + 1) + "\u4E2A\u9644\u4EF6\u4E0A\u4F20\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5",
+                                            },
+                                        ],
+                                    })];
+                            case 4:
+                                _a.sent();
+                                _a.label = 5;
+                            case 5:
+                                i++;
+                                return [3 /*break*/, 1];
+                            case 6: return [2 /*return*/];
+                        }
+                    });
+                });
+            };
+        }
+    }, [fileList, upload]);
     useEffect(function () {
         var MAXSIZE = maxSize ? maxSize : 1024 * 1024 * 100;
         var MAXSIZESTR = maxSizeStr ? maxSizeStr : transformFileSize(MAXSIZE);
@@ -54,18 +139,18 @@ var Upload = function (props) {
     }, [maxSize, maxSizeStr]);
     useEffect(function () {
         // 拉平数据
-        if (Array.isArray(originFileList) && originFileList.length > 0) {
+        if (Array.isArray(originFileList)) {
             if (listType === 'text') {
                 setFileList(originFileList.map(function (item) {
                     var _a, _b, _c, _d;
-                    var attachId = item.attachId, name = item.name, attachName = item.attachName, fileSize = item.fileSize, size = item.size, response = item.response;
+                    var attachId = item.attachId, name = item.name, attachName = item.attachName, fileSize = item.fileSize, size = item.size, response = item.response, percent = item.percent, status = item.status;
                     return __assign(__assign({}, item), { uid: attachId ? attachId : (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.attachId, size: fileSize ? fileSize : size, name: name
                             ? name
                             : attachName
                                 ? attachName
                                 : ((_b = response === null || response === void 0 ? void 0 : response.data) === null || _b === void 0 ? void 0 : _b.attachName)
                                     ? (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.attachName
-                                    : (_d = response === null || response === void 0 ? void 0 : response.data) === null || _d === void 0 ? void 0 : _d.originalName, percent: 100, status: 'done', response: response
+                                    : (_d = response === null || response === void 0 ? void 0 : response.data) === null || _d === void 0 ? void 0 : _d.originalName, percent: typeof percent === 'number' ? percent : 100, status: status ? status : 'done', response: response
                             ? response
                             : {
                                 code: 200,
@@ -78,7 +163,7 @@ var Upload = function (props) {
             else {
                 setFileList(originFileList.map(function (item) {
                     var _a, _b, _c, _d, _e;
-                    var attachId = item.attachId, name = item.name, attachName = item.attachName, fileSize = item.fileSize, size = item.size, response = item.response;
+                    var attachId = item.attachId, name = item.name, attachName = item.attachName, fileSize = item.fileSize, size = item.size, response = item.response, percent = item.percent, status = item.status;
                     var fileId = response ? (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.attachId : null;
                     return __assign(__assign({}, item), { uid: attachId ? attachId : (_b = response === null || response === void 0 ? void 0 : response.data) === null || _b === void 0 ? void 0 : _b.attachId, size: fileSize ? fileSize : size, name: name
                             ? name
@@ -86,7 +171,7 @@ var Upload = function (props) {
                                 ? attachName
                                 : ((_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.attachName)
                                     ? (_d = response === null || response === void 0 ? void 0 : response.data) === null || _d === void 0 ? void 0 : _d.attachName
-                                    : (_e = response === null || response === void 0 ? void 0 : response.data) === null || _e === void 0 ? void 0 : _e.originalName, percent: 100, status: 'done', response: response
+                                    : (_e = response === null || response === void 0 ? void 0 : response.data) === null || _e === void 0 ? void 0 : _e.originalName, percent: typeof percent === 'number' ? percent : 100, status: status ? status : 'done', response: response
                             ? response
                             : {
                                 code: 200,

package/package.json

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