From 37bc6ca6ff385cfc721f312edd1df44f203efe37 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 二月 2023 15:08:09 +0800
Subject: [PATCH] 2023-02-21
---
src/menu/components/tree/antd-tree/index.scss | 3 +
src/tabviews/custom/components/tree/antd-tree/index.jsx | 88 +++++++++++++++++++++++++++++++++++++++----
src/tabviews/custom/components/tree/antd-tree/index.scss | 1
src/tabviews/custom/components/timeline/normal-timeline/index.jsx | 2
4 files changed, 83 insertions(+), 11 deletions(-)
diff --git a/src/menu/components/tree/antd-tree/index.scss b/src/menu/components/tree/antd-tree/index.scss
index a1255ef..20df956 100644
--- a/src/menu/components/tree/antd-tree/index.scss
+++ b/src/menu/components/tree/antd-tree/index.scss
@@ -25,6 +25,9 @@
line-height: 90px;
color: #bcbcbc;
}
+ .model-menu-action-list:not(.length0) {
+ margin: 10px 0px;
+ }
}
.menu-tree-box::after {
display: block;
diff --git a/src/tabviews/custom/components/timeline/normal-timeline/index.jsx b/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
index dd41b85..2d9f4c7 100644
--- a/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
+++ b/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
@@ -218,7 +218,7 @@
this.loadData()
}
- /**
+ /**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
queryModuleParam = (menuId, callback) => {
diff --git a/src/tabviews/custom/components/tree/antd-tree/index.jsx b/src/tabviews/custom/components/tree/antd-tree/index.jsx
index b381c81..8755abb 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,55 @@
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()
+ }
+
+ if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
+ btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
@@ -260,6 +313,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 +321,7 @@
hasSelectKey = true
selectData = {
...item,
+ $$uuid: uuid,
$title: item[config.wrap.labelField] || '',
$key: val,
$parentId: ''
@@ -277,6 +332,7 @@
if (pval === config.wrap.mark) {
parentNodes.push({
...item,
+ $$uuid: uuid,
$title: item[config.wrap.labelField] || '',
$key: val,
$parentId: ''
@@ -284,6 +340,7 @@
} else if (pval) {
_options.push({
...item,
+ $$uuid: uuid,
$title: item[config.wrap.labelField] || '',
$key: val,
$parentId: pval
@@ -312,7 +369,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 +378,7 @@
MKEmitter.emit('resetSelectLine', config.uuid, '', '')
} else if (hasSelectKey) {
- MKEmitter.emit('resetSelectLine', config.uuid, selectKey, selectData)
+ MKEmitter.emit('resetSelectLine', config.uuid, selectData.$$uuid, selectData)
}
}
@@ -393,9 +450,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 +473,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 +484,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 +537,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 +548,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 +569,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}
diff --git a/src/tabviews/custom/components/tree/antd-tree/index.scss b/src/tabviews/custom/components/tree/antd-tree/index.scss
index 0f47f0d..b384cef 100644
--- a/src/tabviews/custom/components/tree/antd-tree/index.scss
+++ b/src/tabviews/custom/components/tree/antd-tree/index.scss
@@ -125,7 +125,6 @@
display: block;
margin: 0!important;
width: 100%;
- height: 34px;
border-radius: 0px;
padding-left: 15px!important;
.anticon {
--
Gitblit v1.8.0