feats

config/routes.js

@@ -92,6 +92,12 @@ export default [
                     component: './Post/Edit',
                     hideInMenu: true,
                   },
+                  {
+                    path: '/post/post-type',
+                    name: '分类管理',
+                    menuCode: 'post.post-type',
+                    component: './Post/Type',
+                  },
                 ],
               },
               {

src/components/ChangePassword/index.jsx

@@ -1,12 +1,39 @@
-import React from 'react';
+import React, { useState } from 'react';
 import {
   ModalForm,
   ProFormText,
 } from '@ant-design/pro-form';
+import md5 from 'md5';
+import { notification } from 'antd';
+import request from '@/utils/request';
 
 export default (props) => {
+  const checkSame = ({ getFieldValue }) => ({
+    validator(_, value) {
+      if (!value || getFieldValue('nw1') === value) {
+        return Promise.resolve();
+      }
+
+      return Promise.reject(new Error('两次密码输入不一致!'));
+    }
+  })
+
+  const handleSubmit = (values) => {
+    const data = {
+      originPassword: md5(values.originPassword),
+      newPassword: md5(values.nw1),
+    }
+
+    return request('/change-password', { data, method: 'put' }).then(() => {
+      props.onFinish()
+      return true
+    }).catch((e) => {
+      notification.error({ message: e.message })
+    })
+  }
+
   return (
-    <ModalForm>
+    <ModalForm width={480} visible={props.visible} onFinish={handleSubmit} onVisibleChange={props.onVisibleChange}>
       <ProFormText.Password
         label="原始密码"
         name="originPassword"
@@ -20,7 +47,7 @@ export default (props) => {
       <ProFormText.Password
         label="新密码"
         name="nw2"
-        rules={[{ required: true, message: '新密码不能为空' }]}
+        rules={[{ required: true, message: '新密码不能为空' }, checkSame ]}
       />
     </ModalForm>
   )

src/components/GlobalHeader/AvatarDropdown.jsx

@@ -1,12 +1,17 @@
-import { LogoutOutlined } from '@ant-design/icons';
-import { Avatar, Menu, Spin } from 'antd';
 import React from 'react';
+import { Avatar, Menu, Spin } from 'antd';
+import { LogoutOutlined, FormOutlined } from '@ant-design/icons';
 import { history, connect } from 'umi';
 import { defaultAvatar } from '@/utils/utils';
+import ChangePassword from '@/components/ChangePassword'
 import HeaderDropdown from '../HeaderDropdown';
 import styles from './index.less';
 
 class AvatarDropdown extends React.Component {
+  state = {
+    showPassword: false,
+  }
+
   onMenuClick = (event) => {
     const { key } = event;
 
@@ -22,7 +27,9 @@ class AvatarDropdown extends React.Component {
       return;
     }
 
-    history.push(`/account/${key}`);
+    if (key === 'password') {
+      this.setState({ showPassword: true })
+    }
   };
 
   render() {
@@ -32,12 +39,22 @@ class AvatarDropdown extends React.Component {
         userName: '',
       },
     } = this.props;
+
     const menuHeaderDropdown = (
       <Menu className={styles.menu} selectedKeys={[]} onClick={this.onMenuClick}>
+        <Menu.Item key="password">
+          <FormOutlined />
+          修改密码
+        </Menu.Item>
         <Menu.Item key="logout">
           <LogoutOutlined />
           退出登录
         </Menu.Item>
+        <ChangePassword
+          visible={this.state.showPassword}
+          onVisibleChange={(v) => this.setState({ showPassword: v })}
+          onFinish={() => this.setState({ showPassword: false })}
+        />
       </Menu>
     );
     return currentUser && currentUser.userName ? (

src/components/School/index.jsx

@@ -7,6 +7,8 @@ export default (props) => {
   const [list, setList] = useState([])
   const [value, setValue] = useState()
 
+  const { autoDefault, ...selectProps } = props
+
   const filterFunc = (input, option) => {
     return option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
   }
@@ -31,7 +33,7 @@ export default (props) => {
       setList(records)
       setLoading(false)
 
-      if (props.autoDefault !== false && records.length > 0) {
+      if (autoDefault !== false && records.length > 0) {
         setValue(records[0].schoolId)
         props.onChange(records[0].schoolId, records[0])
       }
@@ -51,7 +53,7 @@ export default (props) => {
         showSearch
         optionFilterProp="children"
         filterOption={filterFunc}
-        {...props}
+        {...selectProps}
         value={value}
         onChange={handleChange}
       >

src/pages/Post/Type/index.jsx

@@ -0,0 +1,140 @@
+import React, { useEffect, useRef, useState } from 'react';
+import { connect } from 'umi';
+import { PageContainer } from '@ant-design/pro-layout';
+import ProTable from '@ant-design/pro-table';
+import { PlusOutlined } from '@ant-design/icons';
+import { Button, notification } from 'antd';
+import {
+  ModalForm,
+  ProFormText,
+} from '@ant-design/pro-form';
+import request, { queryTable } from '@/utils/request';
+
+const PostTypeList = (props) => {
+  const tableRef = useRef()
+  const form = useRef();
+  const [current, setCurrent] = useState({})
+  const [visible, setVisible] = useState(false)
+
+  const handleEdit = (postType) => {
+    const data = postType || {}
+    setCurrent(data)
+    setVisible(true)
+    if (form.current) {
+      form.current.setFieldsValue(data)
+    }
+  }
+
+  const emitPublishOrNot = (postType) => {
+    // 1 变成 0, 0 变成 1
+    const status = Math.abs(postType.status - 1)
+    request(`/post-type/${postType.typeId}`, { method: 'put', data: { ...postType, status } }).then(() => {
+      notification.success({ message: '操作成功' })
+      tableRef.current.reload()
+    }).catch((e) => {
+      notification.warn({ message: e.message })
+    })
+  }
+
+  const handleSubmit = (postType) => {
+    const method = current.typeId ? 'put' : 'post'
+    const api = current.typeId ? `/post-type/${current.typeId}` : '/post-type'
+    const data = { ...current, ...postType }
+    return request(api, { method, data }).then(() => {
+      notification.success({ message: '操作成功' })
+      tableRef.current.reload()
+      setVisible(false)
+    }).catch((e) => {
+      notification.warn({ message: e.message })
+    })
+  }
+
+  const actions = [
+    <Button key="button" icon={<PlusOutlined />} type="primary" onClick={handleEdit}>
+      新建
+    </Button>,
+  ];
+
+  const columns = [
+    {
+      title: '标题',
+      key: 'name',
+      dataIndex: 'name',
+    },
+    {
+      title: '状态',
+      key: 'status',
+      dataIndex: 'status',
+      width: 240,
+      valueType: 'select',
+      valueEnum: {
+        0: {
+          text: '下架',
+          status: 'Processing',
+        },
+        1: {
+          text: '上架',
+          status: 'Success',
+        },
+      },
+    },
+    {
+      title: '创建时间',
+      key: 'createDate',
+      dataIndex: 'createDate',
+      valueType: 'date',
+      width: 240,
+      hideInSearch: true,
+    },
+    {
+      title: '操作',
+      key: 'option',
+      valueType: 'option',
+      width: 160,
+      render: (_, item) => [
+        <a key="edit" onClick={() => handleEdit(item)}>
+          编辑
+        </a>,
+        <a key="up" onClick={() => emitPublishOrNot(item)}>
+          {item.status === 1 ? '下架' : '上架'}
+        </a>,
+      ],
+    },
+  ];
+
+  useEffect(() => {
+    if (!props.typeList || !props.typeList.length) {
+      props.dispatch({
+        type: 'post/getTypeList',
+        payload: { pageSize: 999 },
+      });
+    }
+  }, [props]);
+
+  return (
+    <PageContainer>
+      <ProTable
+        actionRef={tableRef}
+        columns={columns}
+        request={queryTable('/post-type')}
+        rowKey="typeId"
+        headerTitle="科普列表"
+        search={{
+          labelWidth: '4em',
+        }}
+        toolBarRender={() => actions}
+      />
+      <ModalForm formRef={form} width={600} visible={visible} onVisibleChange={setVisible} onFinish={handleSubmit}>
+        <ProFormText
+          label="名称"
+          name="name"
+          rules={[{ required: true, message: '请填写名称' }]}
+        />
+      </ModalForm>
+    </PageContainer>
+  );
+};
+
+export default connect((s) => ({
+  typeList: s.post.typeList,
+}))(PostTypeList);

src/pages/Statistic/StudentData.jsx

@@ -4,7 +4,7 @@ import { PageContainer } from '@ant-design/pro-layout';
 import ProTable from '@ant-design/pro-table';
 import request, { queryTable } from '@/utils/request';
 
-const StudentData = (props) => {
+const StudentData = () => {
   const tableRef = useRef()
   const [schoolDict, setSchoolDict] = useState({})
 

src/pages/User/List/index.jsx

@@ -35,6 +35,14 @@ export default () => {
     })
   }
 
+  const handleResetPassword = (user) => {
+    request(`/reset-password/${user.userId}`, { method: 'put' }).then(() => {
+      notification.success({ message: '操作成功' })
+    }).catch((e) => {
+      notification.error({ message: e.message })
+    })
+  }
+
   const columns = [
     {
       title: '编号',
@@ -77,12 +85,15 @@ export default () => {
       key: 'option',
       valueType: 'option',
       // 不能操作超级管理员
-      render: (_, user) => [
-        user.userId !== '1' && <a key="edit" onClick={() => handleEdit(user)}>修改</a>,
-        user.userId !== '1' && <a key="disable" onClick={() => changeStatus(user)}>{user.status === 1 ? '禁用' : '启用'}</a>,
-        user.userId !== '1' && <Popconfirm key="delete" title="确定删除当前人员?" onConfirm={() => handleDelete(user)}>
+      render: (_, user) => user.userId === '1' ? [] : [
+        <a key="edit" onClick={() => handleEdit(user)}>修改</a>,
+        <a key="disable" onClick={() => changeStatus(user)}>{user.status === 1 ? '禁用' : '启用'}</a>,
+        <Popconfirm key="delete" title="确定删除当前人员?" onConfirm={() => handleDelete(user)}>
           <a href="#">删除</a>
         </Popconfirm>,
+        <Popconfirm key="reset" title="确定重置用户密码?" onConfirm={() => handleResetPassword(user)}>
+          <a href="#">重置密码</a>
+        </Popconfirm>,
       ].filter(Boolean)
     },
   ]

src/pages/Welcome/components/LineCard.jsx

@@ -84,7 +84,6 @@ export default (props) => {
   const [params, setParams] = useState()
 
   useEffect(() => {
-    console.log('-------->', dtRange)
     if (dtRange) {
       setParams({
         startDate: dtRange[0].format('YYYY-MM-DD'),