ztxkui 4.2.23-2 → 4.2.23-21

package/dist/components/Table/table.js

@@ -62,6 +62,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
     return to;
 };
 import React, { useCallback, memo, useState, useEffect, useRef, useMemo, useImperativeHandle, } from 'react';
+import { unstable_batchedUpdates } from 'react-dom';
 import { Table as AntTable } from 'antd';
 import { message } from '../../index';
 import { ERROR_TD_CLASSNAME } from './';
@@ -74,6 +75,7 @@ import useColumns, { setDynamicKey } from './hooks/useColumns';
 import getSummaryData from './utils/getSummaryData';
 import { domFind } from './utils/dom';
 import { tableValidate } from './utils/validate';
+// import { shallowEqual } from './utils/shallowEqual';
 import classNames from 'classnames';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import { DndProvider } from 'react-dnd';
@@ -104,18 +106,16 @@ 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, showDelAllBtn = props.showDelAllBtn, delAllChange = props.delAllChange, 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, defaultInnerPageSize = props.defaultInnerPageSize, restProps = __rest(props, ["className", "scroll", "pagination", "bordered", "columns", "initColumns", "dataSource", "onAddAndDelHandle", "hideAddIcon", "addIconText", "hideDelIcon", "showDelAllBtn", "delAllChange", "delIconText", "showColumnDynamic", "showColumnDynamicKey", "summaryConfig", "summaryFixed", "summary", "onMoveRow", "onEditableSave", "onDynamicChange", "isResizableColumn", "configInfo", "tableHandleRef", "tableName", "isFlex", "onTableChange", "rowSelection", "showInnerPagination", "defaultInnerPageSize"]);
-    // console.log('table render');
+    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 classes = classNames('zt-table', className, {
         'zt-table--flex': isFlex,
     });
     var _d = useState(false), dynamicVisible = _d[0], setDynamicVisible = _d[1];
-    var _e = useState(columns), _columns = _e[0], setColumns = _e[1];
     var showDynamicHandle = useCallback(function () { return setDynamicVisible(true); }, []);
     var hideDynamicHandle = useCallback(function () { return setDynamicVisible(false); }, []);
     var dataSourceRef = useRef();
     // 内部分页相关配置
-    var _f = useInnerPagination(showInnerPagination, defaultInnerPageSize), paginationConfig = _f.paginationConfig, currentPage = _f.currentPage, setCurrent = _f.setCurrent, pageSize = _f.pageSize;
+    var _e = useInnerPagination(showInnerPagination, defaultInnerPageSize), paginationConfig = _e.paginationConfig, currentPage = _e.currentPage, setCurrent = _e.setCurrent, pageSize = _e.pageSize;
     var rowSelectionDataSource = useRef({});
     var myScroll = useMemo(function () {
         if (scroll) {
@@ -124,9 +124,6 @@ function Table(props) {
         return isFlex ? __assign(__assign({}, _scroll), { y: 100 }) : _scroll;
     }, [scroll, isFlex]);
     /**columns更新，重新设置columns */
-    useEffect(function () {
-        setColumns(columns);
-    }, [columns]);
     useEffect(function () {
         dataSourceRef.current = dataSource;
     }, [dataSource]);
@@ -161,12 +158,52 @@ function Table(props) {
             }
         }
     }, []);
