@zat-design/sisyphus-react 4.0.0-beta.7 → 4.0.0-beta.9

package/lib/ProForm/utils/useWatch.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 exports.toArray = toArray;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _lodash = require("lodash");
 var _warning = _interopRequireDefault(require("rc-util/lib/warning"));
 var _react = require("react");
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 function toArray(value) {
   if (value === undefined || value === null) {
     return [];
@@ -123,7 +123,7 @@ function useWatch(dependencies, form, wait) {
       return (0, _lodash.debounce)(value => {
         // 只在值真正变化时才更新状态
         if (!(0, _isEqual.default)(prevStateRef.current, value)) {
-          prevStateRef.current = (0, _objectSpread2.default)({}, value);
+          prevStateRef.current = (0, _cloneDeep.default)(value);
           setState(value);
         }
       }, wait);
@@ -132,7 +132,7 @@ function useWatch(dependencies, form, wait) {
     // 非防抖版本
     return value => {
       if (!(0, _isEqual.default)(prevStateRef.current, value)) {
-        prevStateRef.current = (0, _objectSpread2.default)({}, value);
+        prevStateRef.current = (0, _cloneDeep.default)(value);
         setState(value);
       }
     };

package/lib/ProLayout/components/Layout/Menu/FoldMenu/index.js

@@ -25,6 +25,7 @@ var FoldMenu = props => {
     collapsed = dataSource.collapsed,
     headerHeight = dataSource.headerHeight;
   var pathNamePrefix = `/${window.location.pathname.split('/')[1]}`;
+  var history = (0, _reactRouterDom.useHistory)();
   var noticeCls = (0, _classnames.default)({
     'pro-layout-menu-tooltip': true,
     'pro-layout-menu-tooltip-has-notice': notice,
@@ -119,6 +120,11 @@ var FoldMenu = props => {
                   keyPath: menuKeyPath
                 });
               }
+
+              // 导航到目标路径
+              if (toPath) {
+                history.push(toPath);
+              }
             },
             children: LiNode
           })
@@ -139,14 +145,16 @@ var FoldMenu = props => {
                   keyPath: menuKeyPath
                 });
               }
+
+              // 导航到目标路径
+              if (toPath) {
+                history.push(toPath);
+              }
               onSelected({
                 selectedPath: toPath
               });
             },
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
-              to: toPath,
-              children: LiNode
-            }, toPath)
+            children: LiNode
           })
         }, toPath) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           onClick: () => {
@@ -162,11 +170,13 @@ var FoldMenu = props => {
                 keyPath: menuKeyPath
               });
             }
+
+            // 导航到目标路径
+            if (toPath) {
+              history.push(toPath);
+            }
           },
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
-            to: toPath,
-            children: LiNode
-          }, toPath)
+          children: LiNode
         });
       })
     })

package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js

@@ -29,6 +29,7 @@ var OpenMenu = props => {
     menus = _ref.menus,
     sideMenu = _ref.sideMenu;
   var linkRef = (0, _react.useRef)(null);
+  var history = (0, _reactRouterDom.useHistory)();
   // 通过URL匹配对应的ID用于回显
   var _useSetState = (0, _ahooks.useSetState)({
       selectedKeys: [],
@@ -125,10 +126,10 @@ var OpenMenu = props => {
       });
     }
   }, [sideMenu]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: cls,
     style: style,
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Menu, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Menu, {
       mode: "inline"
       // @ts-ignore
       ,
@@ -180,7 +181,7 @@ var OpenMenu = props => {
           setTimeout(() => {
             // 路由变更，且不再demo文档中
             if (!window.location.href.includes('~demos/prolayout')) {
-              linkRef.current.click();
+              history.push(router);
             }
           }, 100);
         }
@@ -189,10 +190,7 @@ var OpenMenu = props => {
         height: dataSource.sideMenu ? 'auto' : `calc(100vh - ${(dataSource === null || dataSource === void 0 ? void 0 : dataSource.height) || 0}px)`,
         color: 'red'
       }
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
-      to: router,
-      ref: linkRef
-    })]
+    })
   });
 };
 var _default = exports.default = OpenMenu;

package/lib/ProLayout/components/ProHeader/index.js

@@ -116,11 +116,11 @@ var ProHeader = props => {
           return null;
         }
         var onlyTag = tag && !label && !value;
