From 8a6ce370f1aa1c061b76fa3e9d2d4d1df53ca4c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:38:09 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/tree/antd-tree/index.jsx | 348 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 272 insertions(+), 76 deletions(-)
diff --git a/src/tabviews/custom/components/tree/antd-tree/index.jsx b/src/tabviews/custom/components/tree/antd-tree/index.jsx
index a5ec5fe..35b14ec 100644
--- a/src/tabviews/custom/components/tree/antd-tree/index.jsx
+++ b/src/tabviews/custom/components/tree/antd-tree/index.jsx
@@ -1,45 +1,47 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Spin, Empty, notification, Input, Tree, Modal } from 'antd'
-import { FolderOpenOutlined, FolderOutlined, FileOutlined } from '@ant-design/icons'
+import { Spin, Empty, Input, Tree, Dropdown } from 'antd'
+import { FolderOpenOutlined, FolderOutlined, FileOutlined, MoreOutlined } from '@ant-design/icons'
import Api from '@/api'
import UtilsDM from '@/utils/utils-datamanage.js'
import MKEmitter from '@/utils/events.js'
import TimerTask from '@/utils/timer-task.js'
+import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
const { TreeNode } = Tree
const { Search } = Input
+const MainAction = asyncComponent(() => import('@/tabviews/zshare/actionList'))
+
class NormalTree extends Component {
static propTpyes = {
- data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
- config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
- mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
+ config: PropTypes.object
}
state = {
BID: '', // 涓昏〃ID
config: null, // 鍥捐〃閰嶇疆淇℃伅
loading: false, // 鏁版嵁鍔犺浇鐘舵��
- sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
data: null, // 鏁版嵁
searchkey: null, // 杩囨护鏉′欢
treedata: null, // 鍒楄〃鏁版嵁闆�
treeNodes: null, // 鍒楄〃鏁版嵁闆�
expandedKeys: [], // 灞曞紑鐨勬爲鑺傜偣
selectedKeys: [], // 閫変腑鐨勬爲鑺傜偣
+ lineActions: [],
selected: false // 閫変腑棣栬
}
+ loaded = false
+
UNSAFE_componentWillMount () {
- const { config, data, initdata } = this.props
+ const { config } = this.props
+
let _config = fromJS(config).toJS()
let _data = null
- let _sync = config.setting.sync === 'true'
-
let BID = ''
let BData = ''
@@ -52,54 +54,47 @@
BID = BData.$BID || ''
}
- if (config.setting.sync === 'true' && data) {
- _data = data[config.dataName] || []
- _sync = false
- } else if (config.setting.sync === 'true' && initdata) {
- _data = initdata || []
- _sync = false
+ if (_config.setting.sync === 'true') {
+ _config.setting.onload = 'false'
+
+ if (window.GLOB.SyncData.has(_config.dataName)) {
+ _data = window.GLOB.SyncData.get(_config.dataName) || []
+
+ if (_config.$cache) {
+ Api.writeCacheConfig(_config.uuid, fromJS(_data).toJS(), BID)
+ }
+
+ _config.setting.sync = 'false'
+
+ this.loaded = true
+
+ window.GLOB.SyncData.delete(_config.dataName)
+ }
}
+ let lineActions = []
+ _config.action = _config.action || []
+ _config.action = _config.action.filter(item => {
+ if (item.Ot === 'requiredSgl') {
+ lineActions.push(item)
+ return false
+ }
+ return true
+ })
+
_config.wrap.contentHeight = config.wrap.title || config.wrap.searchable === 'true' ? 'calc(100% - 45px)' : '100%'
+
+ if (_config.wrap.lineHeight) {
+ _config.style['--mk-tree-line-height'] = _config.wrap.lineHeight + 'px'
+ }
this.setState({
selected: _config.wrap.selected === 'true',
config: _config,
data: _data,
BID: BID || '',
- arr_field: _config.columns.map(col => col.field).join(','),
- sync: _sync
- }, () => {
- if (config.setting.sync !== 'true' && config.setting.onload === 'true') {
- setTimeout(() => {
- this.loadData()
- }, config.setting.delay || 0)
- } else if (config.setting.sync === 'true' && _data) {
- this.handleData()
- }
+ lineActions
})
- }
-
- /**
- * @description 鍥捐〃鏁版嵁鏇存柊锛屽埛鏂板唴瀹�
- */
- UNSAFE_componentWillReceiveProps (nextProps) {
- const { sync, config } = this.state
-
- if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
- let _data = []
- if (nextProps.data && nextProps.data[config.dataName]) {
- _data = nextProps.data[config.dataName] || []
- }
-
- this.setState({sync: false, data: _data}, () => {
- this.handleData()
- })
- } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- this.setState({}, () => {
- this.loadData()
- })
- }
}
shouldComponentUpdate (nextProps, nextState) {
@@ -111,13 +106,25 @@
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
+ MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
+ if (config.setting.useMSearch) {
+ MKEmitter.addListener('searchRefresh', this.searchRefresh)
+ }
+
+ if (config.setting.sync === 'true') {
+ MKEmitter.addListener('transferSyncData', this.transferSyncData)
+ }
+
if (config.timer) {
this.timer = new TimerTask()
this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
- this.loadData(true)
+ this.loadData('timer')
})
}
+
+ this.initExec()
}
/**
@@ -128,9 +135,95 @@
return
}
MKEmitter.removeListener('reloadData', this.reloadData)
+ MKEmitter.removeListener('searchRefresh', this.searchRefresh)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
+ MKEmitter.removeListener('transferSyncData', this.transferSyncData)
+ MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
this.timer && this.timer.stop()
+ }
+
+ initExec = () => {
+ const { config, BID } = this.state
+
+ if (config.$cache) {
+ if (config.$time) {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, config.$time, BID).then(res => {
+ if (!res.valid && config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData('init')
+ }, config.setting.delay || 0)
+ }
+
+ if (!res.data || this.loaded) return
+
+ this.setState({data: res.data}, () => {
+ this.handleData()
+ })
+ })
+ } else {
+ this.handleData()
+ }
+ } else {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, 0, BID).then(res => {
+ if (!res.data || this.loaded) return
+
+ this.setState({data: res.data}, () => {
+ this.handleData()
+ })
+ })
+ }
+
+ if (config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData('init')
+ }, config.setting.delay || 0)
+ } else if (this.loaded) {
+ this.handleData()
+ }
+ }
+ } else if (config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
+ } else if (this.loaded) {
+ this.handleData()
+ }
+ }
+
+ transferSyncData = (syncId) => {
+ const { config, BID } = this.state
+
+ if (config.$syncId !== syncId) return
+
+ let _data = window.GLOB.SyncData.get(config.dataName) || []
+
+ if (config.$cache) {
+ Api.writeCacheConfig(config.uuid, fromJS(_data).toJS(), BID)
+ }
+
+ this.loaded = true
+
+ this.setState({data: _data}, () => {
+ this.handleData()
+ })
+
+ window.GLOB.SyncData.delete(config.dataName)
+
+ MKEmitter.removeListener('transferSyncData', this.transferSyncData)
+ }
+
+ searchRefresh = (searchId) => {
+ const { config } = this.state
+
+ if (config.$searchId !== searchId) return
+
+ this.setState({}, () => {
+ this.loadData()
+ })
}
reloadData = (menuId) => {
@@ -153,11 +246,47 @@
}
/**
+ * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
+ */
+ queryModuleParam = (menuId, callback) => {
+ const { config } = this.state
+
+ if (config.uuid !== menuId) return
+
+ let searches = []
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ searches = window.GLOB.SearchBox.get(config.$searchId) || []
+ }
+
+ callback({
+ orderBy: config.setting.order || '',
+ search: searches
+ })
+ }
+
+ /**
+ * @description 鎸夐挳鎵ц瀹屾垚鍚庨〉闈㈠埛鏂�
+ * @param {*} menuId // 鑿滃崟Id
+ * @param {*} position // 鍒锋柊浣嶇疆
+ * @param {*} btn // 鎵ц鐨勬寜閽�
+ */
+ refreshByButtonResult = (menuId, position) => {
+ const { config, BID } = this.state
+
+ if (config.uuid !== menuId) return
+
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
+ } else {
+ this.loadData()
+ }
+ }
+
+ /**
* @description 鏁版嵁鍔犺浇
*/
- async loadData (hastimer) {
- const { mainSearch } = this.props
- const { config, arr_field, BID } = this.state
+ async loadData (type) {
+ const { config, BID } = this.state
if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
@@ -165,50 +294,57 @@
}, () => {
this.handleData()
})
+ this.loaded = true
return
}
- let searches = config.setting.useMSearch && mainSearch ? mainSearch : []
+ let searches = []
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ searches = window.GLOB.SearchBox.get(config.$searchId) || []
+ }
- let requireFields = searches.filter(item => item.required && item.value === '')
- if (requireFields.length > 0) {
+ if (config.$s_req && searches.filter(item => item.required && item.value === '').length > 0) {
return
}
- if (!hastimer) {
+ if (type !== 'timer') {
this.setState({
loading: true
})
}
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, '', '', BID)
+ let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, '', '', BID)
let result = await Api.genericInterface(param)
if (result.status) {
+ this.loaded = true
+ if (config.$cache && type === 'init') {
+ Api.writeCacheConfig(config.uuid, result.data || [], BID)
+ }
+
this.setState({
data: result.data,
loading: false
}, () => {
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()
+ }
+ }
+
+ UtilsDM.querySuccess(result)
} else {
this.setState({
loading: false
})
this.timer && this.timer.stop()
- if (result.ErrCode === 'N') {
- Modal.error({
- title: result.message,
- })
- } else {
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
- }
+ UtilsDM.queryFail(result)
}
}
@@ -233,8 +369,9 @@
let hasSelectKey = false
data.forEach(item => {
- let pval = item[config.wrap.parentField]
- let val = item[config.wrap.valueField]
+ let pval = item[config.wrap.parentField] + ''
+ let val = item[config.wrap.valueField] + ''
+ let uuid = item[config.setting.primaryKey] + ''
if (!val || logMap.has(val)) return
@@ -242,6 +379,7 @@
hasSelectKey = true
selectData = {
...item,
+ $$uuid: uuid,
$title: item[config.wrap.labelField] || '',
$key: val,
$parentId: ''
@@ -252,6 +390,8 @@
if (pval === config.wrap.mark) {
parentNodes.push({
...item,
+ mk_floor: 1,
+ $$uuid: uuid,
$title: item[config.wrap.labelField] || '',
$key: val,
$parentId: ''
@@ -259,6 +399,7 @@
} else if (pval) {
_options.push({
...item,
+ $$uuid: uuid,
$title: item[config.wrap.labelField] || '',
$key: val,
$parentId: pval
@@ -266,7 +407,7 @@
}
})
let _treedata = this.getTree(parentNodes, _options)
-
+
let _treeNodes = []
if (!searchkey) {
@@ -287,7 +428,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({
@@ -296,7 +437,7 @@
MKEmitter.emit('resetSelectLine', config.uuid, '', '')
} else if (hasSelectKey) {
- MKEmitter.emit('resetSelectLine', config.uuid, selectKey, selectData)
+ MKEmitter.emit('resetSelectLine', config.uuid, selectData.$$uuid, selectData)
}
}
@@ -348,6 +489,7 @@
// 娣诲姞鑿滃崟鐨勫瓙鍏冪礌
options = options.filter(option => {
if (option.$parentId === parent.$key) {
+ option.mk_floor = parent.mk_floor + 1
parent.children.push(option)
return false
}
@@ -376,6 +518,52 @@
)
}
return <TreeNode icon={<FileOutlined />} key={item.$key} title={item.$title} dataRef={item} isLeaf />
+ })
+ }
+
+ renderActionTreeNodes = (nodes, actShow) => {
+ return nodes.map(item => {
+ let title = null
+ if (actShow === 'line') {
+ title = <>
+ {item.$title}
+ <MainAction
+ BID={this.state.BID}
+ BData={this.state.BData}
+ setting={this.state.config.setting}
+ actions={this.state.lineActions}
+ columns={this.state.config.columns}
+ selectedData={[{...item, children: ''}]}
+ />
+ </>
+ } else {
+ title = <>
+ {item.$title}
+ <Dropdown overlay={
+ <div className="mk-tree-dropdown-wrap" onClick={(e) => e.stopPropagation()}>
+ <MainAction
+ BID={this.state.BID}
+ BData={this.state.BData}
+ setting={this.state.config.setting}
+ actions={this.state.lineActions}
+ columns={this.state.config.columns}
+ selectedData={[{...item, children: ''}]}
+ />
+ </div>
+ } placement="bottomCenter" trigger={['hover']}>
+ <MoreOutlined onClick={(e) => e.stopPropagation()}/>
+ </Dropdown>
+ </>
+ }
+
+ if (item.children) {
+ return (
+ <TreeNode icon={<span><FolderOpenOutlined /><FolderOutlined /></span>} title={title} key={item.$key} dataRef={item}>
+ {this.renderActionTreeNodes(item.children, actShow)}
+ </TreeNode>
+ )
+ }
+ return <TreeNode icon={<FileOutlined />} key={item.$key} title={title} dataRef={item} isLeaf />
})
}
@@ -424,7 +612,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({
@@ -434,7 +622,7 @@
}
render() {
- const { config, loading, treeNodes, expandedKeys, selectedKeys } = this.state
+ const { BID, BData, config, loading, treeNodes, expandedKeys, selectedKeys, lineActions } = this.state
return (
<div className="custom-tree-box" id={'anchor' + config.uuid} style={config.style}>
@@ -448,18 +636,26 @@
<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}
+ {config.action.length ? <MainAction
+ BID={BID}
+ setting={config.setting}
+ actions={config.action}
+ BData={BData}
+ columns={config.columns}
+ selectedData={[]}
+ /> : null}
{treeNodes && treeNodes.length > 0 ? <div className="tree-box" style={{height: config.wrap.contentHeight}}>
<Tree
blockNode
onSelect={this.selectTreeNode}
expandedKeys={expandedKeys}
selectedKeys={selectedKeys}
- onRightClick={this.changeExpandedAllKeys}
+ onRightClick={!lineActions.length ? this.changeExpandedAllKeys : null}
onExpand={this.changeExpandedKeys}
showIcon={config.wrap.showIcon === 'true'}
showLine={config.wrap.showLine === 'true'}
>
- {this.renderTreeNodes(treeNodes)}
+ {!lineActions.length ? this.renderTreeNodes(treeNodes) : this.renderActionTreeNodes(treeNodes, config.wrap.actShow)}
</Tree>
</div> : null}
{treeNodes && treeNodes.length === 0 ? <Empty description={false}/> : null}
--
Gitblit v1.8.0