@zat-design/sisyphus-react 3.9.7-beta.4 → 3.9.7-beta.6

package/es/ProEditTable/utils/config.js

@@ -236,15 +236,14 @@ export var actions = {
       virtualKey: virtualKey,
       selectedRowKeys: selectedRowKeys
     });
+    var nextData = {
+      selectedRowKeys: [],
+      selectedRows: []
+    };
     // 删除的选择数据包含单行编辑行时，清空可编辑key
     if (virtualKey && selectedRowKeys.includes(editingKeys === null || editingKeys === void 0 ? void 0 : editingKeys[0])) {
-      setState({
-        editingKeys: []
-      });
+      nextData.editingKeys = [];
     }
-    setState({
-      selectedRowKeys: [],
-      selectedRows: []
-    });
+    setState(nextData);
   }
 };

package/es/ProStep/index.js

@@ -1,12 +1,12 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 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 _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { createContext, useContext, useMemo, useRef, useState } from 'react';
+import { createContext, useCallback, useContext, useMemo, useRef, useState } from 'react';
+import { debounce } from 'lodash';
 import { useSetState, useLocalStorageState, useDeepCompareEffect } from 'ahooks';
 import { handleScroll } from './utils';
 import Step from './components/Step';
@@ -20,10 +20,9 @@ export var useStep = function useStep() {
 var ProStep = function ProStep(_ref) {
   var children = _ref.children,
     resetProps = _objectWithoutProperties(_ref, _excluded);
-  var _useState = useState([]),
+  var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
-    ids = _useState2[0],
-    setIds = _useState2[1];
+    reRender = _useState2[1];
   var _useSetState = useSetState({}),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     errorCollection = _useSetState2[0],
@@ -33,6 +32,7 @@ var ProStep = function ProStep(_ref) {
   var _useLocalStorageState = useLocalStorageState('cache-pro-step'),
     _useLocalStorageState2 = _slicedToArray(_useLocalStorageState, 2),
     setLocalData = _useLocalStorageState2[1];
+  var ids = Object.keys(registerMap.current);
   var targetOffset = resetProps.targetOffset,
     _resetProps$collapse = resetProps.collapse,
     collapse = _resetProps$collapse === void 0 ? false : _resetProps$collapse,
@@ -61,6 +61,9 @@ var ProStep = function ProStep(_ref) {
       return pre.order - next.order;
     });
   }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap.current, ids]);
+  var debounceReRender = useCallback(debounce(function () {
+    return reRender({});
+  }, 500), []);
   // 用来注册form匹配到对应的模块id
   var register = function register(_ref4) {
     var id = _ref4.id,
@@ -72,10 +75,8 @@ var ProStep = function ProStep(_ref) {
     var record = {};
     record.title = title;
     record.order = order;
-    if (!ids.includes(id)) {
-      setIds(function (preState) {
-        return [].concat(_toConsumableArray(preState), [id]);
-      });
+    if (!registerMap.current[id]) {
+      debounceReRender();
     }
     if (disabled) {
       registerMap.current[id] = record;

package/lib/ProEditTable/utils/config.js

@@ -242,15 +242,14 @@ var actions = exports.actions = {
       virtualKey: virtualKey,
       selectedRowKeys: selectedRowKeys
     });
+    var nextData = {
+      selectedRowKeys: [],
+      selectedRows: []
+    };
     // 删除的选择数据包含单行编辑行时，清空可编辑key
     if (virtualKey && selectedRowKeys.includes(editingKeys === null || editingKeys === void 0 ? void 0 : editingKeys[0])) {
-      setState({
-        editingKeys: []
-      });
+      nextData.editingKeys = [];
     }
-    setState({
-      selectedRowKeys: [],
-      selectedRows: []
-    });
+    setState(nextData);
   }
 };

package/lib/ProStep/index.js

@@ -8,11 +8,11 @@ exports.useStep = exports.default = exports.ProStepContext = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
+var _lodash = require("lodash");
 var _ahooks = require("ahooks");
 var _utils = require("./utils");
 var _Step = _interopRequireDefault(require("./components/Step"));
@@ -27,10 +27,9 @@ var useStep = exports.useStep = function useStep() {
 var ProStep = function ProStep(_ref) {
   var children = _ref.children,
     resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var _useState = (0, _react.useState)([]),
+  var _useState = (0, _react.useState)({}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    ids = _useState2[0],
-    setIds = _useState2[1];
+    reRender = _useState2[1];
   var _useSetState = (0, _ahooks.useSetState)({}),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     errorCollection = _useSetState2[0],
@@ -40,6 +39,7 @@ var ProStep = function ProStep(_ref) {
   var _useLocalStorageState = (0, _ahooks.useLocalStorageState)('cache-pro-step'),
     _useLocalStorageState2 = (0, _slicedToArray2.default)(_useLocalStorageState, 2),
     setLocalData = _useLocalStorageState2[1];
+  var ids = Object.keys(registerMap.current);
   var targetOffset = resetProps.targetOffset,
     _resetProps$collapse = resetProps.collapse,
     collapse = _resetProps$collapse === void 0 ? false : _resetProps$collapse,
@@ -68,6 +68,9 @@ var ProStep = function ProStep(_ref) {
       return pre.order - next.order;
     });
   }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap.current, ids]);
+  var debounceReRender = (0, _react.useCallback)((0, _lodash.debounce)(function () {
+    return reRender({});
+  }, 500), []);
   // 用来注册form匹配到对应的模块id
   var register = function register(_ref4) {
     var id = _ref4.id,
@@ -79,10 +82,8 @@ var ProStep = function ProStep(_ref) {
     var record = {};
     record.title = title;
     record.order = order;
-    if (!ids.includes(id)) {
-      setIds(function (preState) {
-        return [].concat((0, _toConsumableArray2.default)(preState), [id]);
-      });
+    if (!registerMap.current[id]) {
+      debounceReRender();
     }
     if (disabled) {
       registerMap.current[id] = record;

package/package.json

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