From 5046d0d13dc6a8563b8e54e31913bc44cfa1072f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 四月 2022 19:23:18 +0800
Subject: [PATCH] 2022-04-26
---
src/tabviews/custom/components/tree/antd-tree/index.jsx | 89 ++++++++++++++++++++++++++++++--------------
1 files changed, 60 insertions(+), 29 deletions(-)
diff --git a/src/tabviews/custom/components/tree/antd-tree/index.jsx b/src/tabviews/custom/components/tree/antd-tree/index.jsx
index 743a5af..305d461 100644
--- a/src/tabviews/custom/components/tree/antd-tree/index.jsx
+++ b/src/tabviews/custom/components/tree/antd-tree/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Spin, Empty, notification, Input, Tree, Icon } from 'antd'
+import { Spin, Empty, notification, Input, Tree } from 'antd'
+import { FolderOpenOutlined, FolderOutlined, FileOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -33,6 +34,7 @@
treeNodes: null, // 鍒楄〃鏁版嵁闆�
expandedKeys: [], // 灞曞紑鐨勬爲鑺傜偣
selectedKeys: [], // 閫変腑鐨勬爲鑺傜偣
+ selected: false // 閫変腑棣栬
}
UNSAFE_componentWillMount () {
@@ -49,7 +51,10 @@
_sync = false
}
+ _config.wrap.contentHeight = config.wrap.title || config.wrap.searchable === 'true' ? 'calc(100% - 45px)' : '100%'
+
this.setState({
+ selected: _config.wrap.selected === 'true',
config: _config,
data: _data,
BID: BID || '',
@@ -57,7 +62,9 @@
sync: _sync
}, () => {
if (config.setting.sync !== 'true' && config.setting.onload === 'true') {
- this.loadData()
+ setTimeout(() => {
+ this.loadData(null)
+ }, config.setting.delay || 0)
} else if (config.setting.sync === 'true' && _data) {
this.handleData()
}
@@ -79,12 +86,10 @@
this.setState({sync: false, data: _data}, () => {
this.handleData()
})
- } else if (nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- if (config.setting.syncRefresh === 'true') {
- this.setState({}, () => {
- this.loadData()
- })
- }
+ } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ this.setState({}, () => {
+ this.loadData()
+ })
}
}
@@ -115,7 +120,7 @@
if (!config.timer) return
- const _change = { '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
+ const _change = { '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
let timer = _change[config.timer]
@@ -172,7 +177,7 @@
const { config } = this.state
if (!config.setting.supModule || config.setting.supModule !== MenuID) return
- if (id !== this.state.BID) {
+ if (id !== this.state.BID || id !== '') {
this.setState({ BID: id }, () => {
this.loadData()
})
@@ -195,21 +200,10 @@
return
}
- let searches = []
- if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key)
- mainSearch.forEach(item => {
- if (!keys.includes(item.key)) {
- searches.push(item)
- }
- })
- }
+ let searches = config.setting.useMSearch && mainSearch ? mainSearch : []
- let requireFields = searches.filter(item => item.required && (!item.value || item.value.length === 0))
+ let requireFields = searches.filter(item => item.required && item.value === '')
if (requireFields.length > 0) {
- this.setState({
- loading: false
- })
return
}
@@ -244,17 +238,24 @@
}
handleData = () => {
- const { data, searchkey, config } = this.state
+ const { data, searchkey, config, selectedKeys, selected } = this.state
if (!data || data.length === 0) {
this.setState({
+ selectedKeys: [],
+ expandedKeys: [],
treedata: [],
treeNodes: [],
})
+
+ MKEmitter.emit('resetSelectLine', config.uuid, '', '')
return
}
let parentNodes = []
let _options = []
let logMap = new Map()
+ let selectKey = selectedKeys[0] || ''
+ let selectData = ''
+ let hasSelectKey = false
data.forEach(item => {
let pval = item[config.wrap.parentField]
@@ -262,17 +263,27 @@
if (!val || logMap.has(val)) return
+ if (selectKey && selectKey === val) {
+ hasSelectKey = true
+ selectData = {
+ ...item,
+ $title: item[config.wrap.labelField] || '',
+ $key: val,
+ $parentId: ''
+ }
+ }
+
logMap.set(val, true)
if (pval === config.wrap.mark) {
parentNodes.push({
- // ...item,
+ ...item,
$title: item[config.wrap.labelField] || '',
$key: val,
$parentId: ''
})
} else if (pval) {
_options.push({
- // ...item,
+ ...item,
$title: item[config.wrap.labelField] || '',
$key: val,
$parentId: pval
@@ -290,9 +301,28 @@
}
this.setState({
+ expandedKeys: _treeNodes[0] ? [_treeNodes[0].$key] : [],
treedata: _treedata,
treeNodes: _treeNodes,
})
+
+ if (selected && !hasSelectKey && _treeNodes[0]) {
+ this.setState({
+ selectedKeys: [_treeNodes[0].$key]
+ })
+
+ setTimeout(() => {
+ MKEmitter.emit('resetSelectLine', config.uuid, _treeNodes[0].$key, _treeNodes[0])
+ }, 200)
+ } else if (!hasSelectKey && selectKey) {
+ this.setState({
+ selectedKeys: []
+ })
+
+ MKEmitter.emit('resetSelectLine', config.uuid, '', '')
+ } else if (hasSelectKey) {
+ MKEmitter.emit('resetSelectLine', config.uuid, selectKey, selectData)
+ }
}
treeFilter = (value) => {
@@ -365,12 +395,12 @@
return nodes.map(item => {
if (item.children) {
return (
- <TreeNode icon={<span><Icon type="folder-open" /><Icon type="folder" /></span>} title={item.$title} key={item.$key} dataRef={item}>
+ <TreeNode icon={<span><FolderOpenOutlined /><FolderOutlined /></span>} title={item.$title} key={item.$key} dataRef={item}>
{this.renderTreeNodes(item.children)}
</TreeNode>
)
}
- return <TreeNode icon={<Icon type="file" />} key={item.$key} title={item.$title} dataRef={item} isLeaf />
+ return <TreeNode icon={<FileOutlined />} key={item.$key} title={item.$title} dataRef={item} isLeaf />
})
}
@@ -418,6 +448,7 @@
}
if (selected) {
+ delete _data.children
MKEmitter.emit('resetSelectLine', config.uuid, (_data ? _data.$key : ''), _data)
}
@@ -442,7 +473,7 @@
<span className="title">{config.wrap.title}</span>
{config.wrap.searchable === 'true' ? <Search allowClear onSearch={this.treeFilter} /> : null}
</div> : null}
- {treeNodes && treeNodes.length > 0 ? <div className="tree-box">
+ {treeNodes && treeNodes.length > 0 ? <div className="tree-box" style={{height: config.wrap.contentHeight}}>
<Tree
blockNode
onSelect={this.selectTreeNode}
--
Gitblit v1.8.0