@pisell/materials 6.11.10 → 6.11.11

package/es/components/pisellRecordBoard/context/RecordBoardContext.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+import type { RecordBoardContextValue } from '../types';
+export declare const RecordBoardContext: import("react").Context<RecordBoardContextValue | null>;

package/es/components/pisellRecordBoard/context/RecordBoardProvider.d.ts

@@ -0,0 +1,11 @@
+import React, { ReactNode } from 'react';
+import type { RecordBoardContextValue } from '../types';
+export interface RecordBoardProviderProps {
+    value: RecordBoardContextValue;
+    children: ReactNode;
+}
+/**
+ * 仅负责注入 RecordBoard 上下文。
+ * 实际的数据源、onSearch/onPageChange 由上层（如接 DataSourceContainer 或独立 fetch）提供。
+ */
+export declare const RecordBoardProvider: React.FC<RecordBoardProviderProps>;

package/es/components/pisellRecordBoard/hooks/useRecordBoardContext.d.ts

@@ -0,0 +1,16 @@
+import type { RecordBoardContextValue, RecordBoardChildComponentProps, RecordBoardGridProps } from '../types';
+export interface UseRecordBoardContextOptions {
+    /** 子组件 displayName，用于从 childComponentProps 中取对应 props */
+    displayName?: keyof RecordBoardChildComponentProps;
+    /** 上层传入的 childComponentProps（若 Context 未提供则从参数传入） */
+    childComponentProps?: RecordBoardChildComponentProps;
+}
+/**
+ * 消费 RecordBoard 上下文，供各 layout 内子组件（Search / ToolBar / Grid / CardList / Pagination）使用。
+ * 若传入 displayName，返回会合并 childComponentProps[displayName] 便于透传。
+ * 当 displayName 为 'grid' 时，返回类型包含 RecordBoardGridProps（columns、scroll、size）。
+ */
+export declare function useRecordBoardContext(options: UseRecordBoardContextOptions & {
+    displayName: 'grid';
+}): RecordBoardContextValue & RecordBoardGridProps;
+export declare function useRecordBoardContext(options?: UseRecordBoardContextOptions): RecordBoardContextValue;

package/es/components/pisellRecordBoard/layouts/CardLayout/CardList.d.ts

@@ -0,0 +1,12 @@
+import React from 'react';
+import type { RecordBoardContextValue } from '../../types';
+export interface RecordBoardCardListProps extends Partial<Pick<RecordBoardContextValue, 'data' | 'loading'>> {
+    className?: string;
+    style?: React.CSSProperties;
+    render?: (ctx: RecordBoardContextValue) => React.ReactNode;
+}
+/**
+ * Card 布局下的数据视图：从 context 取 data / loading。
+ */
+declare const RecordBoardCardList: React.FC<RecordBoardCardListProps>;
+export default RecordBoardCardList;

package/es/components/pisellRecordBoard/layouts/CardLayout/index.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+import RecordBoardCardList from './CardList';
+/**
+ * Card 布局：仅内容区 = 卡片列表（不含分页）。
+ * 工具栏、多选操作栏、分页由 Shell Frame 提供，使用时用 ShellFrame 包裹：
+ * <PisellRecordBoard.ShellFrame><PisellRecordBoard.CardLayout /></PisellRecordBoard.ShellFrame>
+ */
+declare const CardLayout: React.FC<{
+    className?: string;
+    style?: React.CSSProperties;
+}>;
+export default CardLayout;
+export { RecordBoardCardList as CardLayoutCardList };

package/es/components/pisellRecordBoard/layouts/GridLayout/Grid.js

@@ -7,12 +7,20 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React, { useMemo } from 'react';
+import React, { useMemo, useRef, useState, useEffect } from 'react';
 import { Table } from 'antd';
 import { useRecordBoardContext } from "../../hooks/useRecordBoardContext";
