From bd6521dcc02d1b224016c4df9e36388668989d0c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 10 七月 2023 00:58:17 +0800
Subject: [PATCH] 2023-07-10

---
 src/tabviews/zshare/actionList/popupbutton/index.jsx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tabviews/zshare/actionList/popupbutton/index.jsx b/src/tabviews/zshare/actionList/popupbutton/index.jsx
index f61eadf..a472218 100644
--- a/src/tabviews/zshare/actionList/popupbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/popupbutton/index.jsx
@@ -186,7 +186,7 @@
 
     if (btn.Ot === 'requiredSgl' && setting.primaryKey) {
       _data = data[0]
-      primaryId = _data[setting.primaryKey] || ''
+      primaryId = _data.$$uuid || _data[setting.primaryKey] || ''
     }
 
     this.setState({
@@ -248,7 +248,7 @@
         ratio = ratio + 'vw'
       }
       return <Modal
-        wrapClassName={'popview-modal ' + (!btn.$view ? '' : 'custom-popview')}
+        wrapClassName={'popview-modal ' + (!btn.$view ? '' : 'custom-popview ') + (btn.popshow || '')}
         title={btn.label}
         width={ratio}
         maskClosable={btn.clickouter === 'close'}

--
Gitblit v1.8.0