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

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

@@ -16,9 +16,9 @@ var _react = require("react");
 var _ahooks = require("ahooks");
 var _lodash = require("lodash");
 var _antd = require("antd");
-var _index = require("./index");
-var _utils = require("./utils");
-var _locale = _interopRequireWildcard(require("../locale"));
+var _index = require("../index");
+var _utils = require("../utils");
+var _locale = _interopRequireWildcard(require("../../locale"));
 var _excluded = ["page", "filters", "sorter"];
 var useDefaultOptions = function useDefaultOptions(options) {
   var _useState = (0, _react.useState)((options === null || options === void 0 ? void 0 : options.page) || _index.defaultPage),

package/lib/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/lib/ProTable/index.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.defaultPage = exports.default = exports.TableContext = void 0;
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -15,20 +14,18 @@ var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
-var _antd = require("antd");
 var _lodash = require("lodash");
 var _ahooks = require("ahooks");
-var _reactSvg = require("react-svg");
 var _classnames2 = _interopRequireDefault(require("classnames"));
-var _utils = require("@zat-design/utils");
 var _index = require("../index");
-var _utils2 = require("../ProUtils/utils");
 var _components = require("./components");
-var _useAntdTable = _interopRequireDefault(require("./useAntdTable"));
+var _useAntdTable = _interopRequireDefault(require("./hooks/useAntdTable"));
+var _RcTable = require("./components/RcTable");
+var _FormatColumn = require("./components/FormatColumn");
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _reset = _interopRequireDefault(require("../assets/reset.svg"));
 var _customColumn = _interopRequireDefault(require("../assets/customColumn.svg"));
-var _utils3 = require("./utils");
+var _utils = require("./utils");
 var _locale = _interopRequireDefault(require("../locale"));
 var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "originalDataSource"],
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
@@ -40,7 +37,7 @@ var defaultPage = exports.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 = (0, _index.useProConfig)('globalConfig') || {},
     configStorage = _ref.storage; // 获取全局缓存位置配置
   var _ref2 = (0, _index.useProConfig)('ProTable') || {},
@@ -65,7 +62,6 @@ function ProTable(props) {
     originalDataSource = props.originalDataSource,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var quickTableConfig = quickConfig ? (0, _objectSpread4.default)({
-    // resizeColumn: true,
     columnConfig: true,
     cacheTime: true
   }, restProps) : (restProps === null || restProps === void 0 ? void 0 : restProps.columnConfig) ? (0, _objectSpread4.default)({
@@ -86,7 +82,7 @@ function ProTable(props) {
     rowKey = _ref3.rowKey;
   var initDataSource = dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
     return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, item), {}, {
-      rowKey: (0, _utils3.getRowKey)(rowKey, item)
+      rowKey: (0, _utils.getRowKey)(rowKey, item)
     });
   });
   var _useSetState = (0, _ahooks.useSetState)({
@@ -102,7 +98,7 @@ function ProTable(props) {
   }, [initDataSource]);
   var _originalDataSource = originalDataSource === null || originalDataSource === void 0 ? void 0 : originalDataSource.map(function (item) {
     return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, item), {}, {
-      rowKey: (0, _utils3.getRowKey)(rowKey, item)
+      rowKey: (0, _utils.getRowKey)(rowKey, item)
     });
   });
   var originalObj = _originalDataSource ? (0, _lodash.keyBy)(_originalDataSource, 'rowKey') : undefined;
