@pisell/materials 6.11.10 → 6.11.12

package/es/components/pisellMetricCard/index.d.ts

@@ -0,0 +1,6 @@
+/**
+ * PisellMetricCard 组件导出
+ */
+export { default as PisellMetricCard } from './PisellMetricCard';
+export type { PisellMetricCardProps, TrendType, FormatOptions, MetricTitleProps, MetricValueProps, MetricComparisonProps, TrendIconProps, } from './types';
+export { default } from './PisellMetricCard';

package/es/components/pisellMultipleSelect/PisellMultipleSelect.less

@@ -7,6 +7,21 @@
   height: 48px !important;
   width: 100%;
 
+  .pisell-lowcode-select-clear {
+    color: #667085;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 44px;
+    min-height: 44px;
+    margin: -22px -8px;
+    padding: 10px 8px;
+
+    &:hover {
+      color: #344054;
+    }
+  }
+
   // Select 触发器（Figma 设计规范，与 SingleSelect / Input 体系一致）
   .pisell-lowcode-select:not(.pisell-lowcode-select-disabled):not(.pisell-lowcode-select-customize-input) {
     .pisell-lowcode-select-selector {
@@ -51,13 +66,6 @@
       color: #667085;
     }
 
-    .pisell-lowcode-select-clear {
-      color: #667085;
-
-      &:hover {
-        color: #344054;
-      }
-    }
 
     // 多选标签（选择后展示的 item）高度 36px
     .pisell-lowcode-select-selection-item {

package/es/components/pisellRecordBoard/PisellRecordBoard.js

@@ -18,12 +18,12 @@ 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); }
 import React, { useMemo, useState, useCallback, useEffect } from 'react';
-import { getColumnVisibilityFromLocal, saveColumnVisibilityToLocal } from '@pisell/utils';
+import { getColumnVisibilityFromLocal, getRecordBoardColumnSettingFromLocal, saveColumnVisibilityToLocal } from '@pisell/utils';
 import { RecordBoardProvider } from "./context/RecordBoardProvider";
 import { getRecordBoardColumnKey } from "./utils/recordBoardColumns";
 var defaultPagination = {
   pageNumber: 1,
-  pageSize: 10
+  pageSize: 50
 };
 
 /**
@@ -67,7 +67,9 @@ function getDefaultRecordBoardContext(layoutType, selection, rowKey) {
     rowKey: rowKey,
     childComponentProps: undefined,
     scrollAreaHeight: null,
-    setScrollAreaHeight: undefined
+    setScrollAreaHeight: undefined,
+    filterResetKey: undefined,
+    setFilterResetKey: undefined
   };
 }
 
@@ -111,7 +113,12 @@ var PisellRecordBoard = function PisellRecordBoard(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     scrollAreaHeight = _useState6[0],
     setScrollAreaHeight = _useState6[1];
-  var _useState7 = useState(function () {
+  /** 点击重置时递增，供 ToolBar 给 PisellFilter 设 key 以强制重挂载，清空弹窗内高级筛选表单 */
+  var _useState7 = useState(0),
+    _useState8 = _slicedToArray(_useState7, 2),
+    filterResetKey = _useState8[0],
+    setFilterResetKey = _useState8[1];
+  var _useState9 = 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) {
@@ -125,23 +132,42 @@ var PisellRecordBoard = function PisellRecordBoard(props) {
         defaultVis[k] = false;
       });
       if (typeof columnVisibilityStorageKey === 'string' && columnVisibilityStorageKey) {
-        var saved = getColumnVisibilityFromLocal(columnVisibilityStorageKey);
-        if (saved && Object.keys(saved).length > 0) {
-          return _objectSpread(_objectSpread({}, defaultVis), saved);
+        if (typeof getRecordBoardColumnSettingFromLocal === 'function') {
+          var saved = getRecordBoardColumnSettingFromLocal(columnVisibilityStorageKey);
+          if (saved !== null && saved !== void 0 && saved.columnVisibility && Object.keys(saved.columnVisibility).length > 0) {
+            return _objectSpread(_objectSpread({}, defaultVis), saved.columnVisibility);
+          }
+        } else if (typeof getColumnVisibilityFromLocal === 'function') {
+          var savedVis = getColumnVisibilityFromLocal(columnVisibilityStorageKey);
+          if (savedVis && Object.keys(savedVis).length > 0) {
+            return _objectSpread(_objectSpread({}, defaultVis), savedVis);
+          }
         }
       }
       return defaultVis;
     }),
