ztxkui 3.2.6 → 3.2.9

package/dist/DemoCom/BasicDemo.js

@@ -1,7 +1,7 @@
 import InputNumber from 'components/InputNumber';
 import Tag from 'components/Tag';
 import Input from 'components/Input';
-import { FormList, RangePicker, Button, Modal } from '../index';
+import { FormList, RangePicker, Button, Modal, Container } from '../index';
 import { InputNumber as AntInputNumber } from 'antd';
 import GridList from 'components/business/NewList';
 import { useState } from 'react';
@@ -52,7 +52,14 @@ function BasicDemo() {
         dayjs('2022-05-11'),
         dayjs('2022-05-31'),
     ]), rangeValue = _b[0], setRangeValue = _b[1];
-    return (React.createElement(React.Fragment, null,
+    var _c = useState(false), loading = _c[0], setLoading = _c[1];
+    return (React.createElement(Container, { loading: loading },
+        React.createElement(Button, { onClick: function () {
+                setLoading(true);
+                setTimeout(function () {
+                    setLoading(false);
+                }, 5000);
+            } }, "\u52A0\u8F7D"),
         React.createElement("div", null,
             React.createElement(Button, { onClick: function () {
                     Modal.confirm({

package/dist/UploadDemo.js

@@ -143,24 +143,27 @@ function UploadDemo() {
     }, []);
     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) {
+        var _a, _b, _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
-                    _c.trys.push([0, 2, , 3]);
+                    _e.trys.push([0, 3, , 4]);
                     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];
+                    _e.sent();
+                    return [4 /*yield*/, ((_d = (_c = tableHandleRef.current) === null || _c === void 0 ? void 0 : _c.validate) === null || _d === void 0 ? void 0 : _d.call(_c))];
                 case 2:
-                    err_1 = _c.sent();
+                    _e.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    err_1 = _e.sent();
                     console.log(err_1);
                     errorFields = err_1.errorFields;
                     if (errorFields) {
                         console.log(errorFields[0].errors + '');
                     }
                     return [2 /*return*/];
-                case 3: return [2 /*return*/];
+                case 4: return [2 /*return*/];
             }
         });
     }); };
@@ -171,6 +174,7 @@ function UploadDemo() {
         console.log('请传入特殊值');
         return UploadSingle.LIST_IGNORE;
     };
+    var tableHandleRef = useRef();
     return (React.createElement("div", null,
         React.createElement(UploadSingle, { action: "http://192.168.0.83:8888/api/zmdms-resource/oss/endpoint/put-file-attach", data: {
                 system: '2',
@@ -193,7 +197,9 @@ 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, rowSelection: "checkbox", uploadTableRef: uploadTableRef }),
+            }, upload: upload, rowSelection: "checkbox", uploadTableRef: uploadTableRef, tableRestProps: {
+                tableHandleRef: tableHandleRef,
+            } }),
         React.createElement(Upload, { maxSize: 200 * 1024, ztAccept: ['.jpg', '.jpeg', '.png', '.bmp', '.gif'], listType: "picture-card", method: "post", headers: {
                 'Zmdms-Auth': token,
             }, showUploadList: {

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

@@ -30,6 +30,7 @@ interface IProps {
     /**是否显示selection */
     rowSelection?: TableRowSelection<any> | 'checkbox' | 'radio';
     uploadTableRef?: any;
+    tableRestProps?: any;
 }
 declare const _default: React.NamedExoticComponent<IProps>;
 export default _default;

package/dist/components/Upload/upload-table.js

@@ -69,7 +69,7 @@ import { divide, round, times } from 'number-precision';
 import { downloadFileCallBack, downloadPublicFile, previewFile, } from 'ztxkutils/dist/fileOperation';
 import { transformFileSize } from 'ztxkutils/dist/tools';
 var UploadTable = function (_a) {
-    var fileList = _a.fileList, action = _a.action, headers = _a.headers, authToken = _a.authToken, method = _a.method, apiBaseUrl = _a.apiBaseUrl, uploadUser = _a.uploadUser, _b = _a.fileBaseUrl, fileBaseUrl = _b === void 0 ? '' : _b, onDelete = _a.onDelete, onUpload = _a.onUpload, showDeleteBtn = _a.showDeleteBtn, isAutoDelete = _a.isAutoDelete, onDownLoadCallbackBefore = _a.onDownLoadCallbackBefore, showDownloadBtn = _a.showDownloadBtn, onDownLoadCallbackAfter = _a.onDownLoadCallbackAfter, onPreviewCallbackBefore = _a.onPreviewCallbackBefore, showPreviewBtn = _a.showPreviewBtn, isPublic = _a.isPublic, data = _a.data, _c = _a.startColumns, startColumns = _c === void 0 ? [] : _c, _d = _a.otherColumns, otherColumns = _d === void 0 ? [] : _d, showUploadBtn = _a.showUploadBtn, rowSelection = _a.rowSelection, uploadTableRef = _a.uploadTableRef;
+    var fileList = _a.fileList, action = _a.action, headers = _a.headers, authToken = _a.authToken, method = _a.method, apiBaseUrl = _a.apiBaseUrl, uploadUser = _a.uploadUser, _b = _a.fileBaseUrl, fileBaseUrl = _b === void 0 ? '' : _b, onDelete = _a.onDelete, onUpload = _a.onUpload, showDeleteBtn = _a.showDeleteBtn, isAutoDelete = _a.isAutoDelete, onDownLoadCallbackBefore = _a.onDownLoadCallbackBefore, showDownloadBtn = _a.showDownloadBtn, onDownLoadCallbackAfter = _a.onDownLoadCallbackAfter, onPreviewCallbackBefore = _a.onPreviewCallbackBefore, showPreviewBtn = _a.showPreviewBtn, isPublic = _a.isPublic, data = _a.data, _c = _a.startColumns, startColumns = _c === void 0 ? [] : _c, _d = _a.otherColumns, otherColumns = _d === void 0 ? [] : _d, showUploadBtn = _a.showUploadBtn, rowSelection = _a.rowSelection, uploadTableRef = _a.uploadTableRef, tableRestProps = _a.tableRestProps;
     var _e = useState([]), dataSource = _e[0], setDataSource = _e[1];
     var _f = useState(false), loading = _f[0], setLoading = _f[1];
     var _g = useState(), selectedRows = _g[0], setSelectedRows = _g[1];
@@ -415,6 +415,6 @@ var UploadTable = function (_a) {
             }
             : rowSelection;
     }, [rowSelection]);
-    return (React.createElement(Table, { columns: columns, dataSource: dataSource, rowKey: "id", loading: loading, rowSelection: myRowSelection }));
+    return (React.createElement(Table, __assign({ columns: columns, dataSource: dataSource, rowKey: "id", loading: loading, rowSelection: myRowSelection }, tableRestProps)));
 };
 export default memo(UploadTable);

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

@@ -67,6 +67,8 @@ export interface IProps extends UploadProps {
     rowSelection?: TableRowSelection<any> | 'checkbox' | 'radio';
     /**组件提供给外部调用的一些方法 */
     uploadTableRef?: any;
+    /**表格方法 */
+    tableRestProps?: any;
 }
 declare const Upload: React.FC<IProps>;
 export default Upload;

package/dist/components/Upload/upload.js

@@ -81,7 +81,7 @@ var _accept = [
 ];
 var statusArr = ['error', 'success', 'done', 'uploading', 'removed'];
 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, upload = props.upload, rowSelection = props.rowSelection, uploadTableRef = props.uploadTableRef, 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", "rowSelection", "uploadTableRef"]);
+    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, rowSelection = props.rowSelection, uploadTableRef = props.uploadTableRef, tableRestProps = props.tableRestProps, 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", "rowSelection", "uploadTableRef", "tableRestProps"]);
     var _j = useState(originFileList || []), fileList = _j[0], setFileList = _j[1];
     var _k = useState('20M'), maxSizeTransStr = _k[0], setMaxSizeTransStr = _k[1];
     useEffect(function () {
@@ -307,6 +307,6 @@ var Upload = function (props) {
                     ? ztShowTipText
                     : 'PDF、Word、Excel、Txt、JPG、PNG、BMP、GIF、RAR、ZIP',
                 ")")))),
-        showTable && (React.createElement(UploadTable, { fileList: fileList, action: fileAction, apiBaseUrl: apiBaseUrl, fileBaseUrl: fileBaseUrl, headers: headers, method: method, uploadUser: uploadUser, onDelete: onDeleteHandle, onUpload: onUploadHandle, showDeleteBtn: showDeleteBtn, onDownLoadCallbackBefore: onDownLoadCallbackBefore, showDownloadBtn: showDownloadBtn, onDownLoadCallbackAfter: onDownLoadCallbackAfter, showPreviewBtn: showPreviewBtn, onPreviewCallbackBefore: onPreviewCallbackBefore, isAutoDelete: isAutoDelete, authToken: authToken, isPublic: isPublic, data: data, startColumns: startColumns, otherColumns: otherColumns, showUploadBtn: showUploadBtn, rowSelection: rowSelection, uploadTableRef: uploadTableRef }))));
+        showTable && (React.createElement(UploadTable, { fileList: fileList, action: fileAction, apiBaseUrl: apiBaseUrl, fileBaseUrl: fileBaseUrl, headers: headers, method: method, uploadUser: uploadUser, onDelete: onDeleteHandle, onUpload: onUploadHandle, showDeleteBtn: showDeleteBtn, onDownLoadCallbackBefore: onDownLoadCallbackBefore, showDownloadBtn: showDownloadBtn, onDownLoadCallbackAfter: onDownLoadCallbackAfter, showPreviewBtn: showPreviewBtn, onPreviewCallbackBefore: onPreviewCallbackBefore, isAutoDelete: isAutoDelete, authToken: authToken, isPublic: isPublic, data: data, startColumns: startColumns, otherColumns: otherColumns, showUploadBtn: showUploadBtn, rowSelection: rowSelection, uploadTableRef: uploadTableRef, tableRestProps: tableRestProps }))));
 };
 export default Upload;

