ztxkui 4.2.18-92 → 4.2.18-94

package/dist/Demo.js

@@ -137,7 +137,9 @@ function Demo() {
         React.createElement(EnhanceSelect, { style: selectStyle, placeholder: i18next.t('一次性加载数据'), url: "http://base-test.zmdms.com.cn:30079/api/zmdms-system/company/list", request: request, dataKey: "id", titleKey: "name", isClickRequest: true, isPaste: true, isCatch: true, mode: "multiple", value: value3, onChange: function (value, option, fullData) {
                 console.log(value);
                 setValue3(value);
-            } }),
+            }, 
+            // open={false}
+            isPasteAddItem: true }),
         React.createElement("button", { onClick: function () {
                 setValue3(['10005004', '10005009']);
             } }, "\u8BBE\u7F6E\u503C"),

package/dist/UploadDemo.js

@@ -292,7 +292,8 @@ function UploadDemo() {
             }, upload: upload, rowSelection: "checkbox", showAllDeleteBtn: true, showAllDownloadBtn: true, uploadTableRef: uploadTableRef, tableRestProps: {
                 tableHandleRef: tableHandleRef,
             } }),
-        React.createElement(Upload, { maxSize: 200 * 1024, ztAccept: ['.jpg', '.jpeg', '.png', '.bmp', '.gif'], listType: "picture-card", method: "post", headers: {
+        "111",
+        React.createElement(Upload, { maxSize: 2 * 1024 * 1024, minSize: 200 * 1024, maxResolution: { width: 960, height: 1200 }, minResolution: { width: 480, height: 600 }, ztAccept: ['.jpg', '.png'], listType: "picture-card", method: "post", headers: {
                 'Zmdms-Auth': token,
             }, showUploadList: {
                 showPreviewIcon: true,

package/dist/components/EnhanceSelect/index.js

@@ -927,7 +927,7 @@ function EnhanceSelect(_a) {
                     }
                     else {
                         // 否则 最后一个不是全部，那就去掉全部
-                        __value = currentData_1.map(function (item) { return item[key_1]; });
+                        __value = currentData_1 === null || currentData_1 === void 0 ? void 0 : currentData_1.filter(function (item) { return item[key_1] !== ''; }).map(function (item) { return item[key_1]; });
                     }
                 }
                 else if (!Array.isArray(__value) && __value != null && currentData_1) {

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

@@ -37,10 +37,14 @@ export interface IProps extends UploadProps {
     ztShowTipText?: string;
     /**允许上传的最大文件大小 */
     maxSize?: number;
+    /**允许上传的最小文件大小 */
+    minSize?: number;
     /**允许上传的最大数量 */
     maxCount?: number;
     /**最大文件大小提示 */
     maxSizeStr?: string;
+    /**最小文件大小提示 */
+    minSizeStr?: string;
     /**上传文件人 */
     uploadUser?: string;
     /**默认文件列表 */
@@ -49,7 +53,7 @@ export interface IProps extends UploadProps {
      * 文件设置回调
      * 当fileList 中的所有文件的status属性为done时，才可以确认文件上传完毕
      **/
-    callback?: (fileList: any) => void;
+    callback?: (fileList: any, options?: any) => void;
     /**
      * 文件删除
      */
@@ -79,6 +83,16 @@ export interface IProps extends UploadProps {
     uploadTableRef?: any;
     /**表格方法 */
     tableRestProps?: any;
+    /** 最大分辨率 */
+    maxResolution?: {
+        width: number;
+        height: number;
+    };
+    /** 最小分辨率 */
+    minResolution?: {
+        width: number;
+        height: number;
+    };
 }
 export declare function getFileId(item: any): any;
 export declare function getFileSize(item: any): any;

package/dist/components/Upload/upload.js

@@ -114,10 +114,38 @@ export function getFileSize(item) {
     }
     return null;
 }
+// 获取图片尺寸的辅助函数
+var getImageDimensions = function (file) {
+    return new Promise(function (resolve, reject) {
+        // 检查是否是图片类型
+        if (!file.type.startsWith('image/')) {
+            resolve({ width: 0, height: 0 });
+            return;
+        }
+        var img = new Image();
+        var url = URL.createObjectURL(file);
+        img.onload = function () {
+            URL.revokeObjectURL(url);
+            console.log("\u56FE\u7247\u5C3A\u5BF8: " + img.width + " x " + img.height);
+            resolve({ width: img.width, height: img.height });
+        };
+        img.onerror = function () {
+            URL.revokeObjectURL(url);
+            reject(new Error('Failed to load image'));
+        };
+        img.src = url;
+    });
+};
 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, tableRestProps = props.tableRestProps, showAllDeleteBtn = props.showAllDeleteBtn, showAllDownloadBtn = props.showAllDownloadBtn, allDeleteCallback = props.allDeleteCallback, allDownloadCallback = props.allDownloadCallback, batchDownloadZipName = props.batchDownloadZipName, 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", "showAllDeleteBtn", "showAllDownloadBtn", "allDeleteCallback", "allDownloadCallback", "batchDownloadZipName"]);
+    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, minSize = props.minSize, minSizeStr = props.minSizeStr, 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, showAllDeleteBtn = props.showAllDeleteBtn, showAllDownloadBtn = props.showAllDownloadBtn, allDeleteCallback = props.allDeleteCallback, allDownloadCallback = props.allDownloadCallback, batchDownloadZipName = props.batchDownloadZipName, maxResolution = props.maxResolution, minResolution = props.minResolution, restProps = __rest(props, ["children", "className", "showTip", "showUploadBtn", "showDeleteBtn", "onDownLoadCallbackBefore", "showDownloadBtn", "onDownLoadCallbackAfter", "showPreviewBtn", "onPreviewCallbackBefore", "showTable", "showUploadList", "onChange", "beforeUpload", "multiple", "ztAccept", "ztShowTipText", "maxCount", "maxSize", "maxSizeStr", "minSize", "minSizeStr", "action", "headers", "method", "uploadUser", "originFileList", "callback", "onDeleteCallback", "isAutoDelete", "apiBaseUrl", "fileBaseUrl", "fileBtnText", "data", "authToken", "listType", "isPublic", "startColumns", "otherColumns", "isDirect", "upload", "rowSelection", "uploadTableRef", "tableRestProps", "showAllDeleteBtn", "showAllDownloadBtn", "allDeleteCallback", "allDownloadCallback", "batchDownloadZipName", "maxResolution", "minResolution"]);
     var _j = useState(originFileList || []), fileList = _j[0], setFileList = _j[1];
     var _k = useState('20M'), maxSizeTransStr = _k[0], setMaxSizeTransStr = _k[1];
+    var ACCEPT = ztAccept ? ztAccept : _accept;
+    // 记录当前上传图片的分辨率
+    var currentResolutionRef = useRef({
+        width: 0,
+        height: 0,
+    });
     useEffect(function () {
         if (upload) {
             upload.current = upload.current ? upload.current : {};
@@ -171,7 +199,7 @@ var Upload = function (props) {
         var MAXSIZE = maxSize ? maxSize : 1024 * 1024 * 100;
         var MAXSIZESTR = maxSizeStr ? maxSizeStr : transformFileSize(MAXSIZE);
         setMaxSizeTransStr(MAXSIZESTR);
-    }, [maxSize, maxSizeStr]);
+    }, [maxSize, maxSizeStr, minSize, minSizeStr]);
     useEffect(function () {
         // 拉平数据
         if (Array.isArray(originFileList)) {
@@ -247,10 +275,11 @@ var Upload = function (props) {
     var beforeFileUpload = function (file, fileList) {
         var fileName = file.name, fileSize = file.size;
         var fileNameSuffix = getFileSuffix(fileName);
-        var ACCEPT = _accept;
         var MAXSIZE = maxSize ? maxSize : 1024 * 1024 * 100;
         var MAXSIZESTR = maxSizeStr ? maxSizeStr : transformFileSize(MAXSIZE);
         setMaxSizeTransStr(MAXSIZESTR);
+        var MINSIZE = minSize ? minSize : 200 * 1024;
+        var MINSIZSTR = minSizeStr ? minSizeStr : transformFileSize(MINSIZE);
         if (!ACCEPT.includes(fileNameSuffix)) {
             message.warning(i18next.t('不支持 {{fileNameSuffix}} 文件格式！', {
                 fileNameSuffix: fileNameSuffix,
@@ -265,13 +294,51 @@ var Upload = function (props) {
             message.warning(i18next.t('文件超出 {{MAXSIZESTR}}！', { MAXSIZESTR: MAXSIZESTR }));
             return AntUpload.LIST_IGNORE;
         }
+        if (fileSize < MINSIZE) {
+            message.warning(i18next.t('文件小于 {{MINSIZSTR}}！', { MINSIZSTR: MINSIZSTR }));
+            return AntUpload.LIST_IGNORE;
+        }
+        // 如果是图片，获取文件分辨率
+        if (file.type.startsWith('image/')) {
+            return getImageDimensions(file)
+                .then(function (dimensions) {
+                currentResolutionRef.current = dimensions;
+                // 在这里可以访问 dimensions.width 和 dimensions.height
+                // 可以根据需要进行验证或其他操作
+                if (maxResolution &&
+                    (dimensions.width > maxResolution.width ||
+                        dimensions.height > maxResolution.height)) {
+                    message.warning(i18next.t('图片分辨率超出最大值宽*高 {{maxResolution}}！', {
+                        maxResolution: maxResolution.width + 'x' + maxResolution.height,
+                    }));
+                    return AntUpload.LIST_IGNORE;
+                }
+                if (minResolution &&
+                    (dimensions.width < minResolution.width ||
+                        dimensions.height < minResolution.height)) {
+                    message.warning(i18next.t('图片分辨率低于最小值宽*高 {{minResolution}}！', {
+                        minResolution: minResolution.width + 'x' + minResolution.height,
+                    }));
+                    return AntUpload.LIST_IGNORE;
+                }
+                console.log('图片分辨率:', dimensions);
+                return file;
+            })
+                .catch(function () {
+                // 获取尺寸失败也允许上传
+                return file;
+            });
+        }
         return Promise.resolve(file);
     };
     /**上传文件改变时的状态 */
     var onFileChange = function (info) {
         var fileList = info.fileList;
         setFileList(fileList);
-        callback && callback(fileList);
+        callback &&
+            callback(fileList, {
+                currentResolution: currentResolutionRef.current,
+            });
     };
     /**文件删除 */
     var onDeleteHandle = function (index, file) {
@@ -442,7 +509,7 @@ var Upload = function (props) {
         showUploadBtn && (React.createElement("div", { className: "zt-upload" },
             showAllDeleteloadBtnInner && (React.createElement(Button, { type: "primary", style: { marginRight: '10px' }, onClick: onAllDeleteHandle }, i18next.t('批量删除'))),
             showAllDownloadBtnInner && createDownloadBtn(),
-            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 },
+            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, accept: ACCEPT === null || ACCEPT === void 0 ? void 0 : ACCEPT.join(',') }, restProps), children ? (children) : !listType || listType === 'text' ? (React.createElement(Button, { type: "primary", disabled: maxCount === fileList.length || restProps.disabled },
                 React.createElement(UploadOutlined, null),
                 fileBtnText || i18next.t('添加附件'),
                 maxCount === fileList.length &&

package/dist/locales/en-US.json

@@ -814,5 +814,7 @@
     "获取选中项": "Gets the selected item",
     "全选": "Select all",
     "反选": "Invert selection",
-    "请至少保留一个展示项!": "Please keep at least one display item!"
+    "请至少保留一个展示项!": "Please keep at least one display item!",
+    "图片分辨率低于最小值宽*高 {{minResolution}}！": "Image resolution is below the minimum value width*height {{minResolution}}!",
+    "图片分辨率超出最大值宽*高 {{maxResolution}}！": "Image resolution is above the maximum value width*height {{maxResolution}}!"
 }

package/dist/locales/zh-CN.json

@@ -814,5 +814,7 @@
     "获取选中项": "获取选中项",
     "全选": "全选",
     "反选": "反选",
-    "请至少保留一个展示项!": "请至少保留一个展示项!"
+    "请至少保留一个展示项!": "请至少保留一个展示项!",
+    "图片分辨率低于最小值宽*高 {{minResolution}}！": "图片分辨率低于最小值宽*高 {{minResolution}}！",
+    "图片分辨率超出最大值宽*高 {{maxResolution}}！": "图片分辨率超出最大值宽*高 {{maxResolution}}！"
 }

package/package.json

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