feat: New user type filter on user management page

Author: guosw

server/controllers/user.js

@@ -172,21 +172,25 @@ class UserController {
   static async getList(ctx) {
     const validator = ctx.validate(ctx.query, {
       username: Joi.string().allow(''),
+      type: Joi.number(), // 检索类型 type = 1 github 用户 type = 2 站内用户 不传则检索所有
       page: Joi.string(),
       pageSize: Joi.number()
     })
 
     if (validator) {
-      const { page = 1, pageSize = 10, username } = ctx.query
+      const { page = 1, pageSize = 10, username, type } = ctx.query
       const where = {
-        role: {
-          $not: 1
-        }
+        role: { $not: 1 }
       }
+
       if (username) {
         where.username = {}
         where.username['$like'] = `%${username}%`
       }
+
+      if (type) {
+        where.github = parseInt(type) === 1 ? { $not: null } : null
+      }
       const result = await UserModel.findAndCountAll({
         where,
         offset: (page - 1) * pageSize,

src/views/admin/user/index.jsx

@@ -1,12 +1,17 @@
 import React, { useState } from 'react'
-import { Table, Input, Tag, Form, Switch, Button, Popconfirm } from 'antd'
+import { Table, Input, Tag, Form, Switch, Button, Popconfirm, Select } from 'antd'
 
 import axios from '@/utils/axios'
 import moment from 'moment'
 
 import useAntdTable from '@/hooks/useAntdTable'
 import useBreadcrumb from '@/hooks/useBreadcrumb'
 
+const typeMapList = [
+  { value: 1, label: 'github 用户' },
+  { value: 2, label: '站内用户' }
+]
+
 function AdminUser(props) {
   useBreadcrumb(['用户管理'])
   const { getFieldDecorator } = props.form
@@ -83,6 +88,18 @@ function AdminUser(props) {
           )}
         </Form.Item>
 
+        <Form.Item label='用户类型'>
+          {getFieldDecorator('type')(
+            <Select style={{ width: 200 }} allowClear>
+              {typeMapList.map(item => (
+                <Select.Option key={item.value} value={item.value}>
+                  {item.label}
+                </Select.Option>
+              ))}
+            </Select>
+          )}
+        </Form.Item>
+
         <Form.Item>
           <Button type='primary' htmlType='submit' style={{ marginRight: 8 }}>检索</Button>