@pisell/materials 1.0.1042 → 1.0.1044

package/lib/components/pisellRecordBoard/shellFrame/ToolBar/index.js

@@ -13,11 +13,16 @@ const require_index$7 = require('../ColumnSetting/index.js');
 let antd = require("antd");
 let react = require("react");
 react = require_rolldown_runtime.__toESM(react);
+let _pisell_utils = require("@pisell/utils");
 let _pisell_icon_es_SwitchVertical01 = require("@pisell/icon/es/SwitchVertical01");
 _pisell_icon_es_SwitchVertical01 = require_rolldown_runtime.__toESM(_pisell_icon_es_SwitchVertical01);
 require("./ToolBarFilter.less");
 
 //#region src/components/pisellRecordBoard/shellFrame/ToolBar/index.tsx
+/** 与 Quick Filter 同源：使用 @pisell/utils 的 locales.getText，无 key 时回退 materials getText */
+function getSortButtonText() {
+	return _pisell_utils.locales.getText("pisell2.recordBoard.toolbar.sort") || require_index.getText("sort-button-text");
+}
 /** 默认搜索参数字段名，与 context.searchParams 对应 */
 const DEFAULT_SEARCH_FIELD = "keyword";
 /** 筛选在 searchParams 中的字段名 */
@@ -90,25 +95,52 @@ const RecordBoardToolBar = (props) => {
 			className: "record-board-toolbar-filter-btn",
 			icon: /* @__PURE__ */ react.default.createElement(_pisell_icon_es_SwitchVertical01.default, null),
 			size: "large"
-		}, require_index.getText("sort-button-text"))
+		}, getSortButtonText())
 	}));
 	const filterConfig = slots.filter;
 	const hideFilter = filterConfig === false;
 	const filterValue = searchParams === null || searchParams === void 0 ? void 0 : searchParams[FILTER_PARAMS_FIELD];
