From d7534812c8199bf1e9faa0279b63e434737d6374 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 16 四月 2021 16:06:27 +0800
Subject: [PATCH] 2021-04-16
---
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index 0d53a35..988d6f9 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -103,7 +103,7 @@
}
let primaryId = '' // 瀵煎叆鏃惰Id
- if (btn.Ot === 'requiredSgl') {
+ if (btn.Ot === 'requiredSgl' && setting.primaryKey) {
primaryId = data[0][setting.primaryKey] || ''
}
@@ -426,7 +426,7 @@
type="link"
title={show === 'icon' ? btn.label : ''}
loading={loading}
- style={btn.btnstyle}
+ style={btn.style}
icon={show === 'text' ? '' : (show === 'icon' ? (btn.icon || 'upload') : (btn.icon || ''))}
onClick={() => {this.actionTrigger()}}
>{show === 'icon' ? '' : btn.label}</Button>
--
Gitblit v1.8.0