chore: commit oxfmt formatting changes and verify artifacts

2026-07-02 15:55:09 +08:00
parent 34726cc46d
commit 4f4cee157a
77 changed files with 5576 additions and 1400 deletions
--- a/apps/admin/src/pages/Users/index.tsx
+++ b/apps/admin/src/pages/Users/index.tsx
@@ -1,5 +1,17 @@
 import React, { useEffect, useState } from 'react';
-import { Table, Button, Modal, Form, Input, Select, Switch, Space, Tag, Popconfirm, message } from 'antd';
+import {
+  Table,
+  Button,
+  Modal,
+  Form,
+  Input,
+  Select,
+  Switch,
+  Space,
+  Tag,
+  Popconfirm,
+  message,
+} from 'antd';
 import { PlusOutlined, EditOutlined, DeleteOutlined, KeyOutlined } from '@ant-design/icons';
 import dayjs from 'dayjs';
 import api from '../../api';
@@ -25,11 +37,15 @@ const UsersPage: React.FC = () => {
      ]);
      setData(users);
      setRoles(rolesRes);
-    } catch (e) { console.error(e); }
+    } catch (e) {
+      console.error(e);
+    }
    setLoading(false);
  };

-  useEffect(() => { fetchData(); }, []);
+  useEffect(() => {
+    fetchData();
+  }, []);

  const handleAdd = () => {
    setEditing(null);
@@ -52,15 +68,27 @@ const UsersPage: React.FC = () => {
    const values = await form.validateFields();
    try {
      if (editing) {
-        await api.put(`/rbac/users/${editing.id}`, { username: values.username, name: values.name, isActive: values.isActive, roleIds: values.roleIds || [] });
+        await api.put(`/rbac/users/${editing.id}`, {
+          username: values.username,
+          name: values.name,
+          isActive: values.isActive,
+          roleIds: values.roleIds || [],
+        });
        message.success('更新成功');
      } else {
-        await api.post('/rbac/users', { username: values.username, password: values.password, name: values.name, roleIds: values.roleIds || [] });
+        await api.post('/rbac/users', {
+          username: values.username,
+          password: values.password,
+          name: values.name,
+          roleIds: values.roleIds || [],
+        });
        message.success('创建成功');
      }
      setModalOpen(false);
      fetchData();
-    } catch (e: any) { message.error(e.message || '操作失败'); }
+    } catch (e: any) {
+      message.error(e.message || '操作失败');
+    }
  };

  const handleDelete = async (id: number) => {
@@ -68,7 +96,9 @@ const UsersPage: React.FC = () => {
      await api.delete(`/rbac/users/${id}`);
      message.success('已删除');
      fetchData();
-    } catch (e: any) { message.error(e.message || '删除失败'); }
+    } catch (e: any) {
+      message.error(e.message || '删除失败');
+    }
  };

  const handleResetPwd = (record: any) => {
@@ -83,7 +113,9 @@ const UsersPage: React.FC = () => {
      await api.put(`/rbac/users/${resetTarget.id}/password`, { password: values.password });
      message.success('密码已重置');
      setPwdModalOpen(false);
-    } catch (e: any) { message.error(e.message || '操作失败'); }
+    } catch (e: any) {
+      message.error(e.message || '操作失败');
+    }
  };

  const columns = [
@@ -91,33 +123,68 @@ const UsersPage: React.FC = () => {
    { title: '用户名', dataIndex: 'username', width: 120 },
    { title: '姓名', dataIndex: 'name', width: 120 },
    {
-      title: '角色', dataIndex: 'roles', width: 200,
-      render: (v: any[]) => v && v.length > 0
-        ? v.map((r: any) => <Tag key={r.id} color="blue">{r.name}</Tag>)
-        : <Tag color="default">无角色</Tag>,
+      title: '角色',
+      dataIndex: 'roles',
+      width: 200,
+      render: (v: any[]) =>
+        v && v.length > 0 ? (
+          v.map((r: any) => (
+            <Tag key={r.id} color="blue">
+              {r.name}
+            </Tag>
+          ))
+        ) : (
+          <Tag color="default">无角色</Tag>
+        ),
    },
    {
-      title: '状态', dataIndex: 'isActive', width: 80,
+      title: '状态',
+      dataIndex: 'isActive',
+      width: 80,
      render: (v: boolean) => <Tag color={v ? 'green' : 'default'}>{v ? '启用' : '禁用'}</Tag>,
    },
    {
-      title: '最后登录', dataIndex: 'lastLoginAt', width: 170,
-      render: (v: string) => v ? dayjs(v).format('YYYY-MM-DD HH:mm:ss') : '-',
+      title: '最后登录',
+      dataIndex: 'lastLoginAt',
+      width: 170,
+      render: (v: string) => (v ? dayjs(v).format('YYYY-MM-DD HH:mm:ss') : '-'),
    },
    {
-      title: '创建时间', dataIndex: 'createdAt', width: 170,
+      title: '创建时间',
+      dataIndex: 'createdAt',
+      width: 170,
      render: (v: string) => dayjs(v).format('YYYY-MM-DD HH:mm:ss'),
    },
    {
-      title: '操作', width: 220, fixed: 'right' as const,
+      title: '操作',
+      width: 220,
+      fixed: 'right' as const,
      render: (_: any, record: any) => (
        <Space>
-          <PermissionButton permission="user:edit" type="link" size="small" icon={<EditOutlined />} onClick={() => handleEdit(record)}>编辑</PermissionButton>
-          <PermissionButton permission="user:reset-password" type="link" size="small" icon={<KeyOutlined />} onClick={() => handleResetPwd(record)}>重置密码</PermissionButton>
+          <PermissionButton
+            permission="user:edit"
+            type="link"
+            size="small"
+            icon={<EditOutlined />}
+            onClick={() => handleEdit(record)}
+          >
+            编辑
+          </PermissionButton>
+          <PermissionButton
+            permission="user:reset-password"
+            type="link"
+            size="small"
+            icon={<KeyOutlined />}
+            onClick={() => handleResetPwd(record)}
+          >
+            重置密码
+          </PermissionButton>
          {record.username !== 'admin' && (
            <PermissionButton permission="user:delete">
              <Popconfirm title="确认删除该用户？" onConfirm={() => handleDelete(record.id)}>
-                <Button type="link" size="small" danger icon={<DeleteOutlined />}>删除</Button>
+                <Button type="link" size="small" danger icon={<DeleteOutlined />}>
+                  删除
+                </Button>
              </Popconfirm>
            </PermissionButton>
          )}
@@ -128,19 +195,54 @@ const UsersPage: React.FC = () => {

  return (
    <div>
-      <div style={{ marginBottom: 16, display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
+      <div
+        style={{
+          marginBottom: 16,
+          display: 'flex',
+          justifyContent: 'space-between',
+          alignItems: 'center',
+        }}
+      >
        <h2 style={{ margin: 0 }}>账号管理</h2>
-        <PermissionButton permission="user:create" type="primary" icon={<PlusOutlined />} onClick={handleAdd}>新增账号</PermissionButton>
+        <PermissionButton
+          permission="user:create"
+          type="primary"
+          icon={<PlusOutlined />}
+          onClick={handleAdd}
+        >
+          新增账号
+        </PermissionButton>
      </div>
-      <Table columns={columns} dataSource={data} rowKey="id" loading={loading} scroll={{ x: 1000 }} pagination={false} />
+      <Table
+        columns={columns}
+        dataSource={data}
+        rowKey="id"
+        loading={loading}
+        scroll={{ x: 1000 }}
+        pagination={false}
+      />

-      <Modal title={editing ? '编辑账号' : '新增账号'} open={modalOpen} onOk={handleSubmit} onCancel={() => setModalOpen(false)} destroyOnClose>
+      <Modal
+        title={editing ? '编辑账号' : '新增账号'}
+        open={modalOpen}
+        onOk={handleSubmit}
+        onCancel={() => setModalOpen(false)}
+        destroyOnClose
+      >
        <Form form={form} layout="vertical">
-          <Form.Item name="username" label="用户名" rules={[{ required: true, message: '请输入用户名' }]}>
+          <Form.Item
+            name="username"
+            label="用户名"
+            rules={[{ required: true, message: '请输入用户名' }]}
+          >
            <Input />
          </Form.Item>
          {!editing && (
-            <Form.Item name="password" label="密码" rules={[{ required: true, min: 4, message: '密码至少4位' }]}>
+            <Form.Item
+              name="password"
+              label="密码"
+              rules={[{ required: true, min: 4, message: '密码至少4位' }]}
+            >
              <Input.Password />
            </Form.Item>
          )}
@@ -152,19 +254,38 @@ const UsersPage: React.FC = () => {
              <Switch checkedChildren="启用" unCheckedChildren="禁用" />
            </Form.Item>
          )}
-          <Form.Item name="roleIds" label="角色分配" rules={[{ required: !editing, message: '请至少选择一个角色' }]}>
+          <Form.Item
+            name="roleIds"
+            label="角色分配"
+            rules={[{ required: !editing, message: '请至少选择一个角色' }]}
+          >
            <Select
              mode="multiple"
              placeholder="选择角色"
-              options={roles.filter((r: any) => r.status !== 0).map((r: any) => ({ value: r.id, label: `${r.name}${r.isSystem ? ' (系统)' : ''}` }))}
+              options={roles
+                .filter((r: any) => r.status !== 0)
+                .map((r: any) => ({
+                  value: r.id,
+                  label: `${r.name}${r.isSystem ? ' (系统)' : ''}`,
+                }))}
            />
          </Form.Item>
        </Form>
      </Modal>

-      <Modal title={`重置密码 - ${resetTarget?.username}`} open={pwdModalOpen} onOk={handlePwdSubmit} onCancel={() => setPwdModalOpen(false)} destroyOnClose>
+      <Modal
+        title={`重置密码 - ${resetTarget?.username}`}
+        open={pwdModalOpen}
+        onOk={handlePwdSubmit}
+        onCancel={() => setPwdModalOpen(false)}
+        destroyOnClose
+      >
        <Form form={pwdForm} layout="vertical">
-          <Form.Item name="password" label="新密码" rules={[{ required: true, min: 4, message: '密码至少4位' }]}>
+          <Form.Item
+            name="password"
+            label="新密码"
+            rules={[{ required: true, min: 4, message: '密码至少4位' }]}
+          >
            <Input.Password />
          </Form.Item>
        </Form>