fix student import and profile labels

apps/admin/src/pages/Students/index.tsx

@@ -1,5 +1,6 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import {
+  Alert,
   App,
   Button,
   Card,
@@ -62,6 +63,19 @@ interface EnrollmentInfo {
   };
 }
 
+
+interface StudentCreateImportResult {
+  message?: string;
+  imported?: number;
+  skipped?: number;
+}
+
+interface StudentUpdateImportResult {
+  message?: string;
+  matched?: number;
+  skipped?: number;
+}
+
 const StudentsPage: React.FC = () => {
   const { modal } = App.useApp();
   const [data, setData] = useState<any[]>([]);
@@ -221,20 +235,94 @@ const StudentsPage: React.FC = () => {
       .catch(() => message.error('下载失败'));
   };
 
-  const handleMatchImport: UploadProps['customRequest'] = async ({ file, onSuccess, onError }) => {
+  const showCreateImportResult = (result: StudentCreateImportResult) => {
+    const imported = result.imported ?? 0;
+    const skipped = result.skipped ?? 0;
+
+    modal.success({
+      title: '导入完成',
+      okText: '知道了',
+      content: (
+        <div>
+          <Descriptions column={1} size="small">
+            <Descriptions.Item label="成功新增">{imported} 人</Descriptions.Item>
+            <Descriptions.Item label="跳过">{skipped} 人</Descriptions.Item>
+          </Descriptions>
+          <div style={{ marginTop: 12, fontWeight: 600 }}>跳过原因：</div>
+          <ul style={{ marginBottom: 0, paddingLeft: 20 }}>
+            <li>姓名为空</li>
+            <li>已存在同名学生</li>
+          </ul>
+          <div style={{ marginTop: 8, color: '#8c8c8c', fontSize: 12 }}>
+            当前后端只返回统计汇总，暂时无法列出具体哪几行被跳过。
+          </div>
+        </div>
+      ),
+    });
+  };
+
+  const showUpdateImportResult = (result: StudentUpdateImportResult) => {
+    const matched = result.matched ?? 0;
+    const skipped = result.skipped ?? 0;
+
+    modal.success({
+      title: '更新完成',
+      okText: '知道了',
+      content: (
+        <div>
+          <Descriptions column={1} size="small">
+            <Descriptions.Item label="成功更新">{matched} 人</Descriptions.Item>
+            <Descriptions.Item label="未匹配">{skipped} 人</Descriptions.Item>
+          </Descriptions>
+          <div style={{ marginTop: 12, fontWeight: 600 }}>匹配规则：</div>
+          <div>手机号优先，身份证号其次</div>
+          <div style={{ marginTop: 8, color: '#8c8c8c', fontSize: 12 }}>
+            当前后端只返回统计汇总，暂时无法列出具体哪几行未匹配。
+          </div>
+        </div>
+      ),
+    });
+  };
+
+  const handleCreateStudentsImport: UploadProps['customRequest'] = async ({
+    file,
+    onSuccess,
+    onError,
+  }) => {
+    const formData = new FormData();
+    formData.append('file', file as File);
+    try {
+      const res = (await api.post('/students/import', formData, {
+        headers: { 'Content-Type': 'multipart/form-data' },
+      })) as StudentCreateImportResult;
+      showCreateImportResult(res);
+      onSuccess?.(res);
+      fetchData();
+    } catch (e: unknown) {
+      const err = e as { message?: string };
+      message.error(err?.message || '导入失败');
+      onError?.(e instanceof Error ? e : new Error(err?.message || '导入失败'));
+    }
+  };
+
+  const handleUpdateExistingStudentsImport: UploadProps['customRequest'] = async ({
+    file,
+    onSuccess,
+    onError,
+  }) => {
     const formData = new FormData();
     formData.append('file', file as File);
     try {
       const res = (await api.post('/students/import-match', formData, {
         headers: { 'Content-Type': 'multipart/form-data' },
-      })) as { message: string };
-      message.success(res.message);
+      })) as StudentUpdateImportResult;
+      showUpdateImportResult(res);
       onSuccess?.(res);
       fetchData();
     } catch (e: unknown) {
       const err = e as { message?: string };
-      message.error(err?.message || '匹配导入失败');
-      onError?.(e instanceof Error ? e : new Error(err?.message || '匹配导入失败'));
+      message.error(err?.message || '更新已有学生资料失败');
+      onError?.(e instanceof Error ? e : new Error(err?.message || '更新已有学生资料失败'));
     }
   };
 
