ztxkui 4.2.23 → 4.2.25

package/dist/TableDemo/data.d.ts

@@ -2,6 +2,7 @@ export declare const dataSource: {
     id: string;
     test1: string;
     test2: number;
+    test111: number;
     test3: string;
     test4: string;
     test5: string;

package/dist/TableDemo/data.js

@@ -3,6 +3,7 @@ export var dataSource = new Array(9).fill(1).map(function (item, index) {
         id: "test-" + index,
         test1: "test1-" + index,
         test2: index + 100,
+        test111: index + 1,
         test3: "test3-" + index,
         test4: "test4-" + index,
         test5: "test5-" + index,

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

@@ -37,6 +37,7 @@ interface IEditableCellProps {
     columns: any;
     onTableChange: any;
     currentpage: ICurrentPage;
+    [prop: string]: any;
 }
 declare const TableEnhanceCell: React.FC<IEditableCellProps>;
 export default TableEnhanceCell;

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

@@ -86,7 +86,7 @@ function transformData(data, config) {
     return newData;
 }
 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, currentpage = _a.currentpage, restProps = __rest(_a, ["title", "index", "editable", "editableConfig", "children", "dataIndex", "record", "handleSave", "onTableChange", "columns", "currentpage"]);
+    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, onMouseEnter = _a.onMouseEnter, onMouseLeave = _a.onMouseLeave, restProps = __rest(_a, ["title", "index", "editable", "editableConfig", "children", "dataIndex", "record", "handleSave", "onTableChange", "columns", "currentpage", "onMouseEnter", "onMouseLeave"]);
     var form = useContext(EditableContext);
     var tdRef = useRef();
     useEffect(function () {

package/dist/components/Table/table-resizable-title.js

@@ -27,7 +27,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 import React from 'react';
 import { Resizable } from 'react-resizable';
 var TableResizableTitle = function (props) {
-    var onResize = props.onResize, width = props.width, restProps = __rest(props, ["onResize", "width"]);
+    var onResize = props.onResize, width = props.width, onMouseEnter = props.onMouseEnter, onMouseLeave = props.onMouseLeave, restProps = __rest(props, ["onResize", "width", "onMouseEnter", "onMouseLeave"]);
     if (!width) {
         return React.createElement("th", __assign({}, restProps));
     }

package/dist/components/Table/table.js

@@ -294,8 +294,14 @@ function Table(props) {
     }, 
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [onMoveRow]);
+    var onRowHandle = useCallback(function (record, index) {
+        return ({
+            index: index,
+            moverow: moveRowHandle,
+        });
+    }, [moveRowHandle]);
     /** 伸缩列 */
-    var handleResize = function (index) {
+    var handleResize = useCallback(function (index) {
         return function (_, _a) {
             var size = _a.size;
             var _newColumns = __spreadArray([], (newColumns || []));
@@ -327,24 +333,19 @@ function Table(props) {
                 return __assign({}, item);
             });
             if (showColumnDynamicKey) {
-                // let catchColumnsStr = '{}';
-                // try {
-                //   catchColumnsStr = JSON.stringify(catchColumns);
-                // } catch (err) {
-                //   console.log(err);
-                // }
-                // localStorage.setItem(showColumnDynamicKey, catchColumnsStr);
                 setDynamicKey(showColumnDynamicKey, catchColumns);
             }
             setNewColumns(_newColumns);
         };
-    };
-    var mergeColumns = isResizableColumn
-        ? (newColumns || []).map(function (col, index) { return (__assign(__assign({}, col), { onHeaderCell: function (column) { return ({
-                width: column.width,
-                onResize: handleResize(index),
-            }); } })); })
-        : newColumns;
+    }, [_columns, dynamicColumns, newColumns, setNewColumns, showColumnDynamicKey]);
+    var mergeColumns = useMemo(function () {
+        return isResizableColumn
+            ? (newColumns || []).map(function (col, index) { return (__assign(__assign({}, col), { onHeaderCell: function (column) { return ({
+                    width: column.width,
+                    onResize: handleResize(index),
+                }); } })); })
+            : newColumns;
+    }, [handleResize, isResizableColumn, newColumns]);
     if (isResizableColumn) {
         components.header = {
             cell: TableResizableTitle,
@@ -448,6 +449,63 @@ function Table(props) {
             },
         };
     }, []);
+    // 表格合计
+    var onSummaryHandle = useCallback(function (pageData) {
+        var _a = rowSelectionDataSource.current || {}, isChange = _a.isChange, selectedRowKeys = _a.selectedRowKeys, selectedRows = _a.selectedRows;
+        var rowKey = restProps.rowKey;
+        var resultDataSoure = typeof rowKey === 'string' && Array.isArray(selectedRowKeys)
+            ? pageData.filter(function (item) {
+                return selectedRowKeys.find(function (key) { return item[rowKey] === key; });
+            })
+            : selectedRows;
+        var summaryData = getSummaryData(summaryConfig, isChange && Array.isArray(resultDataSoure) && resultDataSoure.length > 0
+            ? resultDataSoure
+            : pageData, newColumns, {
+            hasRowSelection: props.rowSelection ? true : false,
+            hasExpandable: props.expandable ? true : false,
+        });
+        return (React.createElement(AntTable.Summary, { fixed: summaryFixed }, summaryData.map(function (summary) {
+            var title = summary.title, key = summary.key, titleIndex = summary.titleIndex, list = summary.list, columnList = summary.columnList, onClickHandle = summary.onClickHandle;
+            return (React.createElement(AntTable.Summary.Row, { key: key }, Array.isArray(list) &&
+                list.map(function (item, index) {
+                    var data = {
+                        index: index,
+                        column: Array.isArray(columnList)
+                            ? columnList[index]
+                            : null,
+                        num: item,
+                    };
+                    if (titleIndex === index) {
+                        return (React.createElement(AntTable.Summary.Cell, { key: index, index: index }, onClickHandle ? (React.createElement("div", { onClick: function () { return onClickHandle === null || onClickHandle === void 0 ? void 0 : onClickHandle(data); } }, title)) : (title)));
+                    }
+                    else {
+                        return (React.createElement(AntTable.Summary.Cell, { key: index, index: index },
+                            React.createElement("div", { style: {
+                                    color: '#333',
+                                }, onClick: function () {
+                                    return onClickHandle && (onClickHandle === null || onClickHandle === void 0 ? void 0 : onClickHandle(data));
+                                } }, item)));
+                    }
+                })));
+        })));
+    }, [
+        newColumns,
+        props === null || props === void 0 ? void 0 : props.expandable,
+        props === null || props === void 0 ? void 0 : props.rowSelection,
+        restProps === null || restProps === void 0 ? void 0 : restProps.rowKey,
+        summaryConfig,
+        summaryFixed,
+    ]);
+    // 多选
+    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);
+        } })); }, [rowSelection]);
     return (React.createElement("div", { style: isFlex
             ? { position: 'relative', overflow: 'hidden', flex: 1 }
             : { position: 'relative', overflow: 'hidden' }, ref: tableRef },
@@ -460,65 +518,7 @@ function Table(props) {
                     ? components
                     : isResizableColumn
                         ? tableResizableTitle
-                        : undefined, onRow: onMoveRow
-                    ? function (record, index) {
-                        return ({
-                            index: index,
-                            moverow: moveRowHandle,
-                        });
-                    }
-                    : undefined, summary: summaryConfig
-                    ? function (pageData) {
-                        var _a = rowSelectionDataSource.current || {}, isChange = _a.isChange, selectedRowKeys = _a.selectedRowKeys, selectedRows = _a.selectedRows;
-                        var rowKey = restProps.rowKey;
-                        var resultDataSoure = typeof rowKey === 'string' && Array.isArray(selectedRowKeys)
-                            ? pageData.filter(function (item) {
-                                return selectedRowKeys.find(function (key) { return item[rowKey] === key; });
-                            })
-                            : selectedRows;
-                        var summaryData = getSummaryData(summaryConfig, isChange &&
-                            Array.isArray(resultDataSoure) &&
-                            resultDataSoure.length > 0
-                            ? resultDataSoure
-                            : pageData, newColumns, {
-                            hasRowSelection: props.rowSelection ? true : false,
-                            hasExpandable: props.expandable ? true : false,
-                        });
-                        return (React.createElement(AntTable.Summary, { fixed: summaryFixed }, summaryData.map(function (summary) {
-                            var title = summary.title, key = summary.key, titleIndex = summary.titleIndex, list = summary.list, columnList = summary.columnList, onClickHandle = summary.onClickHandle;
-                            return (React.createElement(AntTable.Summary.Row, { key: key }, Array.isArray(list) &&
-                                list.map(function (item, index) {
-                                    var data = {
-                                        index: index,
-                                        column: Array.isArray(columnList)
-                                            ? columnList[index]
-                                            : null,
-                                        num: item,
-                                    };
-                                    if (titleIndex === index) {
-                                        return (React.createElement(AntTable.Summary.Cell, { key: index, index: index }, onClickHandle ? (React.createElement("div", { onClick: function () { return onClickHandle === null || onClickHandle === void 0 ? void 0 : onClickHandle(data); } }, title)) : (title)));
-                                    }
-                                    else {
-                                        return (React.createElement(AntTable.Summary.Cell, { key: index, index: index },
-                                            React.createElement("div", { style: {
-                                                    color: '#333',
-                                                }, onClick: function () {
-                                                    return onClickHandle && (onClickHandle === null || onClickHandle === void 0 ? void 0 : onClickHandle(data));
-                                                } }, item)));
-                                    }
-                                })));
-                        })));
-                    }
-                    : summary, rowSelection: rowSelection
-                    ? __assign(__assign({}, rowSelection), { onChange: function (selectedRowKeys, selectedRows) {
-                            rowSelectionDataSource.current = {
-                                selectedRows: selectedRows,
-                                selectedRowKeys: selectedRowKeys,
-                                isChange: true,
-                            };
-                            rowSelection.onChange &&
-                                rowSelection.onChange(selectedRowKeys, selectedRows);
-                        } }) : rowSelection }, restProps)),
+                        : undefined, onRow: onMoveRow ? onRowHandle : undefined, summary: summaryConfig ? onSummaryHandle : summary, rowSelection: rowSelection ? rowSelectionObj : rowSelection }, restProps)),
             showColumnDynamic && (React.createElement(TableDynamic, { visible: dynamicVisible, onClose: hideDynamicHandle, onSave: saveDynamicHandle, onReset: resetDynamicHandle, columns: dynamicColumns })))));
 }
 export default memo(Table);

package/package.json

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