+    var tableRef = useRef();
+    var getCurrentTable = useCallback(function () {
+        var _a;
+        var tableContent = domFind(tableRef.current, '.ant-table-content');
+        if (!tableContent) {
+            tableContent = domFind(tableRef.current, '.ant-table-container');
+        }
+        var tableBody = domFind(tableContent, '.ant-table-tbody');
+        var tr = tableBody === null || tableBody === void 0 ? void 0 : tableBody.children;
+        var arrTr = Array.prototype.slice.call(tr);
+        var resultTr = ((_a = arrTr === null || arrTr === void 0 ? void 0 : arrTr.filter) === null || _a === void 0 ? void 0 : _a.call(arrTr, function (item) { return item.className.includes('ant-table-row'); })) || [];
+        return { tableBody: tableBody, resultTr: resultTr };
+    }, []);
+    var clearErrorClass = useCallback(function (index) {
+        try {
+            var resultTr = getCurrentTable().resultTr;
+            if (typeof index === 'number') {
+                var tds = resultTr[index].querySelectorAll('td');
+                for (var i = 0; i < tds.length; i++) {
+                    tds[i].classList.remove(ERROR_TD_CLASSNAME);
+                }
+            }
+            else {
+                for (var i = 0; i < resultTr.length; i++) {
+                    var tds = resultTr[i].querySelectorAll('td');
+                    for (var j = 0; j < tds.length; j++) {
+                        tds[j].classList.remove(ERROR_TD_CLASSNAME);
+                    }
+                }
+            }
+        }
+        catch (err) {
+            console.log(err);
+        }
+    }, [getCurrentTable]);
+    var onTableChangeHandle = useCallback(function (resultTextList, startIndex) {
+        clearErrorClass();
+        onTableChange && onTableChange(resultTextList, startIndex);
+    }, [clearErrorClass, onTableChange]);
     /**
      * @description 根据配置生成一个新的columns
      *              以及一个需要动态列配置的columns
      */
-    var _g = useColumns({
+    var _f = useColumns({
         columns: _columns,
+        hiddenColumnDynamicIcon: hiddenColumnDynamicIcon,
         showColumnDynamic: showColumnDynamic,
         showColumnDynamicKey: showColumnDynamicKey,
         onAddAndDelHandle: onAddAndDelHandle,
@@ -180,14 +217,9 @@ function Table(props) {
         onEditableSave: onEditableSave,
         configInfo: configInfo,
         copyByKey: copyByKey,
-        onTableChange: onTableChange
-            ? function (resultTextList, startIndex) {
-                clearErrorClass();
-                onTableChange && onTableChange(resultTextList, startIndex);
-            }
-            : undefined,
+        onTableChange: onTableChange ? onTableChangeHandle : undefined,
         currentPage: currentPage,
-    }), newColumns = _g.newColumns, dynamicColumns = _g.dynamicColumns, setNewColumns = _g.setNewColumns;
+    }), newColumns = _f.newColumns, dynamicColumns = _f.dynamicColumns, refreshColumnsHandle = _f.refreshColumnsHandle;
     /**
      * @description 保存列配置
      */
@@ -213,7 +245,6 @@ function Table(props) {
                 return column && column.width
                     ? __assign(__assign({}, item), { width: column.width }) : item;
             });
