@zat-design/sisyphus-react 3.6.7-beta.7 → 3.6.7-beta.8

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/es/ProTable/{useAntdTable.d.ts → 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;

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),

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,8 +1,3 @@
-import _typeof from "@babel/runtime/helpers/esm/typeof";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
-import "antd/es/table/style";
-import _Table from "antd/es/table";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
@@ -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, 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({
@@ -268,53 +261,6 @@ function ProTable(props) {
       return item === null || item === void 0 ? void 0 : item.dataIndex;
     });
   }, [curColumns]);
-  var renderSummary = function renderSummary() {
-    var _ref6 = summary || {},
-      columns = _ref6.columns,
-      _ref6$total = _ref6.total,
-      total = _ref6$total === void 0 ? true : _ref6$total,
-      _ref6$fixed = _ref6.fixed,
-      fixed = _ref6$fixed === void 0 ? true : _ref6$fixed;
-    var _ref7 = tableProps || {},
-      dataSource = _ref7.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 (_ref8) {
-          var key = _ref8.key,
-            index = _ref8.index,
-            colSpan = _ref8.colSpan,
-            prefix = _ref8.prefix,
-            suffix = _ref8.suffix,
-            title = _ref8.title,
-            precision = _ref8.precision,
-            valueType = _ref8.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,
@@ -354,7 +300,7 @@ function ProTable(props) {
     return _rowSelection;
   };
   var onDataSourceChange = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(nextDataSource) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(nextDataSource) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -370,111 +316,76 @@ function ProTable(props) {
       }, _callee2);
     }));
     return function onDataSourceChange(_x2) {
-      return _ref9.apply(this, arguments);
+      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 !== null && _dataSource !== void 0 ? _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
+        }
+      })]
     })
   });
 }

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

@@ -0,0 +1,26 @@
+/**
+ * 获取小数点后的位数
+ * @param num 数字
+ * @returns 位数
+ */
+export declare const getDecimalDigits: (num?: number) => number;
+/**
+ * @description: 获取初始值
+ * @author: xiangchengli
+ * @param {any} rowKey
+ * @param any value
+ * @param any originalObj
+ * @param {any} dataIndex
+ * @return {any}
+ */
+export declare const getOriginalValue: (value: any, record: any, originalObj: any, rowKey: any, dataIndex: any) => any;
+export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;
+/**
+ * 判断数据是否为Response<List<any>>结构
+ * @param data { [key: string]: any } 需要判断数据
+ * @returns boolean 是否
+ */
+export declare const isListResult: (data: {
+    [key: string]: any;
+}) => boolean;
+export declare const getRowKey: (rowKey: any, record: any) => any;

package/es/ProTable/utils/index.js

@@ -0,0 +1,51 @@
+import { get, isEqual } from 'lodash';
+/**
+ * 获取小数点后的位数
+ * @param num 数字
+ * @returns 位数
+ */
+export var getDecimalDigits = function getDecimalDigits() {
+  var num = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  var match = Number(num).toString().match(/\.(\d+)/);
+  return match ? match[1].length : 0;
+};
+/**
+ * @description: 获取初始值
+ * @author: xiangchengli
+ * @param {any} rowKey
+ * @param any value
+ * @param any originalObj
+ * @param {any} dataIndex
+ * @return {any}
+ */
+export var getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
+  if (!originalObj) {
+    return undefined;
+  }
+  var originalRecord = get(originalObj, get(record, rowKey));
+  var originalValue = get(originalRecord, dataIndex);
+  if (!isEqual(originalValue, value)) {
+    return originalValue;
+  }
+  return undefined;
+};
+export var getColumnDataIndex = function getColumnDataIndex(dataIndex) {
+  return typeof dataIndex === 'string' ? dataIndex : dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.join('-');
+};
+/**
+ * 判断数据是否为Response<List<any>>结构
+ * @param data { [key: string]: any } 需要判断数据
+ * @returns boolean 是否
+ */
+export var isListResult = function isListResult(data) {
+  return data.hasOwnProperty('total') && data.hasOwnProperty('list');
+};
+export var getRowKey = function getRowKey(rowKey, record) {
+  // 默认取id
+  var key = record.rowKey || 'id';
+  if (rowKey) {
+    var _ref;
+    key = (_ref = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref !== void 0 ? _ref : key;
+  }
+  return key;
+};

package/{es/ProTable/utils.d.ts → lib/ProTable/components/FormatColumn/index.d.ts}

@@ -1,7 +1,6 @@
 import React from 'react';
-import { ProTableColumn } from './propsType';
+import { ProTableColumn } from '../../propsType';
 export declare const formatColumn: (column: ProTableColumn, originalObj: any, dataSourceObj: any, rowKey: any) => void;
-export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;
 /**
  * 查找最近的父级className
  * @param element 当前node节点
@@ -10,12 +9,3 @@ export declare const getColumnDataIndex: (dataIndex: string | string[]) => strin
  * @returns ReactNode 父级element
  */
 export declare const getParentElement: (element: any, name: any, type?: string) => React.ReactNode;
-/**
- * 判断数据是否为Response<List<any>>结构
- * @param data { [key: string]: any } 需要判断数据
- * @returns boolean 是否
- */
-export declare const isListResult: (data: {
-    [key: string]: any;
-}) => boolean;
-export declare const getRowKey: (rowKey: any, record: any) => any;