From 0c439ced2c97905cb2b02f5f689a37b19369fb8a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 22 七月 2022 15:00:58 +0800
Subject: [PATCH] 2022-07-22
---
src/tabviews/custom/components/tree/antd-tree/index.jsx | 146 ++++++++++++++++++++++++++----------------------
1 files changed, 79 insertions(+), 67 deletions(-)
diff --git a/src/tabviews/custom/components/tree/antd-tree/index.jsx b/src/tabviews/custom/components/tree/antd-tree/index.jsx
index 1ab48b4..5cc68a0 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'
@@ -19,7 +20,6 @@
data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
- menuType: PropTypes.any, // 鑿滃崟绫诲瀷
}
state = {
@@ -33,6 +33,7 @@
treeNodes: null, // 鍒楄〃鏁版嵁闆�
expandedKeys: [], // 灞曞紑鐨勬爲鑺傜偣
selectedKeys: [], // 閫変腑鐨勬爲鑺傜偣
+ selected: false // 閫変腑棣栬
}
UNSAFE_componentWillMount () {
@@ -49,7 +50,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 +61,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()
}
@@ -76,24 +82,13 @@
_data = nextProps.data[config.dataName] || []
}
- // _data = [
- // {ID: 'dsdsagsgfs32ed2dqd61', nvarchar1: '1', nvarchar2: '1', nvarchar3: ''},
- // {ID: 'dsdsagsgfs32ed2dqd61', nvarchar1: '1-1', nvarchar2: '1-1', nvarchar3: '1'},
- // {ID: 'dsdsagsgfs32ed2dqd61', nvarchar1: '1-2', nvarchar2: '1-2', nvarchar3: '1'},
- // {ID: 'dsdsagsgfs32ed2dqd61', nvarchar1: '2', nvarchar2: '2', nvarchar3: ''},
- // {ID: 'dsdsagsgfs32ed2dqd61', nvarchar1: '2-1', nvarchar2: '2-1', nvarchar3: '2'},
- // {ID: 'dsdsagsgfs32ed2dqd61', nvarchar1: '2-2', nvarchar2: '2-2', nvarchar3: '2'},
- // ]
-
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()
+ })
}
}
@@ -124,16 +119,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]
@@ -190,7 +176,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()
})
@@ -201,7 +187,7 @@
* @description 鏁版嵁鍔犺浇
*/
async loadData (hastimer) {
- const { mainSearch, menuType } = this.props
+ const { mainSearch } = this.props
const { config, arr_field, BID } = this.state
if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
@@ -213,21 +199,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
}
@@ -238,7 +213,7 @@
}
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, '', '', BID, menuType)
+ let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, '', '', BID)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -262,17 +237,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]
@@ -280,20 +262,30 @@
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,
- title: item[config.wrap.labelField] || '',
- key: val,
- parentId: ''
+ ...item,
+ $title: item[config.wrap.labelField] || '',
+ $key: val,
+ $parentId: ''
})
} else if (pval) {
_options.push({
- // ...item,
- title: item[config.wrap.labelField] || '',
- key: val,
- parentId: pval
+ ...item,
+ $title: item[config.wrap.labelField] || '',
+ $key: val,
+ $parentId: pval
})
}
})
@@ -308,9 +300,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) => {
@@ -336,9 +347,9 @@
getFilterTree = (parents, searchkey) => {
return parents.filter(node => {
if (!node.children) {
- return (node.title.toLowerCase().indexOf(searchkey) >= 0 || node.key.toLowerCase().indexOf(searchkey) >= 0)
+ return (node.$title.toLowerCase().indexOf(searchkey) >= 0 || node.$key.toLowerCase().indexOf(searchkey) >= 0)
} else {
- if (node.title.toLowerCase().indexOf(searchkey) >= 0 || node.key.toLowerCase().indexOf(searchkey) >= 0) {
+ if (node.$title.toLowerCase().indexOf(searchkey) >= 0 || node.$key.toLowerCase().indexOf(searchkey) >= 0) {
return true
}
@@ -360,7 +371,7 @@
parent.children = []
// 娣诲姞鑿滃崟鐨勫瓙鍏冪礌
options = options.filter(option => {
- if (option.parentId === parent.key) {
+ if (option.$parentId === parent.$key) {
parent.children.push(option)
return false
}
@@ -383,12 +394,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 />
})
}
@@ -414,7 +425,7 @@
getExpandKeys = (node, keys) => {
if (node.children) {
- keys.push(node.key)
+ keys.push(node.$key)
node.children.forEach(_node => {
this.getExpandKeys(_node, keys)
})
@@ -426,22 +437,23 @@
let _expandedKeys = fromJS(this.state.expandedKeys).toJS()
let _data = fromJS(node.props.dataRef).toJS()
- if (_expandedKeys.indexOf(_data.key) >= 0) {
- _expandedKeys = _expandedKeys.filter(key => key !== _data.key)
+ if (_expandedKeys.indexOf(_data.$key) >= 0) {
+ _expandedKeys = _expandedKeys.filter(key => key !== _data.$key)
} else {
if (_data.children) {
- _expandedKeys.push(_data.key)
+ _expandedKeys.push(_data.$key)
_expandedKeys = Array.from(new Set(_expandedKeys))
}
}
if (selected) {
- MKEmitter.emit('resetSelectLine', config.uuid, (_data ? _data.key : ''), _data)
+ delete _data.children
+ MKEmitter.emit('resetSelectLine', config.uuid, (_data ? _data.$key : ''), _data)
}
this.setState({
expandedKeys: _expandedKeys,
- selectedKeys: [_data.key]
+ selectedKeys: [_data.$key]
})
}
@@ -449,7 +461,7 @@
const { config, loading, treeNodes, expandedKeys, selectedKeys } = this.state
return (
- <div className="custom-tree-box" style={config.style}>
+ <div className="custom-tree-box" id={'anchor' + config.uuid} style={config.style}>
{loading ?
<div className="loading-mask">
<div className="ant-spin-blur"></div>
@@ -457,10 +469,10 @@
</div> : null
}
{config.wrap.title || config.wrap.searchable === 'true' ? <div className="tree-header" style={config.headerStyle}>
- <span className="title">{config.wrap.title}</span>
+ <span className={'title ' + (config.wrap.searchable !== 'true' ? 'search-unable' : '')}>{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