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

package/lib/table/utils/index.js

@@ -4,11 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isMergeCell = exports.isBordered = exports.genColumnKey = exports.checkUndefinedOrNull = void 0;
+exports.isMergeCell = exports.isLocaleSorter = exports.isLocaleFilter = exports.isBordered = exports.getServerSorterResult = exports.getServerFilterResult = exports.genColumnKey = exports.flattenColumns = exports.checkUndefinedOrNull = void 0;
 exports.mergePagination = mergePagination;
-exports.parseDefaultColumnConfig = parseDefaultColumnConfig;
+exports.parseServerDefaultColumnConfig = exports.parseProSortOrder = exports.parseProFilteredValue = exports.parseDataIndex = void 0;
 exports.postDataPipeline = postDataPipeline;
 exports.useActionType = useActionType;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -158,7 +160,9 @@ function useActionType(ref, action, props) {
     },
     setPageInfo: function setPageInfo(rest) {
       return action.setPageInfo(rest);
-    }
+    },
+    // 透出 scrollTo（如上层提供）
+    scrollTo: props.scrollTo
   });
   // eslint-disable-next-line no-param-reassign
   ref.current = userAction;
@@ -213,41 +217,174 @@ var genColumnKey = exports.genColumnKey = function genColumnKey(key, index) {
  *
  * @param dataIndex Column 中的 dataIndex
  */
-function parseDataIndex(dataIndex) {
+var parseDataIndex = exports.parseDataIndex = function parseDataIndex(dataIndex) {
   if (Array.isArray(dataIndex)) {
     return dataIndex.join(',');
   }
   return dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString();
-}
+};
 
 /**
- * 从 ProColumns 数组中取出默认的排序和筛选数据
- *
+ * 平铺所有columns, 用于判断是用的是本地筛选/排序
+ * @param data 列配置
+ * @returns 平铺后的列配置
+ */
+var flattenColumns = exports.flattenColumns = function flattenColumns(data) {
+  var _columns = [];
+  for (var i = 0; i < data.length; i++) {
+    var _curItem = data[i];
+    if (_curItem.children) {
+      _columns.push.apply(_columns, (0, _toConsumableArray2.default)(flattenColumns(_curItem.children)));
+    } else {
+      _columns.push(_curItem);
+    }
+  }
+  return _columns;
+};
+
+/**
+ * 判断是否为本地筛选
+ * @param filters 筛选配置
+ * @param onFilter 筛选函数
+ * @returns 是否为本地筛选
+ */
+var isLocaleFilter = exports.isLocaleFilter = function isLocaleFilter(filters, onFilter) {
+  return !!filters && !!onFilter;
+};
+
+/**
+ * 判断是否为本地排序
+ * @param sorter 排序配置
+ * @returns 是否为本地排序
+ */
+var isLocaleSorter = exports.isLocaleSorter = function isLocaleSorter(sorter) {
+  return typeof sorter === 'function' || (0, _typeof2.default)(sorter) === 'object' && typeof sorter.compare === 'function';
+};
+
+/**
+ * 获取服务端筛选数据
+ * @param filters 筛选数据
+ * @param columns 列配置
+ * @returns 服务端筛选数据
+ */
+var getServerFilterResult = exports.getServerFilterResult = function getServerFilterResult(filters, columns) {
+  // 过滤掉本地筛选的列
+  return Object.entries(filters).reduce(function (acc, _ref2) {
+    var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
+      key = _ref3[0],
+      value = _ref3[1];
+    var column = columns.find(function (column) {
+      return parseDataIndex(column.dataIndex) === key;
+    });
+    if (column != null && !isLocaleFilter(column.filters, column.onFilter)) acc[key] = value;
+    return acc;
+  }, {});
+};
+
+/**
+ * 获取服务端排序数据
+ * @param sorterResult 排序数据
+ * @returns 服务端排序数据
+ */
+var getServerSorterResult = exports.getServerSorterResult = function getServerSorterResult(sorterResult) {
+  var result = Array.isArray(sorterResult) ? sorterResult : [sorterResult];
+  var serverSorter = result.reduce(function (acc, item) {
+    var _item$column, _item$column2;
+    var sorter = (_item$column = item.column) === null || _item$column === void 0 ? void 0 : _item$column.sorter;
+    if (sorter != null && isLocaleSorter(sorter)) return acc;
+    var sortKey = typeof sorter === 'string' ? sorter : parseDataIndex((_item$column2 = item.column) === null || _item$column2 === void 0 ? void 0 : _item$column2.dataIndex);
+    if (sortKey != null) acc[sortKey] = item.order;
+    return acc;
+  }, {});
+  return serverSorter;
+};
+
+/**
+ * 从 ProColumns 数组中取出默认的服务端排序和筛选数据
  * @param columns ProColumns
  */
-function parseDefaultColumnConfig(columns) {
+var parseServerDefaultColumnConfig = exports.parseServerDefaultColumnConfig = function parseServerDefaultColumnConfig(columns) {
   var filter = {};
   var sort = {};
   columns.forEach(function (column) {
     // 转换 dataIndex
     var dataIndex = parseDataIndex(column.dataIndex);
-    if (!dataIndex) {
-      return;
+    if (!dataIndex) return; // 没有 dataIndex 的列不参与服务端排序/筛选
+
+    // 当 column 启用服务端 filters 功能时，取出默认的筛选值
+    if (column.filters && !isLocaleFilter(column.filters, column.onFilter)) {
+      var _ref4;
+      filter[dataIndex] = (_ref4 = column.defaultFilteredValue) !== null && _ref4 !== void 0 ? _ref4 : null;
     }
-    // 当 column 启用 filters 功能时，取出默认的筛选值
-    if (column.filters) {
-      var defaultFilteredValue = column.defaultFilteredValue;
-      if (defaultFilteredValue !== undefined) {
-        filter[dataIndex] = column.defaultFilteredValue;
+
+    // 当 column 启用服务端 sorter 功能时，取出默认的排序值
+    if (column.sorter && !isLocaleSorter(column.sorter)) {
+      if (typeof column.sorter === 'string') {
+        var _column$defaultSortOr;
+        sort[column.sorter] = (_column$defaultSortOr = column.defaultSortOrder) !== null && _column$defaultSortOr !== void 0 ? _column$defaultSortOr : null;
+      } else {
+        var _column$defaultSortOr2;
+        sort[dataIndex] = (_column$defaultSortOr2 = column.defaultSortOrder) !== null && _column$defaultSortOr2 !== void 0 ? _column$defaultSortOr2 : null;
       }
     }
-    // 当 column 启用 sorter 功能时，取出默认的排序值
-    if (column.sorter && column.defaultSortOrder) {
-      sort[dataIndex] = column.defaultSortOrder;
-    }
   });
   return {
     sort: sort,
     filter: filter
   };
-}
+};
+
+/**
+ * 解析对应排序值，用作双向绑定
+ * @param proSort 排序配置
+ * @param columnProps 列配置
+ * @returns 排序值
+ */
+var parseProSortOrder = exports.parseProSortOrder = function parseProSortOrder(proSort, columnProps) {
+  var sorter = columnProps.sorter,
+    columnSortOrder = columnProps.sortOrder,
+    dataIndex = columnProps.dataIndex;
+
+  // 优先使用用户明确设置的 sortOrder
+  if (columnSortOrder !== undefined) return columnSortOrder;
+
+  // 如果没有排序器配置，直接返回 undefined
+  if (sorter == null) return undefined;
+
+  // 如果是本地排序，不使用 proSort 中的值
+  if (isLocaleSorter(sorter)) return undefined;
+
+  // 服务端排序：确定排序键
+  var sortKey = typeof sorter === 'string' ? sorter : parseDataIndex(dataIndex);
+
+  // 返回对应的排序值
+  return sortKey ? proSort[sortKey] : undefined;
+};
+
+/**
+ * 解析对应筛选值，用作双向绑定
+ * @param proFilter 筛选配置
+ * @param columnProps 列配置
+ * @returns 筛选值
+ */
+var parseProFilteredValue = exports.parseProFilteredValue = function parseProFilteredValue(proFilter, columnProps) {
+  var filters = columnProps.filters,
+    onFilter = columnProps.onFilter,
+    columnFilteredValue = columnProps.filteredValue,
+    dataIndex = columnProps.dataIndex;
+
+  // 优先使用用户设置的 filteredValue
+  if (columnFilteredValue !== undefined) return columnFilteredValue;
+
+  // 如果没有筛选配置，直接返回 undefined
+  if (filters == null) return undefined;
+
+  // 如果是本地筛选，不使用 proFilter 中的值
+  if (isLocaleFilter(filters, onFilter)) return undefined;
+
+  // 服务端排序：获取筛选键
+  var filterKey = parseDataIndex(dataIndex);
+
+  // 返回对应的筛选值
+  return filterKey ? proFilter[filterKey] : undefined;
+};

package/lib/utils/conversionMomentValue/index.js

@@ -140,17 +140,29 @@ var conversionMomentValue = exports.conversionMomentValue = function conversionM
       tmpValue[valueKey] = conversionMomentValue(itemValue, dateFormatter, valueTypeMap, omitNil, namePath);
       return;
     }
+    var currentDateFormatter = dateFormatter !== null && dateFormatter !== void 0 ? dateFormatter : 'string';
+    var finalDateFormatter;
+    if (currentDateFormatter === 'number' || currentDateFormatter === false || typeof currentDateFormatter === 'function') {
+      finalDateFormatter = currentDateFormatter;
+    } else if (currentDateFormatter === 'string') {
+      finalDateFormatter = dateFormat || dateFormatterMap[valueType];
+    } else {
+      // Custom format string
+      finalDateFormatter = currentDateFormatter;
+    }
     // 处理 FormList 的 value
     if (Array.isArray(itemValue)) {
       tmpValue[valueKey] = itemValue.map(function (arrayValue, index) {
         if (_dayjs.default.isDayjs(arrayValue) || isMoment(arrayValue)) {
-          return convertMoment(arrayValue, dateFormat || dateFormatter, valueType);
+          // For arrays, if no format is defined and dateFormatter is 'string', use 'string' with default format
+          var arrayDateFormatter = finalDateFormatter === undefined && currentDateFormatter === 'string' ? 'string' : finalDateFormatter;
+          return convertMoment(arrayValue, arrayDateFormatter, valueType);
         }
         return conversionMomentValue(arrayValue, dateFormatter, valueTypeMap, omitNil, [valueKey, "".concat(index)].flat(1));
       });
       return;
     }
-    tmpValue[valueKey] = convertMoment(itemValue, dateFormat || (dateFormatter === 'string' ? dateFormatterMap[valueType] : dateFormatter), valueType);
+    tmpValue[valueKey] = convertMoment(itemValue, finalDateFormatter, valueType);
   });
   return tmpValue;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ant-design/pro-components",
-  "version": "3.0.1-0",
+  "version": "3.0.2-0",
   "type": "module",
   "description": "All-in-one package of @ant-design/pro-components",
   "keywords": [
@@ -51,7 +51,7 @@
     "test:ui": "cross-env TZ=UTC vitest --ui",
     "test:update": "cross-env TZ=UTC  vitest -u",
     "tsc": "tsc --noEmit",
-    "prepublishOnly": "npm run test && npm run build",
+    "prepublishOnly": "npm run build",
     "publish:beta": "npm publish --tag beta",
     "update:deps": "pnpm up --latest"
   },
@@ -69,8 +69,8 @@
   "dependencies": {
     "@ant-design/cssinjs": "^1.24.0",
     "@ant-design/icons": "^5.6.1",
-    "@babel/runtime": "^7.27.6",
-    "@ctrl/tinycolor": "^4.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,42 +78,42 @@
     "@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.3.0",
+    "@umijs/route-utils": "^4.0.3",
     "@umijs/use-params": "^1.0.9",
     "classnames": "^2.5.1",
-    "dayjs": "^1.11.13",
+    "dayjs": "^1.11.18",
     "lodash-es": "^4.17.21",
     "path-to-regexp": "^6.3.0",
     "rc-field-form": "^2.7.0",
     "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",
+    "react-syntax-highlighter": "^15.6.6",
     "safe-stable-stringify": "^2.5.0",
     "shiki-es": "^0.2.0",
-    "swr": "^2.3.4"
+    "swr": "^2.3.6"
   },
   "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/dom": "^10.4.1",
+    "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.0",
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^14.6.1",
@@ -123,26 +123,26 @@
     "@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.26",
     "@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.46.2",
+    "@typescript-eslint/parser": "^8.46.2",
     "@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.5.3",
     "@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": "^5.27.6",
     "chalk": "^4.1.2",
     "copy-to-clipboard": "^3.3.3",
     "cross-env": "^7.0.3",
@@ -156,12 +156,12 @@
     "execa": "^5.1.1",
     "express": "^4.21.2",
     "fast-deep-equal": "^3.1.3",
-    "father": "^4.6.1",
+    "father": "^4.6.7",
     "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,10 +170,10 @@
     "nprogress": "^0.2.0",
     "nwsapi": "2.2.13",
     "octokit": "^3.2.2",
-    "playwright": "^1.54.1",
+    "playwright": "^1.56.1",
     "polished": "^4.3.1",
     "prettier": "^3.6.2",
-    "prettier-plugin-organize-imports": "^4.1.0",
+    "prettier-plugin-organize-imports": "^4.3.0",
     "prettier-plugin-packagejson": "^2.5.19",
     "pretty-quick": "^3.3.1",
     "query-string": "^6.14.1",
@@ -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.20.6",
+    "typescript": "^5.9.3",
+    "umi": "^4.5.3",
     "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",