@ant-design/pro-components 3.0.1-0 → 3.1.0-0

package/lib/utils/useEditableMap/index.js

@@ -7,11 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.useEditableMap = useEditableMap;
 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 _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _util = require("@rc-component/util");
 var _antd = require("antd");
 var _react = require("react");
+var _ = require("..");
 var _provider = require("../../provider");
 var _useEditableArray = require("../useEditableArray");
 /* eslint-disable react-hooks/exhaustive-deps */
@@ -60,48 +62,94 @@ function useEditableMap(props) {
     _useMergedState2 = (0, _slicedToArray2.default)(_useMergedState, 2),
     editableKeys = _useMergedState2[0],
     setEditableRowKeys = _useMergedState2[1];
+
   /** 一个用来标志的set 提供了方便的 api 来去重什么的 */
   var editableKeysSet = (0, _react.useMemo)(function () {
-    var keys = editableType === 'single' ? editableKeys === null || editableKeys === void 0 ? void 0 : editableKeys.slice(0, 1) : editableKeys;
-    return new Set(keys);
-  }, [(editableKeys || []).join(','), editableType]);
+    var keys = editableType === 'single' ? (editableKeys === null || editableKeys === void 0 ? void 0 : editableKeys.slice(0, 1)) || [] : editableKeys || [];
+    return new Set(keys.map(function (key) {
+      return String(key);
+    }));
+  }, [editableKeys, editableType]);
+
+  /**
+   * 检查 key 是否在编辑列表中
+   * 使用 editableKeysSet 进行快速查找，性能更好
+   */
+  var checkKeyInEditableList = (0, _.useRefFunction)(function (recordKey) {
+    var keyStr = String((0, _useEditableArray.recordKeyToString)(recordKey));
+    return editableKeysSet.has(keyStr);
+  });
 
   /** 这行是不是编辑状态 */
   var isEditable = (0, _react.useCallback)(function (recordKey) {
-    if (editableKeys !== null && editableKeys !== void 0 && editableKeys.includes((0, _useEditableArray.recordKeyToString)(recordKey))) return true;
-    return false;
-  }, [(editableKeys || []).join(',')]);
+    return checkKeyInEditableList(recordKey);
+  }, [checkKeyInEditableList]);
+
+  /**
+   * 验证是否可以开始编辑
+   */
+  var validateCanStartEdit = (0, _.useRefFunction)(function () {
+    // 如果是单行模式，检查是否已有编辑中的行
+    if (editableType === 'single' && editableKeys && editableKeys.length > 0) {
+      warning(props.onlyOneLineEditorAlertMessage || intl.getMessage('editableTable.onlyOneLineEditor', '只能同时编辑一行'));
+      return false;
+    }
+    return true;
+  });
 
   /**
    * 进入编辑状态
    *
    * @param recordKey
+   * @param recordValue
    */
