-
- );
-};
-
-export const TwindowContainer = () => {
- return (
-
- );
-};
-
-export default Ttwindow;
diff --git a/src/pages/Categories/index.tsx b/src/pages/Categories/index.tsx
index 1b70570e..49e5a486 100644
--- a/src/pages/Categories/index.tsx
+++ b/src/pages/Categories/index.tsx
@@ -6,13 +6,13 @@ import { useSnapshot } from "valtio";
import { Loading } from "@components/universal/Loading";
import { Modal } from "@components/universal/Modal";
import { Title } from "@components/universal/Title";
-import { Twindow } from "@components/universal/Twindow";
import { server } from "@states/app";
import type { BasicPage } from "@type/basic";
import { apiClient } from "@utils/request";
import { Input, Textarea } from "@pages/Write/Input";
import styles from "./index.module.css";
import { useSeo } from "@hooks/use-seo";
+import { toast } from "sonner";
export const CategoriesPage: BasicPage = () => {
useSeo("分类 & 标签")
@@ -320,36 +320,22 @@ export const CategoriesPage: BasicPage = () => {
} else {
e.currentTarget.classList.add(styles.confrim);
if (select.length === 1) {
- Twindow(
- {
- title: `提示 - 合并${
- select[0].type === "category" ? "分类" : "标签"
- }`,
- text: `请继续选择一个${
- select[0].type === "category" ? "分类" : "标签"
- }，然后再次点击合并按钮, 以将 ${select[0].name} ${
- select[0].type === "category" ? "分类" : "标签"
- }下的文章合并到所选${
- select[0].type === "category" ? "分类" : "标签"
- }下`,
- },
- 5000
- );
+ toast(
+ `
+ 请继续选择一个${
+ select[0].type === "category" ? "分类" : "标签"
+ }，再点击合并按钮, 以将 ${select[0].name} ${
+ select[0].type === "category" ? "分类" : "标签"
+ }合并之所选${
+ select[0].type === "category" ? "分类" : "标签"
+ }下
+ `, {
+ duration: 5000,
+ }
+ )
} else {
- Twindow(
- {
- title: `提示 - 合并${
- select[0].type === "category" ? "分类" : "标签"
- }`,
- text: `请再次点击合并按钮, 以将 ${
- select[0].name
- } ${
- select[0].type === "category" ? "分类" : "标签"
- }下的文章合并到 ${select[1].name} ${
- select[1].type === "category" ? "分类" : "标签"
- }下`,
- },
- 5000
+ toast(
+ `请再次点击合并按钮, 以将 ${select[0].name} 合并至 ${select[1].name}`
);
}
}
@@ -371,10 +357,7 @@ export const CategoriesPage: BasicPage = () => {
onClick={(e) => {
// 以确保只有单一类型（分类或标签）被选中
if (select.length && select[0].type === "tags") {
- Twindow({
- title: "提示 - 仅能选择一个分类或标签",
- text: "请先取消选择标签",
- });
+ toast("仅可选择一个分类或标签, 请先取消选择标签");
return;
}
if (e.currentTarget.classList.contains(styles.select)) {
@@ -431,10 +414,7 @@ export const CategoriesPage: BasicPage = () => {
aria-label={tag.name}
onClick={(e) => {
if (select.length && select[0].type === "category") {
- Twindow({
- title: "提示 - 仅能选择一个分类或标签",
- text: "请先取消选择分类",
- });
+ toast("仅可选择一个分类或标签, 请先取消选择分类");
return;
}
if (e.currentTarget.classList.contains(styles.select)) {
diff --git a/src/pages/Friends/index.tsx b/src/pages/Friends/index.tsx
index 96cf8e55..51d28654 100644
--- a/src/pages/Friends/index.tsx
+++ b/src/pages/Friends/index.tsx
@@ -19,7 +19,6 @@ import { Loading } from "@components/universal/Loading";
import { Modal, ModalBody } from "@components/universal/Modal";
import { Selects } from "@components/universal/Select";
import { Title } from "@components/universal/Title";
-import { Twindow } from "@components/universal/Twindow";
import type { BasicPage } from "@type/basic";
import { apiClient } from "@utils/request";
import { getQueryVariable } from "@utils/url";
@@ -33,6 +32,7 @@ import { Input, Textarea } from "@pages/Write/Input";
import styles from "./index.module.css";
import { jump } from "@utils/path";
import { useSeo } from "@hooks/use-seo";
+import { toast } from "sonner";
const FriendsStatus = ["Approved", "Pending", "Spam", "Trash"];
const FriendsFormFront = [
@@ -133,26 +133,29 @@ export const FriendsPage: BasicPage = () => {
URL: select[0] ? jump(`/friends/${select[0]}`) : jump("/friends"),
title: select[0] ? "修改成功" : "添加成功",
};
- apiClient(REQUEST.URL, {
- method: REQUEST.method,
- body: JSON.stringify(item),
- }).then(() => {
- Twindow({
- title: REQUEST.title,
- text: "正在重新加载数据",
- });
- setShowEditModal(false);
- setSelect([]);
- setInSideLoading(true);
- apiClient("/friends/all", {
- query: {
- status: tab === 0 ? undefined : tab,
- },
- }).then((res) => {
- setFriends(res.data);
- setInSideLoading(false);
+ const request = async () => {
+ await apiClient(REQUEST.URL, {
+ method: REQUEST.method,
+ body: JSON.stringify(item),
+ }).then(() => {
+ setShowEditModal(false);
+ setSelect([]);
+ setInSideLoading(true);
+ apiClient("/friends/all", {
+ query: {
+ status: tab === 0 ? undefined : tab,
+ },
+ }).then((res) => {
+ setFriends(res.data);
+ setInSideLoading(false);
+ });
});
- });
+ }
+ toast.promise(request, {
+ loading: "正在提交",
+ success: "提交成功",
+ error: "提交失败",
+ })
}}
options={{
confirmText: "提交",
@@ -355,11 +358,18 @@ export const FriendsPage: BasicPage = () => {
if (
e.currentTarget.classList.contains(postStyles.confrim)
) {
- // select.forEach((item) => {
- // apiClient(`/post/${item}`, {
- // method: "DELETE",
- // })
- // })
+ const handler = Promise.all(
+ select.map((item) => {
+ return apiClient(`/post/${item}`, {
+ method: "DELETE",
+ });
+ })
+ )
+ toast.promise(handler, {
+ loading: "正在删除",
+ success: "删除成功",
+ error: "删除失败",
+ });
setFriends(friends.filter((item) => !select.includes(item.id)));
setSelect([]);
} else {
@@ -448,10 +458,7 @@ export const FriendsPage: BasicPage = () => {
- {props.tag && {props.tag}}
- 
- )}
- {props.allowClose && (
-
- {props.title}
- {props.image && (
- {
- wrapRef.current?.classList.add(styles["hide"]);
- }}
- >
-
- )}
-
- {props.text}
- {props.href && (
-
-
-