From eab76cd34bff799686f68e6b70f86c9001e4913f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 09:41:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/components/MyExportButton.jsx | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/rsf-admin/src/page/components/MyExportButton.jsx b/rsf-admin/src/page/components/MyExportButton.jsx
index f70dced..a684e47 100644
--- a/rsf-admin/src/page/components/MyExportButton.jsx
+++ b/rsf-admin/src/page/components/MyExportButton.jsx
@@ -6,12 +6,14 @@
useDataProvider,
useNotify,
useListContext,
+ useUnselectAll,
} from "react-admin";
const MyExportButton = (props) => {
const {
maxResults = 1000,
onClick,
+ ids,
label = "ra.action.export",
icon = defaultIcon,
exporter: customExporter,
@@ -19,16 +21,17 @@
...rest
} = props;
- const { filter, filterValues, resource, sort, total } = useListContext();
-
+ const { filter, selectedIds, filterValues, resource, sort, total } = useListContext();
+ const unSelect = useUnselectAll(resource);
const dataProvider = useDataProvider();
const notify = useNotify();
-
- const handleClick = useCallback(
+ const handleClick =
+ // useCallback(
(event) => {
dataProvider
.export(resource, {
sort,
+ ids: selectedIds,
filter: filter ? { ...filterValues, ...filter } : filterValues,
pagination: { page: 1, perPage: maxResults },
meta,
@@ -43,6 +46,7 @@
document.body.appendChild(link);
link.click();
link.remove();
+ unSelect();
})
.catch((error) => {
console.error(error);
@@ -51,19 +55,19 @@
if (typeof onClick === "function") {
onClick(event);
}
- },
- [
- dataProvider,
- filter,
- filterValues,
- maxResults,
- notify,
- onClick,
- resource,
- sort,
- meta,
- ],
- );
+ }
+ // [
+ // dataProvider,
+ // filter,
+ // filterValues,
+ // maxResults,
+ // notify,
+ // onClick,
+ // resource,
+ // sort,
+ // meta,
+ // ],
+ // );
return (
<Button
--
Gitblit v1.9.1