From 474c68f0fea10cc62977c67d186732b3346cdd53 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 一月 2023 18:04:45 +0800
Subject: [PATCH] 2023-01-17

---
 src/tabviews/custom/components/chart/custom-chart/index.jsx |   78 ++++++++++++++++++++++++---------------
 1 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/src/tabviews/custom/components/chart/custom-chart/index.jsx b/src/tabviews/custom/components/chart/custom-chart/index.jsx
index a3f4b6d..19713cf 100644
--- a/src/tabviews/custom/components/chart/custom-chart/index.jsx
+++ b/src/tabviews/custom/components/chart/custom-chart/index.jsx
@@ -28,14 +28,14 @@
     loading: false,            // 鏁版嵁鍔犺浇鐘舵��
     sync: false,               // 鏄惁缁熶竴璇锋眰鏁版嵁
     plot: null,                // 鍥捐〃璁剧疆
-    data: null,                // 鏁版嵁
     search: null,              // 鎼滅储鏉′欢
   }
+
+  data = []
 
   UNSAFE_componentWillMount () {
     const { config, data, initdata } = this.props
     let _config = fromJS(config).toJS()
-    let _data = null
     let _sync = config.setting.sync === 'true'
 
     let BID = ''
@@ -50,11 +50,11 @@
       BID = BData.$BID || ''
     }
 
-    if (config.setting.sync === 'true' && data) {
-      _data = data[config.dataName] || []
+    if (_sync && data) {
+      this.data = data[config.dataName] || []
       _sync = false
-    } else if (config.setting.sync === 'true' && initdata) {
-      _data = initdata || []
+    } else if (_sync && initdata) {
+      this.data = initdata || []
       _sync = false
     }
 
@@ -63,8 +63,7 @@
 
     this.setState({
       config: _config,
-      data: _data,
-      empty: !_data || _data.length === 0,
+      empty: this.data.length === 0,
       BID: BID || '',
       arr_field: _config.columns.map(col => col.field).join(','),
       plot: _config.plot,
@@ -75,10 +74,12 @@
         setTimeout(() => {
           this.loadData()
         }, _config.setting.delay || 0)
-      } else if (config.setting.sync === 'true' && _data) {
-        this.handleData()
       }
     })
+
+    if (this.data.length > 0) {
+      this.handleData()
+    }
   }
 
   /**
@@ -93,9 +94,12 @@
         _data = nextProps.data[config.dataName] || []
       }
 
-      this.setState({sync: false, data: _data, empty: _data.length === 0}, () => {
+      if (!is(fromJS(this.data), fromJS(_data))) {
+        this.data = _data
         this.handleData()
-      })
+      }
+
+      this.setState({sync: false, empty: _data.length === 0})
     } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
       this.setState({}, () => {
         this.loadData()
@@ -108,7 +112,7 @@
   }
 
   componentDidMount () {
-    const { config } = this.state
+    const { config, sync } = this.state
 
     MKEmitter.addListener('reloadData', this.reloadData)
     MKEmitter.addListener('resetSelectLine', this.resetParentParam)
@@ -119,6 +123,18 @@
       this.timer = new TimerTask()
       this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
         this.loadData(true)
+      })
+    }
+
+    if (config.$cache && (config.setting.sync !== 'true' || sync)) {
+      Api.getLCacheConfig(config.uuid).then(res => {
+        if (!res || this.data.length > 0) return
+
+        if (!is(fromJS(this.data), fromJS(res))) {
+          this.data = res
+          this.handleData()
+        }
+        this.setState({empty: false})
       })
     }
   }
@@ -215,10 +231,13 @@
 
     if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
       this.setState({
-        data: []
-      }, () => {
-        this.handleData()
+        empty: true
       })
+
+      if (!is(fromJS(this.data), fromJS([]))) {
+        this.data = []
+        this.handleData()
+      }
       return
     }
 
@@ -248,20 +267,19 @@
 
     let result = await Api.genericInterface(param)
     if (result.status) {
-      let reset = true
-
-      if (hastimer && is(fromJS(result.data), fromJS(this.state.data))) {
-        reset = false
+      if (config.$cache) {
+        Api.writeCacheConfig(config.uuid, result.data || '')
       }
 
       this.setState({
-        data: result.data,
         loading: false,
-        empty: result.data.length === 0
-      }, () => {
-        if (!reset) return
-        this.handleData()
+        empty: !result.data || result.data.length === 0
       })
+
+      if (!is(fromJS(this.data), fromJS(result.data || []))) {
+        this.data = result.data || []
+        this.handleData()
+      }
     } else {
       this.setState({
         loading: false
@@ -287,14 +305,14 @@
     
     setTimeout(() => {
       this.viewrender()
-    }, 150)
+    }, 100)
   }
 
   /**
    * @description 鍥捐〃娓叉煋鍒嗙粍
    */
   viewrender = () => {
-    const { config, data } = this.state
+    const { config } = this.state
 
     if (!config.plot.script) return
 
@@ -302,7 +320,7 @@
       try {
         // eslint-disable-next-line
         let func = new Function('Chart', 'DataSet', 'wrap', 'data', 'config', config.plot.script)
-        func(Chart, DataSet, this.wrap, data, config)
+        func(Chart, DataSet, this.wrap, this.data, config)
       } catch (e) {
         console.warn(e)
   
@@ -316,7 +334,7 @@
       try {
         // eslint-disable-next-line
         let func = new Function('echarts', 'DataSet', 'wrap', 'data', 'config', config.plot.script)
-        func(echarts, DataSet, this.wrap, data, config)
+        func(echarts, DataSet, this.wrap, this.data, config)
       } catch (e) {
         console.warn(e)
   
@@ -347,7 +365,7 @@
             <Spin />
           </div> : null
         }
-        <NormalHeader config={config} BID={BID} refresh={this.refreshSearch} />
+        <NormalHeader config={config} BID={BID} refresh={this.refreshSearch}/>
         <div className="canvas-wrap" style={{height: (config.plot.height + 30) + 'px'}}>
           <div className={'canvas' + (empty ? ' empty' : '')} style={{height: config.plot.height + 'px'}} ref={ref => this.wrap = ref}></div>
         </div>

--
Gitblit v1.8.0