@pisell/materials 1.0.1059 → 1.0.1060

package/es/components/pisellMultipleSelect/PisellMultipleSelect.stories.js

@@ -13,10 +13,10 @@ import PisellMultipleSelect from "./PisellMultipleSelect";
 import { useState } from 'react';
 import { Form } from 'antd';
 
-/**
- * PisellMultipleSelect 组件 Storybook
- *
- * 用于展示和测试组件的各种状态和配置
+/**
+ * PisellMultipleSelect 组件 Storybook
+ *
+ * 用于展示和测试组件的各种状态和配置
  */
 var meta = {
   title: '表单/表单组件/PisellMultipleSelect',
@@ -132,8 +132,8 @@ var skillOptions = [{
   color: '#007396'
 }];
 
-/**
- * 基础示例
+/**
+ * 基础示例
  */
 export var Basic = {
   args: {
@@ -154,8 +154,8 @@ export var Basic = {
   }
 };
 
-/**
- * 带标签
+/**
+ * 带标签
  */
 export var WithLabel = {
   args: {
@@ -178,8 +178,8 @@ export var WithLabel = {
   }
 };
 
-/**
- * 标签聚合功能
+/**
+ * 标签聚合功能
  */
 export var TagAggregation = {
   args: {
@@ -209,8 +209,8 @@ export var TagAggregation = {
   }
 };
 
-/**
- * 最大可选数量限制
+/**
+ * 最大可选数量限制
  */
 export var WithMaxCount = {
   args: {
@@ -233,8 +233,8 @@ export var WithMaxCount = {
   }
 };
 
-/**
- * 带搜索功能
+/**
+ * 带搜索功能
  */
 export var WithSearch = {
   args: {
@@ -260,8 +260,8 @@ export var WithSearch = {
   }
 };
 
-/**
- * 带清空按钮
+/**
+ * 带清空按钮
  */
 export var WithClear = {
   args: {
@@ -284,8 +284,8 @@ export var WithClear = {
   }
 };
 
-/**
- * 禁用态
+/**
+ * 禁用态
  */
 export var Disabled = {
   args: {
@@ -296,8 +296,8 @@ export var Disabled = {
   }
 };
 
-/**
- * 只读态
+/**
+ * 只读态
  */
 export var ReadOnly = {
   args: {
@@ -308,8 +308,8 @@ export var ReadOnly = {
   }
 };
 
-/**
- * 只读态 - 标签聚合
+/**
+ * 只读态 - 标签聚合
  */
 export var ReadOnlyWithAggregation = {
   args: {
@@ -321,8 +321,8 @@ export var ReadOnlyWithAggregation = {
   }
 };
 
-/**
- * 只读态 - 空值
+/**
+ * 只读态 - 空值
  */
 export var ReadOnlyEmpty = {
   args: {
@@ -333,8 +333,8 @@ export var ReadOnlyEmpty = {
   }
 };
 
-/**
- * 错误状态
+/**
+ * 错误状态
  */
 export var WithError = {
   args: {
@@ -359,8 +359,8 @@ export var WithError = {
   }
 };
 
-/**
- * 不同尺寸
+/**
+ * 不同尺寸
  */
 export var Sizes = {
   render: function render() {
@@ -404,8 +404,8 @@ export var Sizes = {
   }
 };
 
-/**
- * 表单场景
+/**
+ * 表单场景
  */
 export var InForm = {
   render: function render() {
@@ -446,8 +446,8 @@ export var InForm = {
   }
 };
 
-/**
- * 回调事件演示
+/**
+ * 回调事件演示
  */
 export var WithCallbacks = {
   render: function render() {
@@ -517,8 +517,8 @@ export var WithCallbacks = {
   }
 };
 
-/**
- * 所有状态组合
+/**
+ * 所有状态组合
  */
 export var AllStates = {
   render: function render() {

package/es/components/pisellRecordBoard/PisellRecordBoard.d.ts

@@ -2,7 +2,8 @@ import React from 'react';
 import type { RecordBoardProps } from './types';
 /**
  * RecordBoard 容器：提供统一的 data / pagination / search 上下文。
- * 仅接受打散 props：列表/分页/搜索/多选/列显隐、以及 grid/toolBar/search/paginationConfig/batchActionBar/cardList。
+ * 打散 props：列表/分页/搜索/多选、grid/toolBar/…；可选根级 **floorMap**（兼容透传）。
+ * 平面图推荐在 ShellFrame 内使用 **PisellRecordBoard.FloorMap** 声明，与根级 `floorMap` 合并（子优先）。
  */
 declare const PisellRecordBoard: React.FC<RecordBoardProps>;
 export default PisellRecordBoard;

package/es/components/pisellRecordBoard/PisellRecordBoard.js

@@ -1,4 +1,4 @@
-var _excluded = ["children", "layoutType", "rowKey", "data", "loading", "total", "pagination", "onPageChange", "searchParams", "onSearch", "onReset"];
+var _excluded = ["children", "layoutType", "rowKey", "data", "dataSources", "gridDataSourceKey", "loading", "total", "pagination", "onPageChange", "searchParams", "onSearch", "onReset", "floorMap", "floorMapLayoutContext", "defaultBodyView", "className", "style"];
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -69,13 +69,21 @@ function getDefaultRecordBoardContext(layoutType, selection, rowKey) {
     scrollAreaHeight: null,
     setScrollAreaHeight: undefined,
     filterResetKey: undefined,
-    setFilterResetKey: undefined
+    setFilterResetKey: undefined,
+    bodyView: 'grid',
+    setBodyView: function setBodyView() {},
+    floorMapProps: undefined,
+    floorMapLayoutContext: undefined,
+    defaultBodyView: undefined,
+    dataSources: undefined,
+    gridDataSourceKey: undefined
   };
 }
 
 /**
  * RecordBoard 容器：提供统一的 data / pagination / search 上下文。
- * 仅接受打散 props：列表/分页/搜索/多选/列显隐、以及 grid/toolBar/search/paginationConfig/batchActionBar/cardList。
+ * 打散 props：列表/分页/搜索/多选、grid/toolBar/…；可选根级 **floorMap**（兼容透传）。
+ * 平面图推荐在 ShellFrame 内使用 **PisellRecordBoard.FloorMap** 声明，与根级 `floorMap` 合并（子优先）。
  */
 var PisellRecordBoard = function PisellRecordBoard(props) {
   var _props$columnVisibili;
@@ -84,6 +92,8 @@ var PisellRecordBoard = function PisellRecordBoard(props) {
     layoutType = _props$layoutType === void 0 ? 'grid' : _props$layoutType,
     rowKeyProp = props.rowKey,
     dataProp = props.data,
+    dataSourcesProp = props.dataSources,
+    gridDataSourceKeyProp = props.gridDataSourceKey,
     loadingProp = props.loading,
     totalProp = props.total,
     paginationProp = props.pagination,
@@ -91,6 +101,11 @@ var PisellRecordBoard = function PisellRecordBoard(props) {
     searchParamsProp = props.searchParams,
     onSearchProp = props.onSearch,
     onResetProp = props.onReset,
+    floorMapProp = props.floorMap,
+    floorMapLayoutContextProp = props.floorMapLayoutContext,
+    defaultBodyView = props.defaultBodyView,
+    classNameProp = props.className,
+    styleProp = props.style,
     rest = _objectWithoutProperties(props, _excluded);
 
   /** 默认占满父容器高度（父容器需有高度，如 height:100vh 或 height:100%） */
@@ -119,6 +134,12 @@ var PisellRecordBoard = function PisellRecordBoard(props) {
     filterResetKey = _useState8[0],
     setFilterResetKey = _useState8[1];
   var _useState9 = useState(function () {
+      return defaultBodyView === 'floorMap' ? 'floorMap' : 'grid';
+    }),
+    _useState10 = _slicedToArray(_useState9, 2),
+    bodyView = _useState10[0],
+    setBodyView = _useState10[1];
+  var _useState11 = useState(function () {
       var _props$grid$defaultHi, _props$grid, _props$grid$columns, _props$grid2;
       var fromConfig = (_props$grid$defaultHi = (_props$grid = props.grid) === null || _props$grid === void 0 ? void 0 : _props$grid.defaultHiddenColumnKeys) !== null && _props$grid$defaultHi !== void 0 ? _props$grid$defaultHi : [];
       var fromColumns = ((_props$grid$columns = (_props$grid2 = props.grid) === null || _props$grid2 === void 0 ? void 0 : _props$grid2.columns) !== null && _props$grid$columns !== void 0 ? _props$grid$columns : []).filter(function (col) {
@@ -146,10 +167,10 @@ var PisellRecordBoard = function PisellRecordBoard(props) {
       }
       return defaultVis;
     }),
-    _useState10 = _slicedToArray(_useState9, 2),
-    internalColumnVisibility = _useState10[0],
-    setInternalColumnVisibility = _useState10[1];
-  var _useState11 = useState(function () {
+    _useState12 = _slicedToArray(_useState11, 2),
+    internalColumnVisibility = _useState12[0],
+    setInternalColumnVisibility = _useState12[1];
+  var _useState13 = useState(function () {
       if (typeof columnVisibilityStorageKey === 'string' && columnVisibilityStorageKey && typeof getRecordBoardColumnSettingFromLocal === 'function') {
         var _saved$columnOrder;
         var saved = getRecordBoardColumnSettingFromLocal(columnVisibilityStorageKey);
@@ -157,9 +178,9 @@ var PisellRecordBoard = function PisellRecordBoard(props) {
       }
       return null;
     }),
-    _useState12 = _slicedToArray(_useState11, 2),
-    internalColumnOrder = _useState12[0],
-    setInternalColumnOrder = _useState12[1];
+    _useState14 = _slicedToArray(_useState13, 2),
+    internalColumnOrder = _useState14[0],
+    setInternalColumnOrder = _useState14[1];
   useEffect(function () {
     if (typeof columnVisibilityStorageKey !== 'string' || !columnVisibilityStorageKey) return;
     saveColumnVisibilityToLocal({
@@ -187,10 +208,34 @@ var PisellRecordBoard = function PisellRecordBoard(props) {
       selectedRows: internalSelectedRows,
       onSelectionChange: onSelectionChangeInternal
     }, rowKeyProp);
-    var data = dataProp !== undefined ? dataProp : defaultCtx.data;
-    var loading = loadingProp !== undefined ? loadingProp : defaultCtx.loading;
-    var total = totalProp !== undefined ? totalProp : defaultCtx.total;
+
+    /** 分页状态（推导表格切片前需要） */
     var pagination = paginationProp !== undefined ? paginationProp : defaultCtx.pagination;
+
+    /**
+     * 表格数据：
+     * - 显式传入 `data` 时始终用 `data`（如服务端分页当前页）；
+     * - 否则若存在 `dataSources` + `gridDataSourceKey`，从对应数组做客户端分页切片。
+     */
+    var data;
+    var total;
+    if (dataProp !== undefined) {
+      data = dataProp;
+      total = totalProp !== undefined ? totalProp : defaultCtx.total;
+    } else if (dataSourcesProp != null && gridDataSourceKeyProp != null && gridDataSourceKeyProp !== '') {
+      var _dataSourcesProp$grid;
+      var raw = (_dataSourcesProp$grid = dataSourcesProp[gridDataSourceKeyProp]) !== null && _dataSourcesProp$grid !== void 0 ? _dataSourcesProp$grid : [];
+      total = totalProp !== undefined ? totalProp : raw.length;
+      var pageNumber = pagination.pageNumber,
+        pageSize = pagination.pageSize;
+      var safeSize = Math.max(1, pageSize);
+      var start = Math.max(0, (pageNumber - 1) * safeSize);
+      data = raw.slice(start, start + safeSize);
+    } else {
+      data = defaultCtx.data;
+      total = totalProp !== undefined ? totalProp : defaultCtx.total;
+    }
+    var loading = loadingProp !== undefined ? loadingProp : defaultCtx.loading;
     var onPageChange = onPageChangeProp !== null && onPageChangeProp !== void 0 ? onPageChangeProp : defaultCtx.onPageChange;
     var searchParams = searchParamsProp !== undefined ? searchParamsProp : defaultCtx.searchParams;
     var onSearch = onSearchProp !== null && onSearchProp !== void 0 ? onSearchProp : defaultCtx.onSearch;
@@ -204,6 +249,8 @@ var PisellRecordBoard = function PisellRecordBoard(props) {
     return _objectSpread(_objectSpread({}, defaultCtx), {}, {
       layoutType: layoutType,
       rowKey: rowKey,
+      dataSources: dataSourcesProp,
+      gridDataSourceKey: gridDataSourceKeyProp,
       data: data,
       loading: loading,
       total: total,
@@ -224,20 +271,25 @@ var PisellRecordBoard = function PisellRecordBoard(props) {
       scrollAreaHeight: scrollAreaHeight,
       setScrollAreaHeight: setScrollAreaHeight,
       filterResetKey: filterResetKey,
-      setFilterResetKey: setFilterResetKey
+      setFilterResetKey: setFilterResetKey,
+      bodyView: bodyView,
+      setBodyView: setBodyView,
+      floorMapProps: floorMapProp,
+      floorMapLayoutContext: floorMapLayoutContextProp,
+      defaultBodyView: defaultBodyView
     });
-  }, [layoutType, rowKeyProp, dataProp, loadingProp, totalProp, paginationProp, onPageChangeProp, searchParamsProp, onSearchProp, onResetProp, mergedChildComponentProps, internalSelectedKeys, internalSelectedRows, onSelectionChangeInternal, internalColumnVisibility, onColumnVisibilityChangeInternal, internalColumnOrder, onColumnOrderChangeInternal, fillHeight, scrollAreaHeight, filterResetKey]);
+  }, [layoutType, rowKeyProp, dataProp, dataSourcesProp, gridDataSourceKeyProp, loadingProp, totalProp, paginationProp, onPageChangeProp, searchParamsProp, onSearchProp, onResetProp, mergedChildComponentProps, internalSelectedKeys, internalSelectedRows, onSelectionChangeInternal, internalColumnVisibility, onColumnVisibilityChangeInternal, internalColumnOrder, onColumnOrderChangeInternal, fillHeight, scrollAreaHeight, filterResetKey, floorMapProp, floorMapLayoutContextProp, defaultBodyView, bodyView]);
   var content = /*#__PURE__*/React.createElement(RecordBoardProvider, {
     value: contextValue
   }, children);
   return /*#__PURE__*/React.createElement("div", {
-    className: "pisell-record-board-root",
-    style: {
+    className: classNameProp ? "pisell-record-board-root ".concat(classNameProp) : 'pisell-record-board-root',
+    style: _objectSpread({
       height: '100%',
       display: 'flex',
       flexDirection: 'column',
       minHeight: 0
-    }
+    }, styleProp)
   }, content);
 };
 export default PisellRecordBoard;

package/es/components/pisellRecordBoard/PisellRecordBoard.stories.d.ts

@@ -3,6 +3,10 @@ import PisellRecordBoard from './index';
 declare const meta: Meta<typeof PisellRecordBoard>;
 export default meta;
 declare type Story = StoryObj<typeof PisellRecordBoard>;
+/**
+ * **默认 Story**：餐厅 **多数据源**——**餐桌** + **蘸料摆台**；根级 `dataSources` 同时包含两者；**表格只绑定餐桌一路**（`gridDataSourceKey`）；平面图同时渲染两类落位，无需 Segmented 切换列表。
+ */
+export declare const Default: Story;
 /**
  * Grid 布局 - 带 Table、分页、多选；列 type 驱动列/筛选/排序；筛选在 Filter 弹层内；重置清空筛选与排序。
  */