@zat-design/sisyphus-react 3.6.7 → 3.6.8

package/es/ProTable/components/RcTable/index.js

@@ -0,0 +1,4 @@
+/** 基础表格 */
+export { default as BaseTable } from './components/BaseTable/index';
+/** 拖拽表格 */
+export { default as DraggableTable } from './components/DraggableTable/index';

package/es/ProTable/components/RenderEmptyText/index.d.ts

@@ -0,0 +1,3 @@
+import { ReactNode } from 'react';
+declare const RenderEmptyText: (props: any) => ReactNode;
+export default RenderEmptyText;

package/es/ProTable/components/RenderEmptyText/index.js

@@ -0,0 +1,22 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+var RenderEmptyText = function RenderEmptyText(props) {
+  var _locale$ProTable;
+  var _ref = props || {},
+    empty = _ref.empty,
+    locale = _ref.locale,
+    emptyText = _ref.emptyText;
+  return _jsxs("div", {
+    className: "pro-table-empty",
+    children: [_jsx("div", {
+      className: "empty-image",
+      children: _jsx("img", {
+        src: empty,
+        alt: locale === null || locale === void 0 ? void 0 : (_locale$ProTable = locale.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.noData
+      })
+    }), _jsx("div", {
+      className: "empty-description",
+      children: typeof emptyText === 'function' ? emptyText() : emptyText
+    })]
+  });
+};
+export default RenderEmptyText;

package/es/ProTable/components/RenderFooter/index.d.ts

@@ -0,0 +1,2 @@
+declare const RenderFooter: (props: any) => import("react/jsx-runtime").JSX.Element;
+export default RenderFooter;

package/es/ProTable/components/RenderFooter/index.js

@@ -0,0 +1,12 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+var RenderFooter = function RenderFooter(props) {
+  var _ref = props || {},
+    footerRender = _ref.footerRender,
+    pagination = _ref.pagination,
+    _dataSource = _ref._dataSource;
+  return footerRender ? _jsx("div", {
+    className: "pro-table-footer ".concat(pagination && !!(_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.length) ? 'has-page' : 'no-page'),
+    children: typeof footerRender === 'function' ? footerRender() : footerRender
+  }) : null;
+};
+export default RenderFooter;

package/es/ProTable/components/RenderSummary/index.d.ts

@@ -0,0 +1,3 @@
+import { ReactNode } from 'react';
+declare const renderSummary: (props: any) => ReactNode;
+export default renderSummary;

package/es/ProTable/components/RenderSummary/index.js

@@ -0,0 +1,55 @@
+import "antd/es/table/style";
+import _Table from "antd/es/table";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { get } from 'lodash';
+import { tools } from '@zat-design/utils';
+import { valueTypeRender } from '../../../ProUtils/utils';
+var renderSummary = function renderSummary(props) {
+  var summary = props.summary,
+    dataSource = props.dataSource;
+  var _ref = summary || {},
+    columns = _ref.columns,
+    _ref$total = _ref.total,
+    total = _ref$total === void 0 ? true : _ref$total,
+    _ref$fixed = _ref.fixed,
+    fixed = _ref$fixed === void 0 ? true : _ref$fixed;
+  // 没有数据时，不展示合计栏
+  if (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length)) {
+    return null;
+  }
+  return _typeof(summary) === 'object' ? _jsx(_Table.Summary, {
+    fixed: fixed,
+    children: _jsx(_Table.Summary.Row, {
+      children: columns === null || columns === void 0 ? void 0 : columns.map(function (_ref2) {
+        var key = _ref2.key,
+          index = _ref2.index,
+          colSpan = _ref2.colSpan,
+          prefix = _ref2.prefix,
+          suffix = _ref2.suffix,
+          title = _ref2.title,
+          precision = _ref2.precision,
+          valueType = _ref2.valueType;
+        var text = null;
+        if (title) {
+          text = title;
+        } else if (total && key) {
+          var _dataSource$reduce;
+          var format = valueTypeRender === null || valueTypeRender === void 0 ? void 0 : valueTypeRender[valueType];
+          var sum = dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$reduce = dataSource.reduce) === null || _dataSource$reduce === void 0 ? void 0 : _dataSource$reduce.call(dataSource, function (pre, cur) {
+            var _get;
+            return tools.calc(pre, '+', (_get = get(cur, key)) !== null && _get !== void 0 ? _get : 0);
+          }, 0);
+          text = format ? format(sum, precision !== null && precision !== void 0 ? precision : 2) : sum;
+        }
+        var _key = key;
+        return _jsxs(_Table.Summary.Cell, {
+          index: index,
+          colSpan: colSpan,
+          children: [prefix, text, suffix]
+        }, _key);
+      })
+    })
+  }) : summary;
+};
+export default renderSummary;

