@pisell/materials 1.8.41 → 1.8.43

package/es/components/Pagination/index.js

@@ -2,7 +2,7 @@ import { getText } from "../../locales/index.js";
 import { _objectSpread2 } from "../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import { _objectWithoutProperties } from "../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectWithoutProperties.js";
 import useIsMobileTable from "../table/hooks/useIsMobileTable.js";
-import React, { useEffect, useMemo, useState } from "react";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { locales } from "@pisell/utils";
 import { Pagination } from "antd";
 import classNames from "classnames";
@@ -24,29 +24,56 @@ function getPaginationText(key) {
 	if (fromUtils !== fullKey) return fromUtils;
 	return (_getText = getText(fullKey)) !== null && _getText !== void 0 ? _getText : getText(`table-pagination-${key}`);
 }
+/**
+* antd Pagination 的 showTotal(total, range) 中 range 为本页条目序号区间 [start, end]，
+* 不是页码。未受控时用 range 与 pageSize 推算当前页。
+*/
+function resolveCurrentPage(props, range, pageSize) {
+	var _props$current;
+	const fromProps = (_props$current = props.current) !== null && _props$current !== void 0 ? _props$current : props.defaultCurrent;
+	if (typeof fromProps === "number" && fromProps >= 1) return fromProps;
+	const start = range[0];
+	if (start == null || start < 1 || pageSize < 1) return 1;
+	return Math.floor((start - 1) / pageSize) + 1;
+}
 const Pagination$1 = (props) => {
 	const show = useMemo(() => {
 		return Object.keys(props).length;
 	}, [props]);
 	const isMiniPagination = useIsMobileTable();
-	const effectiveConfig = useMemo(() => {
+	const itemRenderFn = useMemo(() => {
 		const prevText = getPaginationText("previous");
 		const nextText = getPaginationText("next");
-		const showTotalFn = getPaginationText("showTotal");
-		const itemRenderFn = (_, type, originalElement) => {
+		return (_, type, originalElement) => {
 			if (type === "prev") return /* @__PURE__ */ React.createElement("div", { className: classNames("paginator-page-btn", "left") }, /* @__PURE__ */ React.createElement(ArrowLeft, { className: "paginator-page-btn-left-icon" }), /* @__PURE__ */ React.createElement("span", { className: "paginator-page-btn-text" }, prevText));
 			if (type === "next") return /* @__PURE__ */ React.createElement("div", { className: classNames("paginator-page-btn", "right") }, /* @__PURE__ */ React.createElement("span", { className: "paginator-page-btn-text" }, nextText), /* @__PURE__ */ React.createElement(ArrowRight, { className: "paginator-page-btn-right-icon" }));
 			return originalElement;
 		};
+	}, []);
+	const showTotalDefault = useCallback((totalRecords, range) => {
+		var _ref, _props$pageSize;
+		const pageSize = (_ref = (_props$pageSize = props.pageSize) !== null && _props$pageSize !== void 0 ? _props$pageSize : props.defaultPageSize) !== null && _ref !== void 0 ? _ref : 10;
+		const currentPage = resolveCurrentPage(props, range, pageSize);
+		const totalPages = totalRecords <= 0 ? 1 : Math.max(1, Math.ceil(totalRecords / pageSize));
+		const showTotalFn = getPaginationText("showTotal");
+		if (typeof showTotalFn === "function") return showTotalFn(currentPage, totalPages);
+		return `Page ${currentPage} of ${totalPages}`;
+	}, [
+		props.current,
+		props.defaultCurrent,
+		props.pageSize,
+		props.defaultPageSize
+	]);
+	const effectiveConfig = useMemo(() => {
 		return {
 			className: "materials-grid-paginator",
 			defaultCurrent: 1,
-			showTotal: typeof showTotalFn === "function" ? (total, range) => showTotalFn(range[0], range[1]) : (total, range) => `Page ${range[0]} of ${range[1]}`,
+			showTotal: showTotalDefault,
 			itemRender: itemRenderFn,
 			responsive: true,
 			size: "small"
 		};
-	}, []);
+	}, [itemRenderFn, showTotalDefault]);
 	return useMemo(() => {
 		if (!show) return null;
 		let Com = Pagination;
@@ -62,7 +89,14 @@ const Pagination$1 = (props) => {
 const paginationConfig = {
 	className: "materials-grid-paginator",
 	defaultCurrent: 1,
-	showTotal: (total, range) => `Page ${range[0]} of ${range[1]}`,
+	showTotal: (totalRecords, range) => {
+		const pageSize = 10;
+		const currentPage = resolveCurrentPage({ pageSize }, range, pageSize);
+		const totalPages = totalRecords <= 0 ? 1 : Math.max(1, Math.ceil(totalRecords / pageSize));
+		const fn = getPaginationText("showTotal");
+		if (typeof fn === "function") return fn(currentPage, totalPages);
+		return `Page ${currentPage} of ${totalPages}`;
+	},
 	responsive: true,
 	size: "small"
 };
@@ -105,8 +139,8 @@ const MiniPagination = (props) => {
 		}
 	}, /* @__PURE__ */ React.createElement("div", { className: classNames("paginator-page-btn", "right") }, /* @__PURE__ */ React.createElement(ArrowRight, { className: "paginator-page-btn-right-icon" }))));
 };
-const FormPagination = (_ref) => {
-	let { value = {}, onChange, page, pageSize } = _ref, other = _objectWithoutProperties(_ref, _excluded);
+const FormPagination = (_ref2) => {
+	let { value = {}, onChange, page, pageSize } = _ref2, other = _objectWithoutProperties(_ref2, _excluded);
 	const [_p, _setP] = useState(page || 1);
 	const [_ps, _setPs] = useState(pageSize || 10);
 	const _onChange = (p, ps) => {

package/es/components/PisellCards/components/GraphicTextCard/docs/GraphicTextCard.$tab-dev.md

@@ -53,7 +53,7 @@ GraphicTextCard 是一个图文卡片组件，结合图标/图片、文本和状
 1. ✅ 支持自定义背景、圆角、边框、阴影、padding、gap
 2. ✅ 支持自定义文本大小、粗细、颜色、显示行数
 3. ✅ 支持自定义图形区域大小、圆角、背景
-4. ✅ 支持自定义角标位置（通过 offset）和大小（通过 size）
+4. ✅ 支持自定义角标位置和样式
 5. ✅ 支持主题色 CSS 变量（`var(--theme-color)`）
 6. ✅ 文本超出显示省略号
 7. ✅ 图形区域尺寸可配置
@@ -122,12 +122,10 @@ export interface GraphicTextCardProps extends PisellBasicCardProps {
   badge?: {
     type?: 'dot' | 'number' | 'text';
     content?: ReactNode;
+    position?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left';
     offset?: [number, number];
-    size?: 'small' | 'default';
     color?: string;
     style?: CSSProperties;
-    showZero?: boolean;
-    [key: string]: any;
   };
 
   // ========== 插槽配置 ==========
@@ -780,7 +778,6 @@ export default Provider;
 
 1. **BadgeWrapper** - 来自 `TextCard/components/BadgeWrapper`
    - 功能：角标渲染和定位
-   - 位置通过 `offset` 控制，大小通过 `size` 控制，零值显示通过 `showZero` 控制
    - 基于：Ant Design Badge 组件
 
 2. **PisellBasicCardProps** - 来自 `PisellCards/types`