-import { processColumnsForGrid, getRecordBoardColumnKey } from "../../utils/recordBoardColumns";
+import { processColumnsForGrid, getRecordBoardColumnKey, computeUniformColumnSummary } from "../../utils/recordBoardColumns";
+import { getText } from "../../../../locales";
 import "./Grid.less";
 function getRowKey(record, rowKey) {
   var _ref, _record$id;
@@ -29,9 +37,9 @@ function getRowKey(record, rowKey) {
  * Grid 布局下的数据视图：使用 antd Table，从 context 取 data / loading / 多选态。
  */
 /** Context 中与 Table 无关的 key，透传 Table 时排除，避免覆盖或无效传递（含 grid 合并进的 columns/scroll 等） */
-var CONTEXT_ONLY_KEYS = ['data', 'loading', 'total', 'pagination', 'onPageChange', 'searchParams', 'onSearch', 'onReset', 'layoutType', 'selectedKeys', 'selectedRows', 'onSelectionChange', 'rowKey', 'childComponentProps', 'columnVisibility', 'onColumnVisibilityChange', 'columns', 'scroll', 'size', 'defaultHiddenColumnKeys', 'scrollAreaHeight', 'setScrollAreaHeight'];
+var CONTEXT_ONLY_KEYS = ['data', 'loading', 'total', 'pagination', 'onPageChange', 'searchParams', 'onSearch', 'onReset', 'layoutType', 'selectedKeys', 'selectedRows', 'onSelectionChange', 'rowKey', 'childComponentProps', 'columnVisibility', 'onColumnVisibilityChange', 'columns', 'scroll', 'size', 'defaultHiddenColumnKeys', 'scrollAreaHeight', 'setScrollAreaHeight', 'collapseUniformColumns', 'columnOrder', 'onColumnOrderChange'];
 var RecordBoardGridView = function RecordBoardGridView(props) {
-  var _ref2, _ctx$data, _ctx$data2;
+  var _ref2, _ctx$data2, _ctx$data3;
   var ctx = useRecordBoardContext({
     displayName: 'grid'
   });
@@ -44,13 +52,70 @@ var RecordBoardGridView = function RecordBoardGridView(props) {
   // columns 优先用 props，其次用 childComponentProps.grid 合并进 ctx 的 columns
   var rawColumns = (_ref2 = columnsProp !== null && columnsProp !== void 0 ? columnsProp : ctx.columns) !== null && _ref2 !== void 0 ? _ref2 : [];
   var columnVisibility = ctx.columnVisibility;
-  var columns = useMemo(function () {
-    var list = rawColumns;
-    var visible = columnVisibility == null ? list : list.filter(function (col) {
-      return columnVisibility[getRecordBoardColumnKey(col)] !== false;
-    });
-    return processColumnsForGrid(visible);
-  }, [rawColumns, columnVisibility]);
+  var columnOrder = ctx.columnOrder;
+  var collapseUniformColumns = ctx.collapseUniformColumns !== false;
+
+  /** 同值列总结区高度，用于 autoCalc 时正确计算 scroll.y */
+  var summaryRef = useRef(null);
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    uniformSummaryHeight = _useState2[0],
+    setUniformSummaryHeight = _useState2[1];
+  var _useMemo = useMemo(function () {
+      var _ctx$data;
+      var list = rawColumns;
+      if (Array.isArray(columnOrder) && columnOrder.length > 0) {
+        var keyToCol = new Map(list.map(function (c) {
+          return [getRecordBoardColumnKey(c), c];
+        }));
+        var ordered = [];
+        var _iterator = _createForOfIteratorHelper(columnOrder),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var key = _step.value;
+            var col = keyToCol.get(key);
+            if (col) ordered.push(col);
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+        list.forEach(function (col) {
+          var key = getRecordBoardColumnKey(col);
+          if (!columnOrder.includes(key)) ordered.push(col);
+        });
+        list = ordered;
+      }
+      var visibleByUser = columnVisibility == null ? list : list.filter(function (col) {
+        return columnVisibility[getRecordBoardColumnKey(col)] !== false;
+      });
+      var data = (_ctx$data = ctx.data) !== null && _ctx$data !== void 0 ? _ctx$data : [];
+      var shouldCollapseUniform = collapseUniformColumns && data.length > 5;
+      if (!shouldCollapseUniform) {
+        return {
+          columns: processColumnsForGrid(visibleByUser),
+          uniformSummaryItems: [],
+          processedColumnsForSummary: undefined
+        };
+      }
+      var processedAllVisible = processColumnsForGrid(visibleByUser);
+      var _computeUniformColumn = computeUniformColumnSummary(data, visibleByUser),
+        uniformHiddenColumnKeys = _computeUniformColumn.uniformHiddenColumnKeys,
+        items = _computeUniformColumn.summaryItems;
+      var columnsForTable = processedAllVisible.filter(function (col) {
+        return !uniformHiddenColumnKeys.includes(getRecordBoardColumnKey(col));
+      });
+      return {
+        columns: columnsForTable,
+        uniformSummaryItems: items,
+        processedColumnsForSummary: items.length > 0 ? processedAllVisible : undefined
+      };
+    }, [rawColumns, columnVisibility, columnOrder, collapseUniformColumns, ctx.data]),
+    columns = _useMemo.columns,
+    summaryItems = _useMemo.uniformSummaryItems,
+    processedColumnsForSummary = _useMemo.processedColumnsForSummary;
   var tableRowKey = useMemo(function () {
     var _ref3, _ctx$rowKey;
     var key = (_ref3 = (_ctx$rowKey = ctx.rowKey) !== null && _ctx$rowKey !== void 0 ? _ctx$rowKey : rowKeyProp) !== null && _ref3 !== void 0 ? _ref3 : 'id';
@@ -72,6 +137,25 @@ var RecordBoardGridView = function RecordBoardGridView(props) {
     });
   }, [ctx.selectedKeys, ctx.onSelectionChange, rowSelectionConfig]);
 
+  /** 测量同值列总结区高度，供 autoCalc 时 scroll.y 减去该高度 */
+  useEffect(function () {
+    if (summaryItems.length === 0) {
+      setUniformSummaryHeight(0);
+      return;
+    }
+    var el = summaryRef.current;
+    if (!el) return;
+    var ro = new ResizeObserver(function (entries) {
+      var entry = entries[0];
+      if (entry) setUniformSummaryHeight(entry.contentRect.height);
+    });
+    ro.observe(el);
+    return function () {
+      ro.disconnect();
+      setUniformSummaryHeight(0);
+    };
+  }, [summaryItems.length]);
+
   // grid 透传的 Table props（onRow、onHeaderRow、expandable、rowClassName、summary 等）从 ctx 取出并传给 Table
   var gridTableProps = useMemo(function () {
     var picked = {};
@@ -84,7 +168,7 @@ var RecordBoardGridView = function RecordBoardGridView(props) {
   if (typeof render === 'function') {
     return /*#__PURE__*/React.createElement(React.Fragment, null, render(_objectSpread(_objectSpread({}, ctx), rest)));
   }
-  var dataSource = (_ctx$data = ctx.data) !== null && _ctx$data !== void 0 ? _ctx$data : [];
+  var dataSource = (_ctx$data2 = ctx.data) !== null && _ctx$data2 !== void 0 ? _ctx$data2 : [];
   var isEmpty = !Array.isArray(dataSource) || dataSource.length === 0;
   var sumColumnWidths = useMemo(function () {
     return columns.reduce(function (sum, col) {
@@ -100,9 +184,12 @@ var RecordBoardGridView = function RecordBoardGridView(props) {
     var scrollX = isEmpty && scroll && typeof scroll.x !== 'number' ? sumColumnWidths : scroll === null || scroll === void 0 ? void 0 : scroll.x;
     if (scroll !== null && scroll !== void 0 && scroll.autoCalc && typeof ctx.scrollAreaHeight === 'number') {
       var wrapHeight = ctx.scrollAreaHeight;
+      // 40：表头等固定占高；uniformSummaryHeight：同值列总结区动态高度，无总结时为 0
+      var reservedHeight = 40 + uniformSummaryHeight;
+      console.log(wrapHeight, reservedHeight);
       return {
         x: scrollX !== null && scrollX !== void 0 ? scrollX : sumColumnWidths,
-        y: Math.max(wrapHeight - 40, 100),
+        y: Math.max(wrapHeight - reservedHeight, 100),
         scrollToFirstRowOnChange: scroll.scrollToFirstRowOnChange
       };
     }
@@ -120,14 +207,33 @@ var RecordBoardGridView = function RecordBoardGridView(props) {
       return resolved;
     }
     return scroll;
-  }, [rest.scroll, ctx.scroll, ctx.scrollAreaHeight, ctx.pagination, columns, sumColumnWidths, isEmpty]);
+  }, [rest.scroll, ctx.scroll, ctx.scrollAreaHeight, ctx.pagination, columns, sumColumnWidths, isEmpty, uniformSummaryHeight]);
   return /*#__PURE__*/React.createElement("div", {
     "data-layout-slot": "grid",
     className: "pisell-lowcode-record-board-grid"
-  }, /*#__PURE__*/React.createElement(Table, _extends({}, rest, gridTableProps, {
+  }, summaryItems.length > 0 && /*#__PURE__*/React.createElement("div", {
+    ref: summaryRef,
+    className: "pisell-record-board-uniform-summary"
+  }, summaryItems.map(function (item) {
+    var _item$record, _item$displayValue;
+    var processedCol = processedColumnsForSummary === null || processedColumnsForSummary === void 0 ? void 0 : processedColumnsForSummary.find(function (c) {
+      return getRecordBoardColumnKey(c) === item.columnKey;
+    });
+    var useRender = typeof (processedCol === null || processedCol === void 0 ? void 0 : processedCol.render) === 'function';
+    // render 只接收表格单元格相同的 (value, record)：value 固定用 cellValue（dataIndex 取值），绝不传 uniformCompare 的返回值
+    var content = useRender ? processedCol.render(item.cellValue, (_item$record = item.record) !== null && _item$record !== void 0 ? _item$record : {}, 0) : item.type === 'empty' ? getText('record-board-uniform-summary-empty') : (_item$displayValue = item.displayValue) !== null && _item$displayValue !== void 0 ? _item$displayValue : getText('record-board-uniform-summary-same');
+    return /*#__PURE__*/React.createElement("div", {
+      key: item.columnKey,
+      className: "pisell-record-board-uniform-summary-item"
+    }, /*#__PURE__*/React.createElement("span", {
+      className: "pisell-record-board-uniform-summary-label"
+    }, item.title), /*#__PURE__*/React.createElement("span", {
+      className: "pisell-record-board-uniform-summary-value"
+    }, content));
+  })), /*#__PURE__*/React.createElement(Table, _extends({}, rest, gridTableProps, {
     scroll: tableScroll,
     rowKey: tableRowKey,
-    dataSource: (_ctx$data2 = ctx.data) !== null && _ctx$data2 !== void 0 ? _ctx$data2 : [],
+    dataSource: (_ctx$data3 = ctx.data) !== null && _ctx$data3 !== void 0 ? _ctx$data3 : [],
     loading: ctx.loading,
     columns: columns,
     rowSelection: rowSelection,

package/es/components/pisellRecordBoard/layouts/GridLayout/Grid.less

@@ -7,6 +7,44 @@
   }
 }
 
+// 同值列折叠时的总结区样式（参考 Figma 12840-86869）
+.pisell-record-board-uniform-summary {
+  display: flex;
+  flex-wrap: nowrap;
+  align-items: center;
+  gap: 32px;
+  min-height: 44px;
+  padding: 12px 24px;
+  background: #f2f4f7;
+  border-bottom: 1px solid #eaecf0;
+  border-radius: 8px 8px 0 0;
+
+  .pisell-record-board-uniform-summary-item {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    flex-shrink: 0;
+  }
+
+  .pisell-record-board-uniform-summary-label {
+    font-family: inherit;
+    font-size: 12px;
+    font-weight: 500;
+    line-height: 18px;
+    color: #475467;
+    white-space: nowrap;
+  }
+
+  .pisell-record-board-uniform-summary-value {
+    font-family: inherit;
+    font-size: 12px;
+    font-weight: 500;
+    line-height: 18px;
+    color: #475467;
+    white-space: nowrap;
+  }
+}
+
 // 纯 CSS 占满高度：滚动发生在 .pisell-record-board-scroll-body，表头 sticky 固定；高度传到 table
 .pisell-record-board-scroll-body .pisell-lowcode-record-board-grid {
   height: 100%;

package/es/components/pisellRecordBoard/shellFrame/ColumnSetting/ColumnSettingPopover.d.ts

@@ -1,6 +1,5 @@
 /**
- * 列显示隐藏弹层内容（仅控制列展示显隐，不控制 filter/sort）。
- * 参考 table Actions ColumnsSetting PopoverContent，去掉拖拽排序。
+ * 列显示隐藏弹层内容：显隐切换 + 拖拽排序（参考 table Actions ColumnsSetting PopoverContent）。
  */
 import React from 'react';
 import type { RecordBoardColumnType } from '../../types';
@@ -8,6 +7,9 @@ export interface ColumnSettingPopoverProps {
     columns: RecordBoardColumnType[];
     columnVisibility: Record<string, boolean>;
     onColumnVisibilityChange: (visibility: Record<string, boolean>) => void;
+    /** 列 key 顺序（拖拽排序后持久化）；未传则按 columns 顺序 */
+    columnOrder?: string[] | null;
+    onColumnOrderChange?: (columnKeys: string[]) => void;
 }
 declare const ColumnSettingPopover: React.FC<ColumnSettingPopoverProps>;
 export default ColumnSettingPopover;

package/es/components/pisellRecordBoard/shellFrame/ColumnSetting/ColumnSettingPopover.js

@@ -1,16 +1,21 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 /**
- * 列显示隐藏弹层内容（仅控制列展示显隐，不控制 filter/sort）。
- * 参考 table Actions ColumnsSetting PopoverContent，去掉拖拽排序。
+ * 列显示隐藏弹层内容：显隐切换 + 拖拽排序（参考 table Actions ColumnsSetting PopoverContent）。
  */
 
-import React from 'react';
+import React, { useMemo } from 'react';
 import classNames from 'classnames';
+import DotsSix from '@pisell/icon/es/DotsSix';
 import { EyeInvisibleOutlined, EyeOutlined } from '@ant-design/icons';
 import { getText } from "../../../../locales";
+import Sortable from "../../../DragSortList";
 import { getRecordBoardColumnKey } from "../../utils/recordBoardColumns";
 var prefix = 'pisell-lowcode-';
 function getColumnTitle(column) {
@@ -21,19 +26,86 @@ function getColumnTitle(column) {
 var ColumnSettingPopover = function ColumnSettingPopover(_ref) {
   var columns = _ref.columns,
     columnVisibility = _ref.columnVisibility,
-    onColumnVisibilityChange = _ref.onColumnVisibilityChange;
+    onColumnVisibilityChange = _ref.onColumnVisibilityChange,
+    columnOrder = _ref.columnOrder,
+    onColumnOrderChange = _ref.onColumnOrderChange;
+  var orderedColumns = useMemo(function () {
+    if (!Array.isArray(columnOrder) || columnOrder.length === 0) return columns;
+    var keyToCol = new Map(columns.map(function (c) {
+      return [getRecordBoardColumnKey(c), c];
+    }));
+    var result = [];
+    var _iterator = _createForOfIteratorHelper(columnOrder),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var key = _step.value;
+        var col = keyToCol.get(key);
+        if (col) result.push(col);
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    columns.forEach(function (col) {
+      var key = getRecordBoardColumnKey(col);
+      if (!columnOrder.includes(key)) result.push(col);
+    });
+    return result;
+  }, [columns, columnOrder]);
   var handleToggle = function handleToggle(colKey, isShow) {
     onColumnVisibilityChange(_defineProperty({}, colKey, isShow));
   };
-  return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefix, "table-action-column-popover-content-wrap")
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefix, "table-action-column-header")
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "".concat(prefix, "table-action-column-header-title")
-  }, getText('table-action-column-title'))), /*#__PURE__*/React.createElement("div", {
+  var handleOrderChange = function handleOrderChange(list) {
+    onColumnOrderChange === null || onColumnOrderChange === void 0 || onColumnOrderChange(list.map(function (c) {
+      return getRecordBoardColumnKey(c);
+    }).filter(Boolean));
+  };
+  var listContent = /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefix, "table-action-column-content")
-  }, columns.map(function (col) {
+  }, typeof onColumnOrderChange === 'function' ? /*#__PURE__*/React.createElement(Sortable, {
+    list: orderedColumns,
+    rowKey: function rowKey(col) {
+      return getRecordBoardColumnKey(col) || '';
+    },
+    onChange: handleOrderChange
+  }, function (_ref2) {
+    var col = _ref2.item,
+      index = _ref2.index,
+      style = _ref2.style,
+      props = _ref2.props,
+      attributes = _ref2.attributes,
+      setActivatorNodeRef = _ref2.setActivatorNodeRef,
+      listeners = _ref2.listeners;
+    var colKey = getRecordBoardColumnKey(col);
+    var isShow = columnVisibility[colKey] !== false;
+    return /*#__PURE__*/React.createElement("div", _extends({
+      key: colKey
+    }, attributes, {
+      ref: props.ref,
+      style: style,
+      className: "".concat(prefix, "table-action-column-drag-item")
+    }), /*#__PURE__*/React.createElement(DotsSix, _extends({
+      ref: setActivatorNodeRef
+    }, listeners, {
+      style: {
+        touchAction: 'none'
+      },
+      className: "".concat(prefix, "table-action-column-drag-bar")
+    })), /*#__PURE__*/React.createElement("div", {
+      className: "".concat(prefix, "table-action-column-drag-item-right")
+    }, /*#__PURE__*/React.createElement("span", {
+      className: classNames("".concat(prefix, "table-action-column-drag-item-right-text"), _defineProperty({}, "".concat(prefix, "table-action-column-drag-item-right-text-hidden"), !isShow))
+    }, getColumnTitle(col)), /*#__PURE__*/React.createElement("span", {
+      className: "".concat(prefix, "table-action-column-drag-item-right-icon-wrap"),
+      onClick: function onClick() {
+        return handleToggle(colKey, !isShow);
+      },
+      role: "button",
+      "aria-label": isShow ? 'hide' : 'show'
+    }, isShow ? /*#__PURE__*/React.createElement(EyeOutlined, null) : /*#__PURE__*/React.createElement(EyeInvisibleOutlined, null))));
+  }) : orderedColumns.map(function (col) {
     var colKey = getRecordBoardColumnKey(col);
     var isShow = columnVisibility[colKey] !== false;
     return /*#__PURE__*/React.createElement("div", {
@@ -54,6 +126,13 @@ var ColumnSettingPopover = function ColumnSettingPopover(_ref) {
       role: "button",
       "aria-label": isShow ? 'hide' : 'show'
     }, isShow ? /*#__PURE__*/React.createElement(EyeOutlined, null) : /*#__PURE__*/React.createElement(EyeInvisibleOutlined, null))));
-  })));
+  }));
+  return /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefix, "table-action-column-popover-content-wrap")
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefix, "table-action-column-header")
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "".concat(prefix, "table-action-column-header-title")
+  }, getText('table-action-column-title'))), listContent);
 };
 export default ColumnSettingPopover;