package/es/ProTable/components/RenderTableHeader/index.d.ts

@@ -0,0 +1,2 @@
+declare const RenderTableHeader: (props: any) => import("react/jsx-runtime").JSX.Element;
+export default RenderTableHeader;

package/es/ProTable/components/RenderTableHeader/index.js

@@ -0,0 +1,61 @@
+import "antd/es/button/style";
+import _Button from "antd/es/button";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { ReactSVG } from 'react-svg';
+import { ProTreeModal } from '../../../index';
+var RenderTableHeader = function RenderTableHeader(props) {
+  var _locale$ProTable, _locale$ProTable2, _locale$ProTable3;
+  var dataSource = props.dataSource;
+  var _ref = dataSource || {},
+    headerRender = _ref.headerRender,
+    columnConfig = _ref.columnConfig,
+    resizeColumn = _ref.resizeColumn,
+    resetSvg = _ref.resetSvg,
+    resetColumnWidth = _ref.resetColumnWidth,
+    locale = _ref.locale,
+    customColumns = _ref.customColumns,
+    checkColumns = _ref.checkColumns,
+    handleColumnConfig = _ref.handleColumnConfig,
+    customColumnSvg = _ref.customColumnSvg;
+  // 没有数据时，不展示tableHeader
+  if (!(headerRender || columnConfig || resizeColumn)) {
+    return null;
+  }
+  return _jsxs("div", {
+    className: "column-config",
+    children: [_jsx("div", {
+      className: "left-contain",
+      children: headerRender ? typeof headerRender === 'function' ? headerRender() : headerRender : null
+    }), _jsxs("div", {
+      className: "right-actions",
+      children: [resizeColumn && _jsx(_Button, {
+        icon: _jsx(ReactSVG, {
+          className: "anticon",
+          wrapper: "span",
+          src: resetSvg
+        }),
+        onClick: resetColumnWidth,
+        children: locale === null || locale === void 0 ? void 0 : (_locale$ProTable = locale.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.resetColumnWidth
+      }), columnConfig && _jsx(ProTreeModal, {
+        title: locale === null || locale === void 0 ? void 0 : (_locale$ProTable2 = locale.ProTable) === null || _locale$ProTable2 === void 0 ? void 0 : _locale$ProTable2.customColumns,
+        span: 8,
+        mode: "list",
+        draggable: true,
+        dataSource: customColumns,
+        value: checkColumns,
+        allValue: "all",
+        onChange: handleColumnConfig,
+        trigger: _jsx(_Button, {
+          className: "custom-column-btn",
+          icon: _jsx(ReactSVG, {
+            className: "anticon",
+            wrapper: "span",
+            src: customColumnSvg
+          }),
+          children: locale === null || locale === void 0 ? void 0 : (_locale$ProTable3 = locale.ProTable) === null || _locale$ProTable3 === void 0 ? void 0 : _locale$ProTable3.customColumns
+        })
+      })]
+    })]
+  });
+};
+export default RenderTableHeader;

package/es/ProTable/components/TableResizable/index.js

@@ -3,19 +3,11 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["onDrag", "width", "minwidth"];
 import { jsx as _jsx } from "react/jsx-runtime";
-/*
- * @Author: chongyang wanchongyang@zhongan.io
- * @Date: 2023-02-23 17:47:46
- * @LastEditors: chongyang wanchongyang@zhongan.io
- * @LastEditTime: 2023-03-07 20:18:22
- * @FilePath: /za-material-warehouse/src/ProTable/TableResizable.tsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 import { useState, useContext } from 'react';
 import { Resizable } from 'react-resizable';
 import classnames from 'classnames';
 import { TableContext } from '../../index';
-import { getParentElement } from '../../utils';
+import { getParentElement } from '../FormatColumn';
 var ResizableTitle = function ResizableTitle(props) {
   var _restProps$className;
   var onDrag = props.onDrag,

package/es/ProTable/components/index.d.ts

@@ -1,3 +1,5 @@
-export { default as ResizableLine } from './ResizableLine';
 export { default as TableResizable } from './TableResizable';
-export { default as DndWrapper, Row } from './DndWrapper';
+export { default as RenderEmptyText } from './RenderEmptyText';
+export { default as RenderSummary } from './RenderSummary';
+export { default as RenderTableHeader } from './RenderTableHeader';
+export { default as RenderFooter } from './RenderFooter';

package/es/ProTable/components/index.js

@@ -1,3 +1,5 @@
-export { default as ResizableLine } from './ResizableLine';
 export { default as TableResizable } from './TableResizable';
-export { default as DndWrapper, Row } from './DndWrapper';
+export { default as RenderEmptyText } from './RenderEmptyText';
+export { default as RenderSummary } from './RenderSummary';
+export { default as RenderTableHeader } from './RenderTableHeader';
+export { default as RenderFooter } from './RenderFooter';

package/{lib/ProTable → es/ProTable/hooks}/useAntdTable.d.ts

@@ -1,6 +1,6 @@
 import { Key } from 'react';
 import { useRequest } from 'ahooks';
-import { RequestOptions, Service } from './propsType';
+import { RequestOptions, Service } from '../propsType';
 declare function useAntdTable<I, R extends Record<string, any>, S extends Service<I, R>>(service: S, options?: RequestOptions<I, R>, useRequestOptions?: Parameters<typeof useRequest>[1]): {
     data: R[];
     params: any;
@@ -83,6 +83,7 @@ declare function useAntdTable<I, R extends Record<string, any>, S extends Servic
         };
         onChange: (pagination: any, filters: any, sorter: any, extra: any) => void;
     };
+    handleSetStateCallback: (values: any) => void;
     loading: boolean;
     error?: Error;
     cancel: () => void;

package/es/ProTable/{useAntdTable.js → hooks/useAntdTable.js}

@@ -10,9 +10,9 @@ var _excluded = ["page", "filters", "sorter"];
 import { useCallback, useMemo, useState } from 'react';
 import { useRequest, useSetState, useDeepCompareEffect } from 'ahooks';
 import { pickBy, isObject, merge, set, isEqual } from 'lodash';
-import { defaultPage } from './index';
-import { isListResult } from './utils';
-import locale, { formatMessage } from '../locale';
+import { defaultPage } from '../index';
+import { isListResult } from '../utils';
+import locale, { formatMessage } from '../../locale';
 var useDefaultOptions = function useDefaultOptions(options) {
   var _useState = useState((options === null || options === void 0 ? void 0 : options.page) || defaultPage),
     _useState2 = _slicedToArray(_useState, 2),
@@ -89,6 +89,16 @@ function useAntdTable(service, options, useRequestOptions) {
     }
     return requestParams;
   }, [defaultParam, extraParams]);
+  // 仅清数据源相关，查询相关
+  var handleSetStateCallback = function handleSetStateCallback(values) {
+    setState(_objectSpread({
+      data: [],
+      total: 0,
+      selectedRecords: [],
+      selectedRowKeys: [],
+      allSelected: false
+    }, values));
+  };
   var params = useMemo(function () {
     var newQueryBean = _objectSpread(_objectSpread({}, searchValues), extraFilter);
     return getTransformParams(_objectSpread({
@@ -489,7 +499,8 @@ function useAntdTable(service, options, useRequestOptions) {
       rowSelection: returnRowSelection || rowSelections ? rowSelection : undefined,
       pagination: pagination,
       onChange: handleTableChange
-    }
+    },
+    handleSetStateCallback: handleSetStateCallback
   });
 }
 export default useAntdTable;

package/es/ProTable/index.d.ts

@@ -14,6 +14,6 @@ declare namespace ProTable {
         disabled: boolean;
         isView: boolean;
     };
-    var useAntdTable: typeof import("./useAntdTable").default;
+    var useAntdTable: typeof import("./hooks/useAntdTable").default;
 }
 export default ProTable;

package/es/ProTable/index.js

@@ -1,10 +1,5 @@
-import _typeof from "@babel/runtime/helpers/esm/typeof";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import "antd/es/table/style";
-import _Table from "antd/es/table";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
@@ -12,21 +7,20 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "originalDataSource"],
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
-import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState, createContext } from 'react';
-import { get, keyBy, assign } from 'lodash';
+import { get, keyBy, assign, isObject } from 'lodash';
 import { useDebounceEffect, useDeepCompareEffect, useSetState } from 'ahooks';
-import { ReactSVG } from 'react-svg';
 import classnames from 'classnames';
-import { tools } from '@zat-design/utils';
-import { useProConfig, ProTreeModal } from '../index';
-import { valueTypeRender } from '../ProUtils/utils';
-import { TableResizable, ResizableLine, DndWrapper, Row } from './components';
-import useAntdTable from './useAntdTable';
+import { useProConfig } from '../index';
+import { RenderTableHeader, RenderFooter } from './components';
+import useAntdTable from './hooks/useAntdTable';
+import { BaseTable, DraggableTable } from './components/RcTable';
+import { formatColumn } from './components/FormatColumn';
 import empty from '../assets/empty.png';
 import resetSvg from '../assets/reset.svg';
 import customColumnSvg from '../assets/customColumn.svg';
-import { formatColumn, getColumnDataIndex, getRowKey } from './utils';
+import { getColumnDataIndex, getRowKey } from './utils';
 import locale from '../locale';
 var defaultCacheTime = 1; // columns 配置保存时间为一天
 // 全局上下文
@@ -36,7 +30,7 @@ export var defaultPage = {
   pageSize: 10
 };
 function ProTable(props) {
-  var _locale$ProTable, _curTableConfig$pathK, _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5;
+  var _locale$ProTable, _curTableConfig$pathK;
   var _ref = useProConfig('globalConfig') || {},
     configStorage = _ref.storage; // 获取全局缓存位置配置
   var _ref2 = useProConfig('ProTable') || {},
@@ -61,7 +55,6 @@ function ProTable(props) {
     originalDataSource = props.originalDataSource,
     restProps = _objectWithoutProperties(props, _excluded);
   var quickTableConfig = quickConfig ? _objectSpread({
-    // resizeColumn: true,
     columnConfig: true,
     cacheTime: true
   }, restProps) : (restProps === null || restProps === void 0 ? void 0 : restProps.columnConfig) ? _objectSpread({
@@ -197,17 +190,46 @@ function ProTable(props) {
     });
     return newColumns;
   }, [curColumns, handleResize]);
-  var handleColumnConfig = function handleColumnConfig(checkList) {
-    var newColumns = [];
-    if (checkList === 'all') {
-      newColumns = propsColumns;
-    } else {
-      newColumns = checkList === null || checkList === void 0 ? void 0 : checkList.map(function (item) {
-        return _objectSpread({}, propsColumnObj === null || propsColumnObj === void 0 ? void 0 : propsColumnObj[item]);
-      });
-    }
-    setCurColumns(newColumns);
-  };
+  var handleColumnConfig = /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(checkList) {
+      var newColumns, _columnConfig$onColum, catchColumns;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            newColumns = [];
+            if (checkList === 'all') {
+              newColumns = propsColumns;
+            } else {
+              newColumns = checkList === null || checkList === void 0 ? void 0 : checkList.map(function (item) {
+                return _objectSpread({}, propsColumnObj === null || propsColumnObj === void 0 ? void 0 : propsColumnObj[item]);
+              });
+            }
+            if (!isObject(columnConfig)) {
+              _context.next = 6;
+              break;
+            }
+            catchColumns = _defineProperty({}, pathKey, {
+              columns: newColumns.map(function (item) {
+                return {
+                  dataIndex: item.dataIndex,
+                  width: typeof item.width === 'number' ? Math.round(Number(item.width)) : item.width
+                };
+              })
+            });
+            _context.next = 6;
+            return columnConfig === null || columnConfig === void 0 ? void 0 : (_columnConfig$onColum = columnConfig.onColumnOk) === null || _columnConfig$onColum === void 0 ? void 0 : _columnConfig$onColum.call(columnConfig, catchColumns, newColumns);
+          case 6:
+            setCurColumns(newColumns);
+          case 7:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleColumnConfig(_x) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
   useDebounceEffect(function () {
     if (cacheTime) {
       var newTableConfig = _objectSpread(_objectSpread({}, curTableConfig), {}, _defineProperty({}, pathKey, {
@@ -215,7 +237,7 @@ function ProTable(props) {
         columns: curColumns.map(function (item) {
           return {
             dataIndex: item.dataIndex,
-            width: Math.round(Number(item.width))
+            width: typeof item.width === 'number' ? Math.round(Number(item.width)) : item.width
           };
         })
       }));
@@ -239,53 +261,6 @@ function ProTable(props) {
       return item === null || item === void 0 ? void 0 : item.dataIndex;
     });
   }, [curColumns]);
-  var renderSummary = function renderSummary() {
-    var _ref5 = summary || {},
-      columns = _ref5.columns,
-      _ref5$total = _ref5.total,
-      total = _ref5$total === void 0 ? true : _ref5$total,
-      _ref5$fixed = _ref5.fixed,
-      fixed = _ref5$fixed === void 0 ? true : _ref5$fixed;
-    var _ref6 = tableProps || {},
-      dataSource = _ref6.dataSource;
-    // 没有数据时，不展示合计栏
-    if (!(_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.length)) {
-      return null;
-    }
-    return _jsx(_Table.Summary, {
-      fixed: fixed,
-      children: _jsx(_Table.Summary.Row, {
-        children: columns === null || columns === void 0 ? void 0 : columns.map(function (_ref7) {
-          var key = _ref7.key,
-            index = _ref7.index,
-            colSpan = _ref7.colSpan,
-            prefix = _ref7.prefix,
-            suffix = _ref7.suffix,
-            title = _ref7.title,
-            precision = _ref7.precision,
-            valueType = _ref7.valueType;
-          var text = null;
-          if (title) {
-            text = title;
-          } else if (total && key) {
-            var _dataSource$reduce;
-            var format = valueTypeRender === null || valueTypeRender === void 0 ? void 0 : valueTypeRender[valueType];
-            var sum = _dataSource === null || _dataSource === void 0 ? void 0 : (_dataSource$reduce = _dataSource.reduce) === null || _dataSource$reduce === void 0 ? void 0 : _dataSource$reduce.call(_dataSource, function (pre, cur) {
-              var _get;
-              return tools.calc(pre, '+', (_get = get(cur, key)) !== null && _get !== void 0 ? _get : 0);
-            }, 0);
-            text = format ? format(sum, precision !== null && precision !== void 0 ? precision : 2) : sum;
-          }
-          var _key = key;
-          return _jsxs(_Table.Summary.Cell, {
-            index: index,
-            colSpan: colSpan,
-            children: [prefix, text, suffix]
-          }, _key);
-        })
-      })
-    });
-  };
   var cls = classnames(_defineProperty({
     'pro-table': true,
     'pro-table-no-stripe': !stripe,
@@ -325,9 +300,9 @@ function ProTable(props) {
     return _rowSelection;
   };
   var onDataSourceChange = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nextDataSource) {
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(nextDataSource) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             setState({
               dataSource: nextDataSource
@@ -336,116 +311,81 @@ function ProTable(props) {
             assign(dataSource, nextDataSource);
           case 2:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
-    return function onDataSourceChange(_x) {
-      return _ref8.apply(this, arguments);
+    return function onDataSourceChange(_x2) {
+      return _ref6.apply(this, arguments);
     };
   }();
-  var renderComponents = function renderComponents() {
-    if (draggable) {
-      return {
-        body: {
-          row: Row
-        }
-      };
-    }
-    if (resizeColumn) {
-      return TableResizable.components;
+  var _rowClassName = function _rowClassName(record, index) {
+    if (originalDataSource && !originalObj.hasOwnProperty(get(record, 'rowKey'))) {
+      return 'new-cell';
     }
-    return null;
   };
+  var TableComponent = draggable ? DraggableTable : BaseTable;
   return _jsx(TableContext.Provider, {
     value: {
       pathKey: pathKey,
       tableConfig: tableConfig,
       Storage: Storage
     },
-    children: _jsx("div", {
+    children: _jsxs("div", {
       className: cls,
-      children: _jsxs(DndWrapper, {
-        value: _dataSource,
-        onChange: onDataSourceChange,
-        disabled: false,
-        draggable: draggable,
-        rowKey: rowKey,
-        children: [(headerRender || columnConfig || resizeColumn) && _jsxs("div", {
-          className: "column-config",
-          children: [_jsx("div", {
-            className: "left-contain",
-            children: headerRender ? typeof headerRender === 'function' ? headerRender() : headerRender : null
-          }), _jsxs("div", {
-            className: "right-actions",
-            children: [resizeColumn && _jsx(_Button, {
-              icon: _jsx(ReactSVG, {
-                className: "anticon",
-                wrapper: "span",
-                src: resetSvg
-              }),
-              onClick: resetColumnWidth,
-              children: locale === null || locale === void 0 ? void 0 : (_locale$ProTable2 = locale.ProTable) === null || _locale$ProTable2 === void 0 ? void 0 : _locale$ProTable2.resetColumnWidth
-            }), columnConfig && _jsx(ProTreeModal, {
-              title: locale === null || locale === void 0 ? void 0 : (_locale$ProTable3 = locale.ProTable) === null || _locale$ProTable3 === void 0 ? void 0 : _locale$ProTable3.customColumns,
-              span: 8,
-              mode: "list",
-              draggable: true,
-              dataSource: customColumns,
-              value: checkColumns,
-              allValue: "all",
-              onChange: handleColumnConfig,
-              trigger: _jsx(_Button, {
-                className: "custom-column-btn",
-                icon: _jsx(ReactSVG, {
-                  className: "anticon",
-                  wrapper: "span",
-                  src: customColumnSvg
-                }),
-                children: locale === null || locale === void 0 ? void 0 : (_locale$ProTable4 = locale.ProTable) === null || _locale$ProTable4 === void 0 ? void 0 : _locale$ProTable4.customColumns
-              })
-            })]
-          })]
-        }), _jsxs("div", {
-          className: "pro-table-container",
-          children: [_jsx(_Table, _objectSpread(_objectSpread({
-            className: draggable ? 'pro-edit-table-drag' : '',
-            // components={resizeColumn ? TableResizable.components : undefined}
-            components: renderComponents(),
-            // @ts-ignore
+      children: [_jsx(RenderTableHeader, {
+        dataSource: {
+          headerRender: headerRender,
+          columnConfig: columnConfig,
+          resizeColumn: resizeColumn,
+          resetSvg: resetSvg,
+          resetColumnWidth: resetColumnWidth,
+          locale: locale,
+          customColumns: customColumns,
+          checkColumns: checkColumns,
+          handleColumnConfig: handleColumnConfig,
+          customColumnSvg: customColumnSvg
+        }
+      }), _jsxs("div", {
+        className: "pro-table-container",
+        children: [_jsx(TableComponent, _objectSpread(_objectSpread({}, restProps), {}, {
+          draggableProps: {
+            onChange: onDataSourceChange,
+            draggable: draggable,
+            rowKey: rowKey
+          },
+          tableProps: {
+            value: _dataSource,
+            headerRender: headerRender,
             columns: columns,
-            locale: {
-              emptyText: _jsxs("div", {
-                className: "pro-table-empty",
-                children: [_jsx("div", {
-                  className: "empty-image",
-                  children: _jsx("img", {
-                    src: empty,
-                    alt: locale === null || locale === void 0 ? void 0 : (_locale$ProTable5 = locale.ProTable) === null || _locale$ProTable5 === void 0 ? void 0 : _locale$ProTable5.noData
-                  })
-                }), _jsx("div", {
-                  className: "empty-description",
-                  children: typeof emptyText === 'function' ? emptyText() : emptyText
-                })]
-              })
-            },
-            summary: _typeof(summary) === 'object' ? function () {
-              return renderSummary();
-            } : summary,
-            rowClassName: function rowClassName(record, index) {
-              if (originalDataSource && !originalObj.hasOwnProperty(get(record, 'rowKey'))) {
-                return 'new-cell';
-              }
-            }
-          }, tableProps), {}, {
-            dataSource: _dataSource,
-            rowSelection: renderRowSelection()
-          })), _jsx(ResizableLine, {})]
-        }), footerRender ? _jsx("div", {
-          className: "pro-table-footer ".concat(pagination && !!(_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.length) ? 'has-page' : 'no-page'),
-          children: typeof footerRender === 'function' ? footerRender() : footerRender
-        }) : null]
-      })
+            renderRowSelection: renderRowSelection,
+            rowClassName: _rowClassName,
+            disabled: disabled,
+            resizeColumn: resizeColumn
+          },
+          emptyTextProps: {
+            empty: empty,
+            locale: locale,
+            emptyText: emptyText
+          },
+          summaryProps: {
+            summary: summary,
+            dataSource: _dataSource
+          },
+          dataSource: _dataSource
+        })), _jsx("span", {
+          className: "pro-table-resizable-line",
+          style: {
+            display: 'none'
+          }
+        })]
+      }), _jsx(RenderFooter, {
+        dataSource: {
+          footerRender: footerRender,
+          pagination: pagination,
+          _dataSource: _dataSource
+        }
+      })]
     })
   });
 }