From deb2536eaaa559d6c8ec94f81afb94b6c7806b4d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 29 三月 2024 16:15:14 +0800 Subject: [PATCH] 2024-03-29 --- src/tabviews/custom/components/chart/antv-G6/index.jsx | 390 ++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 267 insertions(+), 123 deletions(-) diff --git a/src/tabviews/custom/components/chart/antv-G6/index.jsx b/src/tabviews/custom/components/chart/antv-G6/index.jsx index 8eac201..c7dd705 100644 --- a/src/tabviews/custom/components/chart/antv-G6/index.jsx +++ b/src/tabviews/custom/components/chart/antv-G6/index.jsx @@ -1,7 +1,7 @@ import React, {Component} from 'react' import PropTypes from 'prop-types' import { is, fromJS } from 'immutable' -import { Modal, notification, Spin, Empty } from 'antd' +import { Spin, Empty } from 'antd' import G6 from '@antv/g6' import Api from '@/api' @@ -797,30 +797,27 @@ class antvG6Chart extends Component { static propTpyes = { - data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁 - config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅 - mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢 + config: PropTypes.object } state = { config: null, - data: null, BID: '', BData: '', plot: null, - sync: false, - arr_field : '', chartId: Utils.getuuid(), empty: true } + data = [] + mkgraph = null + selectedId = '' + 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 = '' @@ -833,12 +830,22 @@ BID = BData.$BID || '' } - if (_sync && data) { - _data = data[config.dataName] || [] - _sync = false - } else if (_sync && initdata) { - _data = initdata || [] - _sync = false + if (_config.setting.sync === 'true') { + _config.setting.onload = 'false' + + if (window.GLOB.SyncData.has(_config.dataName)) { + this.data = window.GLOB.SyncData.get(_config.dataName) || [] + + if (_config.$cache) { + Api.writeCacheConfig(_config.uuid, fromJS(this.data).toJS(), BID) + } + + _config.setting.sync = 'false' + + this.loaded = true + + window.GLOB.SyncData.delete(_config.dataName) + } } _config.plot.height = Utils.getHeight(_config.plot.height) @@ -850,55 +857,11 @@ this.setState({ config: _config, - data: _data, BID: BID || '', BData: BData || '', - arr_field: _config.columns.map(col => col.field).join(','), - plot: _config.plot, - 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() - } + plot: _config.plot }) - } - - /** - * @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) { - return !is(fromJS(this.state), fromJS(nextState)) - } - - componentDidMount () { - const { config } = this.state - MKEmitter.addListener('reloadData', this.reloadData) - MKEmitter.addListener('resetSelectLine', this.resetParentParam) - + let that = this if (config.plot.subtype === 'mindmap') { @@ -1027,6 +990,26 @@ } } + shouldComponentUpdate (nextProps, nextState) { + return !is(fromJS(this.state), fromJS(nextState)) + } + + componentDidMount () { + const { config } = this.state + MKEmitter.addListener('reloadData', this.reloadData) + MKEmitter.addListener('resetSelectLine', this.resetParentParam) + + if (config.setting.useMSearch) { + MKEmitter.addListener('searchRefresh', this.searchRefresh) + } + + if (config.setting.sync === 'true') { + MKEmitter.addListener('transferSyncData', this.transferSyncData) + } + + this.initExec() + } + /** * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆 */ @@ -1035,7 +1018,90 @@ return } MKEmitter.removeListener('reloadData', this.reloadData) + MKEmitter.removeListener('searchRefresh', this.searchRefresh) MKEmitter.removeListener('resetSelectLine', this.resetParentParam) + MKEmitter.removeListener('transferSyncData', this.transferSyncData) + } + + 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.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.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) + } + + if (!is(fromJS(this.data), fromJS(_data))) { + this.data = _data + this.handleData() + } + + this.loaded = true + + 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) => { @@ -1057,23 +1123,24 @@ } } - async loadData () { - 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({ - data: {} - }, () => { + if (!is(fromJS(this.data), fromJS([]))) { + this.data = [] 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 } @@ -1082,39 +1149,37 @@ }) 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) { - let data = result.data || [] + if (config.$cache && type === 'init') { + Api.writeCacheConfig(config.uuid, result.data || [], BID) + } + + this.loaded = true this.setState({ - data, loading: false - }, () => { - this.handleData() }) + + if (!is(fromJS(this.data), fromJS(result.data || []))) { + this.data = result.data || [] + this.handleData() + } + + UtilsDM.querySuccess(result) } else { this.setState({ loading: false }) - if (result.ErrCode === 'N') { - Modal.error({ - title: result.message, - }) - } else { - notification.error({ - top: 92, - message: result.message, - duration: 10 - }) - } + UtilsDM.queryFail(result) } } getdata = () => { - const { plot, data, config, BData } = this.state + const { plot, config, BData } = this.state let root = { label: 'Root', @@ -1140,7 +1205,7 @@ let _options = [] let logMap = new Map() - data.forEach(item => { + this.data.forEach(item => { let pval = item[plot.parentField] let val = item[plot.valueField] let label = item[plot.labelField] || '' @@ -1165,9 +1230,20 @@ _options.push(_item) }) - - root = this.getTree(root, _options) + + root.nodeNumber = 0 + root = this.getTree(root, _options, root) root.children = root.children || [] + + if (root.selectedItem) { + let option = {...root.selectedItem} + setTimeout(() => { + MKEmitter.emit('resetSelectLine', config.uuid, option.id, option) + }, 20) + delete root.selectedItem + } else { + this.selectedId = '' + } if (plot.subtype === 'mindmap') { root.type = 'dice-mind-map-root' @@ -1230,13 +1306,22 @@ return root } - getTree = (parent, options) => { + getTree = (parent, options, root) => { parent.children = [] // 娣诲姞鑿滃崟鐨勫瓙鍏冪礌 options = options.filter(option => { if (option.$parentId === parent.id) { delete option.$parentId + + if (this.selectedId && option.id === this.selectedId) { + root.selectedItem = {...option} + option.selected = true + } + parent.children.push(option) + + root.nodeNumber++ + return false } return true @@ -1246,7 +1331,7 @@ parent.children = null } else { parent.children = parent.children.map(item => { - item = this.getTree(item, options) + item = this.getTree(item, options, root) return item }) @@ -1256,24 +1341,71 @@ } handleData = () => { - const { plot, data } = this.state + const { config } = this.state - let _element = document.getElementById(this.state.chartId) - if (_element) { - _element.innerHTML = '' + MKEmitter.emit('resetSelectLine', config.uuid, '', '') + + if (this.mkgraph) { + this.mkgraph.clear() + this.resetrender() + } else { + this.viewrender() } + } - if (!data || data.length === 0) { + viewrender = () => { + const { plot } = this.state + + this.selectedId = '' + if (this.data.length === 0) { this.setState({empty: true}) } else { this.setState({empty: false}) if (plot.subtype === 'mindmap') { - this.ponitrender() + this.mindrender() } else if (plot.subtype === 'indentTree') { this.indentrender() } else if (plot.subtype === 'kapmap') { this.kapmaprender() + } + } + } + + resetrender = () => { + const { plot } = this.state + + if (this.data.length === 0) { + this.setState({empty: true}) + this.selectedId = '' + } else { + this.setState({empty: false}) + + const data = this.getdata() + if (plot.subtype === 'mindmap') { + this.mkgraph.data(data) + + this.mkgraph.render() + + const width = this.wrap.scrollWidth - 30 + + if (plot.collapsed === 'true' && plot.dirField) { + this.mkgraph.zoomTo(1, { x: width / 2, y: plot.height / 2 }) + } else if (plot.collapsed === 'true' || data.nodeNumber < 5) { + this.mkgraph.zoomTo(1, { x: 0, y: plot.height / 2 }) + } + } else if (plot.subtype === 'indentTree') { + this.mkgraph.data(dataIndTransform(data)) + + this.mkgraph.render() + } else if (plot.subtype === 'kapmap') { + this.mkgraph.data(data) + this.mkgraph.render() + this.mkgraph.fitView() + + if (plot.collapsed === 'true' || data.nodeNumber < 5) { + this.mkgraph.zoomTo(1, { x: 0, y: plot.height / 2 }) + } } } } @@ -1333,9 +1465,11 @@ graph.render() graph.fitView() - if (plot.collapsed === 'true') { + if (plot.collapsed === 'true' || data.nodeNumber < 5) { graph.zoomTo(1, { x: 0, y: plot.height / 2 }) } + + this.mkgraph = graph } indentrender = () => { @@ -1397,12 +1531,14 @@ tree.data(dataIndTransform(data)) tree.render() + + this.mkgraph = tree } /** - * @description 鏁g偣鍥� + * @description 鎬濈淮瀵煎浘 */ - ponitrender = () => { + mindrender = () => { const { config, plot, chartId } = this.state const data = this.getdata() const width = this.wrap.scrollWidth - 30 @@ -1456,21 +1592,23 @@ if (plot.collapsed === 'true' && plot.dirField) { tree.zoomTo(1, { x: width / 2, y: plot.height / 2 }) - } else if (plot.collapsed === 'true') { + } else if (plot.collapsed === 'true' || data.nodeNumber < 5) { tree.zoomTo(1, { x: 0, y: plot.height / 2 }) } + + this.mkgraph = tree } handleClick = (data = null) => { const { plot, config } = this.state - if (plot.click && !data) return - if (plot.click === 'menus') { + if (!data) return + let menu = null if (plot.menus && plot.menus.length > 0) { - let s = data[plot.menuType] || '' + let s = data[plot.menuType] + '' plot.menus.forEach(m => { if (s !== m.sign) return menu = m @@ -1497,37 +1635,43 @@ MKEmitter.emit('modifyTabs', newtab, true) } else if (plot.click === 'menu') { + if (!data) return + let menuId = plot.menu.slice(-1)[0] - let newtab = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0] + let menu = null - if (!newtab && plot.MenuID) { - newtab = { + if (window.GLOB.mkThdMenus.has(menuId)) { + menu = {...window.GLOB.mkThdMenus.get(menuId)} + } else if (plot.MenuID) { + menu = { MenuID: plot.MenuID, MenuName: plot.MenuName, - MenuNo: plot.MenuNo, type: plot.tabType } - } else if (!newtab) { - return } - newtab = { - ...newtab, - param: {} - } + if (!menu) return + + menu.param = {} if (plot.joint === 'true') { - newtab.param.$BID = data.$$uuid || '' + menu.param.$BID = data.$$uuid || '' Object.keys(data).forEach(key => { if (/^\$/.test(key)) return - newtab.param[key] = data[key] + menu.param[key] = data[key] }) } - MKEmitter.emit('modifyTabs', newtab, true) + MKEmitter.emit('modifyTabs', menu, true) } else { - MKEmitter.emit('resetSelectLine', config.uuid, (data ? data.$$uuid : ''), data) + if (data) { + this.selectedId = data.$$uuid || '' + MKEmitter.emit('resetSelectLine', config.uuid, data.$$uuid || '', data) + } else { + this.selectedId = '' + MKEmitter.emit('resetSelectLine', config.uuid, '', '') + } } } -- Gitblit v1.8.0