zmdms-webui 0.0.71 → 0.0.73

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

@@ -10,6 +10,10 @@ interface ITitleProps {
     showBg?: boolean;
     /** 是否左右布局 */
     justifyContent?: "space-between" | "flex-start";
+    /** 是否需要上边距 */
+    isTopMargin?: boolean;
+    /** 是否需要下边距 */
+    isBottomMargin?: boolean;
 }
 interface TitleComponent extends React__default.FC<ITitleProps> {
     displayName: string;

package/dist/es/title/title.js

@@ -3,11 +3,13 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import classNames from '../node_modules/classnames/index.js';
 
 var Title = function (props) {
-    var title = props.title, className = props.className, bordered = props.bordered, showBg = props.showBg, _a = props.justifyContent, justifyContent = _a === void 0 ? "space-between" : _a, children = props.children;
+    var title = props.title, className = props.className, bordered = props.bordered, showBg = props.showBg, _a = props.justifyContent, justifyContent = _a === void 0 ? "space-between" : _a, children = props.children, isTopMargin = props.isTopMargin, isBottomMargin = props.isBottomMargin;
     // 主容器类名
     var classes = classNames("ztxk-title", className, {
         "ztxk-title--bordered": bordered,
         "ztxk-title--background": showBg,
+        "ztxk-title--marginTop": isTopMargin,
+        "ztxk-title--marginBottom": isBottomMargin,
     });
     return (jsxs("div", __assign({ className: classes, style: { justifyContent: justifyContent } }, { children: [jsx("div", __assign({ className: "ztxk-title--title" }, { children: title })), jsx("div", __assign({ className: "ztxk-title--extra" }, { children: children }))] })));
 };

package/dist/es/uploadlist/hooks.js

@@ -116,8 +116,11 @@ function useOnChange(props) {
                 fileList: currentFileList,
             });
         // 如果所有得附件都已经完成
