From 004176924ce35c96600f5c18e85478944de8bec6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 14 一月 2023 16:46:50 +0800
Subject: [PATCH] 2023-01-14

---
 src/tabviews/custom/components/chart/antv-bar-line/index.jsx |   43 +++++++++++++++++++++++++++----------------
 1 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
index ee845a8..349f550 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -37,7 +37,7 @@
     transfield: {},            // 瀛楁鍚嶇О缈昏瘧
     sync: false,               // 鏄惁缁熶竴璇锋眰鏁版嵁
     plot: null,                // 鍥捐〃璁剧疆
-    data: null,                // 鏁版嵁
+    data: [],                  // 鏁版嵁
     search: null,              // 鎼滅储鏉′欢
     vFields: [],               // 鏁板�煎瓧娈�
     vstFields: null,           // 缁熻鏁版嵁鍊煎瓧娈典俊鎭�
@@ -335,7 +335,7 @@
 
     this.setState({
       config: _config,
-      data: _data,
+      data: _data || [],
       BID: BID || '',
       vFields: vFields,
       vstFields: vstFields,
@@ -359,7 +359,7 @@
    * @description 鍥捐〃鏁版嵁鏇存柊锛屽埛鏂板唴瀹�
    */
   UNSAFE_componentWillReceiveProps (nextProps) {
-    const { sync, config } = this.state
+    const { sync, config, data } = this.state
 
     if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
       let _data = []
@@ -367,9 +367,11 @@
         _data = nextProps.data[config.dataName] || []
       }
 
-      this.setState({sync: false, data: _data}, () => {
+      this.setState({sync: false, data: _data})
+
+      if (!is(fromJS(data), fromJS(_data))) {
         this.handleData()
-      })
+      }
     } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
       this.setState({}, () => {
         this.loadData()
@@ -382,7 +384,7 @@
   }
 
   componentDidMount () {
-    const { config } = this.state
+    const { config, sync } = this.state
 
     MKEmitter.addListener('reloadData', this.reloadData)
     MKEmitter.addListener('resetSelectLine', this.resetParentParam)
@@ -393,6 +395,16 @@
       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) return
+
+        this.setState({data: res}, () => {
+          this.handleData()
+        })
       })
     }
   }
@@ -522,19 +534,18 @@
 
     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,
+        data: result.data || [],
         loading: false
-      }, () => {
-        if (!reset) return
-        this.handleData()
       })
+
+      if (!is(fromJS(this.state.data), fromJS(result.data || []))) {
+        this.handleData()
+      }
     } else {
       this.setState({
         loading: false
@@ -577,7 +588,7 @@
   getdata = () => {
     const { data, plot, vFields, config } = this.state
 
-    if (!data || data.length === 0) {
+    if (data.length === 0) {
       this.setState({empty: true})
       return []
     }
@@ -726,7 +737,7 @@
       percent = true
     }
 
-    if (!data || data.length === 0) {
+    if (data.length === 0) {
       this.setState({empty: true})
       return []
     }

--
Gitblit v1.8.0