From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14

---
 src/tabviews/zshare/actionList/index.jsx |   42 +++++++++++++++++++++++++-----------------
 1 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/tabviews/zshare/actionList/index.jsx b/src/tabviews/zshare/actionList/index.jsx
index 10871f6..8723fa0 100644
--- a/src/tabviews/zshare/actionList/index.jsx
+++ b/src/tabviews/zshare/actionList/index.jsx
@@ -17,11 +17,11 @@
 const PrintButton = asyncComponent(() => import('./printbutton'))
 const FuncMegvii = asyncComponent(() => import('./funcMegvii'))
 const FuncZip = asyncComponent(() => import('./funczip'))
+const EditLine = asyncComponent(() => import('./editLine'))
 
 class ActionList extends Component {
   static propTpyes = {
     BID: PropTypes.any,               // 涓昏〃ID
-    lock: PropTypes.any,              // 鍙紪杈戣〃涓寜閽攣瀹�
     BData: PropTypes.any,             // 涓昏〃鏁版嵁
     selectedData: PropTypes.any,      // 瀛愯〃涓�夋嫨鏁版嵁
     MenuID: PropTypes.string,         // 鑿滃崟ID
@@ -55,14 +55,14 @@
   }
 
   getButtonList = (actions) => {
-    const { BID, BData, MenuID, columns, setting, selectedData, lock } = this.props
+    const { BID, BData, MenuID, columns, setting, selectedData } = this.props
     return actions.map(item => {
       if (['exec', 'prompt', 'pop'].includes(item.OpenType)) {
         return (
           <NormalButton
             key={item.uuid}
             show={item.show || 'actionList'}
-            disabled={lock || false}
+            disabled={false}
             BID={BID}
             btn={item}
             BData={BData}
@@ -76,7 +76,7 @@
           <ExcelInButton
             key={item.uuid}
             show={item.show || 'actionList'}
-            disabled={lock || false}
+            disabled={false}
             BID={BID}
             btn={item}
             BData={BData}
@@ -89,7 +89,7 @@
           <ExcelOutButton
             key={item.uuid}
             show={item.show || 'actionList'}
-            disabled={lock || false}
+            disabled={false}
             BID={BID}
             btn={item}
             BData={BData}
@@ -102,7 +102,7 @@
           <PopupButton
             key={item.uuid}
             show={item.show || 'actionList'}
-            disabled={lock || false}
+            disabled={false}
             BID={BID}
             btn={item}
             BData={BData}
@@ -115,7 +115,7 @@
           <TabButton
             key={item.uuid}
             show={item.show || 'actionList'}
-            disabled={lock || false}
+            disabled={false}
             btn={item}
             BID={BID}
             BData={BData}
@@ -128,7 +128,7 @@
           <NewPageButton
             key={item.uuid}
             show={item.show || 'actionList'}
-            disabled={lock || false}
+            disabled={false}
             btn={item}
             BData={BData}
             selectedData={selectedData}
@@ -140,7 +140,7 @@
             <ChangeUserButton
               key={item.uuid}
               show={item.show || 'actionList'}
-              disabled={lock || false}
+              disabled={false}
               BID={BID}
               btn={item}
               BData={BData}
@@ -154,7 +154,7 @@
             <PrintButton
               key={item.uuid}
               show={item.show || 'actionList'}
-              disabled={lock || false}
+              disabled={false}
               BID={BID}
               btn={item}
               BData={BData}
@@ -168,7 +168,7 @@
             <FuncMegvii
               key={item.uuid}
               show={item.show || 'actionList'}
-              disabled={lock || false}
+              disabled={false}
               BID={BID}
               btn={item}
               setting={setting}
@@ -180,10 +180,19 @@
             <FuncZip
               key={item.uuid}
               show={item.show || 'actionList'}
-              disabled={lock || false}
+              disabled={false}
               BID={BID}
               btn={item}
               setting={setting}
+              selectedData={selectedData}
+            />
+          )
+        } else if (item.funcType === 'addline' || item.funcType === 'delline') {
+          return (
+            <EditLine
+              key={item.uuid}
+              disabled={false}
+              btn={item}
               selectedData={selectedData}
             />
           )
@@ -194,14 +203,13 @@
   }
 
   render() {
-    const { setting, MenuID } = this.props
+    const { setting } = this.props
     const { actions, mores } = this.state
-    let fixed = setting.actionfixed && setting.tabType === 'main' // 鎸夐挳鏄惁鍥哄畾鍦ㄥご閮�
 
-    if (fixed && MenuID) {
+    if (setting.actionfixed === 'true') {
       return (
         <Affix offsetTop={48}>
-          <div className="button-list toolbar-button" id={fixed ? MenuID + 'mainaction' : ''}>
+          <div className="button-list toolbar-button">
             {this.getButtonList(actions)}
             {mores ? <Dropdown overlay={<div className="mk-button-dropdown-wrap">{this.getButtonList(mores)}</div>} trigger={['hover']}>
               <div className="mk-button-more">鏇村<DownOutlined/></div>
@@ -211,7 +219,7 @@
       )
     } else {
       return (
-        <div className="button-list toolbar-button" id={fixed ? MenuID + 'mainaction' : ''}>
+        <div className="button-list toolbar-button">
           {this.getButtonList(actions)}
           {mores ? <Dropdown overlay={<div className="mk-button-dropdown-wrap">{this.getButtonList(mores)}</div>} trigger={['hover']}>
             <div className="mk-button-more">鏇村<DownOutlined/></div>

--
Gitblit v1.8.0