用户状态字段

actions/user.tsx

@@ -80,7 +80,7 @@ export async function createUserAction(
   }
 
   user.setRoles(data.roles);
-
+  revalidatePath('/dashboard/user');
   redirect('/dashboard/user');
 }
 

app/dashboard/user/[id]/edit/page.tsx

@@ -5,6 +5,7 @@
  */
 
 import { NextPage } from 'next';
+import { notFound } from 'next/navigation';
 import React from 'react';
 import UserForm from '@/app/dashboard/user/components/user-form';
 import { updateUserAction } from '@/actions/user';
@@ -32,8 +33,13 @@ const UserEditPage: NextPage<UserEditPageProps> = async ({ params }) => {
     }],
   });
 
-  const { Roles, ...initialValues } = user?.toJSON() || {};
+  if (!user) {
+    notFound();
+  }
+
+  const { Roles, ...initialValues } = user.toJSON();
   (initialValues as any).roles = Roles?.map((item) => { return item.id; });
+
   return (
     <UserForm action={updateUserAction} initialValues={initialValues} mode="update" />
   );

app/dashboard/user/components/user-form/form.tsx

@@ -2,7 +2,7 @@
 
 import React from 'react';
 import {
-  Row, Col, Form, Input, DatePicker,
+  Row, Col, Form, Input, DatePicker, Radio,
 } from 'antd';
 import dayjs from '@/utils/dayjs';
 import {
@@ -80,6 +80,14 @@ const InternalUserForm: React.FC<WithFormProps> = ({ mode, data }) => {
           <DebounceSelect options={roleOptions} mode="multiple" placeholder="请选择" />
         </Form.Item>
       </Col>
+      <Col span={12}>
+        <Form.Item label="状态" name="status" initialValue rules={[userFormRule]}>
+          <Radio.Group>
+            <Radio value>正常</Radio>
+            <Radio value={false}>禁用</Radio>
+          </Radio.Group>
+        </Form.Item>
+      </Col>
 
       {mode !== 'create' && (
       <>

app/dashboard/user/table.tsx

@@ -7,7 +7,9 @@
 'use client';
 
 import { FC } from 'react';
-import { Button, Table, Modal } from 'antd';
+import {
+  Button, Table, Modal, Switch,
+} from 'antd';
 import { useRouter, usePathname, useSearchParams } from 'next/navigation';
 import Link from 'next/link';
 import { UserModel, UserAttributes } from '@/models';
@@ -60,6 +62,13 @@ const UserTable:FC<UserTableProps> = ({ data }) => {
           title="创建时间"
           dataIndex="createdAt"
         />
+        <Table.Column
+          title="状态"
+          dataIndex="status"
+          render={(status) => {
+            return <Switch disabled checkedChildren="正常" unCheckedChildren="停用" defaultChecked={status} />;
+          }}
+        />
         <Table.Column<any>
           title="操作"
           dataIndex="actions"

components/with-action-form/action-form.tsx

@@ -46,6 +46,8 @@ const ActionForm: React.FC<ActionFormProps> = ({
   };
   const [state, dispatch, pending] = useServerAction(action, initialState);
 
+  console.log('state', state);
+
   useUpdate(() => {
     if (state?.status === ActionStatus.INITIAL) {
       return;

lib/sequelize.ts

@@ -119,6 +119,11 @@ export const sequelize = new Sequelize({
   },
 });
 
+// sequelize.addHook('beforeDefine', (attributes) => {
+//   // todo
+//   console.log('attributes', attributes);
+// });
+
 /**
  * 模型基类
  *

models/user.ts

@@ -69,6 +69,8 @@ class User extends BaseModel<UserAttributes, UserCreationAttributes> {
 
   public ip: CreationOptional<string>;
 
+  declare status: CreationOptional<boolean>;
+
   declare createdBy: CreationOptional<number>;
 
   declare updatedBy: CreationOptional<number>;
@@ -229,6 +231,10 @@ User.init(
       defaultValue: 0,
       comment: 'user last login ip',
     },
+    status: {
+      type: DataTypes.BOOLEAN,
+      defaultValue: true,
+    },
     createdBy: {
       type: DataTypes.INTEGER,
     },

styles/theme.ts

@@ -16,7 +16,7 @@ const config: ThemeConfig = {
     // disabled
     // colorBgContainerDisabled: '#fff',
     // colorTextDisabled: '#444',
-    // motion: false,
+    motion: false,
 
     fontFamily: '',
     fontSize: 14,

zod/user.ts

@@ -110,6 +110,7 @@ const ohtersZod = z.object({
   nickname: z
     .string()
     .regex(/^[\d\w_\u4E00-\u9FFF]{2,20}$/, '长度在2~20位之间，包含中文、字母、数字、下划线')
+    .optional()
     .or(z.literal('')),
   realname: z
     .string()
@@ -121,6 +122,7 @@ const ohtersZod = z.object({
         message: '请输入正确的中文名',
       },
     )
+    .optional()
     .or(z.literal('')),
   mobile: z
     .string()
@@ -132,9 +134,13 @@ const ohtersZod = z.object({
         message: '请输入正确的手机号',
       },
     )
+    .optional()
     .or(z.literal('')),
-  gender: z.enum(['male', 'female', 'unknown']),
-  roles: z.array(z.number()),
+  gender: z.enum(['male', 'female', 'unknown']).optional().or(z.literal('')),
+  roles: z.array(z.number()).optional(),
+  status: z.boolean({
+    required_error: '状态未选择',
+  }),
 });
 
 // 前台注册