From 2ae980243b7ad705dea575eadcfc4cf4e24073bd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:57:19 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/actionList/index.jsx | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/zshare/actionList/index.jsx b/src/tabviews/zshare/actionList/index.jsx
index be12727..3b4c230 100644
--- a/src/tabviews/zshare/actionList/index.jsx
+++ b/src/tabviews/zshare/actionList/index.jsx
@@ -14,6 +14,7 @@
const NewPageButton = asyncComponent(() => import('./newpagebutton'))
const ChangeUserButton = asyncComponent(() => import('./changeuserbutton'))
const PrintButton = asyncComponent(() => import('./printbutton'))
+const FuncMegvii = asyncComponent(() => import('./funcMegvii'))
class ActionList extends Component {
static propTpyes = {
@@ -37,7 +38,6 @@
getButtonList = (actions) => {
const { BID, BData, MenuID, Tab, columns, setting, ContainerId, selectedData, lock } = this.props
-
return actions.map(item => {
if (['exec', 'prompt', 'pop'].includes(item.OpenType)) {
return (
@@ -113,7 +113,7 @@
return (
<NewPageButton
key={item.uuid}
- show="actionList"
+ show={item.show || 'actionList'}
disabled={lock || false}
btn={item}
BData={BData}
@@ -151,6 +151,19 @@
selectedData={selectedData}
/>
)
+ } else if (item.funcType === 'megvii') {
+ return (
+ <FuncMegvii
+ key={item.uuid}
+ show={item.show || 'actionList'}
+ disabled={lock || false}
+ BID={BID}
+ Tab={Tab}
+ btn={item}
+ setting={setting}
+ selectedData={selectedData}
+ />
+ )
}
}
return null
--
Gitblit v1.8.0