-        var tagRender = parmas => {
-          if (Array.isArray(parmas === null || parmas === void 0 ? void 0 : parmas.tag) && parmas !== null && parmas !== void 0 && parmas.tag.length) {
+        var tagRender = params => {
+          if (Array.isArray(params === null || params === void 0 ? void 0 : params.tag) && params !== null && params !== void 0 && params.tag.length) {
             return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
               size: 4,
-              children: parmas.tag.map((tagItem, index) => {
+              children: params.tag.map((tagItem, index) => {
                 return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
                   className: "pro-header-tag",
                   children: tagItem
@@ -128,26 +128,30 @@ var ProHeader = props => {
               })
             });
           }
-          return parmas !== null && parmas !== void 0 && parmas.tag ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          return params !== null && params !== void 0 && params.tag ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
             className: "pro-header-tag",
-            children: parmas === null || parmas === void 0 ? void 0 : parmas.tag
+            children: params === null || params === void 0 ? void 0 : params.tag
           }) : null;
         };
 
         /** 单行渲染 */
-        var valueRender = parmas => {
+        var valueRender = params => {
           return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
             size: 4,
-            align: parmas !== null && parmas !== void 0 && parmas.tag ? 'baseline' : 'center',
-            children: [parmas !== null && parmas !== void 0 && parmas.link ? /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
-              href: parmas.link,
-              rel: "noopener noreferrer",
-              target: "_blank",
-              children: parmas === null || parmas === void 0 ? void 0 : parmas.value
-            }) : parmas === null || parmas === void 0 ? void 0 : parmas.value, parmas !== null && parmas !== void 0 && parmas.copyable && (0, _lodash.isString)(parmas === null || parmas === void 0 ? void 0 : parmas.value) ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Copy, {
-              text: parmas.value
+            align: params !== null && params !== void 0 && params.tag ? 'baseline' : 'center',
+            children: [params !== null && params !== void 0 && params.link ?
+            /*#__PURE__*/
+            // eslint-disable-next-line jsx-a11y/anchor-is-valid
+            (0, _jsxRuntime.jsx)("a", {
+              onClick: () => {
+                var newWindow = window.open(params.link);
+                newWindow.opener = null;
+              },
+              children: params === null || params === void 0 ? void 0 : params.value
+            }) : params === null || params === void 0 ? void 0 : params.value, params !== null && params !== void 0 && params.copyable && (0, _lodash.isString)(params === null || params === void 0 ? void 0 : params.value) ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Copy, {
+              text: params.value
             }) : null, tagRender({
-              tag: parmas === null || parmas === void 0 ? void 0 : parmas.tag
+              tag: params === null || params === void 0 ? void 0 : params.tag
             })]
           });
         };

package/lib/ProTable/hooks/useAntdTable.js

@@ -157,13 +157,64 @@ function useAntdTable(service, options, useRequestOptions) {
       selectedRowKeys: []
     });
   };
