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() { {t('content')} - { 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() {

{t('content')}

-
+
{selectedTask.additional && (
@@ -278,10 +275,11 @@ export default function EmailTaskManager() { onClick={() => refreshTaskStatus(row.id)} disabled={refreshing[row.id]} > - {refreshing[row.id] && ( + {refreshing[row.id] ? ( + ) : ( + )} - , ...([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({
- {/* 基本信息分组 */}
{ + 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;