package/es/components/pisellRecordBoard/shellFrame/ColumnSetting/index.js

@@ -11,13 +11,15 @@ import { getRecordBoardColumnKey } from "../../utils/recordBoardColumns";
 import ColumnSettingPopover from "./ColumnSettingPopover";
 import "./index.less";
 var RecordBoardColumnSetting = function RecordBoardColumnSetting() {
-  var _ctx$childComponentPr, _ctx$columnVisibility;
+  var _ctx$childComponentPr, _ctx$columnVisibility, _ctx$columnOrder;
   var ctx = useRecordBoardContext({
     displayName: 'columnSetting'
   });
   var gridColumns = (_ctx$childComponentPr = ctx.childComponentProps) === null || _ctx$childComponentPr === void 0 || (_ctx$childComponentPr = _ctx$childComponentPr.grid) === null || _ctx$childComponentPr === void 0 ? void 0 : _ctx$childComponentPr.columns;
   var columnVisibility = (_ctx$columnVisibility = ctx.columnVisibility) !== null && _ctx$columnVisibility !== void 0 ? _ctx$columnVisibility : {};
   var onColumnVisibilityChange = ctx.onColumnVisibilityChange;
+  var columnOrder = (_ctx$columnOrder = ctx.columnOrder) !== null && _ctx$columnOrder !== void 0 ? _ctx$columnOrder : null;
+  var onColumnOrderChange = ctx.onColumnOrderChange;
   var content = useMemo(function () {
     if (!Array.isArray(gridColumns) || gridColumns.length === 0 || typeof onColumnVisibilityChange !== 'function') {
       return null;
@@ -25,9 +27,11 @@ var RecordBoardColumnSetting = function RecordBoardColumnSetting() {
     return /*#__PURE__*/React.createElement(ColumnSettingPopover, {
       columns: gridColumns,
       columnVisibility: columnVisibility,
-      onColumnVisibilityChange: onColumnVisibilityChange
+      onColumnVisibilityChange: onColumnVisibilityChange,
+      columnOrder: columnOrder,
+      onColumnOrderChange: onColumnOrderChange
     });
-  }, [gridColumns, columnVisibility, onColumnVisibilityChange]);
+  }, [gridColumns, columnVisibility, onColumnVisibilityChange, columnOrder, onColumnOrderChange]);
   var hasHiddenColumns = useMemo(function () {
     if (!Array.isArray(gridColumns)) return false;
     return gridColumns.some(function (col) {

package/es/components/pisellRecordBoard/shellFrame/Pagination/index.js

@@ -13,7 +13,7 @@ import "./index.less";
 import { useRecordBoardContext } from "../../hooks/useRecordBoardContext";
 var defaultPagination = {
   pageNumber: 1,
-  pageSize: 10
+  pageSize: 50
 };
 /**
  * RecordBoard 下的分页：接入 packages/materials 的 Pagination，从 context 取 pagination / total / onPageChange；可透传 childComponentProps.pagination。