zmdms-webui 1.5.7 → 1.5.9

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

@@ -400,6 +400,10 @@ interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"
     differences?: number[] | ((record: any, index: number) => boolean);
     isMarginTop?: boolean;
     isMarginBottom?: boolean;
+    /**
+     * 新增或删除行配置
+     */
+    AddAndDelProps?: IColumnsTypeProp<RecordType>;
 }
 interface IFields {
     /**

package/dist/es/table/table.js

@@ -38,7 +38,7 @@ import { DndProvider } from '../node_modules/react-dnd/dist/core/DndProvider.js'
 // completed: 实现从execl复制到表格中的功能
 var Table = function (props) {
     // console.log("表格渲染");
-    var className = props.className, _a = props.bordered, bordered = _a === void 0 ? true : _a, _b = props.pagination, pagination = _b === void 0 ? false : _b, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, isRemeberFilter = props.isRemeberFilter, _c = props.isOrderUpdateData, isOrderUpdateData = _c === void 0 ? true : _c, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _d = props.isTheadTitleAdd, isTheadTitleAdd = _d === void 0 ? true : _d, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _e = props.isDelAll, isDelAll = _e === void 0 ? true : _e, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _f = props.summaryFixed, summaryFixed = _f === void 0 ? true : _f, isInnerPagination = props.isInnerPagination, _g = props.innerPaginationPageSize, innerPaginationPageSize = _g === void 0 ? 30 : _g, _h = props.innerPaginationPosition, innerPaginationPosition = _h === void 0 ? INNER_TABLE_PAGINATION_POSITION : _h, _j = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _j === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _j, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _k = props.isResizableColumn, isResizableColumn = _k === void 0 ? true : _k, _l = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _l === void 0 ? true : _l, _m = props.isRealTimeValidate, isRealTimeValidate = _m === void 0 ? true : _m, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, scroll = props.scroll, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "isRemeberFilter", "isOrderUpdateData", "hiddenDynamicIcon", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "hiddenAddBtnHandle", "isTheadTitleAdd", "addMode", "addCallback", "isDel", "delPopTitle", "hiddenDelBtnHandle", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "innerPaginationConfig", "tableRefHandle", "tableName", "serviceOrder", "differences", "virtualKey", "isResizableColumn", "isResizableTitleEllipsis", "isRealTimeValidate", "isMarginTop", "isMarginBottom", "scroll"]);
+    var className = props.className, _a = props.bordered, bordered = _a === void 0 ? true : _a, _b = props.pagination, pagination = _b === void 0 ? false : _b, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, isRemeberFilter = props.isRemeberFilter, _c = props.isOrderUpdateData, isOrderUpdateData = _c === void 0 ? true : _c, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _d = props.isTheadTitleAdd, isTheadTitleAdd = _d === void 0 ? true : _d, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _e = props.isDelAll, isDelAll = _e === void 0 ? true : _e, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _f = props.summaryFixed, summaryFixed = _f === void 0 ? true : _f, isInnerPagination = props.isInnerPagination, _g = props.innerPaginationPageSize, innerPaginationPageSize = _g === void 0 ? 30 : _g, _h = props.innerPaginationPosition, innerPaginationPosition = _h === void 0 ? INNER_TABLE_PAGINATION_POSITION : _h, _j = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _j === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _j, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _k = props.isResizableColumn, isResizableColumn = _k === void 0 ? true : _k, _l = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _l === void 0 ? true : _l, _m = props.isRealTimeValidate, isRealTimeValidate = _m === void 0 ? true : _m, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, scroll = props.scroll, AddAndDelProps = props.AddAndDelProps, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "isRemeberFilter", "isOrderUpdateData", "hiddenDynamicIcon", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "hiddenAddBtnHandle", "isTheadTitleAdd", "addMode", "addCallback", "isDel", "delPopTitle", "hiddenDelBtnHandle", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "innerPaginationConfig", "tableRefHandle", "tableName", "serviceOrder", "differences", "virtualKey", "isResizableColumn", "isResizableTitleEllipsis", "isRealTimeValidate", "isMarginTop", "isMarginBottom", "scroll", "AddAndDelProps"]);
     var classes = classNames("ztxk-table", className, {
         "ztxk-table--flex": isFlex,
     });
@@ -145,6 +145,7 @@ var Table = function (props) {
         hiddenAddBtnHandleRef: hiddenAddBtnHandleRef,
         rowKey: props.rowKey,
         filterConfigRef: filterConfigRef,
+        AddAndDelProps: AddAndDelProps,
     }).newColumns;
     // 内部表格总结栏
     var getSummaryHandle = useSummary(summaryConfig, newColumns, {

package/dist/es/table/useColumns.js

@@ -21,7 +21,7 @@ import ModalComponent from '../modal/modal.js';
 function useColumns(columns, options) {
     var _this = this;
     var _a, _b;
-    var dynamicKey = options.dynamicKey, isRemeberFilter = options.isRemeberFilter, hiddenDynamicIcon = options.hiddenDynamicIcon, currentDynamicList = options.currentDynamicList, dataSource = options.dataSource, dataSourceRef = options.dataSourceRef, onEditableSave = options.onEditableSave, isEdit = options.isEdit, isAdd = options.isAdd, isTheadTitleAdd = options.isTheadTitleAdd, isDel = options.isDel, delPopTitle = options.delPopTitle, dynamicSettingRef = options.dynamicSettingRef, onCurrentListChange = options.onCurrentListChange, onAddAndDel = options.onAddAndDel, getRefreshScuCell = options.getRefreshScuCell, isDelAll = options.isDelAll, currentPage = options.currentPage, onTableChange = options.onTableChange, order = options.order, setOrder = options.setOrder, customSortHandle = options.customSortHandle, isResizableColumn = options.isResizableColumn, isResizableTitleEllipsis = options.isResizableTitleEllipsis, isRealTimeValidate = options.isRealTimeValidate, hiddenDelBtnHandleRef = options.hiddenDelBtnHandleRef, hiddenAddBtnHandleRef = options.hiddenAddBtnHandleRef, rowKey = options.rowKey, filterConfigRef = options.filterConfigRef;
+    var dynamicKey = options.dynamicKey, isRemeberFilter = options.isRemeberFilter, hiddenDynamicIcon = options.hiddenDynamicIcon, currentDynamicList = options.currentDynamicList, dataSource = options.dataSource, dataSourceRef = options.dataSourceRef, onEditableSave = options.onEditableSave, isEdit = options.isEdit, isAdd = options.isAdd, isTheadTitleAdd = options.isTheadTitleAdd, isDel = options.isDel, delPopTitle = options.delPopTitle, dynamicSettingRef = options.dynamicSettingRef, onCurrentListChange = options.onCurrentListChange, onAddAndDel = options.onAddAndDel, getRefreshScuCell = options.getRefreshScuCell, isDelAll = options.isDelAll, currentPage = options.currentPage, onTableChange = options.onTableChange, order = options.order, setOrder = options.setOrder, customSortHandle = options.customSortHandle, isResizableColumn = options.isResizableColumn, isResizableTitleEllipsis = options.isResizableTitleEllipsis, isRealTimeValidate = options.isRealTimeValidate, hiddenDelBtnHandleRef = options.hiddenDelBtnHandleRef, hiddenAddBtnHandleRef = options.hiddenAddBtnHandleRef, rowKey = options.rowKey, filterConfigRef = options.filterConfigRef, AddAndDelProps = options.AddAndDelProps;
     var newColumns = getTableColumns(columns, currentDynamicList).columns;
     // 表头过滤的一些配置（获取表头过滤的input的输入框的引用）
     var searchValueInputRef = useRef(null);
@@ -363,11 +363,7 @@ function useColumns(columns, options) {
             (!(dataSourceRef === null || dataSourceRef === void 0 ? void 0 : dataSourceRef.current) || ((_b = dataSourceRef === null || dataSourceRef === void 0 ? void 0 : dataSourceRef.current) === null || _b === void 0 ? void 0 : _b.length) === 0);
         // 如果配置了增减行
         if (isAdd || isDel) {
-            var newColumn = {
-                title: function () { return (jsxs(Fragment, { children: [showTitleDelIcon_1 ? (jsx(ColumnDelAll, { onAddAndDel: onAddAndDel })) : null, showTitleAddIcon_1 ? jsx(ColumnAdd, { onAddAndDel: onAddAndDel }) : null] })); },
-                width: 42,
-                fixed: "left",
-                align: "center",
+            var newColumn = __assign({ title: function () { return (jsxs(Fragment, { children: [showTitleDelIcon_1 ? (jsx(ColumnDelAll, { onAddAndDel: onAddAndDel })) : null, showTitleAddIcon_1 ? jsx(ColumnAdd, { onAddAndDel: onAddAndDel }) : null] })); }, width: 42, fixed: "left", align: "center", 
                 // 这里需要配置scu吗？TODO:
                 render: function (text, record, index) {
                     var hiddenDel = (hiddenDelBtnHandleRef === null || hiddenDelBtnHandleRef === void 0 ? void 0 : hiddenDelBtnHandleRef.current)
@@ -377,8 +373,7 @@ function useColumns(columns, options) {
                         ? !(hiddenAddBtnHandleRef === null || hiddenAddBtnHandleRef === void 0 ? void 0 : hiddenAddBtnHandleRef.current(record, index))
                         : isAdd;
                     return (jsx(ColumnAddDel, { isAdd: hiddenAdd, isDel: hiddenDel, index: index, delPopTitle: delPopTitle, onAddAndDel: onAddAndDel }));
-                },
-            };
+                } }, AddAndDelProps);
             myNewColumns.unshift(newColumn);
         }
         // 如果配置了动态列配置

package/dist/es/uploadlist/uploadList.js

@@ -253,7 +253,8 @@ var UploadList = function (props, ref) {
         return {
             /** 当前的附件列表数据 */
             getData: function () {
-                var successFileList = innerFileList.filter(function (item) { return item.status === "done"; });
+                // 如果数据中没有status字段，那么认为也是成功的
+                var successFileList = innerFileList.filter(function (item) { return !item.status || item.status === "done"; });
                 var errorFileList = innerFileList.filter(function (item) { return item.status === "error"; });
                 return {
                     fileList: innerFileList,
@@ -261,6 +262,50 @@ var UploadList = function (props, ref) {
                     errorFileList: errorFileList,
                 };
             },
+            /** 内部验证方法 */
+            validate: function (options) { return __awaiter(void 0, void 0, void 0, function () {
+                var _a, title, isError, i, fileItem, status_1;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            _a = options || {}, title = _a.title, isError = _a.isError;
+                            if (!Array.isArray(innerFileList)) return [3 /*break*/, 6];
+                            i = 0;
+                            _b.label = 1;
+                        case 1:
+                            if (!(i < innerFileList.length)) return [3 /*break*/, 6];
+                            fileItem = innerFileList[i];
+                            status_1 = fileItem.status || "done";
+                            if (!(status_1 !== "done" && status_1 !== "error")) return [3 /*break*/, 3];
+                            return [4 /*yield*/, Promise.reject({
+                                    errorFields: [
+                                        {
+                                            errors: "".concat(title || "", " \u7B2C").concat(i + 1, "\u4E2A\u9644\u4EF6\u8FD8\u5728\u4E0A\u4F20\u4E2D\uFF0C\u8BF7\u7A0D\u7B49..."),
+                                        },
+                                    ],
+                                })];
+                        case 2:
+                            _b.sent();
+                            _b.label = 3;
+                        case 3:
+                            if (!(isError && status_1 === "error")) return [3 /*break*/, 5];
+                            return [4 /*yield*/, Promise.reject({
+                                    errorFields: [
+                                        {
+                                            errors: "".concat(title || "", " \u7B2C").concat(i + 1, "\u4E2A\u9644\u4EF6\u4E0A\u4F20\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5"),
+                                        },
+                                    ],
+                                })];
+                        case 4:
+                            _b.sent();
+                            _b.label = 5;
+                        case 5:
+                            i++;
+                            return [3 /*break*/, 1];
+                        case 6: return [2 /*return*/];
+                    }
+                });
+            }); },
         };
     });
     return (jsxs("div", __assign({ className: classes, ref: imgCropModalRef }, { children: [isPreview ? null : (jsxs(Fragment, { children: [isImage ? (jsx(ImgCrop, __assign({ rotationSlider: true, showReset: true, quality: 0.8, modalClassName: "ztxk-upload-imgcrop", modalProps: { getContainer: function () { return imgCropModalRef.current; } }, aspect: imgWidth / imgHeight }, imgCropProps, { children: renderChildren }))) : (renderChildren), showTip ? (jsxs("span", __assign({ className: "ztxk-upload--tips" }, { children: ["(\u5355\u4E2A\u9644\u4EF6\u6700\u5927\u652F\u6301", maxSizeStr, ")"] }))) : ("")] })), isDelete && !isPreview && showTable ? (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 && showTable ? (jsx(Dropdown, __assign({ menu: {

package/package.json

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