-        if (currentFileList.every(function (item) { return item.status === "done" || item.status === "error"; })) {
-            var successFileList = fileList.filter(function (item) { return item.status === "done"; });
+        // 如果是初始化数据 一般是没有item.status的  可以默认认为这种附件是成功的
+        if (currentFileList.every(function (item) {
+            return item.status === "done" || item.status === "error" || !item.status;
+        })) {
+            var successFileList = fileList.filter(function (item) { return item.status === "done" || !item.status; });
             var errorFileList = fileList.filter(function (item) { return item.status === "error"; });
             onChange &&
                 onChange({

package/dist/es/uploadlist/uploadList.js

@@ -9,6 +9,8 @@ import ImgCrop from '../node_modules/antd-img-crop/dist/antd-img-crop.esm.js';
 import { useBeforeUpload, useOnChange, useBasicInfo, useUploadTableData } from './hooks.js';
 import { MAX_PREVIEW_SIZE } from '../config/constant.js';
 import { toPreviewFile } from './utils.js';
+import '../config/ZtxkContext.js';
+import useBaseContext from '../config/useBaseContext.js';
 import LoadingOutlined from '../node_modules/@ant-design/icons/es/icons/LoadingOutlined.js';
 import DownloadOutlined from '../node_modules/@ant-design/icons/es/icons/DownloadOutlined.js';
 import ButtonCom from '../button/button.js';
@@ -25,13 +27,18 @@ var MAXSIZE = 104857600; // 100 * 1024 * 1024
  * 附件大小 attachSize
  */
 var UploadList = function (props, ref) {
-    var children = props.children, btnText = props.btnText, className = props.className, _a = props.showTip, showTip = _a === void 0 ? true : _a, _b = props.maxSize, maxSize = _b === void 0 ? MAXSIZE : _b, showTable = props.showTable, acceptList = props.acceptList, beforeUpload = props.beforeUpload, onChange = props.onChange, _c = props.API_BASEURL, API_BASEURL = _c === void 0 ? "" : _c, _d = props.FILE_API_BASEURL, FILE_API_BASEURL = _d === void 0 ? "" : _d, action = props.action, headers = props.headers, data = props.data, userName = props.userName, fileList = props.fileList, isPublic = props.isPublic, _e = props.maxPreviewSize, maxPreviewSize = _e === void 0 ? MAX_PREVIEW_SIZE : _e, isPreview = props.isPreview, isDownload = props.isDownload, isDelete = props.isDelete, _f = props.zipName, zipName = _f === void 0 ? "\u6279\u91CF\u4E0B\u8F7D-".concat(Date.now(), ".zip") : _f, isImage = props.isImage, customRenderBtn = props.customRenderBtn, 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", "zipName", "isImage", "customRenderBtn"]);
+    var children = props.children, btnText = props.btnText, className = props.className, _a = props.showTip, showTip = _a === void 0 ? true : _a, _b = props.maxSize, maxSize = _b === void 0 ? MAXSIZE : _b, 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, _c = props.maxPreviewSize, maxPreviewSize = _c === void 0 ? MAX_PREVIEW_SIZE : _c, isPreview = props.isPreview, isDownload = props.isDownload, isDelete = props.isDelete, _d = props.zipName, zipName = _d === void 0 ? "\u6279\u91CF\u4E0B\u8F7D-".concat(Date.now(), ".zip") : _d, isImage = props.isImage, customRenderBtn = props.customRenderBtn, 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", "zipName", "isImage", "customRenderBtn"]);
     var maxCount = resetProps.maxCount, listType = resetProps.listType, method = resetProps.method;
     var classes = classNames("ztxk-upload", className, {});
     var maxSizeStr = formatUnit(maxSize);
     var tableRef = useRef({});
     var modalRef = useRef({});
-    var _g = useState(), imgSrc = _g[0], setImgSrc = _g[1];
+    var _e = useState(), imgSrc = _e[0], setImgSrc = _e[1];
+    var _f = useBaseContext(), apiBaseUrl = _f.apiBaseUrl, fileBaseUrl = _f.fileBaseUrl;
+    var API_BASEURL = PROPS_API_BASEURL ? PROPS_API_BASEURL : apiBaseUrl;
+    var FILE_API_BASEURL = PROPS_FILE_API_BASEURL
+        ? PROPS_FILE_API_BASEURL
+        : fileBaseUrl;
     // 文件上传前的判断处理
     var beforeUploadHandle = useBeforeUpload({
         acceptList: acceptList,
@@ -41,22 +48,22 @@ var UploadList = function (props, ref) {
         isImage: isImage,
     });
     // 文件改变逻辑
-    var _h = useOnChange({
+    var _g = useOnChange({
         onChange: onChange,
         userName: userName,
         fileList: fileList,
         isImage: isImage,
         isPublic: isPublic,
         API_BASEURL: API_BASEURL,
-    }), onChangeHandle = _h.onChangeHandle, innerFileList = _h.innerFileList, setInnerFileList = _h.setInnerFileList;
+    }), onChangeHandle = _g.onChangeHandle, innerFileList = _g.innerFileList, setInnerFileList = _g.setInnerFileList;
     // 基础参数
-    var _j = useBasicInfo({
+    var _h = useBasicInfo({
         action: action,
         API_BASEURL: API_BASEURL,
         headers: headers,
         data: data,
         isPublic: isPublic,
-    }), fileAction = _j.fileAction, fileHeaders = _j.fileHeaders, fileData = _j.fileData;
+    }), fileAction = _h.fileAction, fileHeaders = _h.fileHeaders, fileData = _h.fileData;
     // 表格需要的附件列表数据
     var uploadTableData = useUploadTableData({
         fileList: innerFileList,
@@ -227,7 +234,7 @@ var UploadList = function (props, ref) {
             },
         };
     });
-    return (jsxs("div", __assign({ className: classes }, { children: [isPreview ? null : (jsxs(Fragment, { children: [isImage ? (jsx(ImgCrop, __assign({ rotationSlider: true, showReset: true, quality: 0.8, modalClassName: "ztxk-upload-imgcrop" }, { children: renderChildren }))) : (renderChildren), showTip ? (jsxs("span", __assign({ className: "ztxk-upload--tips" }, { children: ["(\u5355\u4E2A\u9644\u4EF6\u6700\u5927\u652F\u6301", maxSizeStr, ")"] }))) : ("")] })), isDelete && !isPreview ? (jsx(Popconfirm, __assign({ title: "\u662F\u5426\u5220\u9664\u9009\u4E2D\u9644\u4EF6\uFF1F", cancelText: "\u5426", okText: "\u662F", onConfirm: function () { return onBatchDeleteHandle(); } }, { children: jsx(ButtonCom, __assign({ type: "primary" }, { children: "\u6279\u91CF\u5220\u9664" })) }))) : null, isDownload ? (jsx(Dropdown, __assign({ menu: {
+    return (jsxs("div", __assign({ className: classes }, { children: [isPreview ? null : (jsxs(Fragment, { children: [isImage ? (jsx(ImgCrop, __assign({ rotationSlider: true, showReset: true, quality: 0.8, modalClassName: "ztxk-upload-imgcrop" }, { children: renderChildren }))) : (renderChildren), showTip ? (jsxs("span", __assign({ className: "ztxk-upload--tips" }, { children: ["(\u5355\u4E2A\u9644\u4EF6\u6700\u5927\u652F\u6301", maxSizeStr, ")"] }))) : ("")] })), isDelete && !isPreview && listType !== "text" ? (jsx(Popconfirm, __assign({ title: "\u662F\u5426\u5220\u9664\u9009\u4E2D\u9644\u4EF6\uFF1F", cancelText: "\u5426", okText: "\u662F", onConfirm: function () { return onBatchDeleteHandle(); } }, { children: jsx(ButtonCom, __assign({ type: "primary" }, { children: "\u6279\u91CF\u5220\u9664" })) }))) : null, isDownload && listType !== "text" ? (jsx(Dropdown, __assign({ menu: {
                     items: [
                         {
                             label: "压缩",

package/dist/es/uploadlist/uploadTable.js

@@ -8,7 +8,7 @@ import dayjs from 'dayjs';
 import { toPreviewFile } from './utils.js';
 import ButtonCom from '../button/button.js';
 import OperationBtn from '../operationbtn/operationBtn.js';
-import { Progress } from 'antd';
+import { Progress, message } from 'antd';
 
 var UploadTable = function (_a, ref) {
     var dataSource = _a.dataSource, action = _a.action, headers = _a.headers, data = _a.data, method = _a.method, setInnerFileList = _a.setInnerFileList, isPublic = _a.isPublic, _b = _a.API_BASEURL, API_BASEURL = _b === void 0 ? "" : _b, _c = _a.FILE_API_BASEURL, FILE_API_BASEURL = _c === void 0 ? "" : _c, maxPreviewSize = _a.maxPreviewSize, isPreview = _a.isPreview, isDelete = _a.isDelete, isDownload = _a.isDownload;
@@ -211,6 +211,10 @@ var UploadTable = function (_a, ref) {
     };
     // 重新上传
     var onReloadUploadHandle = function (record, index) {
+        if (!record.originFileObj) {
+            message.error("当前失败项，没有找到附件原件信息，无法重新上传!");
+            return;
+        }
         setLoading(true);
         uploadFile({
             action: action,