@@ -277,12 +365,12 @@ const StudentsPage: React.FC = () => {
         render: (v: string, record: any) => {
           if (!v) return '-';
           return (
-            <span>
+            <span style={{ display: 'inline-flex', alignItems: 'center', whiteSpace: 'nowrap' }}>
               <span style={{ marginRight: 4 }}>{maskPhone(v)}</span>
               <Button
                 type="link"
                 size="small"
-                style={{ padding: '8px 4px' }}
+                style={{ padding: '8px 4px', flex: 'none' }}
                 onClick={() => handleViewSensitive(record.id, '电话', v)}
                 title="点击查看完整号码"
               >
@@ -305,12 +393,12 @@ const StudentsPage: React.FC = () => {
         render: (v: string, record: any) => {
           if (!v) return '-';
           return (
-            <span>
+            <span style={{ display: 'inline-flex', alignItems: 'center', whiteSpace: 'nowrap' }}>
               <span style={{ marginRight: 4 }}>{maskIdNumber(v)}</span>
               <Button
                 type="link"
                 size="small"
-                style={{ padding: '8px 4px' }}
+                style={{ padding: '8px 4px', flex: 'none' }}
                 onClick={() => handleViewSensitive(record.id, '身份证号', v)}
                 title="点击查看完整号码"
               >
@@ -329,12 +417,12 @@ const StudentsPage: React.FC = () => {
         render: (v: string, record: any) => {
           if (!v) return '-';
           return (
-            <span>
+            <span style={{ display: 'inline-flex', alignItems: 'center', whiteSpace: 'nowrap' }}>
               <span style={{ marginRight: 4 }}>{maskPhone(v)}</span>
               <Button
                 type="link"
                 size="small"
-                style={{ padding: '8px 4px' }}
+                style={{ padding: '8px 4px', flex: 'none' }}
                 onClick={() => handleViewSensitive(record.id, '紧急联系人电话', v)}
                 title="点击查看完整号码"
               >
@@ -530,29 +618,15 @@ const StudentsPage: React.FC = () => {
           >
             添加学生
           </PermissionButton>
+          <Upload accept=".xlsx,.xls" showUploadList={false} customRequest={handleCreateStudentsImport}>
+            <Button icon={<UploadOutlined />}>导入Excel</Button>
+          </Upload>
           <Upload
             accept=".xlsx,.xls"
             showUploadList={false}
-            customRequest={async ({ file, onSuccess, onError }: any) => {
-              const formData = new FormData();
-              formData.append('file', file);
-              try {
-                const res: any = await api.post('/students/import', formData, {
-                  headers: { 'Content-Type': 'multipart/form-data' },
-                });
-                message.success(res.message);
-                onSuccess?.(res);
-                fetchData();
-              } catch (e: any) {
-                message.error(e?.message || '导入失败');
-                onError?.(e instanceof Error ? e : new Error(e?.message || '导入失败'));
-              }
-            }}
+            customRequest={handleUpdateExistingStudentsImport}
           >
-            <Button icon={<UploadOutlined />}>导入Excel</Button>
-          </Upload>
-          <Upload accept=".xlsx,.xls" showUploadList={false} customRequest={handleMatchImport}>
-            <Button icon={<SwapOutlined />}>匹配导入</Button>
+            <Button icon={<SwapOutlined />}>更新已有学生资料</Button>
           </Upload>
           <PermissionButton
             permission="student:view"
@@ -570,6 +644,17 @@ const StudentsPage: React.FC = () => {
           </PermissionButton>
         </Space>
       </div>
+      <Alert
+        showIcon
+        type="warning"
+        style={{ marginBottom: 12 }}
+        message={
+          <span>
+            <strong>更新已有学生资料：</strong>先按手机号、再按身份证号匹配；Excel
+            中填写的非空字段会覆盖原资料，未匹配的学生不会新增。请确认姓名、手机号、身份证号、所属机构和联系人等内容无误。
+          </span>
+        }
+      />
       <Table
         columns={columns}
         dataSource={data}