@zat-design/sisyphus-react 3.6.7-beta.1 → 3.6.7-beta.3

package/es/ProTable/index.js

@@ -1,10 +1,10 @@
 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 _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
@@ -14,7 +14,7 @@ var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stri
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
 import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } 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';
@@ -197,17 +197,38 @@ 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;
+      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 = 5;
+              break;
+            }
+            _context.next = 5;
+            return columnConfig === null || columnConfig === void 0 ? void 0 : (_columnConfig$onColum = columnConfig.onColumnChange) === null || _columnConfig$onColum === void 0 ? void 0 : _columnConfig$onColum.call(columnConfig, newColumns);
+          case 5:
+            setCurColumns(newColumns);
+          case 6:
+          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, {
@@ -240,14 +261,14 @@ function ProTable(props) {
     });
   }, [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;
+    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;
@@ -255,15 +276,15 @@ function ProTable(props) {
     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;
+        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;
@@ -325,9 +346,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 _ref9 = _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,12 +357,12 @@ 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 _ref9.apply(this, arguments);
     };
   }();
   var renderComponents = function renderComponents() {
@@ -366,7 +387,7 @@ function ProTable(props) {
     children: _jsx("div", {
       className: cls,
       children: _jsxs(DndWrapper, {
-        value: _dataSource,
+        value: _dataSource !== null && _dataSource !== void 0 ? _dataSource : [],
         onChange: onDataSourceChange,
         disabled: false,
         draggable: draggable,

package/es/ProTable/useAntdTable.d.ts

@@ -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

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

@@ -201,17 +201,38 @@ 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 (0, _objectSpread4.default)({}, propsColumnObj === null || propsColumnObj === void 0 ? void 0 : propsColumnObj[item]);
-      });
-    }
-    setCurColumns(newColumns);
-  };
+  var handleColumnConfig = /*#__PURE__*/function () {
+    var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(checkList) {
+      var newColumns, _columnConfig$onColum;
+      return (0, _regeneratorRuntime2.default)().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 (0, _objectSpread4.default)({}, propsColumnObj === null || propsColumnObj === void 0 ? void 0 : propsColumnObj[item]);
+              });
+            }
+            if (!(0, _lodash.isObject)(columnConfig)) {
+              _context.next = 5;
+              break;
+            }
+            _context.next = 5;
+            return columnConfig === null || columnConfig === void 0 ? void 0 : (_columnConfig$onColum = columnConfig.onColumnChange) === null || _columnConfig$onColum === void 0 ? void 0 : _columnConfig$onColum.call(columnConfig, newColumns);
+          case 5:
+            setCurColumns(newColumns);
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleColumnConfig(_x) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
   (0, _ahooks.useDebounceEffect)(function () {
     if (cacheTime) {
       var newTableConfig = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, curTableConfig), {}, (0, _defineProperty2.default)({}, pathKey, {
@@ -244,14 +265,14 @@ function ProTable(props) {
     });
   }, [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;
+    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;
@@ -259,15 +280,15 @@ function ProTable(props) {
     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 (_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;
+        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;
@@ -329,9 +350,9 @@ function ProTable(props) {
     return _rowSelection;
   };
   var onDataSourceChange = /*#__PURE__*/function () {
-    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nextDataSource) {
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+    var _ref9 = (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:
             setState({
               dataSource: nextDataSource
@@ -340,12 +361,12 @@ function ProTable(props) {
             (0, _lodash.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 _ref9.apply(this, arguments);
     };
   }();
   var renderComponents = function renderComponents() {
@@ -370,7 +391,7 @@ function ProTable(props) {
     children: (0, _jsxRuntime.jsx)("div", {
       className: cls,
       children: (0, _jsxRuntime.jsxs)(_components.DndWrapper, {
-        value: _dataSource,
+        value: _dataSource !== null && _dataSource !== void 0 ? _dataSource : [],
         onChange: onDataSourceChange,
         disabled: false,
         draggable: draggable,

package/lib/ProTable/useAntdTable.d.ts

@@ -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/lib/ProTable/useAntdTable.js

@@ -96,6 +96,16 @@ function useAntdTable(service, options, useRequestOptions) {
     }
     return requestParams;
   }, [defaultParam, extraParams]);
+  // 仅清数据源相关，查询相关
+  var handleSetStateCallback = function handleSetStateCallback(values) {
+    setState((0, _objectSpread2.default)({
+      data: [],
+      total: 0,
+      selectedRecords: [],
+      selectedRowKeys: [],
+      allSelected: false
+    }, values));
+  };
   var params = (0, _react.useMemo)(function () {
     var newQueryBean = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, searchValues), extraFilter);
     return getTransformParams((0, _objectSpread2.default)({
@@ -496,7 +506,8 @@ function useAntdTable(service, options, useRequestOptions) {
       rowSelection: returnRowSelection || rowSelections ? rowSelection : undefined,
       pagination: pagination,
       onChange: handleTableChange
-    }
+    },
+    handleSetStateCallback: handleSetStateCallback
   });
 }
 var _default = exports.default = useAntdTable;

package/package.json

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