ztxkui 4.1.14 → 4.2.0

package/dist/DemoCom/SinaturesDemo.js

@@ -179,6 +179,7 @@ var SinaturesDemo = function () {
     /** 是否展示添加附件按钮 0不展示 1展示 */
     var showAddBtn = 0;
     var params = {
+        // cancelDefaultCheckedQj: 1,
         needQj: 1,
         needDg: 1,
         needQys: 1,

package/dist/TableDemo/EditableTable.js

@@ -168,6 +168,7 @@ var EditableTable = function () {
                 test1: { isChangeable: 1, isDisplay: 1, isRequired: 1 },
                 test111: { isChangeable: 1, isDisplay: 1, isRequired: 1 },
                 test2: { isChangeable: 1, isDisplay: 1, isRequired: 1 },
+                test3: { isChangeable: 1, isDisplay: 1, isRequired: 1 },
             });
         }, 5000);
     }, []);
@@ -282,8 +283,8 @@ var EditableTable = function () {
         {
             title: "\u91D1\u989D(\u542B\u7A0E)",
             width: 130,
-            dataIndex: 'test2',
-            key: 'test2',
+            dataIndex: 'test2222',
+            key: 'test2222',
             align: 'center',
             editable: false,
             shouldCellUpdate: function (record, preRecord) {
@@ -325,12 +326,14 @@ var EditableTable = function () {
             validate: {},
             render: function (text, record, index) {
                 return (React.createElement(EnhanceSelect, { value: text, list: list1, dataKey: "id", titleKey: "name", dropdownMatchSelectWidth: 130, onChange: function (value, option, fullData) {
+                        var _a, _b;
                         tableHandleRef.current.clearErrorClass(index);
                         var newRecord = {
                             test3: value,
                             test3Name: fullData === null || fullData === void 0 ? void 0 : fullData.name,
                         };
-                        onEditableSaveHandle(newRecord, index);
+                        var realyIndex = (_b = (_a = tableHandleRef.current) === null || _a === void 0 ? void 0 : _a.getRealyIndex) === null || _b === void 0 ? void 0 : _b.call(_a, index);
+                        onEditableSaveHandle(newRecord, realyIndex);
                     } }));
             },
         },
@@ -436,6 +439,7 @@ var EditableTable = function () {
     }, [setRecords]);
     // 表格拖拽排序功能函数
     var onMoveRowHandle = useCallback(function (dragIndex, hoverIndex) {
+        console.log(dragIndex, hoverIndex);
         var newRecords = recordsRef.current.slice();
         var dragRow = newRecords[dragIndex];
         var newDataSource = update(newRecords, {
@@ -515,6 +519,9 @@ var EditableTable = function () {
                     });
                 })();
             } }, "\u9A8C\u8BC1"),