-  var startEditable = function startEditable(recordKey, recordValue) {
+  var startEditable = (0, _.useRefFunction)(function (recordKey, recordValue) {
     var _ref2;
-    // 如果是单行的话，不允许多行编辑
-    if (editableKeysSet.size > 0 && editableType === 'single') {
-      warning(props.onlyOneLineEditorAlertMessage || intl.getMessage('editableTable.onlyOneLineEditor', '只能同时编辑一行'));
+    // 验证是否可以开始编辑
+    if (!validateCanStartEdit()) {
       return false;
     }
+    var keyStr = String((0, _useEditableArray.recordKeyToString)(recordKey));
+
+    // 检查是否已经在编辑列表中，避免重复添加
+    if (checkKeyInEditableList(recordKey)) {
+      return true;
+    }
+
+    // 保存编辑前的数据
     preEditRowRef.current = (_ref2 = recordValue !== null && recordValue !== void 0 ? recordValue : (0, _util.get)(props.dataSource, Array.isArray(recordKey) ? recordKey : [recordKey])) !== null && _ref2 !== void 0 ? _ref2 : null;
-    editableKeysSet.add((0, _useEditableArray.recordKeyToString)(recordKey));
-    setEditableRowKeys(Array.from(editableKeysSet));
+
+    // 更新编辑 keys（不直接修改 editableKeysSet）
+    var newKeys = editableType === 'single' ? [keyStr] : [].concat((0, _toConsumableArray2.default)(editableKeys || []), [keyStr]);
+    setEditableRowKeys(newKeys);
     return true;
-  };
+  });
 
   /**
    * 退出编辑状态
    *
    * @param recordKey
    */
-  var cancelEditable = function cancelEditable(recordKey) {
-    // 防止多次渲染
-    editableKeysSet.delete((0, _useEditableArray.recordKeyToString)(recordKey));
-    setEditableRowKeys(Array.from(editableKeysSet));
+  var cancelEditable = (0, _.useRefFunction)(function (recordKey) {
+    var keyStr = String((0, _useEditableArray.recordKeyToString)(recordKey));
+
+    // 检查是否在编辑列表中
+    if (!checkKeyInEditableList(recordKey)) {
+      return true;
+    }
+
+    // 更新编辑 keys（不直接修改 editableKeysSet）
+    var newKeys = (editableKeys || []).filter(function (key) {
+      return String(key) !== keyStr;
+    });
+    setEditableRowKeys(newKeys);
     return true;
-  };
-  var onCancel = /*#__PURE__*/function () {
+  });
+
+  /**
+   * 取消编辑的回调
+   */
+  var onCancel = (0, _.useRefFunction)( /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(recordKey, editRow, originRow, newLine) {
       var _props$onCancel;
       var success;
@@ -125,11 +173,15 @@ function useEditableMap(props) {
         }
       }, _callee);
     }));