-            setColumns(_newColumns);
             var catchColumns = _newColumns.map(function (item) {
                 if (item.dataIndex || item.key) {
                     return {
@@ -226,24 +257,23 @@ 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);
             }
+            refreshColumnsHandle();
             onDynamicChange && onDynamicChange(catchColumns);
         }
-    }, [_columns, newColumns, onDynamicChange, showColumnDynamicKey]);
+    }, [
+        _columns,
+        newColumns,
+        onDynamicChange,
+        showColumnDynamicKey,
+        refreshColumnsHandle,
+    ]);
     /**
      * @description 动态列配置重置功能
      */
     var resetDynamicHandle = useCallback(function () {
-        var _initColumns = initColumns || columns || [];
-        setColumns(__spreadArray([], _initColumns));
+        var _initColumns = initColumns || _columns || [];
         var catchColumns = (_initColumns || []).map(function (item) {
             if (item.dataIndex || item.key) {
                 return {
@@ -256,23 +286,18 @@ 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);
         }
+        refreshColumnsHandle();
         onDynamicChange && onDynamicChange(catchColumns);
         hideDynamicHandle();
     }, [
         initColumns,
-        columns,
+        _columns,
         hideDynamicHandle,
         onDynamicChange,
         showColumnDynamicKey,
+        refreshColumnsHandle,
     ]);
     /**
      * @description 切换行位置
@@ -280,7 +305,12 @@ function Table(props) {
     var moveRowHandle = useCallback(function (dragIndex, hoverIndex) {
         var innerDragIndex = getInnerIndex(currentPage, dragIndex);
         var innerHoverIndex = getInnerIndex(currentPage, hoverIndex);
-        onMoveRow && onMoveRow(innerDragIndex, innerHoverIndex);
+        if (innerDragIndex === innerHoverIndex) {
+            return;
+        }
+        unstable_batchedUpdates(function () {
+            onMoveRow && onMoveRow(innerDragIndex, innerHoverIndex);
+        });
         // if (dataSource) {
         // const dragRow = dataSource[dragIndex];
         // const newDataSource = update(dataSource, {
@@ -291,11 +321,15 @@ function Table(props) {
         // });
         // onMoveRow && onMoveRow(newDataSource);
         // }
-    }, 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [onMoveRow]);
+    }, [currentPage, 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 +361,28 @@ 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);
+                refreshColumnsHandle();
+            }
+            else {
+                refreshColumnsHandle(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,
+        refreshColumnsHandle,
+        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,
@@ -353,42 +391,6 @@ function Table(props) {
     /**
      * 表格暴露方法给外部使用
      */
-    var tableRef = useRef();
-    function getCurrentTable() {
-        var _a;
-        // 获取表格元素
-        var tableContent = domFind(tableRef.current, '.ant-table-content');
-        if (!tableContent) {
-            tableContent = domFind(tableRef.current, '.ant-table-container');
-        }
-        var tableBody = domFind(tableContent, '.ant-table-tbody');
-        var tr = tableBody === null || tableBody === void 0 ? void 0 : tableBody.children;
-        var arrTr = Array.prototype.slice.call(tr);
-        var resultTr = ((_a = arrTr === null || arrTr === void 0 ? void 0 : arrTr.filter) === null || _a === void 0 ? void 0 : _a.call(arrTr, function (item) { return item.className.includes('ant-table-row'); })) || [];
-        return { tableBody: tableBody, resultTr: resultTr };
-    }
-    function clearErrorClass(index) {
-        try {
-            var resultTr = getCurrentTable().resultTr;
-            if (typeof index === 'number') {
-                var tds = resultTr[index].querySelectorAll('td');
-                for (var i = 0; i < tds.length; i++) {
-                    tds[i].classList.remove(ERROR_TD_CLASSNAME);
-                }
-            }
-            else {
-                for (var i = 0; i < resultTr.length; i++) {
-                    var tds = resultTr[i].querySelectorAll('td');
-                    for (var j = 0; j < tds.length; j++) {
-                        tds[j].classList.remove(ERROR_TD_CLASSNAME);
-                    }
-                }
-            }
-        }
-        catch (err) {
-            console.log(err);
-        }
-    }
     useImperativeHandle(tableHandleRef, function () { return ({
         /** 错误提示 */
         validate: function () { return __awaiter(_this, void 0, void 0, function () {
@@ -448,6 +450,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 +519,10 @@ 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)),
-            showColumnDynamic && (React.createElement(TableDynamic, { visible: dynamicVisible, onClose: hideDynamicHandle, onSave: saveDynamicHandle, onReset: resetDynamicHandle, columns: dynamicColumns })))));
+                        : undefined, onRow: onMoveRow ? onRowHandle : undefined, summary: summaryConfig ? onSummaryHandle : summary, rowSelection: rowSelection ? rowSelectionObj : rowSelection }, restProps)),
+            showColumnDynamic && dynamicVisible && (React.createElement(TableDynamic, { visible: dynamicVisible, onClose: hideDynamicHandle, onSave: saveDynamicHandle, onReset: resetDynamicHandle, columns: dynamicColumns })))));
 }
+// export default memo(Table, (prevProps, nextProps) => {
+//   return shallowEqual(prevProps, nextProps);
+// });
 export default memo(Table);

package/dist/components/Table/utils/shallowEqual.d.ts

@@ -0,0 +1,2 @@
+export declare function is(x: any, y: any): boolean;
+export declare function shallowEqual(objA: any, objB: any, deepKeys?: string[]): boolean;

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

