From b69b5f6329ca5f87932436b7a6c1ddfc3377e10f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 五月 2024 10:56:41 +0800
Subject: [PATCH] 2024-05-16

---
 src/tabviews/custom/components/table/normal-table/index.jsx |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index 323e0eb..fd31261 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -432,8 +432,18 @@
 
       if (col.supField) {
         names = []
-        if (BData && BData[col.supField]) {
-          names = BData[col.supField].split(',')
+        let val = ''
+        if (BData) {
+          let field = col.supField.toLowerCase()
+          Object.keys(BData).forEach(key => {
+            if (key.toLowerCase() === field) {
+              val = BData[key] + ''
+            }
+          })
+        }
+
+        if (val) {
+          names = val.split(',')
 
           if (names.length > fields.length) {
             names.length = fields.length
@@ -928,7 +938,7 @@
     if (config.uuid !== menuId) return
 
     if (config.supNodes) {
-      if (position === 'mainline' || position === 'popclose') {
+      if (['mainline', 'maingrid', 'popclose'].includes(position)) {
         let supNode = this.supModules[this.supModules.length - 1]
         config.supNodes.forEach((item, i) => {
           setTimeout(() => {
@@ -957,8 +967,8 @@
         } else {
           this.reloadtable(btn, id)
         }
-      } else if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
-        MKEmitter.emit('reloadData', config.setting.supModule, BID)
+      } else if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+        MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
       } else {
         this.reloadtable(btn, id)
       }

--
Gitblit v1.8.0