-    return function onCancel(_x, _x2, _x3, _x4) {
+    return function (_x, _x2, _x3, _x4) {
       return _ref3.apply(this, arguments);
     };
-  }();
-  var onSave = /*#__PURE__*/function () {
+  }());
+
+  /**
+   * 保存编辑的回调
+   */
+  var onSave = (0, _.useRefFunction)( /*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(recordKey, editRow, originRow) {
       var _props$onSave;
       var success, actionProps;
@@ -149,6 +201,7 @@ function useEditableMap(props) {
             _context2.next = 7;
             return cancelEditable(recordKey);
           case 7:
+            // 更新数据源
             actionProps = {
               data: props.dataSource,
               row: editRow,
@@ -163,13 +216,17 @@ function useEditableMap(props) {
         }
       }, _callee2);
     }));
-    return function onSave(_x5, _x6, _x7) {
+    return function (_x5, _x6, _x7) {
       return _ref4.apply(this, arguments);
     };
-  }();
+  }());
   var saveText = intl.getMessage('editableTable.action.save', '保存');
   var deleteText = intl.getMessage('editableTable.action.delete', '删除');
   var cancelText = intl.getMessage('editableTable.action.cancel', '取消');
+
+  /**
+   * 渲染操作按钮
+   */
   var actionRender = (0, _react.useCallback)(function (key, config) {
     var renderConfig = (0, _objectSpread2.default)({
       recordKey: key,
@@ -194,7 +251,7 @@ function useEditableMap(props) {
       });
     }
     return [renderResult.save, renderResult.delete, renderResult.cancel];
-  }, [editableKeys && editableKeys.join(','), props.dataSource]);
+  }, [editableKeys, props.dataSource, cancelEditable, onCancel, onSave]);
   return {
     editableKeys: editableKeys,
     setEditableRowKeys: setEditableRowKeys,

package/lib/utils/useMediaQuery/query.js

@@ -15,7 +15,12 @@ function useMediaQuery(mediaQuery) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     matches = _useState2[0],
     setMatches = _useState2[1];
-  (0, _react.useLayoutEffect)(function () {
+
+  // 在 SSR 环境中使用 useEffect，在客户端使用 useLayoutEffect
+  // 这样可以避免 SSR 警告，同时在客户端保持同步更新
+  // 使用条件表达式确保 hooks 调用顺序一致
+  var EffectHook = isSsr ? _react.useEffect : _react.useLayoutEffect;
+  EffectHook(function () {
     if (isSsr) {
       return;
     }
@@ -23,10 +28,11 @@ function useMediaQuery(mediaQuery) {
     var listener = function listener(e) {
       return setMatches(e.matches);
     };
-    mediaQueryList.addListener(listener);
+    // 使用最新的 addEventListener API
+    mediaQueryList.addEventListener('change', listener);
     return function () {
-      return mediaQueryList.removeListener(listener);
+      return mediaQueryList.removeEventListener('change', listener);
     };
-  }, [mediaQuery]);
+  }, [mediaQuery, isSsr]);
   return matches;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ant-design/pro-components",
-  "version": "3.0.1-0",
+  "version": "3.1.0-0",
   "type": "module",
   "description": "All-in-one package of @ant-design/pro-components",
   "keywords": [
@@ -59,7 +59,8 @@
     "last 2 versions",
     "Firefox ESR",
     "> 1%",
-    "ie >= 11"
+    "not dead",
+    "not ie 11"
   ],
   "resolutions": {
     "@types/react": "^18.0.38",
@@ -67,10 +68,10 @@
     "@types/responselike": "^1.0.0"
   },
   "dependencies": {
-    "@ant-design/cssinjs": "^1.24.0",
-    "@ant-design/icons": "^5.6.1",
-    "@babel/runtime": "^7.27.6",
-    "@ctrl/tinycolor": "^4.1.0",
+    "@ant-design/cssinjs": "^2.0.1",
+    "@ant-design/icons": "^6.1.0",
+    "@babel/runtime": "^7.28.4",
+    "@ctrl/tinycolor": "^4.2.0",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^6.0.1",
     "@dnd-kit/sortable": "^7.0.2",
@@ -78,71 +79,68 @@
     "@emotion/cache": "^11.14.0",
     "@emotion/css": "^11.13.5",
     "@emotion/serialize": "^1.3.3",
-    "@rc-component/util": "^1.2.2",
-    "@umijs/route-utils": "^4.0.1",
+    "@rc-component/util": "^1.6.2",
+    "@umijs/route-utils": "^4.0.3",
     "@umijs/use-params": "^1.0.9",
     "classnames": "^2.5.1",
-    "dayjs": "^1.11.13",
-    "lodash-es": "^4.17.21",
+    "dayjs": "^1.11.19",
+    "lodash-es": "^4.17.22",
     "path-to-regexp": "^6.3.0",
-    "rc-field-form": "^2.7.0",
+    "rc-field-form": "^2.7.1",
     "rc-footer": "^0.6.8",
     "rc-resize-observer": "^1.4.3",
     "rc-steps": "^6.0.1",
-    "rc-table": "^7.51.1",
+    "rc-table": "^7.55.1",
     "react-draggable": "^4.5.0",
     "react-layout-kit": "^1.9.2",
     "react-lazy-load": "^4.0.1",
-    "react-markdown": "^8.0.7",
-    "react-syntax-highlighter": "^15.6.1",
     "safe-stable-stringify": "^2.5.0",
-    "shiki-es": "^0.2.0",
-    "swr": "^2.3.4"
+    "swr": "^2.3.8"
   },
   "devDependencies": {
     "@ant-design/antd-theme-variable": "^1.0.0",
-    "@babel/core": "^7.28.0",
+    "@babel/core": "^7.28.5",
     "@babel/eslint-plugin": "^7.27.1",
-    "@babel/parser": "^7.28.0",
+    "@babel/parser": "^7.28.5",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
-    "@babel/preset-env": "^7.28.0",
-    "@babel/preset-react": "^7.27.1",
-    "@babel/preset-typescript": "^7.27.1",
-    "@babel/traverse": "^7.28.0",
+    "@babel/preset-env": "^7.28.5",
+    "@babel/preset-react": "^7.28.5",
+    "@babel/preset-typescript": "^7.28.5",
+    "@babel/traverse": "^7.28.5",
     "@emotion/babel-plugin": "^11.13.5",
     "@octokit/core": "^3.6.0",
     "@octokit/rest": "^18.12.0",
-    "@testing-library/dom": "^10.4.0",
-    "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^16.3.0",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/react": "^16.3.1",
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^14.6.1",
     "@types/glob": "^8.1.0",
     "@types/history": "^4.7.11",
-    "@types/lodash": "^4.17.20",
+    "@types/lodash": "^4.17.21",
     "@types/lodash-es": "^4.17.12",
     "@types/mockjs": "^1.0.10",
     "@types/node": "^14.18.63",
-    "@types/react": "^18.3.23",
+    "@types/react": "^18.3.27",
     "@types/react-dom": "^18.3.7",
     "@types/react-helmet": "^6.1.11",
     "@types/react-responsive": "^8.0.8",
     "@types/shallowequal": "^1.1.5",
     "@types/warning": "^3.0.3",
-    "@typescript-eslint/eslint-plugin": "^8.38.0",
-    "@typescript-eslint/parser": "^8.38.0",
+    "@typescript-eslint/eslint-plugin": "^8.50.1",
+    "@typescript-eslint/parser": "^8.50.1",
     "@umijs/babel-preset-umi": "^3.5.43",
     "@umijs/doctor": "^1.2.1",
     "@umijs/plugin-analytics": "^0.2.4",
     "@umijs/test": "^3.5.43",
     "@umijs/test-utils": "^3.5.43",
-    "@umijs/utils": "^4.4.11",
+    "@umijs/utils": "^4.6.15",
     "@vitejs/plugin-legacy": "^6.1.1",
     "@vitest/browser": "^3.2.4",
     "@vitest/coverage-istanbul": "^3.2.4",
     "@vitest/ui": "^3.2.4",
     "animated-scroll-to": "^2.3.2",
-    "antd": "^5.26.6",
+    "antd": "^6.1.2",
     "chalk": "^4.1.2",
     "copy-to-clipboard": "^3.3.3",
     "cross-env": "^7.0.3",
@@ -154,14 +152,14 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-unicorn": "^47.0.0",
     "execa": "^5.1.1",
-    "express": "^4.21.2",
+    "express": "^4.22.1",
     "fast-deep-equal": "^3.1.3",
-    "father": "^4.6.1",
+    "father": "^4.6.11",
     "gh-pages": "^5.0.0",
     "glob": "^8.1.0",
     "happy-dom": "^14.12.3",
     "identity-obj-proxy": "^3.0.0",
-    "inquirer": "^8.2.6",
+    "inquirer": "^8.2.7",
     "jest-canvas-mock": "^2.5.2",
     "lint-staged": "^10.5.4",
     "mockdate": "^3.0.5",
@@ -170,15 +168,17 @@
     "nprogress": "^0.2.0",
     "nwsapi": "2.2.13",
     "octokit": "^3.2.2",
-    "playwright": "^1.54.1",
+    "playwright": "^1.57.0",
     "polished": "^4.3.1",
-    "prettier": "^3.6.2",
-    "prettier-plugin-organize-imports": "^4.1.0",
-    "prettier-plugin-packagejson": "^2.5.19",
+    "prettier": "^3.7.4",
+    "prettier-plugin-organize-imports": "^4.3.0",
+    "prettier-plugin-packagejson": "^2.5.20",
     "pretty-quick": "^3.3.1",
     "query-string": "^6.14.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
+    "react-markdown": "^8.0.7",
+    "react-syntax-highlighter": "^15.6.6",
     "remark": "^15.0.1",
     "remark-gfm": "^4.0.1",
     "remark-parse": "^11.0.0",
@@ -187,13 +187,13 @@
     "stylelint": "^13.13.1",
     "timezone-mock": "^1.3.6",
     "ts-node": "^10.9.2",
-    "tsx": "^4.20.3",
-    "typescript": "^5.8.3",
-    "umi": "^4.4.11",
+    "tsx": "^4.21.0",
+    "typescript": "^5.9.3",
+    "umi": "^4.6.15",
     "umi-request": "^1.4.0",
     "unified": "^11.0.5",
     "unist-util-visit": "^5.0.0",
-    "vite": "^6.3.5",
+    "vite": "^6.4.1",
     "vitest": "^3.2.4",
     "write-pkg": "^4.0.0",
     "xhr-mock": "^2.5.1",
@@ -201,9 +201,9 @@
     "zustand": "^4.5.7"
   },
   "peerDependencies": {
-    "antd": "^5.11.2",
-    "react": ">=17.0.0",
-    "react-dom": ">=17.0.0"
+    "antd": "^6.0.0",
+    "react": ">=18.0.0",
+    "react-dom": ">=18.0.0"
   },
   "packageManager": "pnpm@9.6.0",
   "publishConfig": {