zmdms-webui 1.3.5 → 1.3.7

package/dist/es/button/buttonExport.js

@@ -24,32 +24,32 @@ var ButtonExport = function (props) {
     var _a = useState(false), loading = _a[0], setLoading = _a[1];
     // const { apiBaseUrl } = useBaseContext();
     var onClickHandle = function (e) { return __awaiter(void 0, void 0, void 0, function () {
-        var res, err_2, blob;
-        var _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var res, err_2, blob, _a, errorFields, errors, msg, errorMsg;
+        var _b, _c, _d, _e;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0:
                     setLoading(true);
                     if (!beforeExportHandle) return [3 /*break*/, 4];
-                    _c.label = 1;
+                    _f.label = 1;
                 case 1:
-                    _c.trys.push([1, 3, , 4]);
+                    _f.trys.push([1, 3, , 4]);
                     return [4 /*yield*/, beforeExportHandle()];
                 case 2:
-                    _c.sent();
+                    _f.sent();
                     return [3 /*break*/, 4];
                 case 3:
-                    _c.sent();
+                    _f.sent();
                     onClick && onClick(e, { result: false });
                     setLoading(false);
                     return [2 /*return*/];
                 case 4:
-                    _c.trys.push([4, 7, , 8]);
+                    _f.trys.push([4, 7, , 8]);
                     res = void 0;
                     if (!fetchHandle) return [3 /*break*/, 6];
                     return [4 /*yield*/, fetchHandle()];
                 case 5:
-                    res = _c.sent();
+                    res = _f.sent();
                     return [3 /*break*/, 6];
                 case 6:
                     exportBolb(res, fileName)
@@ -67,10 +67,10 @@ var ButtonExport = function (props) {
                     setLoading(false);
                     return [3 /*break*/, 8];
                 case 7:
-                    err_2 = _c.sent();
+                    err_2 = _f.sent();
                     setLoading(false);
-                    if (Object.prototype.toString.call((_a = err_2 === null || err_2 === void 0 ? void 0 : err_2.response) === null || _a === void 0 ? void 0 : _a.data) === "[object Blob]") {
-                        blob = (_b = err_2 === null || err_2 === void 0 ? void 0 : err_2.response) === null || _b === void 0 ? void 0 : _b.data;
+                    if (Object.prototype.toString.call((_b = err_2 === null || err_2 === void 0 ? void 0 : err_2.response) === null || _b === void 0 ? void 0 : _b.data) === "[object Blob]") {
+                        blob = (_c = err_2 === null || err_2 === void 0 ? void 0 : err_2.response) === null || _c === void 0 ? void 0 : _c.data;
                         blob
                             .text()
                             .then(function (text) {
@@ -87,7 +87,9 @@ var ButtonExport = function (props) {
                         message.error(err_2);
                     }
                     else {
-                        message.error((err_2 === null || err_2 === void 0 ? void 0 : err_2.msg) || "导出失败!");
+                        _a = err_2 || {}, errorFields = _a.errorFields, errors = _a.errors, msg = _a.msg;
+                        errorMsg = errors || ((_e = (_d = errorFields === null || errorFields === void 0 ? void 0 : errorFields[0]) === null || _d === void 0 ? void 0 : _d.errors) === null || _e === void 0 ? void 0 : _e[0]) || msg;
+                        message.error(errorMsg || "导出失败!");
                     }
                     return [2 /*return*/, err_2];
                 case 8: return [2 /*return*/];

package/dist/es/button/buttonPreview.js

@@ -9,8 +9,8 @@ import { MAX_PREVIEW_SIZE } from '../config/constant.js';
 import { message } from 'antd';
 
 var ButtonPreview = function (props) {
-    var attachId = props.attachId, attachName = props.attachName, attachSize = props.attachSize, attachList = props.attachList; props.isPublic; props.FILE_BASEURL; props.onClick; var resetProps = __rest(props, ["attachId", "attachName", "attachSize", "attachList", "isPublic", "FILE_BASEURL", "onClick"]);
-    var apiBaseUrl = useBaseContext().apiBaseUrl;
+    var attachId = props.attachId, attachName = props.attachName, attachSize = props.attachSize, attachList = props.attachList; props.isPublic; var FILE_BASEURL = props.FILE_BASEURL; props.onClick; var resetProps = __rest(props, ["attachId", "attachName", "attachSize", "attachList", "isPublic", "FILE_BASEURL", "onClick"]);
+    var fileBaseUrl = useBaseContext().fileBaseUrl;
     var onClickHandle = function (e) { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             if (attachId) {
@@ -19,7 +19,7 @@ var ButtonPreview = function (props) {
                 }
                 else {
                     previewFile(attachId, attachName, {
-                        API_BASEURL: apiBaseUrl,
+                        API_BASEURL: FILE_BASEURL || fileBaseUrl,
                         fileList: attachList,
                     });
                 }

package/dist/es/detaillist/index.css

@@ -1 +1 @@
-.ztxk-grid.ztxk-grid--default .ztxk-grid-item{line-height:18px}.ztxk-grid.ztxk-grid--large .ztxk-grid-item{line-height:32px}.ztxk-grid.ztxk-grid--border{border-left:1px solid #ebebeb}.ztxk-grid.ztxk-grid--border:first-child{border-top:1px solid #ebebeb}.ztxk-grid.ztxk-grid--border .ztxk-grid-item{border-bottom:1px solid #ebebeb;border-right:1px solid #ebebeb}.ztxk-grid.ztxk-grid--border .ztxk-grid-item.ztxk-grid-item--text{padding:2px 4px}.ztxk-grid .ztxk-grid-item--flex,.ztxk-grid.ztxk-grid--flex .ztxk-grid-item{align-items:center;display:flex}.ztxk-grid.ztxk-grid--background .ztxk-grid-item--title{background:#eff5fe}.ztxk-grid.ztxk-grid--background .ztxk-grid-item--title .ztxk-grid-item--title-text{color:#333}.ztxk-grid .ztxk-grid-item{font-size:12px;line-height:18px;overflow:hidden}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title{word-wrap:break-word;color:#888;display:flex;padding:2px 0 2px 4px;text-align:right}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title .ztxk-grid-item--title-text{display:inline-block;flex:1}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title .ztxk-grid-item--title-colon{padding:0 0 0 1px}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title .ztxk-grid-item--title-required{color:#ff4d4f!important;font-family:SimSun,sans-serif;font-size:14px;margin:1px 2px 0 0}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title-vertical-center{align-items:center}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--diff{background-color:#fdfd19}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--text{word-wrap:break-word;color:#333;padding:3px 0}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--text-ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--text-noellipsis{white-space:pre-line}.ztxk-grid .ztxk-grid-item--merge{display:flex}.ztxk-grid .ztxk-grid-item--merge .ztxk-grid-item--text{flex:1}
+.ztxk-grid.ztxk-grid--default .ztxk-grid-item{line-height:18px}.ztxk-grid.ztxk-grid--large .ztxk-grid-item{line-height:32px}.ztxk-grid.ztxk-grid--border{border-left:1px solid #ebebeb}.ztxk-grid.ztxk-grid--border:first-child{border-top:1px solid #ebebeb}.ztxk-grid.ztxk-grid--border .ztxk-grid-item{border-bottom:1px solid #ebebeb;border-right:1px solid #ebebeb}.ztxk-grid.ztxk-grid--border .ztxk-grid-item.ztxk-grid-item--text{padding:2px 4px}.ztxk-grid .ztxk-grid-item--flex,.ztxk-grid.ztxk-grid--flex .ztxk-grid-item{align-items:center;display:flex}.ztxk-grid.ztxk-grid--background .ztxk-grid-item--title{background:#eff5fe}.ztxk-grid.ztxk-grid--background .ztxk-grid-item--title .ztxk-grid-item--title-text{color:#333}.ztxk-grid .ztxk-grid-item{font-size:12px;line-height:18px;overflow:hidden}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title{word-wrap:break-word;color:#888;display:flex;justify-content:flex-end;padding:2px 0 2px 4px}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title .ztxk-grid-item--title-text{display:inline-block}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title .ztxk-grid-item--title-colon{padding:0 0 0 1px}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title .ztxk-grid-item--title-required{color:#ff4d4f!important;font-family:SimSun,sans-serif;font-size:14px;margin:1px 2px 0 0}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--title-vertical-center{align-items:center}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--diff{background-color:#fdfd19}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--text{word-wrap:break-word;color:#333;padding:3px 0}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--text-ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ztxk-grid .ztxk-grid-item.ztxk-grid-item--text-noellipsis{white-space:pre-line}.ztxk-grid .ztxk-grid-item--merge{display:flex}.ztxk-grid .ztxk-grid-item--merge .ztxk-grid-item--text{flex:1}

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

@@ -1,5 +1,11 @@
 import { TableComponent } from './interface.js';
 
-declare const MemoTable: TableComponent<any>;
+declare const MemoTable: TableComponent<any>;
+/**
+ * BUG: 之前在业务处遇到一个很奇怪的bug。
+ * 业务通过isDisplay来控制表格列的显隐，导致newColumns的数据少了好几个。
+ * 但是页面的显示的列却是正常。这个在组件库中无法复现。
+ * 导致的问题是验证的时候，这些数据中没有的列无法得到验证
+ */
 
 export { MemoTable as default };

package/dist/es/table/table.js

@@ -35,7 +35,7 @@ import { DndProvider } from '../node_modules/react-dnd/dist/core/DndProvider.js'
 // completed: 实现表头自定义伸缩
 // completed: 排序功能优化
 // completed: 过滤功能
-// TODO: 实现从execl复制到表格中的功能
+// 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, 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"]);

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

@@ -57,6 +57,8 @@ interface IUploadListProps extends Omit<UploadProps, "onChange"> {
     fieldNames?: IUploadFieldNames;
     /** 表格列自定义 */
     tableColumns?: (IColumnsTypeProp<any> | string)[];
+    /** 选择文件前的校验 */
+    onBeforeSelectFileValidate?: () => Promise<boolean>;
 }
 interface IUploadFieldNames {
     attachId?: string;

package/dist/es/uploadlist/uploadTable.js

@@ -12,7 +12,7 @@ import OperationBtn from '../operationbtn/operationBtn.js';
 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; _a.FILE_API_BASEURL; var maxPreviewSize = _a.maxPreviewSize, isPreview = _a.isPreview, isDelete = _a.isDelete, isDownload = _a.isDownload; _a.listType; var tableColumns = _a.tableColumns;
+    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; _a.listType; var tableColumns = _a.tableColumns;
     var _d = useState(false), loading = _d[0], setLoading = _d[1];
     var _e = useState(), checked = _e[0], setChecked = _e[1];
     var isDownloadSingleBoolean = isDownload;
@@ -69,7 +69,7 @@ var UploadTable = function (_a, ref) {
                 case 6:
                     toPreviewFile(record, {
                         maxPreviewSize: maxPreviewSize,
-                        FILE_API_BASEURL: API_BASEURL,
+                        FILE_API_BASEURL: FILE_API_BASEURL,
                         uploadTableData: dataSource,
                     });
                     return [3 /*break*/, 8];