From 5e871a4164869bac7927ea6884dbadd650b1cadf Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 25 五月 2023 11:25:28 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/tabviews/custom/components/table/edit-table/index.jsx |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index d0802d5..96dfbb6 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -92,8 +92,9 @@
           if (item.subcols.length === 0) {
             return false
           }
-        } else if (item.type === 'action') {
+        } else if (item.type === 'custom') {
           item.elements.forEach(btn => {
+            if (btn.eleType !== 'button') return
             if (btn.funcType === 'addline') {
               setting.addable = true
             }
@@ -480,7 +481,9 @@
         BID: id,
         BData: data
       }, () => {
-        this.loadmaindata(true, 'true')
+        setTimeout(() => {
+          this.loadmaindata(true, 'true')
+        }, setting.delay || 0)
       })
     }
   }

--
Gitblit v1.8.0