update 搬迁list组件

This commit is contained in:
2021-06-14 10:35:57 +08:00
parent 453ee91b22
commit 3221960ec2
10 changed files with 774 additions and 14 deletions

View File

@@ -37,7 +37,10 @@
"extends": [
"react-app",
"react-app/jest"
]
],
"rules": {
"eqeqeq": "off"
}
},
"browserslist": {
"production": [
@@ -51,4 +54,4 @@
"last 1 safari version"
]
}
}
}

View File

@@ -1,11 +1,204 @@
import React, { Component } from 'react'
import { Button, Form, List, Pagination, Spin } from 'antd'
import { AntIcon } from 'components'
export default class QueryList extends Component {
render() {
return (
<div>
state = {
loading: false,
dataSource: []
}
// 查询表单实例
form = React.createRef()
// 查询值
query = {}
// 分页器配置
pagination = {
current: 1,
pageSize: 10,
total: 0,
size: 'small',
showSizeChanger: true,
showQuickJumper: true,
showTotal: (total) => `总共${total}条数据`
}
// 默认选中页码
pageIndex = 1
// 默认页面尺寸
pageSize = 10
constructor(props) {
super(props)
this.autoLoad = typeof this.props.autoLoad === 'boolean' ? this.props.autoLoad : true
this.loadData = typeof this.props.loadData === 'function' ? this.props.loadData : async () => { }
if (this.props.pageIndex) {
this.pageIndex = this.props.pageIndex
this.pagination.current = this.pageIndex
}
if (this.props.pageSize) {
this.pageSize = this.props.pageSize
this.pagination.pageSize = this.pageSize
}
}
/**
* 自动加载数据
*/
componentDidMount() {
if (this.autoLoad) {
this.onLoadData()
}
}
/**
* 加载数据
* 调用外部传入的loadData函数,可在loadData中自行改变参数
*/
async onLoadData() {
this.onLoading()
const res = await this.props.loadData({
pageIndex: this.pagination.current,
pageSize: this.pagination.pageSize
}, this.query)
this.setState({
dataSource: res.rows || res.data || res.items
})
this.pagination.total = res.totalCount
this.onLoaded()
}
/**
* 数据开始加载
*/
onLoading() {
this.setState({ loading: true })
}
/**
* 数据加载完成
*/
onLoaded() {
this.setState({ loading: false })
}
/**
* 进行查询
* 返回表单字段值,加载数据,并且返回到第一页
* @param {*} values
*/
onQuery(values) {
this.query = values
this.onReloadData(true)
}
/**
* 重置查询
* 初始化表单字段值,加载数据,并返回到第一页
*/
onResetQuery() {
this.form.current.resetFields()
this.query = {}
this.onReloadData(true)
}
/**
* 重新加载表格数据
* @param {Boolean} resetPage 是否重置页码
*/
onReloadData(resetPage = false) {
if (resetPage) {
this.pagination = {
...this.pagination,
current: this.pageIndex
}
}
this.onLoadData()
}
onListChange(current, pageSize) {
this.pagination = {
...this.pagination,
current,
pageSize
}
this.onLoadData()
}
/**
* 渲染查询栏
* @returns
*/
renderQueryBar() {
const { query, moreQuery } = this.props
return (
<div className="yo-query-bar">
<Form
layout="inline"
ref={this.form}
onFinish={(value) => this.onQuery(value)}
>
{query}
<Form.Item>
<Button.Group className="mr-xs">
<Button htmlType="submit" type="primary">查询</Button>
<Button onClick={() => this.onResetQuery()}>重置</Button>
</Button.Group>
{
moreQuery && <Button>更多查询条件</Button>
}
</Form.Item>
</Form>
</div>
)
}
render() {
const props = {
dataSource: this.state.dataSource,
rowKey: record => record.id || Math.random().toString(16).slice(2),
...this.props
}
return (
<section>
{this.props.query && this.renderQueryBar()}
<div className="yo-action-bar">
<div className="yo-action-bar--actions">
{this.props.operator}
</div>
<div className="yo-action-bar--actions">
<Button.Group>
<Button>刷新</Button>
</Button.Group>
</div>
</div>
<div className="yo-list">
<Spin spinning={this.state.loading} indicator={<AntIcon type="loading" />}>
<List {...props} />
{
!!this.state.dataSource && !!this.state.dataSource.length &&
<Pagination
size="small"
{...this.pagination}
onChange={(current, pageSize) => this.onListChange(current, pageSize)}
/>
}
</Spin>
</div>
</section>
)
}
}

View File

@@ -214,10 +214,12 @@ export default class QueryTreeLayout extends Component {
render() {
const { dataSource, expandedKeys, autoExpandParent } = this.state
const props = {
treeData: this.state.dataSource,
expandedKeys: this.state.expandedKeys,
autoExpandParent: this.state.autoExpandParent
treeData: dataSource,
expandedKeys,
autoExpandParent
}
const on = {

View File

@@ -23,6 +23,12 @@ const name = '应用'
export default class index extends Component {
state = {
codes: {
commonStatus: []
}
}
// 表格实例
table = React.createRef()
@@ -162,7 +168,7 @@ export default class index extends Component {
name = toCamelCase(name)
const codes = this.state.codes[name]
if (codes) {
const c = codes.find((p) => p.code == code)
const c = codes.find((p) => p.code === code)
if (c) {
return c.value
}

View File

@@ -165,6 +165,7 @@ export default class form extends Component {
<Form
initialValues={initialValues}
ref={this.form}
className="yo-form"
>
<Spin spinning={this.state.loading} indicator={<AntIcon type="loading" />}>
<div className="yo-form-group">

View File

@@ -20,6 +20,12 @@ const name = '机构'
export default class index extends Component {
state = {
codes: {
orgType: []
}
}
// 表格实例
table = React.createRef()
@@ -174,7 +180,7 @@ export default class index extends Component {
name = toCamelCase(name)
const codes = this.state.codes[name]
if (codes) {
const c = codes.find((p) => p.code == code)
const c = codes.find((p) => p.code === code)
if (c) {
return c.value
}

View File

@@ -0,0 +1,227 @@
import React, { Component } from 'react'
import { Cascader, Form, Input, InputNumber, Select, Spin, TreeSelect } from 'antd'
import { AntIcon } from 'components'
import { cloneDeep } from 'lodash'
import getDicData from 'util/dic'
import { EMPTY_ID } from 'util/global'
import { api } from 'common/api'
const initialValues = {
sort: 100
}
export default class form extends Component {
state = {
// 加载状态
loading: true,
codes: {
orgType: []
},
options: {
orgData: [],
areaData: []
}
}
// 表单实例
form = React.createRef()
// 初始化数据
record = {}
/**
* mount后回调
*/
componentDidMount() {
this.props.created && this.props.created(this)
}
/**
* 填充数据
* 可以在设置this.record之后对其作出数据结构调整
* [异步,必要]
* @param {*} params
*/
async fillData(params) {
this.record = cloneDeep(params.record)
//#region 从后端转换成前段所需格式
const orgData = await this.loadOrgData()
const areaData = await this.loadAreaData()
const codes = await getDicData('org_type')
this.setState({
codes,
options: {
orgData,
areaData
}
})
const areaCode = [];
const findCode = (data, level) => {
level = level || 0;
for (let i = 0; i < data.length; i++) {
const item = data[i];
areaCode[level] = item.code;
if (item.code === params.record.areaCode) {
areaCode.length = level + 1;
return true;
}
if (item.children && item.children.length) {
const found = findCode(item.children, level + 1);
if (found) {
return true;
}
}
}
};
if (params.record && params.record.areaCode) {
findCode(areaData);
}
this.record = {
pid: params.orgId,
...this.record,
areaCode
}
this.record.areaCode = areaCode
//#endregion
this.form.current.setFieldsValue(this.record)
this.setState({
loading: false
})
}
/**
* 获取数据
* 可以对postData进行数据结构调整
* [异步,必要]
* @returns
*/
async getData() {
const form = this.form.current
const valid = await form.validateFields()
if (valid) {
const postData = form.getFieldsValue()
if (this.record) {
postData.id = this.record.id
}
//#region 从前段转换后端所需格式
postData.areaCode = postData.areaCode[postData.areaCode.length - 1]
//#endregion
return postData
}
}
//#region 自定义方法
async loadOrgData() {
const { data } = await api.getOrgTree()
return [{
id: EMPTY_ID,
parentId: undefined,
title: '顶级',
value: EMPTY_ID,
pid: undefined,
children: data,
}]
}
async loadAreaData() {
const { data } = await api.getAreaTree()
const clearChiildren = (data) => {
data.forEach((item) => {
if (item.children && item.children.length) {
clearChiildren(item.children);
} else {
delete item.children;
}
});
};
clearChiildren(data);
return data
}
onAreaCodeChange(selectedOptions) {
const data = selectedOptions[selectedOptions.length - 1]
this.form.current.setFieldsValue({
name: data.name,
code: data.code
})
}
//#endregion
render() {
return (
<Form
initialValues={initialValues}
ref={this.form}
className="yo-form"
>
<Spin spinning={this.state.loading} indicator={<AntIcon type="loading" />}>
<div className="yo-form-group">
<Form.Item label="所属区域" name="areaCode" rules={[{ required: true, message: '请选择所属区域' }]}>
<Cascader
options={this.state.options.areaData}
fieldNames={{
label: 'name',
value: 'code',
children: 'children'
}}
changeOnSelect
placeholder="请选择所属区域"
onChange={(val, selectedOptions) => this.onAreaCodeChange(selectedOptions)}
/>
</Form.Item>
<Form.Item label="机构名称" name="name" rules={[{ required: true, message: '请输入机构名称', trigger: 'blur' }]}>
<Input autoComplete="off" placeholder="请输入机构名称" />
</Form.Item>
<Form.Item label="唯一编码" name="code" rules={[{ required: true, message: '请输入唯一编码', trigger: 'blur' }]}>
<Input autoComplete="off" placeholder="请输入唯一编码" />
</Form.Item>
<Form.Item label="机构类型" name="type" rules={[{ required: true, message: '请选择机构类型' }]}>
<Select placeholder="请选择机构类型">
{
this.state.codes.orgType.map(item => {
return <Select.Option
key={item.code}
value={+item.code}
>{item.value}</Select.Option>
})
}
</Select>
</Form.Item>
<Form.Item label="上级机构" name="pid" rules={[{ required: true, message: '请选择上级机构' }]}>
<TreeSelect
treeData={this.state.options.orgData}
dropdownStyle={{ maxHeight: '300px', overflow: 'auto' }}
treeDefaultExpandAll
placeholder="请选择上级机构"
/>
</Form.Item>
<Form.Item label="排序" name="sort">
<InputNumber
max={1000}
min={0}
placeholder="请输入排序"
className="w-100-p"
/>
</Form.Item>
<Form.Item label="备注" name="remark">
<Input.TextArea placeholder="请输入备注" />
</Form.Item>
</div>
</Spin>
</Form>
)
}
}

View File

@@ -0,0 +1,319 @@
import React, { Component } from 'react'
import { Button, Card, Descriptions, Form, Input, List, message as Message, Popconfirm, Select, Switch } from 'antd'
import { AntIcon, Auth, Container, Image, ModalForm, QueryList, QueryTreeLayout } from 'components'
import { api } from 'common/api'
import { toCamelCase } from 'util/format'
import { isEqual } from 'lodash'
import getDicData from 'util/dic'
import FormBody from './form'
// 配置页面所需接口函数
const apiAction = {
tree: api.getOrgTree,
page: api.getUserPage,
add: api.sysUserAdd,
edit: api.sysUserEdit,
delete: api.sysUserDelete,
changeStatus: api.sysUserChangeStatus,
resetPwd: api.sysUserResetPwd
}
// 用于弹窗标题
const name = '用户'
export default class index extends Component {
state = {
codes: {
sex: [],
commonStatus: []
}
}
// 表格实例
list = React.createRef()
// 新增窗口实例
addForm = React.createRef()
// 编辑窗口实例
editForm = React.createRef()
// 树选中节点
selectId = undefined
/**
* 阻止外部组件引发的渲染,提升性能
* 可自行添加渲染条件
* [必要]
* @param {*} props
* @param {*} state
* @returns
*/
shouldComponentUpdate(props, state) {
return !isEqual(this.state, state)
}
/**
* 加载字典数据,之后开始加载表格数据
* 如果必须要加载字典数据,可直接对表格设置autoLoad=true
*/
componentDidMount() {
this.list.current.onLoading()
getDicData('sex', 'common_status').then(res => {
this.setState({
codes: res
}, () => {
this.list.current.onLoadData()
})
})
}
/**
* 调用加载数据接口,可在调用前对query进行处理
* [异步,必要]
* @param {*} params
* @param {*} query
* @returns
*/
loadData = async (params, query) => {
query = {
...query,
sysEmpParam: {
orgId: this.selectId
}
}
const { data } = await apiAction.page({
...params,
...query,
})
return data
}
/**
* 调用树结构数据接口
* [异步,必要]
* @returns
*/
loadTreeData = async () => {
const { data } = await apiAction.tree()
return data
}
/**
* 树节点选中事件
* [必要]
* @param {*} id
*/
onSelectTree(id) {
this.selectId = id
this.list.current.onReloadData()
}
/**
* 绑定字典数据
* @param {*} code
* @param {*} name
* @returns
*/
bindCodeValue(code, name) {
name = toCamelCase(name)
const codes = this.state.codes[name]
if (codes) {
const c = codes.find((p) => p.code == code)
if (c) {
return c.value
}
}
return null
}
/**
* 打开新增/编辑弹窗
* @param {*} modal
* @param {*} record
*/
onOpen(modal, record) {
modal.current.open({
orgId: this.selectId,
record
})
}
/**
* 对表格上的操作进行统一处理
* [异步]
* @param {*} action
* @param {*} successMessage
*/
async onAction(action, successMessage) {
this.list.current.onLoading()
try {
await action
Message.success(successMessage)
this.list.current.onReloadData()
} catch {
this.list.current.onLoaded()
}
}
/**
* 删除
* @param {*} record
*/
onDelete(record) {
this.onAction(
apiAction.delete(record),
'删除成功'
)
}
//#region 自定义方法
renderItem(record) {
return (
<List.Item
key={record.id}
actions={
[
<Auth auth="sysUser:edit">
<a onClick={() => this.onOpen(this.editForm, record)}>编辑</a>
</Auth>,
<Auth auth="sysOrg:delete">
<Popconfirm
placement="topRight"
title="是否确认删除"
onConfirm={() => this.onDelete(record)}
>
<a>删除</a>
</Popconfirm>
</Auth>,
<Auth aut="sysUser:resetPwd">
<a onClick={() => this.onResetPassword(record)}>重置密码</a>
</Auth>
]
}
>
<List.Item.Meta
avatar={
<Image
type="avatar"
shape="square"
size={48}
id={record.avatar}
icon={<AntIcon type="user" />}
/>
}
title={record.nickName || record.name}
description={record.account}
/>
<Descriptions className="flex-1" column={2}>
<Descriptions.Item label="性别">{this.bindCodeValue(record.sex, 'sex')}</Descriptions.Item>
<Descriptions.Item label="手机">{record.phone || '未设置'}</Descriptions.Item>
<Descriptions.Item label="邮箱">{record.email || '未设置'}</Descriptions.Item>
</Descriptions>
<div className="yo-list-content--h">
<Auth auth="sysUser:changeStatus">
<div className="yo-list-content--h--item text-center">
<Switch
checked={!record.status}
loading={record.statusChanging}
checkedChildren={this.bindCodeValue(0, 'common_status')}
unCheckedChildren={this.bindCodeValue(1, 'common_status')}
onChange={checked => this.onSetUserStatus(record, checked)}
/>
</div>
</Auth>
</div>
</List.Item>
)
}
onSetUserStatus(record, checked) {
this.onAction(
apiAction.changeStatus({ id: record.id, status: +!checked }),
'设置成功'
)
}
onResetPassword(record) {
this.onAction(
apiAction.resetPwd(record),
'重置成功'
)
}
//#endregion
render() {
return (
<QueryTreeLayout
loadData={this.loadTreeData}
defaultExpanded={true}
onSelect={(key) => this.onSelectTree(key)}
>
<Container mode="fluid">
<Card bordered={false}>
<QueryList
ref={this.list}
loadData={this.loadData}
query={
<Auth auth="sysApp:page">
<Form.Item label="关键词" name="searchValue">
<Input
autoComplete="off"
placeholder="请输入姓名、账号、手机号"
className="w-200"
/>
</Form.Item>
<Form.Item label="状态" name="searchStatus">
<Select
allowClear
placeholder="请选择状态"
className="w-200"
>
{
this.state.codes.commonStatus.map(item => {
return <Select.Option
key={item.code}
item={item.code}
>{item.value}</Select.Option>
})
}
</Select>
</Form.Item>
</Auth>
}
operator={
<Button
icon={<AntIcon type="plus" />}
onClick={() => this.onOpen(this.addForm)}
>新增{name}</Button>
}
renderItem={(record) => this.renderItem(record)}
/>
</Card>
</Container>
<ModalForm
title={`新增${name}`}
action={apiAction.add}
ref={this.addForm}
onSuccess={() => this.list.current.onReloadData()}
>
<FormBody />
</ModalForm>
<ModalForm
title={`编辑${name}`}
action={apiAction.edit}
ref={this.editForm}
onSuccess={() => this.list.current.onReloadData()}
>
<FormBody />
</ModalForm>
</QueryTreeLayout>
)
}
}

View File

@@ -29,11 +29,11 @@ store.subscribe = (...args) => {
if (path) {
const resultState = cloneDeep(result(state, path))
if (!isEqual(snapshot, resultState)) {
listener.apply(this, [...args, resultState])
listener.apply(this, [resultState, ...args])
}
snapshot = resultState
} else {
listener.apply(this, [...args, state])
listener.apply(this, [state, ...args])
}
})
}

View File

@@ -11,7 +11,9 @@ const user = (state = {}, action) => {
}
}
const layout = (state = {}, action) => {
const layout = (state = {
siderCollapsed: false
}, action) => {
switch (action.type) {
// 打开窗口
case 'OPEN_WINDOW':
@@ -24,7 +26,8 @@ const layout = (state = {}, action) => {
return state
// 侧边收起状态
case 'TOGGLE_COLLAPSED':
return state
const _state = { ...state, siderCollapsed: action.siderCollapsed }
return _state
default:
return state
}