feat: New filter condition for user management

Author: guosw

server/controllers/user.js

@@ -173,12 +173,14 @@ class UserController {
     const validator = ctx.validate(ctx.query, {
       username: Joi.string().allow(''),
       type: Joi.number(), // 检索类型 type = 1 github 用户 type = 2 站内用户 不传则检索所有
+      'rangeDate[]': Joi.array(),
       page: Joi.string(),
       pageSize: Joi.number()
     })
 
     if (validator) {
       const { page = 1, pageSize = 10, username, type } = ctx.query
+      const rangeDate = ctx.query['rangeDate[]']
       const where = {
         role: { $not: 1 }
       }
@@ -191,6 +193,11 @@ class UserController {
       if (type) {
         where.github = parseInt(type) === 1 ? { $not: null } : null
       }
+
+      if (Array.isArray(rangeDate) && rangeDate.length === 2) {
+        where.createdAt = { $between: rangeDate }
+      }
+
       const result = await UserModel.findAndCountAll({
         where,
         offset: (page - 1) * pageSize,

src/views/admin/user/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react'
-import { Table, Input, Tag, Form, Switch, Button, Popconfirm, Select } from 'antd'
+import { Table, Input, Tag, Form, Switch, Button, Popconfirm, Select, DatePicker } from 'antd'
 
 import axios from '@/utils/axios'
 import moment from 'moment'
@@ -72,6 +72,9 @@ function AdminUser(props) {
     e.preventDefault()
     props.form.validateFields((err, values) => {
       if (!err) {
+        if (Array.isArray(values.rangeDate)) {
+          values.rangeDate = values.rangeDate.map(m => m.format('YYYY-MM-DD'))
+        }
         setQueryParams({ ...queryParams, ...values })
         onSearch({ ...queryParams, ...values })
       }
@@ -100,6 +103,12 @@ function AdminUser(props) {
           )}
         </Form.Item>
 
+        <Form.Item label='创建日期'>
+          {getFieldDecorator('rangeDate')(
+            <DatePicker.RangePicker />
+          )}
+        </Form.Item>
+
         <Form.Item>
           <Button type='primary' htmlType='submit' style={{ marginRight: 8 }}>检索</Button>