-	const hasFilterItems = Array.isArray(filterValue === null || filterValue === void 0 ? void 0 : filterValue.quickFilter) && filterValue.quickFilter.length > 0 || Array.isArray(filterValue === null || filterValue === void 0 ? void 0 : filterValue.otherFilter) && filterValue.otherFilter.length > 0;
+	const hasFilterList = Array.isArray(filterValue === null || filterValue === void 0 ? void 0 : filterValue.quickFilter) && filterValue.quickFilter.length > 0 || Array.isArray(filterValue === null || filterValue === void 0 ? void 0 : filterValue.otherFilter) && filterValue.otherFilter.length > 0;
+	const hasFilterValues = typeof (filterValue === null || filterValue === void 0 ? void 0 : filterValue.values) === "object" && filterValue.values !== null && Object.keys(filterValue.values).length > 0;
+	const hasFilterItems = hasFilterList || hasFilterValues;
+	const defaultFilterFromConfig = typeof filterConfig === "object" && filterConfig !== null && filterConfig.defaultFilterValue ? filterConfig.defaultFilterValue : null;
 	const effectiveFilterValue = (0, react.useMemo)(() => {
-		var _base$values;
-		const base = filterValue != null && hasFilterItems ? filterValue : typeof filterConfig === "object" && filterConfig !== null && filterConfig.defaultFilterValue ? filterConfig.defaultFilterValue : derivedFilterFromColumns && (derivedFilterFromColumns.quickFilter.length > 0 || derivedFilterFromColumns.otherFilter.length > 0) ? derivedFilterFromColumns : getDefaultFilterValue();
-		return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, base), {}, { values: (_base$values = base.values) !== null && _base$values !== void 0 ? _base$values : {} });
+		var _defaultFilterFromCon, _defaultFilterFromCon2, _base$values;
+		const base = filterValue != null && hasFilterItems ? filterValue : defaultFilterFromConfig ? defaultFilterFromConfig : derivedFilterFromColumns && (derivedFilterFromColumns.quickFilter.length > 0 || derivedFilterFromColumns.otherFilter.length > 0) ? derivedFilterFromColumns : getDefaultFilterValue();
+		const quickFilter = Array.isArray(base.quickFilter) && base.quickFilter.length > 0 ? base.quickFilter : (_defaultFilterFromCon = defaultFilterFromConfig === null || defaultFilterFromConfig === void 0 ? void 0 : defaultFilterFromConfig.quickFilter) !== null && _defaultFilterFromCon !== void 0 ? _defaultFilterFromCon : [];
+		let otherFilter = Array.isArray(base.otherFilter) && base.otherFilter.length > 0 ? base.otherFilter : (_defaultFilterFromCon2 = defaultFilterFromConfig === null || defaultFilterFromConfig === void 0 ? void 0 : defaultFilterFromConfig.otherFilter) !== null && _defaultFilterFromCon2 !== void 0 ? _defaultFilterFromCon2 : [];
+		if (otherFilter === base.otherFilter && Array.isArray(defaultFilterFromConfig === null || defaultFilterFromConfig === void 0 ? void 0 : defaultFilterFromConfig.otherFilter) && defaultFilterFromConfig.otherFilter.length > 0) {
+			const configMap = new Map(defaultFilterFromConfig.otherFilter.map((c) => {
+				var _ref2, _c$key;
+				return [(_ref2 = (_c$key = c.key) !== null && _c$key !== void 0 ? _c$key : c.name) !== null && _ref2 !== void 0 ? _ref2 : "", c];
+			}));
+			otherFilter = otherFilter.map((item) => {
+				var _ref3, _item$key;
+				const key = (_ref3 = (_item$key = item.key) !== null && _item$key !== void 0 ? _item$key : item.name) !== null && _ref3 !== void 0 ? _ref3 : "";
+				const configItem = configMap.get(key);
+				if (!configItem) return item;
+				return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, configItem), item), {}, { other: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, configItem === null || configItem === void 0 ? void 0 : configItem.other), item === null || item === void 0 ? void 0 : item.other) });
+			});
+		}
+		return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, base), {}, {
+			quickFilter,
+			otherFilter,
+			values: (_base$values = base.values) !== null && _base$values !== void 0 ? _base$values : {}
+		});
 	}, [
 		filterValue,
 		hasFilterItems,
-		filterConfig,
+		defaultFilterFromConfig,
 		derivedFilterFromColumns
 	]);
 	const filterValueForPisellFilter = (0, react.useMemo)(() => require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, effectiveFilterValue), {}, { quickFilter: [] }), [effectiveFilterValue]);
 	const handleFilterChange = (0, react.useCallback)((value) => {
-		onSearch(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, searchParams), {}, { [FILTER_PARAMS_FIELD]: value }));
+		var _currentFilter$values, _value$values;
+		const currentFilter = searchParams === null || searchParams === void 0 ? void 0 : searchParams[FILTER_PARAMS_FIELD];
+		const currentValues = (_currentFilter$values = currentFilter === null || currentFilter === void 0 ? void 0 : currentFilter.values) !== null && _currentFilter$values !== void 0 ? _currentFilter$values : {};
+		const incomingValues = (_value$values = value === null || value === void 0 ? void 0 : value.values) !== null && _value$values !== void 0 ? _value$values : {};
+		const nextFilter = require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, value), {}, { values: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, currentValues), incomingValues) });
+		onSearch(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, searchParams), {}, { [FILTER_PARAMS_FIELD]: nextFilter }));
 	}, [onSearch, searchParams]);
 	const filterNode = hideFilter ? null : /* @__PURE__ */ react.default.createElement(require_index$4.default, require_objectSpread2._objectSpread2({
 		value: filterValueForPisellFilter,

package/lib/components/pisellRecordBoard/shellFrame/ToolBarReset/index.js

@@ -5,10 +5,15 @@ const require_useRecordBoardContext = require('../../hooks/useRecordBoardContext
 let antd = require("antd");
 let react = require("react");
 react = require_rolldown_runtime.__toESM(react);
+let _pisell_utils = require("@pisell/utils");
 let _ant_design_icons = require("@ant-design/icons");
 require("./index.less");
 
 //#region src/components/pisellRecordBoard/shellFrame/ToolBarReset/index.tsx
+/** 与 Quick Filter 同源：使用 @pisell/utils 的 locales.getText，无 key 时回退 materials getText */
+function getResetButtonText() {
+	return _pisell_utils.locales.getText("pisell2.recordBoard.toolbar.reset") || require_index.getText("record-board-toolbar-reset");
+}
 /** 筛选在 searchParams 中的字段名，与 ToolBar 一致 */
 const FILTER_PARAMS_FIELD = "filter";
 /** 排序在 searchParams 中的字段名，与 ToolBar 一致 */
@@ -18,7 +23,7 @@ const SORT_PARAMS_FIELD = "sort";
 * 点击后以空 filter.values、清空 sort 调用 onSearch，并调用 onReset（若提供）。
 */
 const ToolBarReset = ({ size = "large", type = "default", children }) => {
-	const defaultResetText = require_index.getText("record-board-toolbar-reset");
+	const defaultResetText = getResetButtonText();
 	const { searchParams, onSearch, onReset } = require_useRecordBoardContext.useRecordBoardContext();
 	const handleReset = (0, react.useCallback)(() => {
 		var _currentFilter$otherF;

package/lib/components/pisellRecordBoard/types.d.ts

@@ -213,7 +213,8 @@ type RecordBoardGridProps = {
   size?: 'small' | 'middle' | 'default'; /** 当前选中的行 key 列表（多选） */
   selectedKeys?: Key[]; /** 当前选中的行数据（多选） */
   selectedRows?: unknown[]; /** 多选变更回调 */
-  onSelectionChange?: (keys: Key[], rows: unknown[]) => void;
+  onSelectionChange?: (keys: Key[], rows: unknown[]) => void; /** 多选列配置：fixed、columnWidth 等，与 selectedKeys/onSelectionChange 合并为 Table rowSelection */
+  rowSelection?: Partial<Omit<NonNullable<TableProps<unknown>['rowSelection']>, 'selectedRowKeys' | 'onChange'>>;
 } & Omit<TableProps<unknown>, 'dataSource' | 'loading' | 'pagination' | 'columns' | 'scroll' | 'size' | 'rowSelection'>;
 interface RecordBoardChildComponentProps {
   /** 搜索配置，透传给 PisellFind；关键词绑定 searchParams.keyword */

package/lib/components/pisellTimeRangeDisplay/PisellTimeRangeDisplay.js

@@ -57,7 +57,7 @@ const PisellTimeRangeDisplay = (props) => {
 		"duration"
 	] } = fields || {};
 	const showSeconds = (_durationFormat$showS = durationFormat === null || durationFormat === void 0 ? void 0 : durationFormat.showSeconds) !== null && _durationFormat$showS !== void 0 ? _durationFormat$showS : false;
-	const effectiveDateFormat = (0, react.useMemo)(() => require_objectSpread2._objectSpread2({ showRelativeDay: true }, dateFormat), [dateFormat]);
+	const effectiveDateFormat = (0, react.useMemo)(() => require_objectSpread2._objectSpread2({ showRelativeDay: false }, dateFormat), [dateFormat]);
 	const referenceDate = (0, dayjs.default)();
 	const relativeDay = (effectiveDateFormat === null || effectiveDateFormat === void 0 ? void 0 : effectiveDateFormat.showRelativeDay) ? require_relativeDay.getRelativeDay(start, referenceDate) : null;
 	const hideWeekdayWhenDateRelative = showDate && relativeDay !== null;

package/lib/components/skeleton/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import * as react19 from "react";
+import * as react21 from "react";
 
 //#region src/components/skeleton/index.d.ts
-declare const Skeleton: (props: any) => react19.JSX.Element;
+declare const Skeleton: (props: any) => react21.JSX.Element;
 //#endregion
 export { Skeleton };

package/lib/components/time-picker/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import * as react20 from "react";
+import * as react19 from "react";
 
 //#region src/components/time-picker/index.d.ts
-declare const TimePicker: (props: any) => react20.JSX.Element;
+declare const TimePicker: (props: any) => react19.JSX.Element;
 //#endregion
 export { TimePicker };

package/lib/components/upload/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import * as react21 from "react";
+import * as react20 from "react";
 
 //#region src/components/upload/index.d.ts
-declare const Upload: (props: any) => react21.JSX.Element;
+declare const Upload: (props: any) => react20.JSX.Element;
 //#endregion
 export { Upload };

package/lib/locales/zh-CN.js

@@ -56,7 +56,7 @@ var zh_CN_default = {
 	"pisell-lookup-placeholder": "请输入搜索内容",
 	"pisell-lookup-button-text": "搜索",
 	"pisell-lookup-confirm-button-text": "Lookup",
-	"pisell-lookup-clear": "Clear",
+	"pisell-lookup-clear": "清空",
 	"pisell-lookup-close": "Close",
 	"pisell-lookup-search-history": "搜索历史",
 	"pisell-lookup-clear-history": "清空",
@@ -64,7 +64,7 @@ var zh_CN_default = {
 	"pisell-lookup-popular-search": "Popular Search",
 	"pisell-lookup-loading": "加载中...",
 	"pisell-lookup-no-data": "暂无数据",
-	"pisell-find-button-text": "Find",
+	"pisell-find-button-text": "搜索",
 	"pisell-find-placeholder": "请输入搜索内容",
 	"pisell-export-button-text": "导出",
 	"batch-editor-actions": "操作",

package/lib/locales/zh-TW.js

@@ -56,7 +56,7 @@ var zh_TW_default = {
 	"pisell-lookup-placeholder": "請輸入搜索內容",
 	"pisell-lookup-button-text": "搜索",
 	"pisell-lookup-confirm-button-text": "Lookup",
-	"pisell-lookup-clear": "Clear",
+	"pisell-lookup-clear": "清空",
 	"pisell-lookup-close": "Close",
 	"pisell-lookup-search-history": "搜索歷史",
 	"pisell-lookup-clear-history": "清空",
@@ -64,7 +64,7 @@ var zh_TW_default = {
 	"pisell-lookup-popular-search": "Popular Search",
 	"pisell-lookup-loading": "加載中...",
 	"pisell-lookup-no-data": "暫無數據",
-	"pisell-find-button-text": "Find",
+	"pisell-find-button-text": "搜尋",
 	"pisell-find-placeholder": "請輸入搜索內容",
 	"pisell-export-button-text": "導出",
 	"batch-editor-actions": "操作",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.1042",
+  "version": "1.0.1044",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -89,9 +89,9 @@
     "swiper": "^8.4.7",
     "antd-mobile": "^5.38.1",
     "vod-js-sdk-v6": "^1.4.11",
-    "@pisell/date-picker": "1.0.133",
-    "@pisell/icon": "0.0.10",
-    "@pisell/utils": "1.0.60"
+    "@pisell/utils": "1.0.61",
+    "@pisell/date-picker": "1.0.134",
+    "@pisell/icon": "0.0.10"
   },
   "peerDependencies": {
     "react": "^18.0.0",