zmdms-webui 2.0.7 → 2.0.8

package/dist/es/table/useColumns.js

@@ -319,22 +319,23 @@ function useColumns(columns, options) {
                 return jsx(Badge, __assign({}, props, { children: v }));
             };
         }
+        var formatRender = function (text) {
+            if (typeof text === "object") {
+                return PLACEHOLDER_NULL;
+            }
+            if (text == null || text === "")
+                return PLACEHOLDER_NULL;
+            if (_column.dateFormat)
+                return dayjs(text).format(_column.dateFormat);
+            if (_column.precision)
+                text = exactRound(text, _column.precision);
+            if (_column.thousand)
+                text = addThousedSeparator(text);
+            return text;
+        };
         // 添加render字段，
         if (!_column.render && !_column.editable) {
-            _column.render = function (text, record, index) {
-                if (typeof text === "object") {
-                    return PLACEHOLDER_NULL;
-                }
-                if (text == null || text === "")
-                    return PLACEHOLDER_NULL;
-                if (_column.dateFormat)
-                    return dayjs(text).format(_column.dateFormat);
-                if (_column.precision)
-                    text = exactRound(text, _column.precision);
-                if (_column.thousand)
-                    text = addThousedSeparator(text);
-                return text;
-            };
+            _column.render = formatRender;
         }
         if (_column.render) {
             // 对外暴露粘贴方法
@@ -346,7 +347,7 @@ function useColumns(columns, options) {
             // 自定义合计行，不需要render属性
             _column.render = function (text, record, index) {
                 if (record[IS_SUMMARY]) {
-                    return text;
+                    return formatRender(text);
                 }
                 return __render__1(text, record, index, options_1);
             };

package/dist/es/uploadlist/interface.d.ts

@@ -45,6 +45,8 @@ interface IUploadListProps extends Omit<UploadProps, "onChange"> {
     zipName?: string;
     /** 是否只上传图片 */
     isImage?: boolean;
+    /** 图片预览 */
+    isImgPreview?: boolean;
     /** 裁剪组件的一些配置 link: https://github.com/nanxiaobei/antd-img-crop/blob/main/README.zh-CN.md */
     imgCropProps?: Partial<ImgCropProps>;
     /** 图片展示的宽度 默认110 */

package/dist/es/uploadlist/uploadList.js

@@ -31,7 +31,7 @@ var MAXSIZE = 104857600; // 100 * 1024 * 1024
  */
 var UploadList = function (props, ref) {
     var _a;
-    var children = props.children, btnText = props.btnText, className = props.className, _b = props.showTip, showTip = _b === void 0 ? true : _b, _c = props.maxSize, maxSize = _c === void 0 ? MAXSIZE : _c, showTable = props.showTable, acceptList = props.acceptList, beforeUpload = props.beforeUpload, onChange = props.onChange, PROPS_API_BASEURL = props.API_BASEURL, PROPS_FILE_API_BASEURL = props.FILE_API_BASEURL, action = props.action, headers = props.headers, data = props.data, userName = props.userName, fileList = props.fileList, isPublic = props.isPublic, _d = props.maxPreviewSize, maxPreviewSize = _d === void 0 ? MAX_PREVIEW_SIZE : _d, isPreview = props.isPreview, isDownload = props.isDownload, isDelete = props.isDelete, _e = props.filePreview, filePreview = _e === void 0 ? true : _e, _f = props.zipName, zipName = _f === void 0 ? "\u6279\u91CF\u4E0B\u8F7D-".concat(Date.now(), ".zip") : _f, isImage = props.isImage, imgCropProps = props.imgCropProps, _g = props.imgWidth, imgWidth = _g === void 0 ? 110 : _g, _h = props.imgHeight, imgHeight = _h === void 0 ? 110 : _h, customRenderBtn = props.customRenderBtn, disAllowDuplicateFile = props.disAllowDuplicateFile, fieldNames = props.fieldNames, tableColumns = props.tableColumns, onBeforeDownloadValidate = props.onBeforeDownloadValidate, onBeforePreviewValidate = props.onBeforePreviewValidate, onBeforeDeleteValidate = props.onBeforeDeleteValidate, resetProps = __rest(props, ["children", "btnText", "className", "showTip", "maxSize", "showTable", "acceptList", "beforeUpload", "onChange", "API_BASEURL", "FILE_API_BASEURL", "action", "headers", "data", "userName", "fileList", "isPublic", "maxPreviewSize", "isPreview", "isDownload", "isDelete", "filePreview", "zipName", "isImage", "imgCropProps", "imgWidth", "imgHeight", "customRenderBtn", "disAllowDuplicateFile", "fieldNames", "tableColumns", "onBeforeDownloadValidate", "onBeforePreviewValidate", "onBeforeDeleteValidate"]);
+    var children = props.children, btnText = props.btnText, className = props.className, _b = props.showTip, showTip = _b === void 0 ? true : _b, _c = props.maxSize, maxSize = _c === void 0 ? MAXSIZE : _c, showTable = props.showTable, acceptList = props.acceptList, beforeUpload = props.beforeUpload, onChange = props.onChange, PROPS_API_BASEURL = props.API_BASEURL, PROPS_FILE_API_BASEURL = props.FILE_API_BASEURL, action = props.action, headers = props.headers, data = props.data, userName = props.userName, fileList = props.fileList, isPublic = props.isPublic, _d = props.maxPreviewSize, maxPreviewSize = _d === void 0 ? MAX_PREVIEW_SIZE : _d, isPreview = props.isPreview, isDownload = props.isDownload, isDelete = props.isDelete, _e = props.filePreview, filePreview = _e === void 0 ? true : _e, _f = props.zipName, zipName = _f === void 0 ? "\u6279\u91CF\u4E0B\u8F7D-".concat(Date.now(), ".zip") : _f, isImage = props.isImage, imgCropProps = props.imgCropProps, _g = props.imgWidth, imgWidth = _g === void 0 ? 110 : _g, _h = props.imgHeight, imgHeight = _h === void 0 ? 110 : _h, customRenderBtn = props.customRenderBtn, disAllowDuplicateFile = props.disAllowDuplicateFile, fieldNames = props.fieldNames, tableColumns = props.tableColumns, onBeforeDownloadValidate = props.onBeforeDownloadValidate, onBeforePreviewValidate = props.onBeforePreviewValidate, onBeforeDeleteValidate = props.onBeforeDeleteValidate, isImgPreview = props.isImgPreview, resetProps = __rest(props, ["children", "btnText", "className", "showTip", "maxSize", "showTable", "acceptList", "beforeUpload", "onChange", "API_BASEURL", "FILE_API_BASEURL", "action", "headers", "data", "userName", "fileList", "isPublic", "maxPreviewSize", "isPreview", "isDownload", "isDelete", "filePreview", "zipName", "isImage", "imgCropProps", "imgWidth", "imgHeight", "customRenderBtn", "disAllowDuplicateFile", "fieldNames", "tableColumns", "onBeforeDownloadValidate", "onBeforePreviewValidate", "onBeforeDeleteValidate", "isImgPreview"]);
     var maxCount = resetProps.maxCount, listType = resetProps.listType, method = resetProps.method;
     var imgSizeClassName = "temporary-className-".concat(imgWidth, "-").concat(imgHeight);
     var classes = classNames("ztxk-upload", className, (_a = {},
@@ -293,7 +293,8 @@ var UploadList = function (props, ref) {
     var renderChildren = (jsx(Upload, __assign({ showUploadList: showUploadListMemo, multiple: true, beforeUpload: beforeUploadHandle, onChange: onChangeHandle, action: fileAction, headers: fileHeaders, data: fileData, fileList: innerFileList, onPreview: onPreview, onDownload: onDownload }, resetProps, { children: children ? (children) : !listType || listType === "text" ? (jsxs(ButtonCom, __assign({ type: "primary", icon: jsx(UploadOutlined, {}) }, { children: [btnText || "添加附件", maxCount ? "(\u6700\u591A\u4E0A\u4F20".concat(maxCount, "\u4E2A\u6587\u4EF6)") : ""] }))) : isImage &&
             maxCount &&
             innerFileList &&
-            innerFileList.length >= maxCount ? null : (jsxs("div", __assign({ className: "ztxk-upload--picture" }, { children: [jsx(UploadOutlined, { style: { fontSize: 18 } }), jsx("div", __assign({ style: { marginTop: 8 } }, { children: btnText || "添加图片" }))] }))) })));
+            innerFileList.length >= maxCount &&
+            !isImgPreview ? null : (jsxs("div", __assign({ className: "ztxk-upload--picture" }, { children: [jsx(UploadOutlined, { style: { fontSize: 18 } }), jsx("div", __assign({ style: { marginTop: 8 } }, { children: btnText || "添加图片" }))] }))) })));
     // 暴露给外部的一些方法
     useImperativeHandle(ref, function () {
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",