ztxkui 1.5.6 → 1.6.0

package/dist/components/EnhanceSelect/index.js

@@ -74,6 +74,12 @@ 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.dataKey, dataKey = _c === void 0 ? 'id' : _c, componentKey = _a.componentKey, _d = _a.titleKey, titleKey = _d === void 0 ? 'name' : _d, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, transformData = _a.transformData, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "request", "remoteSearch", "remoteSearchKey", "transformData"]);
     // 下拉数据源
     var _e = useFetchState([]), selectList = _e[0], setSelectList = _e[1];
+    // 如果selectList 发生改变，那么触发onCompleted事件
+    useEffect(function () {
+        if (Array.isArray(selectList) && onCompleted) {
+            onCompleted(selectList);
+        }
+    }, [selectList, onCompleted]);
     // 获取数据，并设置数据
     var getDataHandle = useCallback(function (request, options, appointObj) {
         getData(request, options)

package/dist/components/EnhanceTree/index.d.ts

@@ -42,10 +42,14 @@ export interface IProps extends TreeProps {
      * 是否显示总计、已选条目
      */
     showTotal?: boolean;
+    /**
+     * 数据加载完毕触发
+     */
+    onCompleted?: (data: any) => void;
 }
 /**
  * 增强树组件
  * 添加远程搜索
  */
-declare function EnhanceTree({ treeData: outTreeData, defaultTreeData, params, url, method, request, asyncLoadChildren, asyncLoadChildrenKey, transformData, showSearch, showTotal, ...restProps }: IProps): JSX.Element;
+declare function EnhanceTree({ treeData: outTreeData, defaultTreeData, params, url, method, request, asyncLoadChildren, asyncLoadChildrenKey, transformData, showSearch, showTotal, onCompleted, ...restProps }: IProps): JSX.Element;
 export default EnhanceTree;

package/dist/components/EnhanceTree/index.js

@@ -58,13 +58,19 @@ function updateTreeData(list, key, children) {
  * 添加远程搜索
  */
 function EnhanceTree(_a) {
-    var outTreeData = _a.treeData, defaultTreeData = _a.defaultTreeData, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, request = _a.request, asyncLoadChildren = _a.asyncLoadChildren, _c = _a.asyncLoadChildrenKey, asyncLoadChildrenKey = _c === void 0 ? 'parentId' : _c, transformData = _a.transformData, showSearch = _a.showSearch, showTotal = _a.showTotal, restProps = __rest(_a, ["treeData", "defaultTreeData", "params", "url", "method", "request", "asyncLoadChildren", "asyncLoadChildrenKey", "transformData", "showSearch", "showTotal"]);
+    var outTreeData = _a.treeData, defaultTreeData = _a.defaultTreeData, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, request = _a.request, asyncLoadChildren = _a.asyncLoadChildren, _c = _a.asyncLoadChildrenKey, asyncLoadChildrenKey = _c === void 0 ? 'parentId' : _c, transformData = _a.transformData, showSearch = _a.showSearch, showTotal = _a.showTotal, onCompleted = _a.onCompleted, restProps = __rest(_a, ["treeData", "defaultTreeData", "params", "url", "method", "request", "asyncLoadChildren", "asyncLoadChildrenKey", "transformData", "showSearch", "showTotal", "onCompleted"]);
     /**
      * treeData 为当前组件使用的数据源
      * 这样做的目的，是因为如果做远程搜索和搜索方法组件内部处理时
      * 保证数据源唯一
      */
     var _d = useFetchState([]), treeData = _d[0], setTreeData = _d[1];
+    // 如果selectList 发生改变，那么触发onCompleted事件
+    useEffect(function () {
+        if (Array.isArray(treeData) && onCompleted) {
+            onCompleted(treeData);
+        }
+    }, [treeData, onCompleted]);
     // 获取数据，并设置数据
     var getDataHandle = useCallback(function (request, options, isConcat, dataNode) {
         return getData(request, options)

package/dist/components/EnhanceTreeSelect/index.d.ts

@@ -34,10 +34,14 @@ export interface IProps<T> extends Omit<TreeSelectProps<T>, 'onChange'> {
      * 接口数据格式转换
      */
     transformData?: (res: any) => any;
+    /**
+     * 数据加载完毕触发
+     */
+    onCompleted?: (data: any) => void;
 }
 /**
  * 增强下拉树
  * 添加远程搜索
  */
-declare function EnhanceTreeSelect<VT extends SelectValue = SelectValue>({ treeData: outTreeData, defaultTreeData, params, url, method, request, asyncLoadChildren, asyncLoadChildrenKey, transformData, treeDataSimpleMode, ...restProps }: IProps<VT>): JSX.Element;
+declare function EnhanceTreeSelect<VT extends SelectValue = SelectValue>({ treeData: outTreeData, defaultTreeData, params, url, method, request, asyncLoadChildren, asyncLoadChildrenKey, transformData, treeDataSimpleMode, onCompleted, ...restProps }: IProps<VT>): JSX.Element;
 export default EnhanceTreeSelect;

package/dist/components/EnhanceTreeSelect/index.js

@@ -46,13 +46,19 @@ function getData(request, options) {
  * 添加远程搜索
  */
 function EnhanceTreeSelect(_a) {
-    var outTreeData = _a.treeData, defaultTreeData = _a.defaultTreeData, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, request = _a.request, asyncLoadChildren = _a.asyncLoadChildren, _c = _a.asyncLoadChildrenKey, asyncLoadChildrenKey = _c === void 0 ? 'parentId' : _c, transformData = _a.transformData, treeDataSimpleMode = _a.treeDataSimpleMode, restProps = __rest(_a, ["treeData", "defaultTreeData", "params", "url", "method", "request", "asyncLoadChildren", "asyncLoadChildrenKey", "transformData", "treeDataSimpleMode"]);
+    var outTreeData = _a.treeData, defaultTreeData = _a.defaultTreeData, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, request = _a.request, asyncLoadChildren = _a.asyncLoadChildren, _c = _a.asyncLoadChildrenKey, asyncLoadChildrenKey = _c === void 0 ? 'parentId' : _c, transformData = _a.transformData, treeDataSimpleMode = _a.treeDataSimpleMode, onCompleted = _a.onCompleted, restProps = __rest(_a, ["treeData", "defaultTreeData", "params", "url", "method", "request", "asyncLoadChildren", "asyncLoadChildrenKey", "transformData", "treeDataSimpleMode", "onCompleted"]);
     /**
      * treeData 为当前组件使用的数据源
      * 这样做的目的，是因为如果做远程搜索和搜索方法组件内部处理时
      * 保证数据源唯一
      */
     var _d = useFetchState([]), treeData = _d[0], setTreeData = _d[1];
+    // 如果selectList 发生改变，那么触发onCompleted事件
+    useEffect(function () {
+        if (Array.isArray(treeData) && onCompleted) {
+            onCompleted(treeData);
+        }
+    }, [treeData, onCompleted]);
     // 获取数据，并设置数据
     var getDataHandle = useCallback(function (request, options, isConcat) {
         return getData(request, options)

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

@@ -24,6 +24,7 @@ interface IProps {
     isPublic?: boolean;
     /**额外的上传表格列配置 */
     otherColumns?: any;
+    showUploadBtn?: boolean;
 }
 declare const _default: React.NamedExoticComponent<IProps>;
 export default _default;

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

@@ -58,10 +58,102 @@ 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.otherColumns, otherColumns = _c === void 0 ? [] : _c;
+    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.otherColumns, otherColumns = _c === void 0 ? [] : _c, showUploadBtn = _a.showUploadBtn;
     var _d = useState([]), dataSource = _d[0], setDataSource = _d[1];
     var _e = useState(false), loading = _e[0], setLoading = _e[1];
-    var columns = __spreadArray(__spreadArray([
+    var columns = showUploadBtn
+        ? __spreadArray(__spreadArray([
+            {
+                title: '文件名称',
+                width: 200,
+                fixed: 'left',
+                dataIndex: 'fileName',
+                key: 'fileName',
+            },
+            {
+                title: '文件大小',
+                width: 60,
+                dataIndex: 'fileSize',
+                key: 'fileSize',
+                render: function (value, record, index) {
+                    return transformFileSize(value);
+                },
+            },
+            {
+                title: '上传时间',
+                width: 100,
+                dataIndex: 'uploadTime',
+                key: 'uploadTime',
+            },
+            {
+                title: '上传人',
+                width: 80,
+                dataIndex: 'uploadUser',
+                key: 'uploadUser',
+            }
+        ], otherColumns), [
+            {
+                title: '上传进度',
+                width: 200,
+                render: function (text, record, index) {
+                    // uploading done error removed
+                    var status = record.status === 'error' ? 'exception' : undefined;
+                    if (record.status === 'error') {
+                        return (React.createElement(Button, { type: "link", style: { color: '#ff4d4f' }, onClick: function () { return onSubmitFile(record.originFileObj, index); } }, "\u56FE\u7247\u4E0A\u4F20\u5931\u8D25\uFF0C\u91CD\u65B0\u4E0A\u4F20"));
+                    }
+                    return React.createElement(Progress, { percent: record === null || record === void 0 ? void 0 : record.percent, status: status });
+                },
+            },
+            {
+                title: '操作',
+                width: 80,
+                fixed: 'right',
+                render: function (text, record, index) {
+                    return (React.createElement(React.Fragment, null,
+                        showDownloadBtn && (React.createElement(Button, { type: "link", style: {
+                                height: 28,
+                            }, onClick: function () {
+                                if (isPublic) {
+                                    downloadPublicFile(apiBaseUrl, record === null || record === void 0 ? void 0 : record.fileId, record === null || record === void 0 ? void 0 : record.fileName);
+                                }
+                                else {
+                                    // downloadFile(
+                                    //   apiBaseUrl,
+                                    //   record?.fileId,
+                                    //   record?.fileName,
+                                    //   authToken
+                                    // );
+                                    downloadFileCallBack(apiBaseUrl, record === null || record === void 0 ? void 0 : record.fileId, record === null || record === void 0 ? void 0 : record.fileName, {
+                                        authToken: authToken,
+                                        callbackAfter: function () {
+                                            onDownLoadCallbackAfter &&
+                                                onDownLoadCallbackAfter(record);
+                                        },
+                                    });
+                                }
+                            } }, "\u4E0B\u8F7D")),
+                        showPreviewBtn && (React.createElement(Button, { type: "link", style: {
+                                height: 28,
+                            }, onClick: function () {
+                                if ((record === null || record === void 0 ? void 0 : record.fileSize) >= 10 * 1024 * 1024) {
+                                    message.warning('文件过大，暂不支持在线预览，请先下载后查看!');
+                                }
+                                else {
+                                    previewFile(fileBaseUrl, record === null || record === void 0 ? void 0 : record.fileId, {
+                                        titleName: record === null || record === void 0 ? void 0 : record.fileName,
+                                        authToken: authToken,
+                                    });
+                                    onPreviewCallbackBefore &&
+                                        onPreviewCallbackBefore(record);
+                                }
+                            } }, "\u9884\u89C8")),
+                        showDeleteBtn && (React.createElement(Popconfirm, { title: "\u662F\u5426\u5220\u9664\u8BE5\u6761\u6570\u636E?", cancelText: "\u5426", okText: "\u662F", onConfirm: function () { return onDeleteFile(record, index); } },
+                            React.createElement(Button, { style: {
+                                    height: 28,
+                                }, type: "link" }, "\u5220\u9664")))));
+                },
+            },
+        ]) : __spreadArray(__spreadArray([
         {
             title: '文件名称',
             width: 200,
@@ -81,7 +173,6 @@ var UploadTable = function (_a) {
         {
             title: '上传时间',
             width: 100,
-            align: 'center',
             dataIndex: 'uploadTime',
             key: 'uploadTime',
         },
@@ -92,23 +183,10 @@ var UploadTable = function (_a) {
             key: 'uploadUser',
         }
     ], otherColumns), [
-        {
-            title: '上传进度',
-            width: 200,
-            render: function (text, record, index) {
-                // uploading done error removed
-                var status = record.status === 'error' ? 'exception' : undefined;
-                if (record.status === 'error') {
-                    return (React.createElement(Button, { type: "link", style: { color: '#ff4d4f' }, onClick: function () { return onSubmitFile(record.originFileObj, index); } }, "\u56FE\u7247\u4E0A\u4F20\u5931\u8D25\uFF0C\u91CD\u65B0\u4E0A\u4F20"));
-                }
-                return React.createElement(Progress, { percent: record === null || record === void 0 ? void 0 : record.percent, status: status });
-            },
-        },
         {
             title: '操作',
             width: 80,
             fixed: 'right',
-            align: 'center',
             render: function (text, record, index) {
                 return (React.createElement(React.Fragment, null,
                     showDownloadBtn && (React.createElement(Button, { type: "link", style: {
@@ -140,8 +218,12 @@ var UploadTable = function (_a) {
                                 message.warning('文件过大，暂不支持在线预览，请先下载后查看!');
                             }
                             else {
-                                previewFile(fileBaseUrl, record === null || record === void 0 ? void 0 : record.fileId, authToken);
-                                onPreviewCallbackBefore && onPreviewCallbackBefore(record);
+                                previewFile(fileBaseUrl, record === null || record === void 0 ? void 0 : record.fileId, {
+                                    titleName: record === null || record === void 0 ? void 0 : record.fileName,
+                                    authToken: authToken,
+                                });
+                                onPreviewCallbackBefore &&
+                                    onPreviewCallbackBefore(record);
                             }
                         } }, "\u9884\u89C8")),
                     showDeleteBtn && (React.createElement(Popconfirm, { title: "\u662F\u5426\u5220\u9664\u8BE5\u6761\u6570\u636E?", cancelText: "\u5426", okText: "\u662F", onConfirm: function () { return onDeleteFile(record, index); } },

package/dist/components/Upload/upload.js

@@ -154,12 +154,15 @@ var Upload = function (props) {
     var onFilePreview = function (file) {
         try {
             console.log(file);
-            var attachId = file.response.data.attachId, size = file.size;
+            var _a = file.response.data, attachId = _a.attachId, attachName = _a.attachName, size = file.size;
             if (size >= 10 * 1024 * 1024) {
                 message.warning('文件过大，暂不支持在线预览，请先下载后查看!');
             }
             else {
-                previewFile(fileBaseUrl, attachId, authToken);
+                previewFile(fileBaseUrl, attachId, {
+                    titleName: (file === null || file === void 0 ? void 0 : file.fileName) || attachName,
+                    authToken: authToken,
+                });
                 onPreviewCallbackBefore && onPreviewCallbackBefore(file);
             }
         }
@@ -181,6 +184,6 @@ var Upload = function (props) {
                 "(\u5355\u4E2A\u9644\u4EF6\u6700\u5927\u652F\u6301",
                 maxSizeTransStr,
                 "\uFF0C\u652F\u6301\u683C\u5F0F\uFF1APDF\u3001Word\u3001Excel\u3001Txt\u3001JPG\u3001PNG\u3001BMP\u3001GIF\u3001RAR\u3001ZIP)")))),
-        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, otherColumns: otherColumns }))));
+        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, otherColumns: otherColumns, showUploadBtn: showUploadBtn }))));
 };
 export default Upload;

package/dist/components/business/DetailList/index.js

@@ -83,7 +83,9 @@ var DetailList = function (_a) {
                                                     message.warning('文件过大，暂不支持在线预览，请先下载后查看!');
                                                 }
                                                 else {
-                                                    previewFile(fileBaseUrl, item === null || item === void 0 ? void 0 : item.attachId);
+                                                    previewFile(fileBaseUrl, item === null || item === void 0 ? void 0 : item.attachId, {
+                                                        titleName: item === null || item === void 0 ? void 0 : item.attachName,
+                                                    });
                                                     onPreviewCallbackBefore &&
                                                         onPreviewCallbackBefore(item);
                                                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "1.5.6",
+  "version": "1.6.0",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",
@@ -78,7 +78,7 @@
     "source-map-explorer": "^2.5.2",
     "typescript": "^4.1.2",
     "web-vitals": "^1.0.1",
-    "ztxkutils": "^1.9.0"
+    "ztxkutils": "^2.0.1"
   },
   "peerDependencies": {
     "axios": ">=0.21.1",