ztxkui 4.3.29 → 4.3.31

package/dist/components/PrintContainer/print-container.js

@@ -585,7 +585,9 @@ var PrintContainer = function (_a) {
     // 生成pdf
     var onPdfHandleFn = function (_a) {
         var pdfOptions = _a.pdfOptions, imgPositionX = _a.imgPositionX;
-        setSpinning(true);
+        setTimeout(function () {
+            setSpinning(true);
+        });
         htmlToPdf({
             dom: containerRef.current,
             pdfName: pdfName,
@@ -811,7 +813,7 @@ var PrintContainer = function (_a) {
                     ? pdfBase64.map(function (base64, index) {
                         var _a, _b;
                         var title = ((_b = (_a = allDom[index]) === null || _a === void 0 ? void 0 : _a.dataset) === null || _b === void 0 ? void 0 : _b.title) ||
-                            pdfName ||
+                            pdfName + "-" + (index + 1) ||
                             "\u5355\u636E" + (index + 1);
                         return dataURLtoFile(base64, title + ".pdf");
                     })
@@ -832,6 +834,7 @@ var PrintContainer = function (_a) {
                     url: '/api/zmdms-resource/seal/confirm-seal-position',
                     method: 'POST',
                     data: formData,
+                    timeout: 300000,
                     headers: {
                         'Content-Type': 'multipart/form-data',
                     },
@@ -883,7 +886,8 @@ var PrintContainer = function (_a) {
                 deptId: deptId,
                 needWatermark: needWatermark,
             },
-            heaers: {
+            timeout: 300000,
+            headers: {
                 'Content-Type': 'application/json',
             },
         })
@@ -960,7 +964,7 @@ var PrintContainer = function (_a) {
                     ? pdfBase64.map(function (base64, index) {
                         var _a, _b;
                         var title = ((_b = (_a = allDom[index]) === null || _a === void 0 ? void 0 : _a.dataset) === null || _b === void 0 ? void 0 : _b.title) ||
-                            pdfName ||
+                            pdfName + "-" + (index + 1) ||
                             "\u5355\u636E" + (index + 1);
                         return dataURLtoFile(base64, title + ".pdf");
                     })
@@ -994,6 +998,7 @@ var PrintContainer = function (_a) {
                     headers: {
                         'Content-Type': 'multipart/form-data',
                     },
+                    timeout: 300000,
                 })
                     .then(function (res) {
                     var _a;
@@ -1053,7 +1058,9 @@ var PrintContainer = function (_a) {
         });
     };
     var onExportSealFileHandleFn = function (options, isZip) {
-        setSpinning(true);
+        setTimeout(function () {
+            setSpinning(true);
+        });
         // 文件还在加载中
         if (!fontTTF.data) {
             loadFontTTFPromise
@@ -1252,7 +1259,7 @@ var PrintContainer = function (_a) {
                     ? pdfBase64.map(function (base64, index) {
                         var _a, _b;
                         var title = ((_b = (_a = allDom[index]) === null || _a === void 0 ? void 0 : _a.dataset) === null || _b === void 0 ? void 0 : _b.title) ||
-                            pdfName ||
+                            pdfName + "-" + (index + 1) ||
                             "\u5355\u636E" + (index + 1);
                         return dataURLtoFile(base64, title + ".pdf");
                     })
@@ -1292,7 +1299,7 @@ var PrintContainer = function (_a) {
                     ? pdfBase64.map(function (base64, index) {
                         var _a, _b;
                         var title = ((_b = (_a = allDom[index]) === null || _a === void 0 ? void 0 : _a.dataset) === null || _b === void 0 ? void 0 : _b.title) ||
-                            pdfName ||
+                            pdfName + "-" + (index + 1) ||
                             "\u5355\u636E" + (index + 1);
                         return dataURLtoFile(base64, title + ".pdf");
                     })

package/dist/components/PrintContainer/service.js

@@ -18,6 +18,7 @@ export function autoSealThenDownloadFilesHandle(request, formData, options) {
             'Content-Type': 'multipart/form-data',
         },
         responseType: 'blob',
+        timeout: 300000,
     })
         .then(function (res) {
         var _a;
@@ -35,11 +36,14 @@ export function autoSealThenDownloadFilesHandle(request, formData, options) {
         }
         var aLink = document.createElement('a');
         aLink.style.display = 'none';
-        aLink.href = window.URL.createObjectURL(blob);
-        aLink.download = fileNameStr === null || fileNameStr === void 0 ? void 0 : fileNameStr.replaceAll('"', '');
+        var href = window.URL.createObjectURL(blob);
+        aLink.href = href;
+        // aLink.download = fileNameStr?.replaceAll('"', '');
+        aLink.download = fileNameStr === null || fileNameStr === void 0 ? void 0 : fileNameStr.replace(/"/g, '');
         document.body.appendChild(aLink);
         aLink.click();
         document.body.removeChild(aLink);
+        window.URL.revokeObjectURL(href);
     })
         .catch(function (err) {
         var _a, _b, _c;

package/dist/components/Table/constants.d.ts

@@ -3,3 +3,5 @@
  */
 export declare const dynamicColumnDragType: unique symbol;
 export declare const tableDragRowType: unique symbol;
+export declare const INNER_PARENT_ROW_KEY = "__inner__parent__row__key_cyx";
+export declare const INNER_PARENT_ROW_KEY_NO = "__inner__parent__row__key_cyx_no";

package/dist/components/Table/constants.js

@@ -3,3 +3,5 @@
  */
 export var dynamicColumnDragType = Symbol('dynamic-column-drag');
 export var tableDragRowType = Symbol('table-drag-row');
+export var INNER_PARENT_ROW_KEY = '__inner__parent__row__key_cyx';
+export var INNER_PARENT_ROW_KEY_NO = '__inner__parent__row__key_cyx_no';

package/dist/components/Table/hooks/useColumns.d.ts

@@ -36,6 +36,7 @@ interface IProps<RecordType> {
     preDataSource?: any;
     rowKey?: any;
     dataSourceRef?: any;
+    expandableChildrenColumnName?: string;
 }
 export declare const getTableLayoutFullData: (columns: any, tableLayout: any) => any;
 export declare const LOCALSTORAGE_KEY = "ztui_dynamic_table_key";

package/dist/components/Table/hooks/useColumns.js

@@ -155,7 +155,7 @@ export function setDynamicKey(dynamicStorageKey, value) {
     localStorage.setItem(LOCALSTORAGE_LRU_KEY, JSON.stringify(lruKeys));
 }
 function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig) {
-    var columns = basicConfig.columns, newColumnsRef = basicConfig.newColumnsRef, showColumnDynamic = basicConfig.showColumnDynamic, showColumnDynamicKey = basicConfig.showColumnDynamicKey, configInfo = basicConfig.configInfo, currentDataSource = basicConfig.currentDataSource, preDataSource = basicConfig.preDataSource, rowKey = basicConfig.rowKey, dataSourceRef = basicConfig.dataSourceRef;
+    var columns = basicConfig.columns, newColumnsRef = basicConfig.newColumnsRef, showColumnDynamic = basicConfig.showColumnDynamic, showColumnDynamicKey = basicConfig.showColumnDynamicKey, configInfo = basicConfig.configInfo, currentDataSource = basicConfig.currentDataSource, preDataSource = basicConfig.preDataSource, rowKey = basicConfig.rowKey, dataSourceRef = basicConfig.dataSourceRef, expandableChildrenColumnName = basicConfig.expandableChildrenColumnName;
     var onEditableSave = editableConfig.onEditableSave, onTableChange = editableConfig.onTableChange, currentPage = editableConfig.currentPage;
     var ColumnDynamicCom = dynamicConfig.ColumnDynamicCom, DelAllCom = dynamicConfig.DelAllCom, onAddAndDelHandleMemo = dynamicConfig.onAddAndDelHandleMemo, onAddAndDelHandle = dynamicConfig.onAddAndDelHandle, hideAddIcon = dynamicConfig.hideAddIcon, addIconText = dynamicConfig.addIconText, hideDelIcon = dynamicConfig.hideDelIcon, delIconText = dynamicConfig.delIconText;
     var copyByKey = otherConfig.copyByKey, myCatchColumns = otherConfig.myCatchColumns;
@@ -210,14 +210,17 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
             _column.shouldCellUpdate = function (record, preRecord) {
                 try {
                     var recordKey_1 = record[rowKey];
-                    var currentIndex = currentDataSource.findIndex(function (item) { return item[rowKey] === recordKey_1; });
-                    var preIndex = preDataSource.findIndex(function (item) { return item[rowKey] === recordKey_1; });
-                    if (currentIndex !== preIndex) {
-                        return true;
-                    }
-                    if (typeof _column.dataIndex === 'string' &&
-                        record[_column.dataIndex] !== preRecord[_column.dataIndex]) {
-                        return true;
+                    if (Array.isArray(currentDataSource) &&
+                        Array.isArray(preDataSource)) {
+                        var currentIndex = currentDataSource.findIndex(function (item) { return item[rowKey] === recordKey_1; });
+                        var preIndex = preDataSource.findIndex(function (item) { return item[rowKey] === recordKey_1; });
+                        if (currentIndex !== preIndex) {
+                            return true;
+                        }
+                        if (typeof _column.dataIndex === 'string' &&
+                            record[_column.dataIndex] !== preRecord[_column.dataIndex]) {
+                            return true;
+                        }
                     }
                 }
                 catch (err) {
@@ -247,6 +250,8 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
                         onTableChange: onTableChange,
                         dataSource: function () { return dataSourceRef.current; },
                         currentpage: currentPage,
+                        rowKey: rowKey,
+                        expandableChildrenColumnName: expandableChildrenColumnName,
                     });
                 } });
             // 兼容下拉框滚动行为
@@ -354,7 +359,7 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
     };
 }
 function useColumns(props) {
-    var columns = props.columns, hiddenColumnDynamicIcon = props.hiddenColumnDynamicIcon, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, showDelAllBtn = props.showDelAllBtn, delAllChange = props.delAllChange, addIconText = props.addIconText, hideDelIcon = props.hideDelIcon, delIconText = props.delIconText, showDynamicHandle = props.showDynamicHandle, onEditableSave = props.onEditableSave, configInfo = props.configInfo, copyByKey = props.copyByKey, onTableChange = props.onTableChange, currentPage = props.currentPage, currentDataSource = props.currentDataSource, preDataSource = props.preDataSource, rowKey = props.rowKey, dataSourceRef = props.dataSourceRef;
+    var columns = props.columns, hiddenColumnDynamicIcon = props.hiddenColumnDynamicIcon, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, showDelAllBtn = props.showDelAllBtn, delAllChange = props.delAllChange, addIconText = props.addIconText, hideDelIcon = props.hideDelIcon, delIconText = props.delIconText, showDynamicHandle = props.showDynamicHandle, onEditableSave = props.onEditableSave, configInfo = props.configInfo, copyByKey = props.copyByKey, onTableChange = props.onTableChange, currentPage = props.currentPage, currentDataSource = props.currentDataSource, preDataSource = props.preDataSource, rowKey = props.rowKey, dataSourceRef = props.dataSourceRef, expandableChildrenColumnName = props.expandableChildrenColumnName;
     var newColumnsRef = useRef();
     // 动态列配置显隐
     var ColumnDynamicCom = useCallback(function () {
@@ -387,6 +392,7 @@ function useColumns(props) {
             preDataSource: preDataSource,
             rowKey: rowKey,
             dataSourceRef: dataSourceRef,
+            expandableChildrenColumnName: expandableChildrenColumnName,
         }, {
             onEditableSave: onEditableSave,
             onTableChange: onTableChange,
@@ -424,6 +430,7 @@ function useColumns(props) {
         preDataSource,
         rowKey,
         dataSourceRef,
+        expandableChildrenColumnName,
     ]);
     var _a = useState(false), refreshColumns = _a[0], setRefreshColumns = _a[1];
     var _b = useState([]), myCatchColumns = _b[0], setMyCatchColumns = _b[1];

package/dist/components/Table/table-enhance-cell.js

@@ -63,6 +63,7 @@ import { Input } from 'antd';
 import { ERROR_TD_CLASSNAME } from './index';
 import { getInnerIndex } from './hooks/useInnerPagination';
 import { exactRound } from 'ztxkutils/dist/tools';
+import { INNER_PARENT_ROW_KEY_NO, INNER_PARENT_ROW_KEY } from './constants';
 /**
  * 数据转换 将粘贴过来的数据格式化处理
  */
@@ -87,7 +88,7 @@ function transformData(data, config) {
     return newData;
 }
 var TableEnhanceCell = function (_a) {
-    var title = _a.title, index = _a.index, editable = _a.editable, editableConfig = _a.editableConfig, children = _a.children, dataIndex = _a.dataIndex, record = _a.record, handleSave = _a.handleSave, dataSource = _a.dataSource, onTableChange = _a.onTableChange, columns = _a.columns, currentpage = _a.currentpage, onMouseEnter = _a.onMouseEnter, onMouseLeave = _a.onMouseLeave, restProps = __rest(_a, ["title", "index", "editable", "editableConfig", "children", "dataIndex", "record", "handleSave", "dataSource", "onTableChange", "columns", "currentpage", "onMouseEnter", "onMouseLeave"]);
+    var title = _a.title, index = _a.index, editable = _a.editable, editableConfig = _a.editableConfig, children = _a.children, dataIndex = _a.dataIndex, record = _a.record, handleSave = _a.handleSave, dataSource = _a.dataSource, onTableChange = _a.onTableChange, columns = _a.columns, currentpage = _a.currentpage, onMouseEnter = _a.onMouseEnter, onMouseLeave = _a.onMouseLeave, rowKey = _a.rowKey, expandableChildrenColumnName = _a.expandableChildrenColumnName, restProps = __rest(_a, ["title", "index", "editable", "editableConfig", "children", "dataIndex", "record", "handleSave", "dataSource", "onTableChange", "columns", "currentpage", "onMouseEnter", "onMouseLeave", "rowKey", "expandableChildrenColumnName"]);
     var tdRef = useRef();
     var valueRef = useRef({});
     var _b = useState(), val = _b[0], setVal = _b[1];
@@ -103,14 +104,43 @@ var TableEnhanceCell = function (_a) {
      * @description 保存事件
      */
     var save = useCallback(function (info) { return __awaiter(void 0, void 0, void 0, function () {
-        var innerIndex, newDataSource, newRecord, values, result, currentInputNumberValue, result, currentInputNumberValue;
+        var innerIndex, newDataSource, newRecord, parentId_1, currentParentItem, parentIndex, currentParentItemChildren, childrenRecord, values, result, currentInputNumberValue, result, currentInputNumberValue;
         var _a, _b, _c;
         return __generator(this, function (_d) {
             innerIndex = getInnerIndex(currentpage, index);
             newDataSource = dataSource ? dataSource() : undefined;
-            newRecord = Array.isArray(newDataSource) && typeof index === 'number'
-                ? newDataSource[index]
-                : record;
+            newRecord = record;
+            // 代表当前修改的是子项，需要通过rowKey找到父项中对应的子项，取到最新值
+            if (newRecord && newRecord[INNER_PARENT_ROW_KEY]) {
+                try {
+                    innerIndex = typeof index === 'number' ? index : innerIndex;
+                    parentId_1 = newRecord[INNER_PARENT_ROW_KEY];
+                    currentParentItem = null;
+                    // 代表没有配置rowKey，那需要找到父级index
+                    if (parentId_1.startsWith(INNER_PARENT_ROW_KEY_NO)) {
+                        parentIndex = parentId_1.slice(INNER_PARENT_ROW_KEY_NO.length) - 0;
+                        currentParentItem = newDataSource[parentIndex];
+                    }
+                    else {
+                        currentParentItem = newDataSource.find(function (item) { return item[rowKey] === parentId_1; });
+                    }
+                    currentParentItemChildren = currentParentItem[expandableChildrenColumnName];
+                    childrenRecord = typeof index === 'number'
+                        ? __assign({}, currentParentItemChildren[index]) : record;
+                    Reflect.deleteProperty(childrenRecord, INNER_PARENT_ROW_KEY);
+                    newRecord = typeof index === 'number' ? childrenRecord : record;
+                }
+                catch (err) {
+                    console.log(err);
+                }
+            }
+            else {
+                // 直接取父级元素即可
+                newRecord =
+                    Array.isArray(newDataSource) && typeof innerIndex === 'number'
+                        ? newDataSource[innerIndex]
+                        : record;
+            }
             try {
                 values = valueRef.current;
                 if (!handleSave) {
@@ -141,7 +171,17 @@ var TableEnhanceCell = function (_a) {
             }
             return [2 /*return*/];
         });
-    }); }, [currentpage, dataIndex, handleSave, index, record, title, dataSource]);
+    }); }, [
+        currentpage,
+        dataIndex,
+        handleSave,
+        index,
+        record,
+        title,
+        dataSource,
+        expandableChildrenColumnName,
+        rowKey,
+    ]);
     var removeErrorClass = useCallback(function () {
         var _a, _b;
         if (tdRef.current &&

package/dist/components/Table/table.js

@@ -81,6 +81,7 @@ import { HTML5Backend } from 'react-dnd-html5-backend';
 import { DndProvider } from 'react-dnd';
 // import update from 'immutability-helper';
 import useInnerPagination, { getInnerIndex } from './hooks/useInnerPagination';
+import { INNER_PARENT_ROW_KEY, INNER_PARENT_ROW_KEY_NO } from './constants';
 /**默认scroll配置 */
 // const _scroll = { y: 500, x: 1000 };
 var _scroll = { x: 1000 };
@@ -113,17 +114,18 @@ export function usePrevious(value) {
 }
 function Table(props) {
     var _this = this;
-    var className = props.className, scroll = props.scroll, _a = props.pagination, pagination = _a === void 0 ? false : _a, _b = props.bordered, bordered = _b === void 0 ? true : _b, _columns = props.columns, initColumns = props.initColumns, dataSource = props.dataSource, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, addIconText = props.addIconText, hideDelIcon = props.hideDelIcon, showDelAllBtn = props.showDelAllBtn, delAllChange = props.delAllChange, delIconText = props.delIconText, hiddenColumnDynamicIcon = props.hiddenColumnDynamicIcon, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, summaryConfig = props.summaryConfig, summaryFixed = props.summaryFixed, summary = props.summary, onMoveRow = props.onMoveRow, onEditableSave = props.onEditableSave, onDynamicChange = props.onDynamicChange, _c = props.isResizableColumn, isResizableColumn = _c === void 0 ? true : _c, configInfo = props.configInfo, tableHandleRef = props.tableHandleRef, tableName = props.tableName, isFlex = props.isFlex, onTableChange = props.onTableChange, rowSelection = props.rowSelection, showInnerPagination = props.showInnerPagination, defaultInnerPageSize = props.defaultInnerPageSize, restProps = __rest(props, ["className", "scroll", "pagination", "bordered", "columns", "initColumns", "dataSource", "onAddAndDelHandle", "hideAddIcon", "addIconText", "hideDelIcon", "showDelAllBtn", "delAllChange", "delIconText", "hiddenColumnDynamicIcon", "showColumnDynamic", "showColumnDynamicKey", "summaryConfig", "summaryFixed", "summary", "onMoveRow", "onEditableSave", "onDynamicChange", "isResizableColumn", "configInfo", "tableHandleRef", "tableName", "isFlex", "onTableChange", "rowSelection", "showInnerPagination", "defaultInnerPageSize"]);
+    var _a, _b;
+    var className = props.className, scroll = props.scroll, _c = props.pagination, pagination = _c === void 0 ? false : _c, _d = props.bordered, bordered = _d === void 0 ? true : _d, _columns = props.columns, initColumns = props.initColumns, dataSource = props.dataSource, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, addIconText = props.addIconText, hideDelIcon = props.hideDelIcon, showDelAllBtn = props.showDelAllBtn, delAllChange = props.delAllChange, delIconText = props.delIconText, hiddenColumnDynamicIcon = props.hiddenColumnDynamicIcon, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, summaryConfig = props.summaryConfig, summaryFixed = props.summaryFixed, summary = props.summary, onMoveRow = props.onMoveRow, onEditableSave = props.onEditableSave, onDynamicChange = props.onDynamicChange, _e = props.isResizableColumn, isResizableColumn = _e === void 0 ? true : _e, configInfo = props.configInfo, tableHandleRef = props.tableHandleRef, tableName = props.tableName, isFlex = props.isFlex, onTableChange = props.onTableChange, rowSelection = props.rowSelection, showInnerPagination = props.showInnerPagination, defaultInnerPageSize = props.defaultInnerPageSize, restProps = __rest(props, ["className", "scroll", "pagination", "bordered", "columns", "initColumns", "dataSource", "onAddAndDelHandle", "hideAddIcon", "addIconText", "hideDelIcon", "showDelAllBtn", "delAllChange", "delIconText", "hiddenColumnDynamicIcon", "showColumnDynamic", "showColumnDynamicKey", "summaryConfig", "summaryFixed", "summary", "onMoveRow", "onEditableSave", "onDynamicChange", "isResizableColumn", "configInfo", "tableHandleRef", "tableName", "isFlex", "onTableChange", "rowSelection", "showInnerPagination", "defaultInnerPageSize"]);
     var classes = classNames('zt-table', className, {
         'zt-table--flex': isFlex,
     });
-    var _d = useState(false), dynamicVisible = _d[0], setDynamicVisible = _d[1];
+    var _f = useState(false), dynamicVisible = _f[0], setDynamicVisible = _f[1];
     var showDynamicHandle = useCallback(function () { return setDynamicVisible(true); }, []);
     var hideDynamicHandle = useCallback(function () { return setDynamicVisible(false); }, []);
     var dataSourceRef = useRef();
     var preDataSource = usePrevious(dataSource);
     // 内部分页相关配置
-    var _e = useInnerPagination(showInnerPagination, defaultInnerPageSize), paginationConfig = _e.paginationConfig, currentPage = _e.currentPage, setCurrent = _e.setCurrent, pageSize = _e.pageSize;
+    var _g = useInnerPagination(showInnerPagination, defaultInnerPageSize), paginationConfig = _g.paginationConfig, currentPage = _g.currentPage, setCurrent = _g.setCurrent, pageSize = _g.pageSize;
     var rowSelectionDataSource = useRef({});
     var myScroll = useMemo(function () {
         if (scroll) {
@@ -131,10 +133,46 @@ function Table(props) {
         }
         return isFlex ? __assign(__assign({}, _scroll), { y: 100 }) : _scroll;
     }, [scroll, isFlex]);
+    var expandableDataSource = useMemo(function () {
+        var _a, _b;
+        if (!onEditableSave) {
+            return dataSource;
+        }
+        else {
+            try {
+                var childrenColumnName_1 = ((_a = props === null || props === void 0 ? void 0 : props.expandable) === null || _a === void 0 ? void 0 : _a.childrenColumnName) || 'children';
+                return (_b = dataSource === null || dataSource === void 0 ? void 0 : dataSource.slice()) === null || _b === void 0 ? void 0 : _b.map(function (item, index) {
+                    var _a;
+                    if (item) {
+                        var itemRowKey_1 = typeof props.rowKey === 'string'
+                            ? item[props.rowKey]
+                            : "" + INNER_PARENT_ROW_KEY_NO + index;
+                        var newChildren = item[childrenColumnName_1];
+                        if (Array.isArray(newChildren)) {
+                            newChildren = newChildren.map(function (childrenItem) {
+                                var _a;
+                                return __assign(__assign({}, childrenItem), (_a = {}, _a[INNER_PARENT_ROW_KEY] = itemRowKey_1, _a));
+                            });
+                            return __assign(__assign({}, item), (_a = {}, _a[childrenColumnName_1] = newChildren, _a));
+                        }
+                    }
+                    return item;
+                });
+            }
+            catch (err) {
+                return dataSource;
+            }
+        }
+    }, [
+        onEditableSave,
+        dataSource,
+        (_a = props === null || props === void 0 ? void 0 : props.expandable) === null || _a === void 0 ? void 0 : _a.childrenColumnName,
+        props.rowKey,
+    ]);
     /**columns更新，重新设置columns */
     useEffect(function () {
-        dataSourceRef.current = dataSource;
-    }, [dataSource]);
+        dataSourceRef.current = expandableDataSource;
+    }, [expandableDataSource]);
     var copyByKey = useCallback(function (key) {
         var _a, _b;
         if (Array.isArray(dataSourceRef.current)) {
@@ -209,7 +247,7 @@ function Table(props) {
      * @description 根据配置生成一个新的columns
      *              以及一个需要动态列配置的columns
      */
-    var _f = useColumns({
+    var _h = useColumns({
         columns: _columns,
         hiddenColumnDynamicIcon: hiddenColumnDynamicIcon,
         showColumnDynamic: showColumnDynamic,
@@ -231,7 +269,8 @@ function Table(props) {
         preDataSource: preDataSource,
         dataSourceRef: dataSourceRef,
         rowKey: props.rowKey,
-    }), newColumns = _f.newColumns, dynamicColumns = _f.dynamicColumns, refreshColumnsHandle = _f.refreshColumnsHandle;
+        expandableChildrenColumnName: ((_b = props === null || props === void 0 ? void 0 : props.expandable) === null || _b === void 0 ? void 0 : _b.childrenColumnName) || 'children',
+    }), newColumns = _h.newColumns, dynamicColumns = _h.dynamicColumns, refreshColumnsHandle = _h.refreshColumnsHandle;
     /**
      * @description 保存列配置
      */
@@ -510,14 +549,14 @@ function Table(props) {
         summaryFixed,
     ]);
     // 多选
-    var rowSelectionObj = useMemo(function () { return (__assign(__assign({}, rowSelection), { onChange: function (selectedRowKeys, selectedRows, info) {
+    var rowSelectionObj = useMemo(function () { return (__assign(__assign({}, rowSelection), { onChange: function (selectedRowKeys, selectedRows) {
             rowSelectionDataSource.current = {
                 selectedRows: selectedRows,
                 selectedRowKeys: selectedRowKeys,
                 isChange: true,
             };
             (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.onChange) &&
-                rowSelection.onChange(selectedRowKeys, selectedRows, info);
+                rowSelection.onChange(selectedRowKeys, selectedRows);
         } })); }, [rowSelection]);
     return (React.createElement("div", { style: isFlex
             ? { position: 'relative', overflow: 'hidden', flex: 1 }
@@ -527,7 +566,7 @@ function Table(props) {
                     ? pagination
                         ? pagination
                         : paginationConfig
-                    : pagination, scroll: myScroll, columns: mergeColumns, dataSource: dataSource, components: onMoveRow || onEditableSave
+                    : pagination, scroll: myScroll, columns: mergeColumns, dataSource: expandableDataSource, components: onMoveRow || onEditableSave
                     ? components
                     : isResizableColumn
                         ? tableResizableTitle

package/dist/components/business/Signatures/components/QunjSeal.js

@@ -43,13 +43,14 @@ var QunjSeal = function (_a) {
     /** 渲染SealCheckboxGroup组件 */
     var getSealCheckboxGroupRender = function () {
         return (React.createElement(Item, { name: "details", label: "", noBorder: true, width: "all", style: {
-                height: '180px',
+                height: '100%',
+                minHeight: '180px',
                 overflowY: 'auto',
                 overflowX: 'hidden',
             } },
             React.createElement(SealCheckboxGroup, { sealList: sealList, onChange: onSealCheckboxHandle, isEdit: isEdit })));
     };
-    return (React.createElement(Form, { form: form, onValuesChange: onValuesChangeHandle }, checked ? (React.createElement(React.Fragment, null,
+    return (React.createElement(Form, { form: form, onValuesChange: onValuesChangeHandle, style: { height: '100%' } }, checked ? (React.createElement(React.Fragment, null,
         React.createElement("div", { style: {
                 display: 'flex',
                 justifyContent: 'space-between',

package/dist/components/business/Signatures/index.js

@@ -103,68 +103,68 @@ var Sinatures = function (_a) {
     var isUpload = _a.isUpload, qunjSealChange = _a.qunjSealChange, electronicSealChange = _a.electronicSealChange, onSigValuesChange = _a.onSigValuesChange, handleRef = _a.handleRef, ZT_API_BASEURL = _a.ZT_API_BASEURL, ZT_FILE_BASEURL = _a.ZT_FILE_BASEURL, systemCode = _a.systemCode, token = _a.token, openCustomerModalHandle = _a.openCustomerModalHandle, request = _a.request, showDeleteBtn = _a.showDeleteBtn, batchDownloadZipName = _a.batchDownloadZipName, otherParams = __rest(_a, ["isUpload", "qunjSealChange", "electronicSealChange", "onSigValuesChange", "handleRef", "ZT_API_BASEURL", "ZT_FILE_BASEURL", "systemCode", "token", "openCustomerModalHandle", "request", "showDeleteBtn", "batchDownloadZipName"]);
     var canEdit = otherParams.canEdit, needQj = otherParams.needQj, needDg = otherParams.needDg, needQys = otherParams.needQys, fileList = otherParams.fileList, qunjSeal = otherParams.qunjSeal, electronicSeal = otherParams.electronicSealIdList, flowId = otherParams.flowId, deptId = otherParams.deptId, flowStatus = otherParams.flowStatus, caseId = otherParams.caseId, contract_id = otherParams.contractId, docAttachMap = otherParams.docAttachMap, checkAttachIdList = otherParams.checkAttachIdList, // 已盖章附件id
     documentIdList = otherParams.documentIdList, // 文档id列表
-    cancelDefaultCheckedQj = otherParams.cancelDefaultCheckedQj;
+    cancelDefaultCheckedQj = otherParams.cancelDefaultCheckedQj, // 取消默认勾选群杰用印申请
+    _b = otherParams.isCheckedEconomic, // 取消默认勾选群杰用印申请
+    isCheckedEconomic = _b === void 0 ? 1 : _b;
     var authToken = token || '';
     // 是否可编辑 1可编辑  0不可编辑
     var isEdit = canEdit === 1;
     // 如果上传，需要传入系统的code
     var uploadData = useMemo(function () { return (systemCode ? { system: systemCode } : {}); }, [systemCode]);
     // 组件内部管理的数组
-    var _b = useRecords(fileList), records = _b.records, setRecords = _b.setRecords;
+    var _c = useRecords(fileList), records = _c.records, setRecords = _c.setRecords;
     // 组件内部管理的群杰数据
-    var _c = useQunjData(qunjSeal), innerQunjSeal = _c.qunjSeal, setQunjSeal = _c.setQunjSeal;
+    var _d = useQunjData(qunjSeal), innerQunjSeal = _d.qunjSeal, setQunjSeal = _d.setQunjSeal;
     // 组件内部管理的电子印章数据
-    var _d = useElectronicData(electronicSeal), innerElectronicSeal = _d.electronicSeal, setElectronicSeal = _d.setElectronicSeal;
+    var _e = useElectronicData(electronicSeal), innerElectronicSeal = _e.electronicSeal, setElectronicSeal = _e.setElectronicSeal;
     // 设置确认盖章按钮是否展示
-    var _e = useState(false), checkSealVisible = _e[0], setCheckSealVisible = _e[1];
+    var _f = useState(false), checkSealVisible = _f[0], setCheckSealVisible = _f[1];
     // 合同id
-    var _f = useState(null), contractId = _f[0], setContractId = _f[1];
+    var _g = useState(null), contractId = _g[0], setContractId = _g[1];
     // 已盖章附件id
-    var _g = useState([]), sealedIds = _g[0], setSealedIds = _g[1];
+    var _h = useState([]), sealedIds = _h[0], setSealedIds = _h[1];
     // docAttachMap
-    var _h = useState(null), attachMap = _h[0], setAttachMap = _h[1];
+    var _j = useState(null), attachMap = _j[0], setAttachMap = _j[1];
     // 文档id列表
-    var _j = useState([]), documentIds = _j[0], setDocumentIds = _j[1];
+    var _k = useState([]), documentIds = _k[0], setDocumentIds = _k[1];
     // 总用印次数超过4倍
-    var _k = useState(false), isTotalSealNumTooMore = _k[0], setIsTotalSealNumTooMore = _k[1];
+    var _l = useState(false), isTotalSealNumTooMore = _l[0], setIsTotalSealNumTooMore = _l[1];
     // 采购合同 销售合同 双边合同 部门间交易合同 需要展示合同份数 其他的不需要
     var showContranctNum = FLOW_IDS.includes("" + flowId);
     // 电子印章列表
-    var _l = useState([]), electronicList = _l[0], setElectronicList = _l[1];
+    var _m = useState([]), electronicList = _m[0], setElectronicList = _m[1];
     // 群杰印章列表
-    var _m = useState([]), sealList = _m[0], setSealList = _m[1];
+    var _o = useState([]), sealList = _o[0], setSealList = _o[1];
     // 上一次盖章时的参数信息
-    var _o = useState({}), prevParam = _o[0], setPrevParam = _o[1];
+    var _p = useState({}), prevParam = _p[0], setPrevParam = _p[1];
     // 请确认
-    var _p = useState(false), isSure = _p[0], setIsSure = _p[1];
+    var _q = useState(false), isSure = _q[0], setIsSure = _q[1];
     // 群杰表单
     var form = Form.useForm()[0];
     // 是否加盖群杰印章
-    var _q = useState(true), checked = _q[0], setChecked = _q[1];
+    var _r = useState(true), checked = _r[0], setChecked = _r[1];
     // 盖章按钮loading
-    var _r = useState(false), loading = _r[0], setLoading = _r[1];
+    var _s = useState(false), loading = _s[0], setLoading = _s[1];
     // 初始化是否清空契约锁信息标识
-    var _s = useState(true), isInit = _s[0], setIsInit = _s[1];
+    var _t = useState(true), isInit = _t[0], setIsInit = _t[1];
     // 表格loading
     var tbloading = useState(false)[0];
     // 仅需要群杰印章
-    var _t = useState(false), isOnlyQj = _t[0], setIsOnlyQj = _t[1];
+    var _u = useState(false), isOnlyQj = _u[0], setIsOnlyQj = _u[1];
     // 存放onSigValuesChange缓存回调方法
     var fnRef = useRef();
     // 是否加盖经济责任人手签章
-    var _u = useState(true), isEconomic = _u[0], setIsEconomic = _u[1];
+    var _v = useState(isCheckedEconomic ? true : false), isEconomic = _v[0], setIsEconomic = _v[1];
     // 一级责任人名字
-    var _v = useState(''), yjzrr = _v[0], setYjzrr = _v[1];
+    var _w = useState(''), yjzrr = _w[0], setYjzrr = _w[1];
     // 未确认盖章位置的弹窗是否可见
-    var _w = useState(false), visible = _w[0], setVisible = _w[1];
+    var _x = useState(false), visible = _x[0], setVisible = _x[1];
     // 未确认盖章位置的电子印章列表
-    var _x = useState([]), unSealList = _x[0], setUnSealList = _x[1];
+    var _y = useState([]), unSealList = _y[0], setUnSealList = _y[1];
     // 需重新确认盖章位置的电子印章
-    var _y = useState([]), needReSealList = _y[0], setNeedReSealList = _y[1];
+    var _z = useState([]), needReSealList = _z[0], setNeedReSealList = _z[1];
     useEffect(function () {
-        if (cancelDefaultCheckedQj) {
-            setChecked(false);
-        }
+        setChecked(cancelDefaultCheckedQj ? false : true);
     }, [cancelDefaultCheckedQj]);
     useEffect(function () {
         fnRef.current = onSigValuesChange;
@@ -178,6 +178,7 @@ var Sinatures = function (_a) {
                 setSealedIds(checkAttachIdList || []);
                 setAttachMap(docAttachMap);
                 setDocumentIds(documentIdList);
+                setIsEconomic(isCheckedEconomic ? true : false);
                 // 从docAttachMap中获取是否加盖经济责任人手签章
                 if (typeof docAttachMap === 'string') {
                     var _isEconomic = Object.entries(JSON.parse(docAttachMap)).find(function (_a) {
@@ -208,6 +209,7 @@ var Sinatures = function (_a) {
         electronicSeal,
         isInit,
         records,
+        isCheckedEconomic,
     ]);
     /** 是否加盖群杰印章 */
     var needQjSealFn = function (e) {
@@ -796,7 +798,7 @@ var Sinatures = function (_a) {
         });
     }
     // 上传组件的数据
-    var _z = useState(), originFileList = _z[0], setOriginFileList = _z[1];
+    var _0 = useState(), originFileList = _0[0], setOriginFileList = _0[1];
     /** 签章组件onChange事件 */
     var sigValuesChange = useCallback(function (type, value) {
         var _a, _b;
@@ -826,7 +828,7 @@ var Sinatures = function (_a) {
             var hasElecSeal = records.filter(function (item) { return item.isElectronicSeal; });
             // 勾选加盖电子印章后 显示确认盖章按钮
             setCheckSealVisible(value ? true : hasElecSeal.length > 1 ? true : false);
-            setIsEconomic(value ? true : false);
+            isCheckedEconomic && setIsEconomic(value ? true : false);
             // 去除加盖电子印章勾选时  清除合同id 等之前的信息
             if (!value && hasElecSeal.length === 1) {
                 setSealedIds([]);
@@ -834,6 +836,7 @@ var Sinatures = function (_a) {
                 setAttachMap(null);
                 setDocumentIds([]);
                 setElectronicSeal([]);
+                !isCheckedEconomic && setIsEconomic(false);
                 if (onSigValuesChange) {
                     onSigValuesChange(sigValuesChange('clearContractPrevInfo'));
                 }

package/dist/components/business/Signatures/props.d.ts

@@ -85,4 +85,6 @@ export interface IProps {
     batchDownloadZipName?: string;
     /** 取消默认勾选群杰用印申请 */
     cancelDefaultCheckedQj?: number;
+    /** 是否默认勾选经济责任人 1为默认勾选 0为不勾选 */
+    isCheckedEconomic?: number;
 }

package/package.json

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