@@ -0,0 +1,34 @@
+import isEqual from 'lodash/isEqual';
+export function is(x, y) {
+    return ((x === y && (x !== 0 || 1 / x === 1 / y)) || (x !== x && y !== y) // eslint-disable-line no-self-compare
+    );
+}
+export function shallowEqual(objA, objB, deepKeys) {
+    var hasOwnProperty = Object.prototype.hasOwnProperty;
+    if (is(objA, objB)) {
+        return true;
+    }
+    if (typeof objA !== 'object' ||
+        objA === null ||
+        typeof objB !== 'object' ||
+        objB === null) {
+        return false;
+    }
+    var keysA = Object.keys(objA);
+    var keysB = Object.keys(objB);
+    if (keysA.length !== keysB.length) {
+        return false;
+    }
+    // Test for A's keys different from B.
+    for (var i = 0; i < keysA.length; i++) {
+        var key = keysA[i];
+        if ((deepKeys === null || deepKeys === void 0 ? void 0 : deepKeys.includes(key)) && !isEqual(objA[key], objB[key])) {
+            return false;
+        }
+        else if (!hasOwnProperty.call(objB, key) || !is(objA[key], objB[key])) {
+            console.log('因为某个key渲染', key, objA[key], objB[key]);
+            return false;
+        }
+    }
+    return true;
+}

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

@@ -83,9 +83,6 @@ export function tableValidate(dataSource, mergeColumns, restParams) {
                                         return [2 /*return*/, "break"];
                                     }
                                     value = item[dataIndex];
-                                    if (dataIndex === 'test3') {
-                                        console.log(value);
-                                    }
                                     setElementState = function (i, index, className) {
                                         var _a, _b, _c;
                                         // 获取表格元素

package/dist/components/Tabs/DraggableTabNode.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+interface DraggableTabPaneProps extends React.HTMLAttributes<HTMLDivElement> {
+    index: React.Key;
+    moveNode: (dragIndex: React.Key, hoverIndex: React.Key) => void;
+}
+declare const DraggableTabNode: ({ index, children, moveNode, }: DraggableTabPaneProps) => JSX.Element;
+export default DraggableTabNode;

package/dist/components/Tabs/DraggableTabNode.js

@@ -0,0 +1,33 @@
+import React, { useRef } from 'react';
+import { useDrag, useDrop } from 'react-dnd';
+var type = 'DraggableTabNode';
+var DraggableTabNode = function (_a) {
+    var index = _a.index, children = _a.children, moveNode = _a.moveNode;
+    var ref = useRef(null);
+    var _b = useDrop({
+        accept: type,
+        collect: function (monitor) {
+            var dragIndex = (monitor.getItem() || {}).index;
+            if (dragIndex === index) {
+                return {};
+            }
+            return {
+                isOver: monitor.isOver(),
+                dropClassName: 'dropping',
+            };
+        },
+        drop: function (item) {
+            moveNode(item.index, index);
+        },
+    }), _c = _b[0], isOver = _c.isOver, dropClassName = _c.dropClassName, drop = _b[1];
+    var _d = useDrag({
+        type: type,
+        item: { index: index },
+        collect: function (monitor) { return ({
+            isDragging: monitor.isDragging(),
+        }); },
+    }), drag = _d[1];
+    drop(drag(ref));
+    return (React.createElement("div", { ref: ref, style: { marginRight: 2 }, className: isOver ? dropClassName : '' }, children));
+};
+export default DraggableTabNode;

package/dist/components/Tabs/hooks.d.ts

@@ -0,0 +1,3 @@
+export declare function useMoveTabNode(panes: any, onMoveChange: any): {
+    renderTabBar: import("rc-tabs/lib/interface").RenderTabBar;
+};

package/dist/components/Tabs/hooks.js

@@ -0,0 +1,59 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
+};
+import React, { useState } from 'react';
+import DraggableTabNode from './DraggableTabNode';
+function createNewPanes(panes, order) {
+    var newPanes = __spreadArray([], panes).sort(function (a, b) {
+        var orderA = order.indexOf(a.key);
+        var orderB = order.indexOf(b.key);
+        if (orderA !== -1 && orderB !== -1) {
+            return orderA - orderB;
+        }
+        if (orderA !== -1) {
+            return -1;
+        }
+        if (orderB !== -1) {
+            return 1;
+        }
+        var ia = panes.indexOf(a);
+        var ib = panes.indexOf(b);
+        return ia - ib;
+    });
+    return newPanes;
+}
+export function useMoveTabNode(panes, onMoveChange) {
+    var _a = useState([]), order = _a[0], setOrder = _a[1];
+    var moveTabNode = function (dragKey, hoverKey) {
+        var newOrder = order.slice();
+        panes.forEach(function (item) {
+            if (item.key && newOrder.indexOf(item.key) === -1) {
+                newOrder.push(item.key);
+            }
+        });
+        var dragIndex = newOrder.indexOf(dragKey);
+        var hoverIndex = newOrder.indexOf(hoverKey);
+        newOrder.splice(dragIndex, 1);
+        newOrder.splice(hoverIndex, 0, dragKey);
+        setOrder(newOrder);
+        var newPanes = createNewPanes(panes, newOrder);
+        onMoveChange && onMoveChange(newPanes);
+    };
+    var renderTabBar = function (tabBarProps, DefaultTabBar) { return (React.createElement(DefaultTabBar, __assign({}, tabBarProps), function (node) { return (React.createElement(DraggableTabNode, { key: node.key, index: node.key, moveNode: moveTabNode }, node)); })); };
+    return {
+        renderTabBar: renderTabBar,
+    };
+}