+        React.createElement(Button, { onClick: function () {
+                console.log(records);
+            } }, "\u83B7\u53D6\u6570\u636E"),
         React.createElement(Table, { dataSource: records, columns: columns, rowKey: "id", 
             // 表格项可输入
             onEditableSave: onEditableSaveHandle, 
@@ -525,7 +532,7 @@ var EditableTable = function () {
             // tableValidate
             tableHandleRef: tableHandleRef, tableName: "\u6211\u662F\u4E00\u4E2A\u8868\u683C", 
             // 显隐配置
-            configInfo: tableConfig, showColumnDynamic: true, showColumnDynamicKey: "test-o-0011", onTableChange: onTableChange, expandable: {
+            configInfo: tableConfig, showColumnDynamic: true, showColumnDynamicKey: "test-o-0011", onTableChange: onTableChange, showInnerPagination: true, expandable: {
                 expandedRowRender: function (record) { return React.createElement("p", { style: { margin: 0 } }, "111"); },
                 rowExpandable: function (record) { return true; },
             }, rowSelection: {

package/dist/TableDemo/data.js

@@ -1,4 +1,4 @@
-export var dataSource = new Array(10).fill(1).map(function (item, index) {
+export var dataSource = new Array(9).fill(1).map(function (item, index) {
     return {
         id: "test-" + index,
         test1: "test1-" + index,

package/dist/TableDemo/index.js

@@ -8,16 +8,12 @@ import React from 'react';
 // 路由配置
 // store
 // 自定义组件
-import BasicTable from './BasicTable';
+// import BasicTable from './BasicTable';
 import EditableTable from './EditableTable';
 import ModalTable from './ModalTable';
 // 其他文件
 var TableDemo = function () {
     return (React.createElement("div", null,
-        React.createElement(BasicTable, null),
-        React.createElement(BasicTable, { dynamicKey: "symbol-id-2" }),
-        React.createElement(BasicTable, { dynamicKey: "symbol-id-3" }),
-        React.createElement(BasicTable, { dynamicKey: "symbol-id-4" }),
         React.createElement(EditableTable, null),
         React.createElement(ModalTable, null)));
 };

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

@@ -28,6 +28,8 @@ interface IProps<RecordType> {
     configInfo?: IConfigInfo;
     copyByKey?: any;
     onTableChange?: any;
+    /** 当前页 */
+    currentPage?: any;
 }
 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

@@ -18,6 +18,7 @@ import React, { useCallback, useEffect, useState, useRef } from 'react';
 import Button from '../../Button';
 import { PicRightOutlined } from '@ant-design/icons';
 import TableAddDelColumn from '../table-adddel-column';
+import { getInnerIndex } from './useInnerPagination';
 // 获取表格columns完整数据
 export var getTableLayoutFullData = function (columns, tableLayout) {
     if (Array.isArray(tableLayout) && tableLayout.length > 0) {
@@ -152,7 +153,7 @@ export function setDynamicKey(dynamicStorageKey, value) {
     localStorage.setItem(LOCALSTORAGE_LRU_KEY, JSON.stringify(lruKeys));
 }
 function useColumns(props) {
-    var columns = props.columns, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, addIconText = props.addIconText, hideDelIcon = props.hideDelIcon, delIconText = props.delIconText, showDynamicHandle = props.showDynamicHandle, onEditableSave = props.onEditableSave, configInfo = props.configInfo, copyByKey = props.copyByKey, onTableChange = props.onTableChange;
+    var columns = props.columns, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, 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;
     var tableLayout = getStorage(showColumnDynamicKey);
     var newColumnsRef = useRef();
     // 新的columns
@@ -224,6 +225,7 @@ function useColumns(props) {
                             handleSave: onEditableSave,
                             columns: function () { return newColumnsRef.current; },
                             onTableChange: onTableChange,
+                            currentpage: currentPage,
                         });
                     } });
                 // 兼容下拉框滚动行为
@@ -305,7 +307,10 @@ function useColumns(props) {
                     width: 52,
                     fixed: 'left',
                     align: 'center',
-                    render: function (text, render, index) { return (React.createElement(TableAddDelColumn, { onAddAndDelHandle: function (type) { return onAddAndDelHandle(type, index); }, hideAddIcon: hideAddIcon, addIconText: addIconText, hideDelIcon: hideDelIcon, delIconText: delIconText })); },
+                    render: function (text, render, index) { return (React.createElement(TableAddDelColumn, { onAddAndDelHandle: function (type) {
+                            var innerIndex = getInnerIndex(currentPage, index);
+                            onAddAndDelHandle(type, innerIndex);
+                        }, hideAddIcon: hideAddIcon, addIconText: addIconText, hideDelIcon: hideDelIcon, delIconText: delIconText })); },
                 };
                 _newColumns.unshift(newColumn);
             }

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

@@ -0,0 +1,21 @@
+/**
+ * @author 陈亚雄
+ * @description 内部分页的相关配置
+ */
+import { TablePaginationConfig } from 'antd';
+import { MutableRefObject } from 'react';
+export declare type ICurrentPage = MutableRefObject<{
+    page: number;
+    pageSize: number;
+} | null>;
+export declare function getInnerIndex(currentPage: ICurrentPage, index?: number): number;
+export default function useInnerPagination(isShow?: boolean): {
+    paginationConfig: false | TablePaginationConfig;
+    currentPage: MutableRefObject<{
+        page: number;
+        pageSize: number;
+    }>;
+    setCurrent: import("react").Dispatch<import("react").SetStateAction<number>>;
+    pageSize: number;
+    current: number;
+};

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

@@ -0,0 +1,49 @@
+import { useMemo, useRef, useEffect, useState } from 'react';
+// 获取内部当前索引位置
+export function getInnerIndex(currentPage, index) {
+    // 得到当前修改索引相对于 整体数据源 的索引
+    var currentPageObj = currentPage === null || currentPage === void 0 ? void 0 : currentPage.current;
+    if (!currentPageObj) {
+        return isNaN(Number(index)) ? 0 : Number(index);
+    }
+    var innerIndex = currentPageObj.pageSize * (currentPageObj.page - 1) + (index ? index : 0);
+    return innerIndex;
+}
+export default function useInnerPagination(isShow) {
+    var currentPage = useRef(null);
+    var _a = useState(1), current = _a[0], setCurrent = _a[1];
+    var _b = useState(10), pageSize = _b[0], setPageSize = _b[1];
+    useEffect(function () {
+        if (isShow) {
+            currentPage.current = {
+                page: current,
+                pageSize: isNaN(Number(pageSize)) ? 10 : Number(pageSize),
+            };
+        }
+    }, [isShow, current, pageSize]);
+    useEffect(function () {
+        if (!isShow) {
+            currentPage.current = null;
+        }
+    }, [isShow]);
+    var paginationConfig = useMemo(function () { return ({
+        current: current,
+        pageSize: pageSize,
+        onChange: function (page, pageSize) {
+            if (isShow) {
+                setCurrent(page);
+                setPageSize(pageSize);
+            }
+        },
+        hideOnSinglePage: true,
+        defaultPageSize: 10,
+        pageSizeOptions: ['10', '20'],
+    }); }, [isShow, current, pageSize]);
+    return {
+        paginationConfig: paginationConfig,
+        currentPage: currentPage,
+        setCurrent: setCurrent,
+        pageSize: pageSize,
+        current: current,
+    };
+}

package/dist/components/Table/table-enhance-cell.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { IFormatterType, ICurrencySymbol } from '../../hooks/useFormatter';
+import { ICurrentPage } from './hooks/useInnerPagination';
 /**配置列属性 */
 export interface IEditableConfig {
     type: 'input' | 'select' | 'inputNumber' | 'textArea';
@@ -35,6 +36,7 @@ interface IEditableCellProps {
     handleSave: (record: any, index: number | undefined, dataIndex: string) => void;
     columns: any;
     onTableChange: any;
+    currentpage: ICurrentPage;
 }
 declare const TableEnhanceCell: React.FC<IEditableCellProps>;
 export default TableEnhanceCell;

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

@@ -60,8 +60,9 @@ import React, { useContext, useEffect, memo, useRef } from 'react';
 import { EditableContext } from './table-enhance-row';
 import { Form, Input, InputNumber, Select, message } from '../../index';
 import { ERROR_TD_CLASSNAME } from './index';
+import { getInnerIndex } from './hooks/useInnerPagination';
 var TableEnhanceCell = memo(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, onTableChange = _a.onTableChange, columns = _a.columns, restProps = __rest(_a, ["title", "index", "editable", "editableConfig", "children", "dataIndex", "record", "handleSave", "onTableChange", "columns"]);
+    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, onTableChange = _a.onTableChange, columns = _a.columns, currentpage = _a.currentpage, restProps = __rest(_a, ["title", "index", "editable", "editableConfig", "children", "dataIndex", "record", "handleSave", "onTableChange", "columns", "currentpage"]);
     var form = useContext(EditableContext);
     var tdRef = useRef();
     useEffect(function () {
@@ -74,14 +75,17 @@ var TableEnhanceCell = memo(function (_a) {
      * @description 保存事件
      */
     var save = function (info) { return __awaiter(void 0, void 0, void 0, function () {
-        var values, result, currentInputNumberValue, result, currentInputNumberValue, err_1;
+        var innerIndex, values, result, currentInputNumberValue, result, currentInputNumberValue, err_1;
         var _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
-                    _c.trys.push([0, 2, , 3]);
-                    return [4 /*yield*/, (form === null || form === void 0 ? void 0 : form.validateFields())];
+                    innerIndex = getInnerIndex(currentpage, index);
+                    _c.label = 1;
                 case 1:
+                    _c.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, (form === null || form === void 0 ? void 0 : form.validateFields())];
+                case 2:
                     values = _c.sent();
                     if (!handleSave) {
                         console.error('Table props onEditableSave is not a function');
@@ -91,7 +95,9 @@ var TableEnhanceCell = memo(function (_a) {
                         currentInputNumberValue = values[dataIndex];
                         if (currentInputNumberValue > (result === null || result === void 0 ? void 0 : result.number)) {
                             message.warning((result.tableName ? "\u60A8\u4FEE\u6539" + result.tableName + "\u8868\u683C\u7684" : '表格') + " \u7B2C" + (typeof index === 'number' ? index + 1 : index) + "\u884C \u7684" + title + "\u5B57\u6BB5\uFF0C\u8F93\u5165\u7684\u6570\u503C\uFF0C\u5DF2\u8D85\u8FC7\u6700\u5927\u503C\uFF0C\u5DF2\u5E2E\u60A8\u4FEE\u6539\u4E3A\u6700\u5927\u503C!");
-                            handleSave(__assign(__assign(__assign({}, record), values), (_a = {}, _a[dataIndex] = result === null || result === void 0 ? void 0 : result.number, _a)), index, dataIndex);
+                            handleSave(__assign(__assign(__assign({}, record), values), (_a = {}, _a[dataIndex] = result === null || result === void 0 ? void 0 : result.number, _a)), 
+                            // index,
+                            innerIndex, dataIndex);
                             return [2 /*return*/];
                         }
                     }
@@ -100,17 +106,20 @@ var TableEnhanceCell = memo(function (_a) {
                         currentInputNumberValue = values[dataIndex];
                         if (currentInputNumberValue < (result === null || result === void 0 ? void 0 : result.number)) {
                             message.warning((result.tableName ? "\u60A8\u4FEE\u6539" + result.tableName + "\u8868\u683C\u7684" : '表格') + " \u7B2C" + (index ? index + 1 : index) + "\u884C \u7684" + title + "\u5B57\u6BB5\uFF0C\u8F93\u5165\u7684\u6570\u503C\uFF0C\u5DF2\u4F4E\u4E8E\u6700\u5C0F\u503C\uFF0C\u5DF2\u5E2E\u60A8\u4FEE\u6539\u4E3A\u6700\u5C0F\u503C!");
-                            handleSave(__assign(__assign(__assign({}, record), values), (_b = {}, _b[dataIndex] = result === null || result === void 0 ? void 0 : result.number, _b)), index, dataIndex);
+                            handleSave(__assign(__assign(__assign({}, record), values), (_b = {}, _b[dataIndex] = result === null || result === void 0 ? void 0 : result.number, _b)), 
+                            // index,
+                            innerIndex, dataIndex);
                             return [2 /*return*/];
                         }
                     }
-                    handleSave(__assign(__assign({}, record), values), index, dataIndex);
-                    return [3 /*break*/, 3];
-                case 2:
+                    // handleSave({ ...record, ...values }, index, dataIndex);
+                    handleSave(__assign(__assign({}, record), values), innerIndex, dataIndex);
+                    return [3 /*break*/, 4];
+                case 3:
                     err_1 = _c.sent();
                     console.error('Save failed:', err_1);
-                    return [3 /*break*/, 3];
-                case 3: return [2 /*return*/];
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
             }
         });
     }); };
@@ -126,6 +135,7 @@ var TableEnhanceCell = memo(function (_a) {
         var text = e.clipboardData.getData('text/plain');
         // 首先判断是否有换行符
         if (text) {
+            var innerIndex = getInnerIndex(currentpage, index);
             // 兼容多种换行模式
             var textList = [];
             if (text.indexOf('\r\n') !== -1) {
@@ -169,7 +179,8 @@ var TableEnhanceCell = memo(function (_a) {
                     });
                     return result;
                 });
-                onTableChange && onTableChange(resultTextList, index, record);
+                // onTableChange && onTableChange(resultTextList, index, record);
+                onTableChange && onTableChange(resultTextList, innerIndex, record);
             }
         }
     }

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

@@ -38,7 +38,12 @@ export interface IProps<RecordType> extends Omit<TableProps<RecordType>, 'column
     tableHandleRef?: React.Ref<{
         validate: () => Promise<any>;
         clearErrorClass: (index: number) => void;
+        getCurrentPage: () => {
+            page: number;
+            pageSize: number;
+        } | null;
         [prop: string]: any;
+        getRealyIndex: (index: number) => number;
     }>;
     /** 表格组件名字 */
     tableName?: string;
@@ -46,6 +51,8 @@ export interface IProps<RecordType> extends Omit<TableProps<RecordType>, 'column
     isFlex?: boolean;
     /** 表格change */
     onTableChange?: any;
+    /** 是否开启内部分页。需要处理 修改数据，插入 删除数据。处理批量粘贴数据 */
+    showInnerPagination?: boolean;
 }
 /**
  * TodoList

package/dist/components/Table/table.js

@@ -77,6 +77,8 @@ import { tableValidate } from './utils/validate';
 import classNames from 'classnames';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import { DndProvider } from 'react-dnd';
+// import update from 'immutability-helper';
+import useInnerPagination, { getInnerIndex } from './hooks/useInnerPagination';
 /**默认scroll配置 */
 // const _scroll = { y: 500, x: 1000 };
 var _scroll = { x: 1000 };
@@ -102,7 +104,7 @@ var components = {
  */
 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, delIconText = props.delIconText, 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, restProps = __rest(props, ["className", "scroll", "pagination", "bordered", "columns", "initColumns", "dataSource", "onAddAndDelHandle", "hideAddIcon", "addIconText", "hideDelIcon", "delIconText", "showColumnDynamic", "showColumnDynamicKey", "summaryConfig", "summaryFixed", "summary", "onMoveRow", "onEditableSave", "onDynamicChange", "isResizableColumn", "configInfo", "tableHandleRef", "tableName", "isFlex", "onTableChange", "rowSelection"]);
+    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, delIconText = props.delIconText, 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, restProps = __rest(props, ["className", "scroll", "pagination", "bordered", "columns", "initColumns", "dataSource", "onAddAndDelHandle", "hideAddIcon", "addIconText", "hideDelIcon", "delIconText", "showColumnDynamic", "showColumnDynamicKey", "summaryConfig", "summaryFixed", "summary", "onMoveRow", "onEditableSave", "onDynamicChange", "isResizableColumn", "configInfo", "tableHandleRef", "tableName", "isFlex", "onTableChange", "rowSelection", "showInnerPagination"]);
     // console.log('table render');
     var classes = classNames('zt-table', className, {
         'zt-table--flex': isFlex,
@@ -112,6 +114,8 @@ function Table(props) {
     var showDynamicHandle = useCallback(function () { return setDynamicVisible(true); }, []);
     var hideDynamicHandle = useCallback(function () { return setDynamicVisible(false); }, []);
     var dataSourceRef = useRef();
+    // 内部分页相关配置
+    var _f = useInnerPagination(showInnerPagination), paginationConfig = _f.paginationConfig, currentPage = _f.currentPage, setCurrent = _f.setCurrent, pageSize = _f.pageSize;
     var rowSelectionDataSource = useRef({});
     var myScroll = useMemo(function () {
         if (scroll) {
@@ -161,7 +165,7 @@ function Table(props) {
      * @description 根据配置生成一个新的columns
      *              以及一个需要动态列配置的columns
      */
-    var _f = useColumns({
+    var _g = useColumns({
         columns: _columns,
         showColumnDynamic: showColumnDynamic,
         showColumnDynamicKey: showColumnDynamicKey,
@@ -180,7 +184,8 @@ function Table(props) {
                 onTableChange && onTableChange(resultTextList, startIndex);
             }
             : undefined,
-    }), newColumns = _f.newColumns, dynamicColumns = _f.dynamicColumns, setNewColumns = _f.setNewColumns;
+        currentPage: currentPage,
+    }), newColumns = _g.newColumns, dynamicColumns = _g.dynamicColumns, setNewColumns = _g.setNewColumns;
     /**
      * @description 保存列配置
      */
@@ -271,7 +276,9 @@ function Table(props) {
      * @description 切换行位置
      */
     var moveRowHandle = useCallback(function (dragIndex, hoverIndex) {
-        onMoveRow && onMoveRow(dragIndex, hoverIndex);
+        var innerDragIndex = getInnerIndex(currentPage, dragIndex);
+        var innerHoverIndex = getInnerIndex(currentPage, hoverIndex);
+        onMoveRow && onMoveRow(innerDragIndex, innerHoverIndex);
         // if (dataSource) {
         // const dragRow = dataSource[dragIndex];
         // const newDataSource = update(dataSource, {
@@ -282,7 +289,9 @@ function Table(props) {
         // });
         // onMoveRow && onMoveRow(newDataSource);
         // }
-    }, [onMoveRow]);
+    }, 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [onMoveRow]);
     /** 伸缩列 */
     var handleResize = function (index) {
         return function (_, _a) {
@@ -390,6 +399,9 @@ function Table(props) {
                                 rowSelection: props.rowSelection,
                                 expandable: props.expandable,
                                 tableName: tableName,
+                                showInnerPagination: showInnerPagination,
+                                setCurrent: setCurrent,
+                                pageSize: pageSize,
                             })];
                     case 1:
                         _a.sent();
@@ -403,6 +415,17 @@ function Table(props) {
         },
         /** 移除错误样式 */
         clearErrorClass: clearErrorClass,
+        /** 暴露内部分页提供给外部的一些方法 */
+        getCurrentPage: function () {
+            return currentPage.current;
+        },
+        /** 对于自定义render 可以通过这个方法 得到真正更改的行数据 */
+        getRealyIndex: function (index) {
+            if (currentPage.current && showInnerPagination) {
+                return ((currentPage.current.page - 1) * currentPage.current.pageSize + index);
+            }
+            return index;
+        },
     }); });
     var tableResizableTitle = useMemo(function () {
         return {
@@ -415,7 +438,11 @@ function Table(props) {
             ? { position: 'relative', overflow: 'hidden', flex: 1 }
             : { position: 'relative', overflow: 'hidden' }, ref: tableRef },
         React.createElement(DndProvider, { backend: HTML5Backend, context: window },
-            React.createElement(AntTable, __assign({ className: classes, bordered: bordered, pagination: pagination, scroll: myScroll, columns: mergeColumns, dataSource: dataSource, components: onMoveRow || onEditableSave
+            React.createElement(AntTable, __assign({ className: classes, bordered: bordered, pagination: showInnerPagination
+                    ? pagination
+                        ? pagination
+                        : paginationConfig
+                    : pagination, scroll: myScroll, columns: mergeColumns, dataSource: dataSource, components: onMoveRow || onEditableSave
                     ? components
                     : isResizableColumn
                         ? tableResizableTitle

package/dist/components/Table/utils/validate.js

@@ -40,13 +40,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
  */
 import { ERROR_TD_CLASSNAME } from '../index';
 export function tableValidate(dataSource, mergeColumns, restParams) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function () {
-        var getCurrentTable, rowSelection, tableName, expandable, requiredFileds, resultTr, i, item, j, _o, dataIndex, title, validate, index, value, err_1, errorTr, errorTds, errorTd, errorTr, errorTds, errorTd, errorTr, errorTds, errorTd;
-        return __generator(this, function (_p) {
-            switch (_p.label) {
+        var getCurrentTable, rowSelection, tableName, expandable, showInnerPagination, setCurrent, pageSize, requiredFileds, i, item, _loop_1, j, state_1;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
-                    getCurrentTable = restParams.getCurrentTable, rowSelection = restParams.rowSelection, tableName = restParams.tableName, expandable = restParams.expandable;
+                    getCurrentTable = restParams.getCurrentTable, rowSelection = restParams.rowSelection, tableName = restParams.tableName, expandable = restParams.expandable, showInnerPagination = restParams.showInnerPagination, setCurrent = restParams.setCurrent, pageSize = restParams.pageSize;
                     if (!Array.isArray(dataSource) || dataSource.length === 0) {
                         console.info('没有数据，无需验证!');
                         return [2 /*return*/];
@@ -68,83 +68,148 @@ export function tableValidate(dataSource, mergeColumns, restParams) {
                             }
                         });
                     }
-                    resultTr = getCurrentTable().resultTr;
                     i = 0;
-                    _p.label = 1;
+                    _e.label = 1;
                 case 1:
-                    if (!(i < dataSource.length)) return [3 /*break*/, 14];
+                    if (!(i < dataSource.length)) return [3 /*break*/, 6];
                     item = dataSource[i];
+                    _loop_1 = function (j) {
+                        var _f, dataIndex, title, validate, index, value, setElementState, innerCurrentI, currentPage, err_1;
+                        return __generator(this, function (_g) {
+                            switch (_g.label) {
+                                case 0:
+                                    _f = requiredFileds[j], dataIndex = _f.dataIndex, title = _f.title, validate = _f.validate, index = _f.index;
+                                    if (!dataIndex) {
+                                        return [2 /*return*/, "break"];
+                                    }
+                                    value = item[dataIndex];
+                                    if (dataIndex === 'test3') {
+                                        console.log(value);
+                                    }
+                                    setElementState = function (i, index, className) {
+                                        var _a, _b, _c;
+                                        // 获取表格元素
+                                        var resultTr = getCurrentTable().resultTr;
+                                        var errorTr = resultTr[i];
+                                        var errorTds = Array.prototype.slice.call(errorTr === null || errorTr === void 0 ? void 0 : errorTr.children);
+                                        var errorTd = typeof index === 'number' ? errorTds[index] : null;
+                                        (_b = (_a = errorTd === null || errorTd === void 0 ? void 0 : errorTd.classList) === null || _a === void 0 ? void 0 : _a.add) === null || _b === void 0 ? void 0 : _b.call(_a, className);
+                                        (_c = errorTd === null || errorTd === void 0 ? void 0 : errorTd.scrollIntoView) === null || _c === void 0 ? void 0 : _c.call(errorTd);
+                                    };
+                                    innerCurrentI = i;
+                                    currentPage = 1;
+                                    if (showInnerPagination) {
+                                        currentPage = Math.ceil((i + 1) / pageSize);
+                                        innerCurrentI = innerCurrentI - pageSize * (currentPage - 1);
+                                    }
+                                    if (!validate) return [3 /*break*/, 10];
+                                    if (!(typeof validate === 'function')) return [3 /*break*/, 5];
+                                    _g.label = 1;
+                                case 1:
+                                    _g.trys.push([1, 3, , 4]);
+                                    return [4 /*yield*/, validate(value, item, innerCurrentI + 1, title)];
+                                case 2:
+                                    _g.sent();
+                                    return [3 /*break*/, 4];
+                                case 3:
+                                    err_1 = _g.sent();
+                                    if (showInnerPagination) {
+                                        setCurrent(currentPage);
+                                        setTimeout(function () {
+                                            setElementState(innerCurrentI, index, ERROR_TD_CLASSNAME);
+                                        });
+                                    }
+                                    else {
+                                        setElementState(i, index, ERROR_TD_CLASSNAME);
+                                    }
+                                    return [2 /*return*/, { value: Promise.reject(err_1) }];
+                                case 4: return [3 /*break*/, 9];
+                                case 5:
+                                    if (!!((_b = (_a = validate) === null || _a === void 0 ? void 0 : _a.pattern) === null || _b === void 0 ? void 0 : _b.test(value))) return [3 /*break*/, 9];
+                                    if (!showInnerPagination) return [3 /*break*/, 7];
+                                    setCurrent(currentPage);
+                                    setTimeout(function () {
+                                        setElementState(innerCurrentI, index, ERROR_TD_CLASSNAME);
+                                    });
+                                    return [4 /*yield*/, Promise.reject({
+                                            errorFields: [
+                                                {
+                                                    errors: (tableName || '') + " \u7B2C" + (innerCurrentI + 1) + "\u884C " + title + " " + (((_c = validate) === null || _c === void 0 ? void 0 : _c.message) || '填写错误!'),
+                                                },
+                                            ],
+                                        })];
+                                case 6:
+                                    _g.sent();
+                                    return [3 /*break*/, 9];
+                                case 7:
+                                    setElementState(i, index, ERROR_TD_CLASSNAME);
+                                    return [4 /*yield*/, Promise.reject({
+                                            errorFields: [
+                                                {
+                                                    errors: (tableName || '') + " \u7B2C" + (i + 1) + "\u884C " + title + " " + (((_d = validate) === null || _d === void 0 ? void 0 : _d.message) || '填写错误!'),
+                                                },
+                                            ],
+                                        })];
+                                case 8:
+                                    _g.sent();
+                                    _g.label = 9;
+                                case 9: return [3 /*break*/, 14];
+                                case 10:
+                                    if (!(value === '' || value == null)) return [3 /*break*/, 14];
+                                    if (!showInnerPagination) return [3 /*break*/, 12];
+                                    setCurrent(currentPage);
+                                    setTimeout(function () {
+                                        setElementState(innerCurrentI, index, ERROR_TD_CLASSNAME);
+                                    });
+                                    return [4 /*yield*/, Promise.reject({
+                                            errorFields: [
+                                                {
+                                                    errors: (tableName || '') + " \u7B2C" + (innerCurrentI + 1) + "\u884C " + title + " \u4E3A\u7A7A!",
+                                                    rowIndex: i,
+                                                    colIndex: index,
+                                                },
+                                            ],
+                                        })];
+                                case 11:
+                                    _g.sent();
+                                    return [3 /*break*/, 14];
+                                case 12:
+                                    setElementState(i, index, ERROR_TD_CLASSNAME);
+                                    return [4 /*yield*/, Promise.reject({
+                                            errorFields: [
+                                                {
+                                                    errors: (tableName || '') + " \u7B2C" + (i + 1) + "\u884C " + title + " \u4E3A\u7A7A!",
+                                                    rowIndex: i,
+                                                    colIndex: index,
+                                                },
+                                            ],
+                                        })];
+                                case 13:
+                                    _g.sent();
+                                    _g.label = 14;
+                                case 14: return [2 /*return*/];
+                            }
+                        });
+                    };
                     j = 0;
-                    _p.label = 2;
+                    _e.label = 2;
                 case 2:
-                    if (!(j < requiredFileds.length)) return [3 /*break*/, 13];
-                    _o = requiredFileds[j], dataIndex = _o.dataIndex, title = _o.title, validate = _o.validate, index = _o.index;
-                    if (!dataIndex) {
-                        return [3 /*break*/, 13];
-                    }
-                    value = item[dataIndex];
-                    if (!validate) return [3 /*break*/, 10];
-                    if (!(typeof validate === 'function')) return [3 /*break*/, 7];
-                    _p.label = 3;
+                    if (!(j < requiredFileds.length)) return [3 /*break*/, 5];
+                    return [5 /*yield**/, _loop_1(j)];
                 case 3:
-                    _p.trys.push([3, 5, , 6]);
-                    return [4 /*yield*/, validate(value, item, i + 1, title)];
+                    state_1 = _e.sent();
+                    if (typeof state_1 === "object")
+                        return [2 /*return*/, state_1.value];
+                    if (state_1 === "break")
+                        return [3 /*break*/, 5];
+                    _e.label = 4;
                 case 4:
-                    _p.sent();
-                    return [3 /*break*/, 6];
-                case 5:
-                    err_1 = _p.sent();
-                    errorTr = resultTr[i];
-                    errorTds = Array.prototype.slice.call(errorTr === null || errorTr === void 0 ? void 0 : errorTr.children);
-                    errorTd = typeof index === 'number' ? errorTds[index] : null;
-                    (_b = (_a = errorTd === null || errorTd === void 0 ? void 0 : errorTd.classList) === null || _a === void 0 ? void 0 : _a.add) === null || _b === void 0 ? void 0 : _b.call(_a, ERROR_TD_CLASSNAME);
-                    (_c = errorTd === null || errorTd === void 0 ? void 0 : errorTd.scrollIntoView) === null || _c === void 0 ? void 0 : _c.call(errorTd);
-                    return [2 /*return*/, Promise.reject(err_1)];
-                case 6: return [3 /*break*/, 9];
-                case 7:
-                    if (!!((_e = (_d = validate) === null || _d === void 0 ? void 0 : _d.pattern) === null || _e === void 0 ? void 0 : _e.test(value))) return [3 /*break*/, 9];
-                    errorTr = resultTr[i];
-                    errorTds = Array.prototype.slice.call(errorTr === null || errorTr === void 0 ? void 0 : errorTr.children);
-                    errorTd = typeof index === 'number' ? errorTds[index] : null;
-                    (_g = (_f = errorTd === null || errorTd === void 0 ? void 0 : errorTd.classList) === null || _f === void 0 ? void 0 : _f.add) === null || _g === void 0 ? void 0 : _g.call(_f, ERROR_TD_CLASSNAME);
-                    (_h = errorTd === null || errorTd === void 0 ? void 0 : errorTd.scrollIntoView) === null || _h === void 0 ? void 0 : _h.call(errorTd);
-                    return [4 /*yield*/, Promise.reject({
-                            errorFields: [
-                                {
-                                    errors: (tableName || '') + " \u7B2C" + (i + 1) + "\u884C " + title + " " + (((_j = validate) === null || _j === void 0 ? void 0 : _j.message) || '填写错误!'),
-                                },
-                            ],
-                        })];
-                case 8:
-                    _p.sent();
-                    _p.label = 9;
-                case 9: return [3 /*break*/, 12];
-                case 10:
-                    if (!(value === '' || value == null)) return [3 /*break*/, 12];
-                    errorTr = resultTr[i];
-                    errorTds = Array.prototype.slice.call(errorTr === null || errorTr === void 0 ? void 0 : errorTr.children);
-                    errorTd = typeof index === 'number' ? errorTds[index] : null;
-                    (_l = (_k = errorTd === null || errorTd === void 0 ? void 0 : errorTd.classList) === null || _k === void 0 ? void 0 : _k.add) === null || _l === void 0 ? void 0 : _l.call(_k, ERROR_TD_CLASSNAME);
-                    (_m = errorTd === null || errorTd === void 0 ? void 0 : errorTd.scrollIntoView) === null || _m === void 0 ? void 0 : _m.call(errorTd);
-                    return [4 /*yield*/, Promise.reject({
-                            errorFields: [
-                                {
-                                    errors: (tableName || '') + " \u7B2C" + (i + 1) + "\u884C " + title + " \u4E3A\u7A7A!",
-                                    rowIndex: i,
-                                    colIndex: index,
-                                },
-                            ],
-                        })];
-                case 11:
-                    _p.sent();
-                    _p.label = 12;
-                case 12:
                     j++;
                     return [3 /*break*/, 2];
-                case 13:
+                case 5:
                     i++;
                     return [3 /*break*/, 1];
-                case 14: return [2 /*return*/];
+                case 6: return [2 /*return*/];
             }
         });
     });

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

@@ -386,6 +386,6 @@ var DetailTable = function (_a) {
         React.createElement("div", { style: { marginBottom: '10px' } },
             createDownloadBtn(),
             createDownloadGzBtn()),
-        React.createElement(Table, { columns: columnsLast, rowKey: "attachId", dataSource: records, scroll: { x: 'max-content' }, rowSelection: myRowSelection })));
+        React.createElement(Table, { columns: columnsLast, rowKey: "attachId", dataSource: records, scroll: { x: 'max-content', y: 300 }, rowSelection: myRowSelection })));
 };
 export default memo(DetailTable);

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

@@ -102,7 +102,8 @@ var FLOW_IDS = [
 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;
+    documentIdList = otherParams.documentIdList, // 文档id列表
+    cancelDefaultCheckedQj = otherParams.cancelDefaultCheckedQj;
     var authToken = token || '';
     // 是否可编辑 1可编辑  0不可编辑
     var isEdit = canEdit === 1;
@@ -160,6 +161,11 @@ var Sinatures = function (_a) {
     var _y = useState([]), unSealList = _y[0], setUnSealList = _y[1];
     // 需重新确认盖章位置的电子印章
     var _z = useState([]), needReSealList = _z[0], setNeedReSealList = _z[1];
+    useEffect(function () {
+        if (cancelDefaultCheckedQj) {
+            setChecked(false);
+        }
+    }, [cancelDefaultCheckedQj]);
     useEffect(function () {
         fnRef.current = onSigValuesChange;
     }, [onSigValuesChange]);
@@ -1066,7 +1072,7 @@ var Sinatures = function (_a) {
         docAttachMap: attachMap,
     };
     return (React.createElement(React.Fragment, null,
-        isEdit ? (React.createElement(Table, { columns: columnsLast, rowKey: "attachId", loading: tbloading, dataSource: records, scroll: { x: 'max-content' } })) : (React.createElement(DetailTable, __assign({}, detail, { batchDownloadZipName: batchDownloadZipName }))),
+        isEdit ? (React.createElement(Table, { columns: columnsLast, rowKey: "attachId", loading: tbloading, dataSource: records, scroll: { x: 'max-content', y: 400 } })) : (React.createElement(DetailTable, __assign({}, detail, { batchDownloadZipName: batchDownloadZipName }))),
         React.createElement(Modal, { title: "\u4E0B\u5217\u5370\u7AE0\u672A\u786E\u8BA4\u76D6\u7AE0\u4F4D\u7F6E\uFF0C\u5982\u4E0D\u9700\u8981\u8BF7\u53D6\u6D88\u52FE\u9009\u3002", width: 800, closable: false, visible: visible, loading: false, onCancel: function () {
                 setVisible(false);
             }, footer: React.createElement(React.Fragment, null,

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

@@ -83,4 +83,6 @@ export interface IProps {
     showDeleteBtn?: boolean;
     /** 批量下载zip包名 */
     batchDownloadZipName?: string;
+    /** 取消默认勾选群杰用印申请 */
+    cancelDefaultCheckedQj?: number;
 }

package/package.json

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