@zat-design/sisyphus-react 3.6.2-beta.3 → 3.6.2-beta.4

package/es/ProStep/index.js

@@ -1,4 +1,5 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
@@ -6,7 +7,7 @@ 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, useEffect, useMemo, useRef, useState } from 'react';
+import { createContext, useContext, useMemo, useRef, useState } from 'react';
 import { useEventEmitter, useSetState, useLocalStorageState, useDeepCompareEffect } from 'ahooks';
 import { handleScroll } from './utils';
 import Step from './components/Step';
@@ -61,7 +62,8 @@ var ProStep = function ProStep(_ref) {
         order: order
       };
     }).filter(function (item) {
-      return anchorIds.includes(item.code);
+      var _anchorIds$includes;
+      return anchorIds === null || anchorIds === void 0 ? void 0 : (_anchorIds$includes = anchorIds.includes) === null || _anchorIds$includes === void 0 ? void 0 : _anchorIds$includes.call(anchorIds, item.code);
     }).sort(function (pre, next) {
       return pre.order - next.order;
     });
@@ -75,6 +77,9 @@ var ProStep = function ProStep(_ref) {
       validator = _ref4.validator,
       order = _ref4.order,
       disabled = _ref4.disabled;
+    if (anchorIds.includes(id)) {
+      return null;
+    }
     var record = {};
     record.title = title;
     record.order = order;
@@ -136,6 +141,9 @@ var ProStep = function ProStep(_ref) {
     if (title && !(registerMap === null || registerMap === void 0 ? void 0 : (_registerMap$current = registerMap.current) === null || _registerMap$current === void 0 ? void 0 : _registerMap$current[id])) {
       registerMap.current[id] = record;
     }
+    setAnchorIds(function (preState) {
+      return _toConsumableArray(new Set([].concat(_toConsumableArray(preState), [id])));
+    });
     emitter.useSubscription(subEvent);
   };
   var notify = /*#__PURE__*/function () {
@@ -158,27 +166,6 @@ var ProStep = function ProStep(_ref) {
       return _ref6.apply(this, arguments);
     };
   }();
-  var handleListenerDom = function handleListenerDom() {
-    var targetElement = document.getElementById('pro-step');
-    var observer = new MutationObserver(function (mutations) {
-      mutations.forEach(function (mutation) {
-        // 处理 DOM 树变化的逻辑
-        var Anchors = document.getElementsByClassName('pro-step-item') || [];
-        // 当前页面所存在的所有折叠项
-        var nextAnchorIds = [];
-        Array.prototype.slice.call(Anchors).forEach(function (dom) {
-          var id = dom.getAttribute('id');
-          nextAnchorIds.push(id);
-        });
-        setAnchorIds(nextAnchorIds);
-      });
-    });
-    var config = {
-      subtree: true,
-      childList: true // 是否观察子元素的添加或删除
-    };
-    observer.observe(targetElement, config);
-  };
   var triggerTo = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(keys) {
       var events, result, nextErrorCollection;
@@ -230,9 +217,6 @@ var ProStep = function ProStep(_ref) {
       });
     }
   }, [errorCollection, dataSource]);
-  useEffect(function () {
-    handleListenerDom();
-  }, []);
   return _jsx(ProStepContext.Provider, {
     value: {
       collapse: collapse,

package/lib/ProStep/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useStep = exports.default = exports.ProStepContext = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -68,7 +69,8 @@ var ProStep = function ProStep(_ref) {
         order: order
       };
     }).filter(function (item) {
-      return anchorIds.includes(item.code);
+      var _anchorIds$includes;
+      return anchorIds === null || anchorIds === void 0 ? void 0 : (_anchorIds$includes = anchorIds.includes) === null || _anchorIds$includes === void 0 ? void 0 : _anchorIds$includes.call(anchorIds, item.code);
     }).sort(function (pre, next) {
       return pre.order - next.order;
     });
@@ -82,6 +84,9 @@ var ProStep = function ProStep(_ref) {
       validator = _ref4.validator,
       order = _ref4.order,
       disabled = _ref4.disabled;
+    if (anchorIds.includes(id)) {
+      return null;
+    }
     var record = {};
     record.title = title;
     record.order = order;
@@ -143,6 +148,9 @@ var ProStep = function ProStep(_ref) {
     if (title && !(registerMap === null || registerMap === void 0 ? void 0 : (_registerMap$current = registerMap.current) === null || _registerMap$current === void 0 ? void 0 : _registerMap$current[id])) {
       registerMap.current[id] = record;
     }
+    setAnchorIds(function (preState) {
+      return (0, _toConsumableArray2.default)(new Set([].concat((0, _toConsumableArray2.default)(preState), [id])));
+    });
     emitter.useSubscription(subEvent);
   };
   var notify = /*#__PURE__*/function () {
@@ -165,27 +173,6 @@ var ProStep = function ProStep(_ref) {
       return _ref6.apply(this, arguments);
     };
   }();
-  var handleListenerDom = function handleListenerDom() {
-    var targetElement = document.getElementById('pro-step');
-    var observer = new MutationObserver(function (mutations) {
-      mutations.forEach(function (mutation) {
-        // 处理 DOM 树变化的逻辑
-        var Anchors = document.getElementsByClassName('pro-step-item') || [];
-        // 当前页面所存在的所有折叠项
-        var nextAnchorIds = [];
-        Array.prototype.slice.call(Anchors).forEach(function (dom) {
-          var id = dom.getAttribute('id');
-          nextAnchorIds.push(id);
-        });
-        setAnchorIds(nextAnchorIds);
-      });
-    });
-    var config = {
-      subtree: true,
-      childList: true // 是否观察子元素的添加或删除
-    };
-    observer.observe(targetElement, config);
-  };
   var triggerTo = /*#__PURE__*/function () {
     var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(keys) {
       var events, result, nextErrorCollection;
@@ -237,9 +224,6 @@ var ProStep = function ProStep(_ref) {
       });
     }
   }, [errorCollection, dataSource]);
-  (0, _react.useEffect)(function () {
-    handleListenerDom();
-  }, []);
   return (0, _jsxRuntime.jsx)(ProStepContext.Provider, {
     value: {
       collapse: collapse,

package/package.json

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