From e2d83ec9e6a288ff5b3db66c1c25e7f00b3e2615 Mon Sep 17 00:00:00 2001
From: web <web@ppanel.dev>
Date: Mon, 8 Sep 2025 03:24:21 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20Replace=20MarkdownEditor?=
 =?UTF-8?q?=20with=20HTMLEditor=20in=20EmailBroadcastForm;=20simplify=20co?=
 =?UTF-8?q?ntent=20rendering=20in=20EmailTaskManager;=20disable=20eslint?=
 =?UTF-8?q?=20in=20service=20index=20files?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/dashboard/marketing/email/broadcast-form.tsx   |  4 ++--
 .../app/dashboard/marketing/email/task-manager.tsx     | 10 ++++------
 apps/admin/app/dashboard/payment/payment-form.tsx      |  1 -
 .../ui/src/custom-components/pro-table/pro-table.tsx   | 10 ++++++++++
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/apps/admin/app/dashboard/marketing/email/broadcast-form.tsx b/apps/admin/app/dashboard/marketing/email/broadcast-form.tsx
index efba34e..4f4c986 100644
--- a/apps/admin/app/dashboard/marketing/email/broadcast-form.tsx
+++ b/apps/admin/app/dashboard/marketing/email/broadcast-form.tsx
@@ -31,7 +31,7 @@ import {
 } from '@workspace/ui/components/sheet';
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@workspace/ui/components/tabs';
 import { Textarea } from '@workspace/ui/components/textarea';
-import { MarkdownEditor } from '@workspace/ui/custom-components/editor';
+import { HTMLEditor } from '@workspace/ui/custom-components/editor';
 import { EnhancedInput } from '@workspace/ui/custom-components/enhanced-input';
 import { Icon } from '@workspace/ui/custom-components/icon';
 import { useTranslations } from 'next-intl';
@@ -286,7 +286,7 @@ export default function EmailBroadcastForm() {
                       <FormItem>
                         <FormLabel>{t('content')}</FormLabel>
                         <FormControl>
-                          <MarkdownEditor
+                          <HTMLEditor
                             value={field.value}
                             onChange={(value) => {
                               form.setValue(field.name, value || '');
diff --git a/apps/admin/app/dashboard/marketing/email/task-manager.tsx b/apps/admin/app/dashboard/marketing/email/task-manager.tsx
index 2ee6f98..1057417 100644
--- a/apps/admin/app/dashboard/marketing/email/task-manager.tsx
+++ b/apps/admin/app/dashboard/marketing/email/task-manager.tsx
@@ -253,10 +253,7 @@ export default function EmailTaskManager() {
                                 <h4 className='text-muted-foreground mb-2 text-sm font-medium'>
                                   {t('content')}
                                 </h4>
-                                <div
-                                  className='prose prose-sm max-w-none'
-                                  dangerouslySetInnerHTML={{ __html: selectedTask.content }}
-                                />
+                                <div dangerouslySetInnerHTML={{ __html: selectedTask.content }} />
                               </div>
                               {selectedTask.additional && (
                                 <div>
@@ -278,10 +275,11 @@ export default function EmailTaskManager() {
                       onClick={() => refreshTaskStatus(row.id)}
                       disabled={refreshing[row.id]}
                     >
-                      {refreshing[row.id] && (
+                      {refreshing[row.id] ? (
                         <Icon icon='mdi:loading' className='mr-2 h-3 w-3 animate-spin' />
+                      ) : (
+                        <Icon icon='mdi:refresh' className='mr-2 h-3 w-3' />
                       )}
-                      <Icon icon='mdi:refresh' className='h-3 w-3' />
                     </Button>,
                     ...([0, 1].includes(row.status)
                       ? [
diff --git a/apps/admin/app/dashboard/payment/payment-form.tsx b/apps/admin/app/dashboard/payment/payment-form.tsx
index 868f05a..c9042b0 100644
--- a/apps/admin/app/dashboard/payment/payment-form.tsx
+++ b/apps/admin/app/dashboard/payment/payment-form.tsx
@@ -155,7 +155,6 @@ export default function PaymentForm<T>({
         <ScrollArea className='-mx-6 h-[calc(100vh-48px-36px-36px-env(safe-area-inset-top))]'>
           <Form {...form}>
             <form onSubmit={form.handleSubmit(handleSubmit)} className='space-y-6 px-6 pt-4'>
-              {/* 基本信息分组 */}
               <div className='space-y-4'>
                 <div className='grid grid-cols-1 gap-4 sm:grid-cols-2'>
                   <FormField
diff --git a/packages/ui/src/custom-components/pro-table/pro-table.tsx b/packages/ui/src/custom-components/pro-table/pro-table.tsx
index da64cf4..25c517d 100644
--- a/packages/ui/src/custom-components/pro-table/pro-table.tsx
+++ b/packages/ui/src/custom-components/pro-table/pro-table.tsx
@@ -211,6 +211,16 @@ export function ProTable<
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [pagination.pageIndex, pagination.pageSize, columnFilters]);
 
+  useEffect(() => {
+    if (initialFilters) {
+      const newFilters = Object.entries(initialFilters).map(([id, value]) => ({
+        id,
+        value,
+      })) as ColumnFiltersState;
+      setColumnFilters(newFilters);
+    }
+  }, [initialFilters]);
+
   const selectedRows = table.getSelectedRowModel().flatRows.map((row) => row.original);
   const selectedCount = selectedRows.length;