From 0472ec32cadb4f9bca6dbab82ac33a42e76f37ed Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 28 六月 2022 16:24:15 +0800
Subject: [PATCH] 菜单栏&时间轴

---
 src/tabviews/custom/components/table/normal-table/index.jsx |   38 ++++++++++++++------------------------
 1 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index b592956..1fbcb48 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -67,7 +67,7 @@
       }
     }
 
-    let setting = {..._config.setting, ..._config.wrap, style: {}}
+    let setting = {..._config.setting, ..._config.wrap}
 
     if (setting.selected !== 'always' && setting.selected !== 'init') {
       setting.selected = 'false'
@@ -129,12 +129,12 @@
       }
     })
 
-    if (setting.color) {
-      setting.style.color = setting.color
-    }
-    if (setting.fontSize) {
-      setting.style.fontSize = setting.fontSize
-    }
+    // if (setting.color) {
+    //   setting.style.color = setting.color
+    // }
+    // if (setting.fontSize) {
+    //   setting.style.fontSize = setting.fontSize
+    // }
 
     if (_config.wrap.collapse === 'true') {
       _config.wrap.title = _config.wrap.title || ' '
@@ -541,26 +541,16 @@
 
     if (config.uuid !== menuId) return
 
-    let supModule = config.setting.supModule
-
-    btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
-
-    if (!btn.syncComponentId || btn.syncComponentId !== supModule) {
-      if (position === 'line') {
-        if (lines && lines.length === 1) {
-          this.loadmainLinedata(lines[0].$$uuid)
-        } else {
-          this.reloadtable(btn, id)
-        }
-      } else if (position === 'mainline' || position === 'popclose') { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
-        if (supModule && BID) {
-          MKEmitter.emit('reloadData', supModule, BID)
-        } else {
-          this.reloadtable(btn, id)
-        }
+    if (position === 'line') {
+      if (lines && lines.length === 1) {
+        this.loadmainLinedata(lines[0].$$uuid)
       } else {
         this.reloadtable(btn, id)
       }
+    } else if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
+      MKEmitter.emit('reloadData', config.setting.supModule, BID)
+    } else {
+      this.reloadtable(btn, id)
     }
 
     if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」

--
Gitblit v1.8.0