+  var resetParams = () => {
+    setState({
+      searchValues: {},
+      allSelected: false,
+      selectedRecords: [],
+      selectedRowKeys: [],
+      extraFilter: {
+        filters: undefined,
+        sorter: undefined
+      }
+    });
+  };
+
+  // 重置查询条件: 页码还原、勾选清空
+  var onReset = refresh => {
+    form === null || form === void 0 || form.resetFields();
+    var newPage = {
+      pageNum: 1,
+      pageSize: page.pageSize
+    };
+    resetParams();
+    if (isResetQuery || refresh) {
+      onPageChange(newPage);
+      run(getTransformParams({
+        page: newPage
+      }));
+    }
+  };
 
   /**
    * 手动触发时，手动调用run
    */
   (0, _react.useEffect)(() => {
     if (!(useRequestOptions !== null && useRequestOptions !== void 0 && useRequestOptions.manual)) {
-      run(getTransformParams());
+      onReset(true);
+    }
+  }, [useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
+
+  /**
+   * 手动触发时，手动调用run
+   */
+  (0, _react.useEffect)(() => {
+    if (!(useRequestOptions !== null && useRequestOptions !== void 0 && useRequestOptions.manual)) {
+      // 当 extraParams 变化时,重置分页和选中状态
+      onPageChange(initPage);
+      setState({
+        searchValues: {},
+        allSelected: false,
+        selectedRecords: [],
+        selectedRowKeys: [],
+        extraFilter: {
+          filters: undefined,
+          sorter: undefined
+        }
+      });
+      run(getTransformParams({
+        page: initPage
+      }));
     }
   }, [useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
   (0, _ahooks.useDeepCompareEffect)(() => {
@@ -273,34 +324,6 @@ function useAntdTable(service, options, useRequestOptions) {
       page: newPage
     }, extraFilter), _values)));
   };
-  var resetParams = page => {
-    setState({
-      searchValues: {},
-      allSelected: false,
-      selectedRecords: [],
-      selectedRowKeys: [],
-      extraFilter: {
-        filters: undefined,
-        sorter: undefined
-      }
-    });
-  };
-
-  // 重置查询条件: 页码还原、勾选清空
-  var onReset = () => {
-    form === null || form === void 0 || form.resetFields();
-    var newPage = {
-      pageNum: 1,
-      pageSize: page.pageSize
-    };
-    resetParams(newPage);
-    if (isResetQuery) {
-      onPageChange(newPage);
-      run(getTransformParams({
-        page: newPage
-      }));
-    }
-  };
   var refreshPage = res => {
     var transformResult = transformResponse ? transformResponse(res) : res || {};
     var _ref3 = (0, _utils.isListResult)(transformResult) ? transformResult : (transformResult === null || transformResult === void 0 ? void 0 : transformResult.data) || {},

package/lib/ProTabs/style/index.less

@@ -6,6 +6,9 @@
         .pro-tabs-card-left {
           width: 84px !important;
         }
+        .pro-tabs-card-right {
+          width: 24px !important;
+        }
         .pro-tabs-card-right img {
           width: 24px !important;
         }
@@ -94,7 +97,7 @@
 
     .pro-tabs-card-right {
       display: flex;
-
+      width: 48px;
       img {
         width: 48px;
       }
@@ -123,6 +126,7 @@
     width: 200px;
     padding: calc(9px * var(--zaui-size; 1)) 16px calc(9px * var(--zaui-size; 1)) 24px;
     border: 1px solid var(--zaui-line, #dddddd);
+    border-radius: var(--zaui-border-radius, 8px);
 
     .pro-tabs-card-left {
       width: 104px;

package/lib/utils/index.js

@@ -13,10 +13,22 @@ var _lodash = require("lodash");
 var EMPTY_VALUE = [undefined, null, ''];
 
 // 自定义深比对 如果两边都是函数类型则认为相等
+// 对于 React 元素，不直接认为相等，而是让 lodash 继续进行深度比较
 var customEqualForFunction = (value, other) => {
-  if ((0, _lodash.isFunction)(value) && (0, _lodash.isFunction)(other) || /*#__PURE__*/_react.default.isValidElement(value) && /*#__PURE__*/_react.default.isValidElement(other)) {
+  // 只有当两边都是函数时才认为相等
+  if ((0, _lodash.isFunction)(value) && (0, _lodash.isFunction)(other)) {
     return true;
   }
+  // 对于 React 元素，返回 undefined 让 isEqualWith 继续使用默认比较逻辑
+  // 这样会比较 React 元素的 type、props 等属性
+  if ( /*#__PURE__*/_react.default.isValidElement(value) && /*#__PURE__*/_react.default.isValidElement(other)) {
+    // 比较 React 元素的类型和关键 props
+    if (value.type !== other.type) {
+      return false;
+    }
+    // 对于相同类型的 React 元素，返回 undefined 让 isEqualWith 继续深度比较 props
+    return undefined;
+  }
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.0.0-beta.7",
+  "version": "4.0.0-beta.9",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -78,8 +78,8 @@
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
     "@zat-design/utils": "4.0.0-beta.5",
-    "ahooks": "3.8.4",
-    "antd": "^5.26.4",
+    "ahooks": "3.9.5",
+    "antd": "^5.28.1",
     "big.js": "^6.2.1",
     "classnames": "^2.3.1",
     "dayjs": "^1.11.13",
@@ -135,7 +135,6 @@
     "lint-staged": "^10.0.0",
     "mini-css-extract-plugin": "^2.9.4",
     "mockjs": "^1.0.0",
-    "moment": "^2.30.1",
     "prettier": "^2.5.0",
     "pretty-quick": "^3.1.3",
     "react": "^18.2.0",