ztxkui 2.8.9-4 → 2.8.9-6

package/dist/components/Table/hooks/useColumns.js

@@ -32,7 +32,7 @@ function useColumns(props) {
             var _column = __assign({}, col);
             // 添加超出隐藏
             // !_column.render 兼容下拉框滚动行为，设置了ellipsis的话，会导致overflow:hidden，导致一些问题
-            if (_column.ellipsis !== false && !_column.render) {
+            if (_column.ellipsis !== false) {
                 _column.ellipsis = true;
             }
             // 如果列需要编辑

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

@@ -30,6 +30,8 @@ interface IProps {
     /**是否显示selection */
     rowSelection?: TableRowSelection<any> | 'checkbox' | 'radio';
     uploadTableRef?: any;
+    /** 是否不需要权限上传 */
+    isNoAuthUpload?: boolean;
 }
 declare const _default: React.NamedExoticComponent<IProps>;
 export default _default;

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

@@ -67,10 +67,10 @@ import { Button, Progress, message, Popconfirm } from '../../index';
 import Table from '../Table';
 import dayjs from 'dayjs';
 import { divide, round, times } from 'number-precision';
-import { downloadFileCallBack, downloadPublicFile, previewFile, } from 'ztxkutils/dist/fileOperation';
+import { downloadFileCallBack, downloadPublicFile, previewFile, createPublicPreviewUrl, } 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, isNoAuthUpload = _a.isNoAuthUpload;
     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];
@@ -129,7 +129,7 @@ var UploadTable = function (_a) {
                         showDownloadBtn && (React.createElement(Button, { type: "link", style: {
                                 height: 28,
                             }, onClick: function () {
-                                if (isPublic) {
+                                if (isPublic || isNoAuthUpload) {
                                     downloadPublicFile(apiBaseUrl, record === null || record === void 0 ? void 0 : record.fileId, record === null || record === void 0 ? void 0 : record.fileName);
                                 }
                                 else {
@@ -155,10 +155,18 @@ var UploadTable = function (_a) {
                                     message.warning(i18next.t('文件过大，暂不支持在线预览，请先下载后查看!'));
                                 }
                                 else {
-                                    previewFile(fileBaseUrl, record === null || record === void 0 ? void 0 : record.fileId, {
-                                        titleName: record === null || record === void 0 ? void 0 : record.fileName,
-                                        authToken: authToken,
-                                    });
+                                    if (isNoAuthUpload) {
+                                        createPublicPreviewUrl(fileBaseUrl, {
+                                            fileId: record === null || record === void 0 ? void 0 : record.fileId,
+                                            fileName: record === null || record === void 0 ? void 0 : record.fileName,
+                                        });
+                                    }
+                                    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);
                                 }
@@ -208,7 +216,7 @@ var UploadTable = function (_a) {
                     showDownloadBtn && (React.createElement(Button, { type: "link", style: {
                             height: 28,
                         }, onClick: function () {
-                            if (isPublic) {
+                            if (isPublic || isNoAuthUpload) {
                                 downloadPublicFile(apiBaseUrl, record === null || record === void 0 ? void 0 : record.fileId, record === null || record === void 0 ? void 0 : record.fileName);
                             }
                             else {
@@ -234,10 +242,18 @@ var UploadTable = function (_a) {
                                 message.warning(i18next.t('文件过大，暂不支持在线预览，请先下载后查看!'));
                             }
                             else {
-                                previewFile(fileBaseUrl, record === null || record === void 0 ? void 0 : record.fileId, {
-                                    titleName: record === null || record === void 0 ? void 0 : record.fileName,
-                                    authToken: authToken,
-                                });
+                                if (isNoAuthUpload) {
+                                    createPublicPreviewUrl(fileBaseUrl, {
+                                        fileId: record === null || record === void 0 ? void 0 : record.fileId,
+                                        fileName: record === null || record === void 0 ? void 0 : record.fileName,
+                                    });
+                                }
+                                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);
                             }

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

@@ -67,6 +67,8 @@ export interface IProps extends UploadProps {
     rowSelection?: TableRowSelection<any> | 'checkbox' | 'radio';
     /**组件提供给外部调用的一些方法 */
     uploadTableRef?: any;
+    /** 是否不需要权限上传 */
+    isNoAuthUpload?: boolean;
 }
 declare const Upload: React.FC<IProps>;
 export default Upload;

package/dist/components/Upload/upload.js

@@ -63,7 +63,7 @@ import { UploadOutlined } from '@ant-design/icons';
 import { Button, message } from '../../index';
 import UploadTable from './upload-table';
 import classNames from 'classnames';
-import { downloadFileCallBack, downloadPublicFile, previewFile, createThumbnailUrl, } from 'ztxkutils/dist/fileOperation';
+import { downloadFileCallBack, downloadPublicFile, previewFile, createPublicPreviewUrl, createThumbnailUrl, } from 'ztxkutils/dist/fileOperation';
 import { transformFileSize } from 'ztxkutils/dist/tools';
 var _accept = [
     '.pdf',
@@ -82,7 +82,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, isNoAuthUpload = props.isNoAuthUpload, 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", "isNoAuthUpload"]);
     var _j = useState(originFileList || []), fileList = _j[0], setFileList = _j[1];
     var _k = useState('20M'), maxSizeTransStr = _k[0], setMaxSizeTransStr = _k[1];
     useEffect(function () {
@@ -239,7 +239,7 @@ var Upload = function (props) {
     var onFileDownload = function (file) {
         try {
             var name_1 = file.name, _a = file.response.data, attachId = _a.attachId, originalName = _a.originalName;
-            if (isPublic) {
+            if (isPublic || isNoAuthUpload) {
                 downloadPublicFile(apiBaseUrl, attachId, name_1 || originalName, {
                     callbackAfter: function () {
                         onDownLoadCallbackAfter && onDownLoadCallbackAfter(file);
@@ -279,10 +279,18 @@ var Upload = function (props) {
                 message.warning(i18next.t('文件过大，暂不支持在线预览，请先下载后查看!'));
             }
             else {
-                previewFile(fileBaseUrl, attachId, {
-                    titleName: (file === null || file === void 0 ? void 0 : file.fileName) || attachName,
-                    authToken: authToken,
-                });
+                if (isNoAuthUpload) {
+                    createPublicPreviewUrl(fileBaseUrl, {
+                        fileId: attachId,
+                        fileName: (file === null || file === void 0 ? void 0 : file.fileName) || attachName,
+                    });
+                }
+                else {
+                    previewFile(fileBaseUrl, attachId, {
+                        titleName: (file === null || file === void 0 ? void 0 : file.fileName) || attachName,
+                        authToken: authToken,
+                    });
+                }
                 onPreviewCallbackBefore && onPreviewCallbackBefore(file);
             }
         }
@@ -291,8 +299,15 @@ var Upload = function (props) {
         }
     };
     var fileAction = action
-        ? action
+        ? typeof action === 'string'
+            ? (action === null || action === void 0 ? void 0 : action.startsWith('http')) || action.startsWith('https')
+                ? action
+                : apiBaseUrl + "/api/zmdms-resource/oss/endpoint/put-file-attach"
+            : action
         : apiBaseUrl + "/api/zmdms-resource/oss/endpoint/put-file-attach";
+    if (isNoAuthUpload) {
+        fileAction = apiBaseUrl + "/api/zmdms-resource/oss/endpoint/public/put-file-by-name";
+    }
     return (React.createElement(React.Fragment, null,
         showUploadBtn && (React.createElement("div", { className: "zt-upload" },
             React.createElement(AntUpload, __assign({ className: classes, beforeUpload: beforeUpload ? beforeUpload : beforeFileUpload, onChange: onChange ? onChange : onFileChange, showUploadList: showUploadList ? showUploadList : false, fileList: fileList, multiple: multiple ? multiple : true, action: fileAction, headers: headers, data: data, method: method, onDownload: onFileDownload, onPreview: onFilePreview, onRemove: onFileRemove, openFileDialogOnClick: maxCount !== fileList.length || isDirect, maxCount: maxCount, listType: listType }, restProps), children ? (children) : !listType || listType === 'text' ? (React.createElement(Button, { type: "primary", disabled: maxCount === fileList.length || restProps.disabled },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "2.8.9-4",
+  "version": "2.8.9-6",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",
@@ -22,7 +22,7 @@
     "react-dnd-html5-backend": "^14.0.0",
     "react-to-print": "^2.14.7",
     "ztxkui": "2.8.9",
-    "ztxkutils": "2.10.66-45"
+    "ztxkutils": "^2.10.66-50"
   },
   "scripts": {
     "analyze": "source-map-explorer 'dist/static/js/*.js'",