From dda47756fa781557e20bb332c467232ac6436de7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 20 十月 2022 15:25:41 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/cardcomponent/index.jsx | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/tabviews/zshare/cardcomponent/index.jsx b/src/tabviews/zshare/cardcomponent/index.jsx
index f9eac6c..5fd8517 100644
--- a/src/tabviews/zshare/cardcomponent/index.jsx
+++ b/src/tabviews/zshare/cardcomponent/index.jsx
@@ -24,7 +24,6 @@
type: PropTypes.any, // 鍗＄墖绫诲瀷锛屾坊鍔犳寜閽负 insert
BID: PropTypes.any, // 涓昏〃ID
BData: PropTypes.any, // 涓昏〃鏁版嵁
- Tab: PropTypes.any, // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
MenuID: PropTypes.string, // 鑿滃崟ID
setting: PropTypes.object, // 椤甸潰璁惧畾
columns: PropTypes.array, // 鏄剧ず鍒�
@@ -147,7 +146,7 @@
* @description 鑾峰彇鎸夐挳鍏冪礌
*/
getActionList = (actions) => {
- const { BData, Tab, setting, columns, ContainerId, data, MenuID } = this.props
+ const { BData, setting, columns, ContainerId, data, MenuID } = this.props
return actions.map(item => {
if (['exec', 'prompt', 'pop'].includes(item.OpenType)) {
@@ -155,7 +154,6 @@
<NormalButton
key={item.uuid}
BID={data.$$BID}
- Tab={Tab}
btn={item}
BData={BData}
setting={setting}
@@ -169,7 +167,6 @@
<PopupButton
key={item.uuid}
BID={data.$$BID}
- Tab={Tab}
btn={item}
BData={BData}
setting={setting}
@@ -182,7 +179,6 @@
key={item.uuid}
btn={item}
MenuID={MenuID}
- setting={setting}
selectedData={[data]}
/>
)
@@ -191,7 +187,6 @@
<NewPageButton
key={item.uuid}
btn={item}
- setting={setting}
selectedData={[data]}
/>
)
@@ -211,7 +206,6 @@
<PrintButton
key={item.uuid}
BID={data.$$BID}
- Tab={Tab}
btn={item}
BData={BData}
setting={setting}
@@ -498,7 +492,6 @@
<div className="mk-card-insert">
<NormalButton
BID={this.props.BID}
- Tab={this.props.Tab}
btn={{...card.insertAction, style}}
BData={this.props.BData}
setting={this.props.setting}
@@ -517,7 +510,6 @@
static propTpyes = {
BID: PropTypes.any, // 涓昏〃ID
BData: PropTypes.any, // 涓昏〃鏁版嵁
- Tab: PropTypes.any, // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
MenuID: PropTypes.string, // 鑿滃崟ID
config: PropTypes.object, // 椤甸潰閰嶇疆淇℃伅
columns: PropTypes.array, // 鏄剧ず鍒�
@@ -757,7 +749,7 @@
}
render() {
- const { plot, data, loading, BID, BData, Tab, MenuID, config, columns, ContainerId } = this.props
+ const { plot, data, loading, BID, BData, MenuID, config, columns, ContainerId } = this.props
const { card, colMap, selectKey, actionList } = this.state
return (
@@ -777,7 +769,6 @@
<ExcelInButton
key={action.uuid}
BID={BID}
- Tab={Tab}
btn={action}
setting={config.setting}
/>
@@ -787,7 +778,6 @@
<ExcelOutButton
key={action.uuid}
BID={BID}
- Tab={Tab}
btn={action}
setting={config.setting}
/>
@@ -802,7 +792,6 @@
<CardCell
key={i}
BID={BID}
- Tab={Tab}
card={card}
data={item}
BData={BData}
@@ -821,7 +810,6 @@
key="insert"
type="insert"
BID={BID}
- Tab={Tab}
card={card}
data={{key: 'insert'}}
BData={BData}
--
Gitblit v1.8.0