-    _useState8 = _slicedToArray(_useState7, 2),
-    internalColumnVisibility = _useState8[0],
-    setInternalColumnVisibility = _useState8[1];
+    _useState10 = _slicedToArray(_useState9, 2),
+    internalColumnVisibility = _useState10[0],
+    setInternalColumnVisibility = _useState10[1];
+  var _useState11 = useState(function () {
+      if (typeof columnVisibilityStorageKey === 'string' && columnVisibilityStorageKey && typeof getRecordBoardColumnSettingFromLocal === 'function') {
+        var _saved$columnOrder;
+        var saved = getRecordBoardColumnSettingFromLocal(columnVisibilityStorageKey);
+        return (_saved$columnOrder = saved === null || saved === void 0 ? void 0 : saved.columnOrder) !== null && _saved$columnOrder !== void 0 ? _saved$columnOrder : null;
+      }
+      return null;
+    }),
+    _useState12 = _slicedToArray(_useState11, 2),
+    internalColumnOrder = _useState12[0],
+    setInternalColumnOrder = _useState12[1];
   useEffect(function () {
     if (typeof columnVisibilityStorageKey !== 'string' || !columnVisibilityStorageKey) return;
     saveColumnVisibilityToLocal({
       componentId: columnVisibilityStorageKey,
-      columnVisibility: internalColumnVisibility
+      columnVisibility: internalColumnVisibility,
+      columnOrder: internalColumnOrder !== null && internalColumnOrder !== void 0 ? internalColumnOrder : undefined
     });
-  }, [columnVisibilityStorageKey, internalColumnVisibility]);
+  }, [columnVisibilityStorageKey, internalColumnVisibility, internalColumnOrder]);
   var onSelectionChangeInternal = useCallback(function (keys, rows) {
     setInternalSelectedKeys(keys);
     setInternalSelectedRows(rows);
@@ -151,6 +177,9 @@ var PisellRecordBoard = function PisellRecordBoard(props) {
       return _objectSpread(_objectSpread({}, prev), visibility);
     });
   }, []);
+  var onColumnOrderChangeInternal = useCallback(function (columnKeys) {
+    setInternalColumnOrder(columnKeys);
+  }, []);
   var contextValue = useMemo(function () {
     var _gridSelection$select;
     var defaultCtx = getDefaultRecordBoardContext(layoutType, {
@@ -188,12 +217,16 @@ var PisellRecordBoard = function PisellRecordBoard(props) {
       onSelectionChange: onSelectionChange,
       columnVisibility: internalColumnVisibility,
       onColumnVisibilityChange: onColumnVisibilityChangeInternal,
+      columnOrder: internalColumnOrder,
+      onColumnOrderChange: onColumnOrderChangeInternal,
       childComponentProps: mergedChildComponentProps !== null && mergedChildComponentProps !== void 0 ? mergedChildComponentProps : defaultCtx.childComponentProps,
       fillHeight: fillHeight,
       scrollAreaHeight: scrollAreaHeight,
-      setScrollAreaHeight: setScrollAreaHeight
+      setScrollAreaHeight: setScrollAreaHeight,
+      filterResetKey: filterResetKey,
+      setFilterResetKey: setFilterResetKey
     });
-  }, [layoutType, rowKeyProp, dataProp, loadingProp, totalProp, paginationProp, onPageChangeProp, searchParamsProp, onSearchProp, onResetProp, mergedChildComponentProps, internalSelectedKeys, internalSelectedRows, onSelectionChangeInternal, internalColumnVisibility, onColumnVisibilityChangeInternal, fillHeight, scrollAreaHeight]);
+  }, [layoutType, rowKeyProp, dataProp, loadingProp, totalProp, paginationProp, onPageChangeProp, searchParamsProp, onSearchProp, onResetProp, mergedChildComponentProps, internalSelectedKeys, internalSelectedRows, onSelectionChangeInternal, internalColumnVisibility, onColumnVisibilityChangeInternal, internalColumnOrder, onColumnOrderChangeInternal, fillHeight, scrollAreaHeight, filterResetKey]);
   var content = /*#__PURE__*/React.createElement(RecordBoardProvider, {
     value: contextValue
   }, children);

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

@@ -11,6 +11,14 @@ export declare const GridLayoutWithTable: Story;
  * Grid 布局 - 多页分页示例（至少 25 页：250 条数据，每页 10 条）
  */
 export declare const GridWithMultiplePages: Story;
+/**
+ * Grid 布局 - 同值列折叠：当前页某列全部同值或全部为空时，该列隐藏并在表格上方展示总结区（列名 + 统一值/空数据）。
+ */
+export declare const GridLayoutWithCollapseUniformColumns: Story;
+/**
+ * Grid 布局 - uniformCompare 示例：列值为对象时，用 uniformCompare(value, record) 返回用于比较的 string/number，全同则折叠。
+ */
+export declare const GridLayoutWithUniformCompare: Story;
 /**
  * Grid 布局 - grid 透传 antd Table props：onRow（行点击）、rowClassName 等
  */