@@ -110,7 +106,7 @@ function ProTable(props) {
   var propsColumnObj = (0, _react.useMemo)(function () {
     return propsColumns.reduce(function (acc, cur) {
       // @ts-ignore
-      acc[(0, _utils3.getColumnDataIndex)(cur.dataIndex)] = (0, _objectSpread4.default)({}, cur);
+      acc[(0, _utils.getColumnDataIndex)(cur.dataIndex)] = (0, _objectSpread4.default)({}, cur);
       return acc;
     }, {});
   }, [propsColumns]);
@@ -133,9 +129,9 @@ function ProTable(props) {
       var _curTableConfig$pathK2, _curTableConfig$pathK3, _localColumns;
       localColumns = (_curTableConfig$pathK2 = curTableConfig[pathKey]) === null || _curTableConfig$pathK2 === void 0 ? void 0 : (_curTableConfig$pathK3 = _curTableConfig$pathK2.columns) === null || _curTableConfig$pathK3 === void 0 ? void 0 : _curTableConfig$pathK3.map(function (item) {
         var _propsColumnObj$getCo;
-        return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, propsColumnObj[(0, _utils3.getColumnDataIndex)(item.dataIndex)]), {}, {
+        return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, propsColumnObj[(0, _utils.getColumnDataIndex)(item.dataIndex)]), {}, {
           dataIndex: item.dataIndex,
-          width: resizeColumn ? item === null || item === void 0 ? void 0 : item.width : (_propsColumnObj$getCo = propsColumnObj[(0, _utils3.getColumnDataIndex)(item.dataIndex)]) === null || _propsColumnObj$getCo === void 0 ? void 0 : _propsColumnObj$getCo.width
+          width: resizeColumn ? item === null || item === void 0 ? void 0 : item.width : (_propsColumnObj$getCo = propsColumnObj[(0, _utils.getColumnDataIndex)(item.dataIndex)]) === null || _propsColumnObj$getCo === void 0 ? void 0 : _propsColumnObj$getCo.width
         });
       });
       localColumns = ((_localColumns = localColumns) === null || _localColumns === void 0 ? void 0 : _localColumns.length) === 0 ? undefined : localColumns;