package/dist/components/Tabs/tabs.d.ts

@@ -5,6 +5,9 @@ interface IProps extends TabsProps {
     isContent?: boolean;
     marginTop?: boolean;
     marginBottom?: boolean;
+    isMove?: boolean;
+    panes?: any[];
+    onMoveChange?: any;
 }
 declare function Tabs(props: IProps): JSX.Element;
 declare namespace Tabs {

package/dist/components/Tabs/tabs.js

@@ -22,16 +22,22 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import React from 'react';
 import { Tabs as AntTabs } from 'antd';
+import { DndProvider } from 'react-dnd';
+import { HTML5Backend } from 'react-dnd-html5-backend';
 import classNames from 'classnames';
+import { useMoveTabNode } from './hooks';
+var initPanes = [];
 function Tabs(props) {
-    var children = props.children, className = props.className, isHeader = props.isHeader, isContent = props.isContent, _a = props.marginTop, marginTop = _a === void 0 ? false : _a, _b = props.marginBottom, marginBottom = _b === void 0 ? true : _b, restProps = __rest(props, ["children", "className", "isHeader", "isContent", "marginTop", "marginBottom"]);
+    var children = props.children, className = props.className, isHeader = props.isHeader, isContent = props.isContent, _a = props.marginTop, marginTop = _a === void 0 ? false : _a, _b = props.marginBottom, marginBottom = _b === void 0 ? true : _b, isMove = props.isMove, _c = props.panes, panes = _c === void 0 ? initPanes : _c, onMoveChange = props.onMoveChange, restProps = __rest(props, ["children", "className", "isHeader", "isContent", "marginTop", "marginBottom", "isMove", "panes", "onMoveChange"]);
+    var renderTabBar = useMoveTabNode(panes, onMoveChange).renderTabBar;
     var classes = classNames('zt-tab', className, {
         'zt-tab-header': isHeader,
         'zt-tab-content': isContent,
         'zt-tab--margin-top': marginTop,
         'zt-tab--margin-bottom': marginBottom,
     });
-    return (React.createElement(AntTabs, __assign({ type: isHeader ? 'editable-card' : isContent ? 'card' : undefined, hideAdd: isHeader ? true : undefined, className: classes }, restProps), children));
+    return isMove ? (React.createElement(DndProvider, { backend: HTML5Backend },
+        React.createElement(AntTabs, __assign({ type: isHeader ? 'editable-card' : isContent ? 'card' : undefined, hideAdd: isHeader ? true : undefined, className: classes, renderTabBar: renderTabBar }, restProps), children))) : (React.createElement(AntTabs, __assign({ type: isHeader ? 'editable-card' : isContent ? 'card' : undefined, hideAdd: isHeader ? true : undefined, className: classes }, restProps), children));
 }
 Tabs.TabPane = AntTabs.TabPane;
 export default Tabs;

package/dist/components/business/Footer/index.d.ts

@@ -26,6 +26,7 @@ interface IProps {
     footerDom?: IFooterDom[] | null;
     style?: React.CSSProperties;
     className?: string;
+    align?: 'left' | 'center' | 'right';
 }
 declare const _default: React.NamedExoticComponent<IProps>;
 export default _default;