From ba9e189dd33c8d48f7f4ac36bcefeef9afb426f8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 七月 2023 23:40:49 +0800
Subject: [PATCH] 2023-07-17
---
src/tabviews/custom/components/tree/antd-tree/index.jsx | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 102 insertions(+), 12 deletions(-)
diff --git a/src/tabviews/custom/components/tree/antd-tree/index.jsx b/src/tabviews/custom/components/tree/antd-tree/index.jsx
index b381c81..e924dd2 100644
--- a/src/tabviews/custom/components/tree/antd-tree/index.jsx
+++ b/src/tabviews/custom/components/tree/antd-tree/index.jsx
@@ -120,6 +120,8 @@
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
+ MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
if (config.timer) {
this.timer = new TimerTask()
@@ -148,6 +150,8 @@
}
MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
+ MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
this.timer && this.timer.stop()
}
@@ -168,6 +172,51 @@
this.setState({ BID: id }, () => {
this.loadData()
})
+ }
+ }
+
+ /**
+ * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
+ */
+ queryModuleParam = (menuId, callback) => {
+ const { mainSearch } = this.props
+ const { arr_field, config } = this.state
+
+ if (config.uuid !== menuId) return
+
+ let searches = []
+ if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+ let keys = searches.map(item => item.key.toLowerCase())
+ mainSearch.forEach(item => {
+ if (!keys.includes(item.key.toLowerCase())) {
+ searches.push(item)
+ }
+ })
+ }
+
+ callback({
+ arr_field: arr_field,
+ orderBy: config.setting.order || '',
+ search: searches,
+ menuName: config.name
+ })
+ }
+
+ /**
+ * @description 鎸夐挳鎵ц瀹屾垚鍚庨〉闈㈠埛鏂�
+ * @param {*} menuId // 鑿滃崟Id
+ * @param {*} position // 鍒锋柊浣嶇疆
+ * @param {*} btn // 鎵ц鐨勬寜閽�
+ */
+ refreshByButtonResult = (menuId, position, btn) => {
+ const { config, BID } = this.state
+
+ if (config.uuid !== menuId) return
+
+ if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
+ MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ } else {
+ this.loadData()
}
}
@@ -207,7 +256,7 @@
let result = await Api.genericInterface(param)
if (result.status) {
this.loaded = true
- if (config.$cache) {
+ if (config.$cache && config.setting.onload !== 'false') {
Api.writeCacheConfig(config.uuid, result.data || '')
}
@@ -217,17 +266,39 @@
}, () => {
this.handleData()
})
+
+ if (config.timer && config.clearField && result.data && result.data[0]) {
+ let vals = (config.clearValue || '').split(',')
+ if (vals.includes(result.data[0][config.clearField])) {
+ this.timer && this.timer.stop()
+ }
+ }
+
+ if (result.message) {
+ if (result.ErrCode === 'Y') {
+ Modal.success({
+ title: result.message
+ })
+ } else if (result.ErrCode === 'S') {
+ notification.success({
+ top: 92,
+ message: result.message,
+ duration: 2
+ })
+ }
+ }
} else {
this.setState({
loading: false
})
this.timer && this.timer.stop()
+ if (!result.message) return
if (result.ErrCode === 'N') {
Modal.error({
title: result.message,
})
- } else {
+ } else if (result.ErrCode !== '-2') {
notification.error({
top: 92,
message: result.message,
@@ -260,6 +331,7 @@
data.forEach(item => {
let pval = item[config.wrap.parentField]
let val = item[config.wrap.valueField]
+ let uuid = item[config.setting.primaryKey] || ''
if (!val || logMap.has(val)) return
@@ -267,6 +339,7 @@
hasSelectKey = true
selectData = {
...item,
+ $$uuid: uuid,
$title: item[config.wrap.labelField] || '',
$key: val,
$parentId: ''
@@ -277,6 +350,8 @@
if (pval === config.wrap.mark) {
parentNodes.push({
...item,
+ mk_floor: 1,
+ $$uuid: uuid,
$title: item[config.wrap.labelField] || '',
$key: val,
$parentId: ''
@@ -284,6 +359,7 @@
} else if (pval) {
_options.push({
...item,
+ $$uuid: uuid,
$title: item[config.wrap.labelField] || '',
$key: val,
$parentId: pval
@@ -291,7 +367,7 @@
}
})
let _treedata = this.getTree(parentNodes, _options)
-
+
let _treeNodes = []
if (!searchkey) {
@@ -312,7 +388,7 @@
})
setTimeout(() => {
- MKEmitter.emit('resetSelectLine', config.uuid, _treeNodes[0].$key, _treeNodes[0])
+ MKEmitter.emit('resetSelectLine', config.uuid, _treeNodes[0].$$uuid, _treeNodes[0])
}, 200)
} else if (!hasSelectKey && selectKey) {
this.setState({
@@ -321,7 +397,7 @@
MKEmitter.emit('resetSelectLine', config.uuid, '', '')
} else if (hasSelectKey) {
- MKEmitter.emit('resetSelectLine', config.uuid, selectKey, selectData)
+ MKEmitter.emit('resetSelectLine', config.uuid, selectData.$$uuid, selectData)
}
}
@@ -373,6 +449,7 @@
// 娣诲姞鑿滃崟鐨勫瓙鍏冪礌
options = options.filter(option => {
if (option.$parentId === parent.$key) {
+ option.mk_floor = parent.mk_floor + 1
parent.children.push(option)
return false
}
@@ -393,9 +470,20 @@
*/
renderTreeNodes = (nodes) => {
return nodes.map(item => {
- let title = item.$title
+ if (item.children) {
+ return (
+ <TreeNode icon={<span><FolderOpenOutlined /><FolderOutlined /></span>} title={item.$title} key={item.$key} dataRef={item}>
+ {this.renderTreeNodes(item.children)}
+ </TreeNode>
+ )
+ }
+ return <TreeNode icon={<FileOutlined />} key={item.$key} title={item.$title} dataRef={item} isLeaf />
+ })
+ }
- title = <>
+ renderActionTreeNodes = (nodes) => {
+ return nodes.map(item => {
+ let title = <>
{item.$title}
<Dropdown overlay={
<div className="mk-tree-dropdown-wrap" onClick={(e) => e.stopPropagation()}>
@@ -405,7 +493,7 @@
setting={this.state.config.setting}
actions={this.state.config.action}
columns={this.state.config.columns}
- selectedData={[item]}
+ selectedData={[{...item, children: ''}]}
/>
</div>
} placement="bottomCenter" trigger={['hover']}>
@@ -416,7 +504,7 @@
if (item.children) {
return (
<TreeNode icon={<span><FolderOpenOutlined /><FolderOutlined /></span>} title={title} key={item.$key} dataRef={item}>
- {this.renderTreeNodes(item.children)}
+ {this.renderActionTreeNodes(item.children)}
</TreeNode>
)
}
@@ -469,7 +557,7 @@
if (selected) {
delete _data.children
- MKEmitter.emit('resetSelectLine', config.uuid, (_data ? _data.$key : ''), _data)
+ MKEmitter.emit('resetSelectLine', config.uuid, (_data ? _data.$$uuid : ''), _data)
}
this.setState({
@@ -480,6 +568,8 @@
render() {
const { config, loading, treeNodes, expandedKeys, selectedKeys } = this.state
+
+ let extra = config.action && config.action.length > 0
return (
<div className="custom-tree-box" id={'anchor' + config.uuid} style={config.style}>
@@ -499,12 +589,12 @@
onSelect={this.selectTreeNode}
expandedKeys={expandedKeys}
selectedKeys={selectedKeys}
- onRightClick={this.changeExpandedAllKeys}
+ onRightClick={!extra ? this.changeExpandedAllKeys : null}
onExpand={this.changeExpandedKeys}
showIcon={config.wrap.showIcon === 'true'}
showLine={config.wrap.showLine === 'true'}
>
- {this.renderTreeNodes(treeNodes)}
+ {!extra ? this.renderTreeNodes(treeNodes) : this.renderActionTreeNodes(treeNodes)}
</Tree>
</div> : null}
{treeNodes && treeNodes.length === 0 ? <Empty description={false}/> : null}
--
Gitblit v1.8.0