@@ -178,8 +174,8 @@ function ProTable(props) {
   var columns = (0, _react.useMemo)(function () {
     var newColumns = curColumns.map(function (item, index) {
       var _propsColumnObj$getCo2;
-      if ((_propsColumnObj$getCo2 = propsColumnObj[(0, _utils3.getColumnDataIndex)(item.dataIndex)]) === null || _propsColumnObj$getCo2 === void 0 ? void 0 : _propsColumnObj$getCo2.render) {
-        item.render = propsColumnObj[(0, _utils3.getColumnDataIndex)(item.dataIndex)].render;
+      if ((_propsColumnObj$getCo2 = propsColumnObj[(0, _utils.getColumnDataIndex)(item.dataIndex)]) === null || _propsColumnObj$getCo2 === void 0 ? void 0 : _propsColumnObj$getCo2.render) {
+        item.render = propsColumnObj[(0, _utils.getColumnDataIndex)(item.dataIndex)].render;
       }
       return (0, _objectSpread4.default)((0, _objectSpread4.default)({
         ellipsis: resizeColumn
@@ -197,7 +193,7 @@ function ProTable(props) {
       return !(item === null || item === void 0 ? void 0 : item.delete);
     });
     newColumns === null || newColumns === void 0 ? void 0 : newColumns.forEach(function (item) {
-      (0, _utils3.formatColumn)(item, originalObj, dataSourceObj, 'rowKey');
+      (0, _FormatColumn.formatColumn)(item, originalObj, dataSourceObj, 'rowKey');
     });
     return newColumns;
   }, [curColumns, handleResize]);
@@ -272,53 +268,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 (0, _jsxRuntime.jsx)(_antd.Table.Summary, {
-      fixed: fixed,
-      children: (0, _jsxRuntime.jsx)(_antd.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 = _utils2.valueTypeRender === null || _utils2.valueTypeRender === void 0 ? void 0 : _utils2.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 _utils.tools.calc(pre, '+', (_get = (0, _lodash.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 (0, _jsxRuntime.jsxs)(_antd.Table.Summary.Cell, {
-            index: index,
-            colSpan: colSpan,
-            children: [prefix, text, suffix]
-          }, _key);
-        })
-      })
-    });
-  };
   var cls = (0, _classnames2.default)((0, _defineProperty2.default)({
     'pro-table': true,
     'pro-table-no-stripe': !stripe,
@@ -358,7 +307,7 @@ function ProTable(props) {
     return _rowSelection;
   };
   var onDataSourceChange = /*#__PURE__*/function () {
-    var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(nextDataSource) {
+    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(nextDataSource) {
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -374,111 +323,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: _components.Row
-        }
-      };
-    }
-    if (resizeColumn) {
-      return _components.TableResizable.components;
+  var _rowClassName = function _rowClassName(record, index) {
+    if (originalDataSource && !originalObj.hasOwnProperty((0, _lodash.get)(record, 'rowKey'))) {
+      return 'new-cell';
     }
-    return null;
   };
+  var TableComponent = draggable ? _RcTable.DraggableTable : _RcTable.BaseTable;
   return (0, _jsxRuntime.jsx)(TableContext.Provider, {
     value: {
       pathKey: pathKey,
       tableConfig: tableConfig,
       Storage: Storage
     },
-    children: (0, _jsxRuntime.jsx)("div", {
+    children: (0, _jsxRuntime.jsxs)("div", {
       className: cls,
-      children: (0, _jsxRuntime.jsxs)(_components.DndWrapper, {
-        value: _dataSource !== null && _dataSource !== void 0 ? _dataSource : [],
-        onChange: onDataSourceChange,
-        disabled: false,
-        draggable: draggable,
-        rowKey: rowKey,
-        children: [(headerRender || columnConfig || resizeColumn) && (0, _jsxRuntime.jsxs)("div", {
-          className: "column-config",
-          children: [(0, _jsxRuntime.jsx)("div", {
-            className: "left-contain",
-            children: headerRender ? typeof headerRender === 'function' ? headerRender() : headerRender : null
-          }), (0, _jsxRuntime.jsxs)("div", {
-            className: "right-actions",
-            children: [resizeColumn && (0, _jsxRuntime.jsx)(_antd.Button, {
-              icon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
-                className: "anticon",
-                wrapper: "span",
-                src: _reset.default
-              }),
-              onClick: resetColumnWidth,
-              children: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable2 = _locale.default.ProTable) === null || _locale$ProTable2 === void 0 ? void 0 : _locale$ProTable2.resetColumnWidth
-            }), columnConfig && (0, _jsxRuntime.jsx)(_index.ProTreeModal, {
-              title: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable3 = _locale.default.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: (0, _jsxRuntime.jsx)(_antd.Button, {
-                className: "custom-column-btn",
-                icon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
-                  className: "anticon",
-                  wrapper: "span",
-                  src: _customColumn.default
-                }),
-                children: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable4 = _locale.default.ProTable) === null || _locale$ProTable4 === void 0 ? void 0 : _locale$ProTable4.customColumns
-              })
-            })]
-          })]
-        }), (0, _jsxRuntime.jsxs)("div", {
-          className: "pro-table-container",
-          children: [(0, _jsxRuntime.jsx)(_antd.Table, (0, _objectSpread4.default)((0, _objectSpread4.default)({
-            className: draggable ? 'pro-edit-table-drag' : '',
-            // components={resizeColumn ? TableResizable.components : undefined}
-            components: renderComponents(),
-            // @ts-ignore
+      children: [(0, _jsxRuntime.jsx)(_components.RenderTableHeader, {
+        dataSource: {
+          headerRender: headerRender,
+          columnConfig: columnConfig,
+          resizeColumn: resizeColumn,
+          resetSvg: _reset.default,
+          resetColumnWidth: resetColumnWidth,
+          locale: _locale.default,
+          customColumns: customColumns,
+          checkColumns: checkColumns,
+          handleColumnConfig: handleColumnConfig,
+          customColumnSvg: _customColumn.default
+        }
+      }), (0, _jsxRuntime.jsxs)("div", {
+        className: "pro-table-container",
+        children: [(0, _jsxRuntime.jsx)(TableComponent, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, restProps), {}, {
+          draggableProps: {
+            onChange: onDataSourceChange,
+            draggable: draggable,
+            rowKey: rowKey
+          },
+          tableProps: {
+            value: _dataSource,
+            headerRender: headerRender,
             columns: columns,
-            locale: {
-              emptyText: (0, _jsxRuntime.jsxs)("div", {
-                className: "pro-table-empty",
-                children: [(0, _jsxRuntime.jsx)("div", {
-                  className: "empty-image",
-                  children: (0, _jsxRuntime.jsx)("img", {
-                    src: _empty.default,
-                    alt: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable5 = _locale.default.ProTable) === null || _locale$ProTable5 === void 0 ? void 0 : _locale$ProTable5.noData
-                  })
-                }), (0, _jsxRuntime.jsx)("div", {
-                  className: "empty-description",
-                  children: typeof emptyText === 'function' ? emptyText() : emptyText
-                })]
-              })
-            },
-            summary: (0, _typeof2.default)(summary) === 'object' ? function () {
-              return renderSummary();
-            } : summary,
-            rowClassName: function rowClassName(record, index) {
-              if (originalDataSource && !originalObj.hasOwnProperty((0, _lodash.get)(record, 'rowKey'))) {
-                return 'new-cell';
-              }
-            }
-          }, tableProps), {}, {
-            dataSource: _dataSource,
-            rowSelection: renderRowSelection()
-          })), (0, _jsxRuntime.jsx)(_components.ResizableLine, {})]
-        }), footerRender ? (0, _jsxRuntime.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.default,
+            locale: _locale.default,
+            emptyText: emptyText
+          },
+          summaryProps: {
+            summary: summary,
+            dataSource: _dataSource
+          },
+          dataSource: _dataSource
+        })), (0, _jsxRuntime.jsx)("span", {
+          className: "pro-table-resizable-line",
+          style: {
+            display: 'none'
+          }
+        })]
+      }), (0, _jsxRuntime.jsx)(_components.RenderFooter, {
+        dataSource: {
+          footerRender: footerRender,
+          pagination: pagination,
+          _dataSource: _dataSource
+        }
+      })]
     })
   });
 }

package/lib/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/lib/ProTable/utils/index.js

@@ -0,0 +1,57 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isListResult = exports.getRowKey = exports.getOriginalValue = exports.getDecimalDigits = exports.getColumnDataIndex = void 0;
+var _lodash = require("lodash");
+/**
+ * 获取小数点后的位数
+ * @param num 数字
+ * @returns 位数
+ */
+var getDecimalDigits = exports.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}
+ */
+var getOriginalValue = exports.getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
+  if (!originalObj) {
+    return undefined;
+  }
+  var originalRecord = (0, _lodash.get)(originalObj, (0, _lodash.get)(record, rowKey));
+  var originalValue = (0, _lodash.get)(originalRecord, dataIndex);
+  if (!(0, _lodash.isEqual)(originalValue, value)) {
+    return originalValue;
+  }
+  return undefined;
+};
+var getColumnDataIndex = exports.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 是否
+ */
+var isListResult = exports.isListResult = function isListResult(data) {
+  return data.hasOwnProperty('total') && data.hasOwnProperty('list');
+};
+var getRowKey = exports.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.6.7-beta.6",
+  "version": "3.6.7-beta.8",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",

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

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

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

@@ -1,10 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-var ResizableLine = function ResizableLine() {
-  return _jsx("span", {
-    className: "pro-table-resizable-line",
-    style: {
-      display: 'none'
-    }
-  });
-};
-export default ResizableLine;

package/lib/ProTable/components/ResizableLine/index.d.ts

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

package/lib/ProTable/components/ResizableLine/index.js

@@ -1,16 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _jsxRuntime = require("react/jsx-runtime");
-var ResizableLine = function ResizableLine() {
-  return (0, _jsxRuntime.jsx)("span", {
-    className: "pro-table-resizable-line",
-    style: {
-      display: 'none'
-    }
-  });
-};
-var _default = exports.default = ResizableLine;