From 71e3da644eca32a5aa40503e903efb0640748093 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 七月 2023 17:00:59 +0800
Subject: [PATCH] 2023-07-21

---
 src/tabviews/custom/components/chart/antv-G6/index.jsx |  122 ++++++++++++++++++++++++----------------
 1 files changed, 72 insertions(+), 50 deletions(-)

diff --git a/src/tabviews/custom/components/chart/antv-G6/index.jsx b/src/tabviews/custom/components/chart/antv-G6/index.jsx
index 8d7f359..51977d6 100644
--- a/src/tabviews/custom/components/chart/antv-G6/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-G6/index.jsx
@@ -797,9 +797,7 @@
 
 class antvG6Chart extends Component {
   static propTpyes = {
-    data: PropTypes.array,           // 缁熶竴鏌ヨ鏁版嵁
-    config: PropTypes.object,        // 缁勪欢閰嶇疆淇℃伅
-    mainSearch: PropTypes.any,       // 澶栧眰鎼滅储鏉′欢
+    config: PropTypes.object
   }
 
   state = {
@@ -807,7 +805,6 @@
     BID: '',
     BData: '',
     plot: null,
-    sync: false,
     arr_field : '',
     chartId: Utils.getuuid(),
     empty: true
@@ -816,13 +813,12 @@
   data = []
   mkgraph = null
   selectedId = ''
+  loaded = false
 
   UNSAFE_componentWillMount () {
-    const { config, data, initdata } = this.props
+    const { config } = this.props
+
     let _config = fromJS(config).toJS()
-
-    let _sync = _config.setting.sync === 'true'
-
     let BID = ''
     let BData = ''
 
@@ -835,12 +831,18 @@
       BID = BData.$BID || ''
     }
 
-    if (_sync && data) {
-      this.data = data[config.dataName] || []
-      _sync = false
-    } else if (_sync && initdata) {
-      this.data = initdata || []
-      _sync = false
+    if (_config.setting.sync === 'true' && 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())
+      }
+
+      _config.setting.sync = 'false'
+
+      this.loaded = true
+
+      window.GLOB.SyncData.delete(_config.dataName)
     }
 
     _config.plot.height = Utils.getHeight(_config.plot.height)
@@ -855,8 +857,7 @@
       BID: BID || '',
       BData: BData || '',
       arr_field: _config.columns.map(col => col.field).join(','),
-      plot: _config.plot,
-      sync: _sync
+      plot: _config.plot
     }, () => {
       if (config.setting.sync !== 'true' && config.setting.onload === 'true') {
         setTimeout(() => {
@@ -997,44 +998,26 @@
     }
   }
 
-  /**
-   * @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]
-      }
-
-      if (!is(fromJS(this.data), fromJS(_data))) {
-        this.data = _data
-        this.handleData()
-      }
-
-      this.setState({sync: false})
-    } 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, sync } = this.state
+    const { config } = this.state
     MKEmitter.addListener('reloadData', this.reloadData)
     MKEmitter.addListener('resetSelectLine', this.resetParentParam)
 
-    if (config.$cache && (config.setting.sync !== 'true' || sync)) {
+    if (config.setting.useMSearch) {
+      MKEmitter.addListener('searchRefresh', this.searchRefresh)
+    }
+
+    if (config.setting.sync === 'true') {
+      MKEmitter.addListener('transferSyncData', this.transferSyncData)
+    }
+
+    if (config.$cache && !this.loaded) {
       Api.getLCacheConfig(config.uuid).then(res => {
-        if (!res || this.data.length > 0) return
+        if (!res || this.loaded) return
 
         if (!is(fromJS(this.data), fromJS(res))) {
           this.data = res
@@ -1052,7 +1035,42 @@
       return
     }
     MKEmitter.removeListener('reloadData', this.reloadData)
+    MKEmitter.removeListener('searchRefresh', this.searchRefresh)
     MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+    MKEmitter.removeListener('transferSyncData', this.transferSyncData)
+  }
+
+  transferSyncData = (syncId) => {
+    const { config } = 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())
+    }
+
+    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) => {
@@ -1075,7 +1093,6 @@
   }
 
   async loadData () {
-    const { mainSearch } = this.props
     const { config, arr_field, BID } = this.state
 
     if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
@@ -1083,13 +1100,16 @@
         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
     }
 
@@ -1103,9 +1123,11 @@
     let result = await Api.genericInterface(param)
     if (result.status) {
       if (config.$cache && config.setting.onload !== 'false') {
-        Api.writeCacheConfig(config.uuid, result.data || '')
+        Api.writeCacheConfig(config.uuid, result.data || [])
       }
 
+      this.loaded = true
+
       this.setState({
         loading: false
       })

--
Gitblit v1.8.0