Fixed query

Author: LyricTian

src/pages/Menu/MenuCard.tsx

@@ -14,9 +14,9 @@ import {
 } from 'antd';
 import React, { PureComponent } from 'react';
 
-import { ConnectState } from '@/models/connect';
 import { FormComponentProps } from 'antd/lib/form';
 import { connect } from 'dva';
+import { ConnectState } from '@/models/connect';
 import MenuAction from './MenuAction';
 import MenuResource from './MenuResource';
 

src/pages/Menu/MenuList.tsx

@@ -2,9 +2,9 @@ import { AnyAction, Dispatch } from 'redux';
 import { Button, Card, Col, Form, Input, Layout, Modal, Radio, Row, Table, Tree } from 'antd';
 import React, { PureComponent } from 'react';
 
-import { ConnectState } from '@/models/connect';
 import { FormComponentProps } from 'antd/lib/form';
 import { connect } from 'dva';
+import { ConnectState } from '@/models/connect';
 import MenuCard from './MenuCard';
 import { MenuModelState } from '@/models/menu';
 import PButton from '@/components/PermButton';
@@ -303,8 +303,13 @@ class MenuList extends PureComponent<MenuListProps, MenuListState> {
       <PageHeaderLayout title="菜单管理" breadcrumbList={breadcrumbList}>
         <Layout>
           <Layout.Sider
-            width={200}
-            style={{ background: '#fff', borderRight: '1px solid lightGray' }}
+            width={220}
+            style={{
+              background: '#fff',
+              borderRight: '1px solid lightGray',
+              paddingLeft: 10,
+              paddingRight: 10,
+            }}
           >
             <Tree
               expandedKeys={expandedKeys}

src/pages/Role/RoleCard.tsx

@@ -2,9 +2,9 @@ import { AnyAction, Dispatch } from 'redux';
 import { Card, Col, Form, Input, InputNumber, Modal, Row, message } from 'antd';
 import React, { PureComponent } from 'react';
 
-import { ConnectState } from '@/models/connect';
 import { FormComponentProps } from 'antd/es/form';
 import { connect } from 'dva';
+import { ConnectState } from '@/models/connect';
 import RoleMenu from './RoleMenu';
 
 export interface RoleCardProps extends FormComponentProps {

src/pages/Role/RoleList.tsx

@@ -1,12 +1,12 @@
 import { AnyAction, Dispatch } from 'redux';
 import { Button, Card, Col, Form, Input, Modal, Row, Table } from 'antd';
-import { ConnectState, RoleModeState } from '@/models/connect';
 import React, { PureComponent } from 'react';
-
 import { FormComponentProps } from 'antd/es/form';
+import { connect } from 'dva';
+import { ConnectState, RoleModeState } from '@/models/connect';
+
 import PButton from '@/components/PermButton';
 import PageHeaderLayout from '@/layouts/PageHeaderLayout';
-import { connect } from 'dva';
 import RoleCard from './RoleCard';
 import styles from './RoleList.less';
 

src/pages/User/RoleSelect.tsx

@@ -56,16 +56,7 @@ export default class RoleSelect extends PureComponent<RoleSelectProps, RoleSelec
     }
   };
 
-  render():
-    | React.ReactElement<any, string | React.JSXElementConstructor<any>>
-    | string
-    | number
-    | {}
-    | React.ReactNodeArray
-    | React.ReactPortal
-    | boolean
-    | null
-    | undefined {
+  render() {
     const { value, data } = this.state;
 
     return (

src/pages/User/UserCard.tsx

@@ -1,10 +1,10 @@
 import { AnyAction, Dispatch } from 'redux';
-import { ConnectState, UserModelState } from '@/models/connect';
 import { Form, Input, Modal, Radio } from 'antd';
 import React, { PureComponent } from 'react';
 
 import { FormComponentProps } from 'antd/lib/form';
 import { connect } from 'dva';
+import { ConnectState, UserModelState } from '@/models/connect';
 import RoleSelect from './RoleSelect';
 import { md5Hash } from '../../utils/utils';
 

src/pages/User/UserList.tsx

@@ -1,11 +1,11 @@
 import { AnyAction, Dispatch } from 'redux';
 import { Badge, Button, Card, Col, Form, Input, Modal, Radio, Row, Table } from 'antd';
-import { ConnectState, UserModelState } from '@/models/connect';
 import React, { PureComponent } from 'react';
 
 import { FormComponentProps } from 'antd/lib/form';
-import PButton from '@/components/PermButton';
 import { connect } from 'dva';
+import PButton from '@/components/PermButton';
+import { ConnectState, UserModelState } from '@/models/connect';
 import PageHeaderLayout from '../../layouts/PageHeaderLayout';
 import RoleSelect from './RoleSelect';
 import UserCard from './UserCard';
@@ -147,16 +147,14 @@ class UserList extends PureComponent<UserListProps, UserListState> {
         return;
       }
 
-      let roleIDs = '';
-      if (values.role_ids) {
-        roleIDs = values.role_ids.map((v: any) => v.role_id).join(',');
+      const search = { ...values };
+      if (search.roleIDs) {
+        search.roleIDs = search.roleIDs.map((v: any) => v.role_id).join(',');
       }
+
       this.dispatch({
         type: 'user/fetch',
-        search: {
-          ...values,
-          role_ids: roleIDs,
-        },
+        search,
         pagination: {},
       });
       this.clearSelectRows();
@@ -196,16 +194,16 @@ class UserList extends PureComponent<UserListProps, UserListState> {
         <Row gutter={16}>
           <Col span={8}>
             <Form.Item label="用户名">
-              {getFieldDecorator('user_name')(<Input placeholder="请输入" />)}
+              {getFieldDecorator('userName')(<Input placeholder="请输入" />)}
             </Form.Item>
           </Col>
           <Col span={8}>
             <Form.Item label="真实姓名">
-              {getFieldDecorator('real_name')(<Input placeholder="请输入" />)}
+              {getFieldDecorator('realName')(<Input placeholder="请输入" />)}
             </Form.Item>
           </Col>
           <Col span={8}>
-            <Form.Item label="所属角色">{getFieldDecorator('role_ids')(<RoleSelect />)}</Form.Item>
+            <Form.Item label="所属角色">{getFieldDecorator('roleIDs')(<RoleSelect />)}</Form.Item>
           </Col>
         </Row>
         <Row gutter={16}>