package/dist/components/business/Container/container.js

@@ -20,15 +20,32 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { Spin } from 'antd';
 import classNames from 'classnames';
 var Container = function (_a) {
     var loading = _a.loading, children = _a.children, className = _a.className, containerRef = _a.containerRef, spinProps = _a.spinProps, restProps = __rest(_a, ["loading", "children", "className", "containerRef", "spinProps"]);
     var classes = classNames('zt-container', className);
+    var _b = useState(1), countdown = _b[0], setCountdown = _b[1];
+    useEffect(function () {
+        if (!loading) {
+            setCountdown(1);
+        }
+    }, [loading]);
+    useEffect(function () {
+        if (!loading) {
+            return;
+        }
+        var timeout = setInterval(function () {
+            setCountdown(function (pre) { return pre + 1; });
+        }, 1000);
+        return function () {
+            timeout && clearInterval(timeout);
+        };
+    }, [loading]);
     return (React.createElement("div", __assign({ className: classes }, restProps, { ref: containerRef }),
         loading && (React.createElement("div", { className: "zt-container__loading" },
-            React.createElement(Spin, __assign({ size: "large", spinning: loading }, spinProps)))),
+            React.createElement(Spin, __assign({ size: "large", spinning: loading, tip: "" + countdown }, spinProps)))),
         children));
 };
 export default Container;

package/package.json

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