Merge pull request 'Dev' (#13) from dev into main

Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/13

apps/admin-web/src/pages/DevPlanTasksPage.tsx

@@ -16,12 +16,10 @@ import type { ColumnsType } from 'antd/es/table';
 import {
   DEV_PLAN_TASK_STATUS_LABELS,
   DEV_PLAN_TASK_TYPE_LABELS,
-  SUPPORT_TICKET_STATUS_LABELS,
   type DevPlanTaskDto,
   type DevPlanTaskStatusDto,
   type DevPlanTaskTypeDto,
   type DevPlanVersionDto,
-  type SupportTicketDto,
 } from '@dukang/shared-types';
 import { request } from '../lib/api';
 import { fmtTime } from '../lib/constants';
@@ -52,7 +50,6 @@ export default function DevPlanTasksPage() {
   const [batchEditOpen, setBatchEditOpen] = useState(false);
   const [batchSaving, setBatchSaving] = useState(false);
   const [versions, setVersions] = useState<DevPlanVersionDto[]>([]);
-  const [supportTickets, setSupportTickets] = useState<SupportTicketDto[]>([]);
   const [editing, setEditing] = useState<DevPlanTaskDto | null>(null);
   const [saving, setSaving] = useState(false);
   const [dispatching, setDispatching] = useState(false);
@@ -67,13 +64,6 @@ export default function DevPlanTasksPage() {
       .catch(() => setVersions([]));
   }, [batchEditOpen]);
 
-  useEffect(() => {
-    if (!modalOpen || editing) return;
-    request<{ items: SupportTicketDto[] }>('/admin/support-tickets?pageSize=100')
-      .then((res) => setSupportTickets(res.items ?? []))
-      .catch(() => setSupportTickets([]));
-  }, [modalOpen, editing]);
-
   const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<DevPlanTaskDto>(
     '/admin/dev-plan/tasks',
     () => {
@@ -88,7 +78,7 @@ export default function DevPlanTasksPage() {
 
   function openCreate() {
     setEditing(null);
-    form.setFieldsValue({ content: '', type: 'BUG', status: 'TODO', supportTicketId: undefined });
+    form.setFieldsValue({ content: '', type: 'BUG', status: 'TODO' });
     setModalOpen(true);
   }
 
@@ -111,11 +101,7 @@ export default function DevPlanTasksPage() {
       } else {
         await request('/admin/dev-plan/tasks', {
           method: 'POST',
-          body: JSON.stringify({
+          body: JSON.stringify({ content: values.content, type: values.type }),
-            content: values.content,
-            type: values.type,
-            supportTicketId: values.supportTicketId || undefined,
-          }),
         });
         message.success('已创建');
       }
@@ -319,20 +305,7 @@ export default function DevPlanTasksPage() {
             <Form.Item name="status" label="状态" rules={[{ required: true }]}>
               <Select options={STATUS_OPTIONS} />
             </Form.Item>
-          ) : (
+          ) : null}
-            <Form.Item name="supportTicketId" label="绑定技术支持工单">
-              <Select
-                allowClear
-                showSearch
-                optionFilterProp="label"
-                placeholder="可选：关联工单"
-                options={supportTickets.map((t) => ({
-                  value: t.id,
-                  label: `${t.ticketNo} · ${SUPPORT_TICKET_STATUS_LABELS[t.status]} · ${t.title}`,
-                }))}
-              />
-            </Form.Item>
-          )}
         </Form>
       </Modal>
 

apps/admin-web/src/pages/SupportTicketsPage.tsx

@@ -577,7 +577,11 @@ export default function SupportTicketsPage() {
           isSuperAdmin
             ? {
                 selectedRowKeys,
-                onChange: (keys) => setSelectedRowKeys(keys as string[]),
+                onChange: (keys, rows) => {
+                  const pending = rows.filter((r) => r.status === 'PENDING_REVIEW').map((r) => String(r.id));
+                  setSelectedRowKeys(pending.length === rows.length ? (keys as string[]) : pending);
+                },
+                getCheckboxProps: (row) => ({ disabled: row.status !== 'PENDING_REVIEW' }),
               }
             : undefined
         }