From f38b3321250222b81a797a538d9c3efa9f8a0ecb Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 29 五月 2022 03:54:05 +0800
Subject: [PATCH] 2022-05-29

---
 src/tabviews/zshare/cardcomponent/index.jsx |  108 ++++++++++++++++++++++--------------------------------
 1 files changed, 44 insertions(+), 64 deletions(-)

diff --git a/src/tabviews/zshare/cardcomponent/index.jsx b/src/tabviews/zshare/cardcomponent/index.jsx
index d3283a3..0c21b02 100644
--- a/src/tabviews/zshare/cardcomponent/index.jsx
+++ b/src/tabviews/zshare/cardcomponent/index.jsx
@@ -1,10 +1,12 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import { is, fromJS } from 'immutable'
-import { Icon, Card, Spin, Empty } from 'antd'
+import { Card, Spin, Empty } from 'antd'
 
 import asyncComponent from '@/utils/asyncComponent'
 import asyncExcelComponent from './asyncButtonComponent'
+import MKEmitter from '@/utils/events.js'
+import MkIcon from '@/components/mk-icon'
 import '@/assets/css/table.scss'
 import './index.scss'
 
@@ -22,16 +24,14 @@
     type: PropTypes.any,              // 鍗$墖绫诲瀷锛屾坊鍔犳寜閽负 insert
     BID: PropTypes.any,               // 涓昏〃ID
     BData: PropTypes.any,             // 涓昏〃鏁版嵁
-    MenuName: PropTypes.any,          // 鑿滃崟鍚嶇О
     Tab: PropTypes.any,               // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
     MenuID: PropTypes.string,         // 鑿滃崟ID
     setting: PropTypes.object,        // 椤甸潰璁惧畾
-    logcolumns: PropTypes.array,      // 瀛楁鍒�
+    columns: PropTypes.array,         // 鏄剧ず鍒�
     card: PropTypes.object,           // 鍗$墖璁剧疆淇℃伅
     data: PropTypes.object,           // 鍗$墖鏁版嵁
     selectKey: PropTypes.string,      // 閫夋嫨鍗$墖鐨勫簭鍙�
     colMap: PropTypes.any,            // 鏄剧ず鍒椾俊鎭紝鐢ㄤ簬璁剧疆鏍囪
-    refreshdata: PropTypes.func,      // 鎸夐挳鎿嶄綔鍚庢暟鎹埛鏂�
     switchCard: PropTypes.func        // 鍗$墖鍒囨崲
   }
 
@@ -111,13 +111,30 @@
     
     let extra = null
     if (card.header && card.header.actions) {
-      let actions = this.getActionList(card.header.actions, card.header.show)
+      let actions = card.header.actions.map(item => {
+        if (card.header.show === 'icon') {
+          item.show = 'icon'
+        } else {
+          item.show = 'button'
+        }
+        return item
+      })
+
+      actions = this.getActionList(actions)
       extra = actions[0]
     }
 
     let _actions = null
     if (card.bottom && card.bottom.actions) {
-      _actions = this.getActionList(card.bottom.actions, card.bottom.show)
+      _actions = card.bottom.actions.map(item => {
+        if (card.bottom.show === 'icon') {
+          item.show = 'icon'
+        } else {
+          item.show = 'button'
+        }
+        return item
+      })
+      _actions = this.getActionList(_actions)
     }
 
     this.setState({
@@ -129,51 +146,44 @@
   /**
    * @description 鑾峰彇鎸夐挳鍏冪礌
    */
-  getActionList = (actions, show) => {
-    const { BID, BData, Tab, setting, logcolumns, ContainerId, data, MenuID, MenuName } = this.props
+  getActionList = (actions) => {
+    const { BData, Tab, setting, columns, ContainerId, data, MenuID } = this.props
     
     return actions.map(item => {
       if (['exec', 'prompt', 'pop'].includes(item.OpenType)) {
         return (
           <NormalButton
             key={item.uuid}
-            BID={BID}
+            BID={data.$$BID}
             Tab={Tab}
             btn={item}
-            show={show}
             BData={BData}
             setting={setting}
-            MenuName={MenuName}
-            columns={logcolumns}
+            columns={columns}
             selectedData={[data]}
             ContainerId={ContainerId}
-            updateStatus={this.updateStatus}
           />
         )
       } else if (item.OpenType === 'popview') {
         return (
           <PopupButton
             key={item.uuid}
-            BID={BID}
+            BID={data.$$BID}
             Tab={Tab}
             btn={item}
-            show={show}
             BData={BData}
             setting={setting}
             selectedData={[data]}
-            updateStatus={this.updateStatus}
           />
         )
-      } else if (item.OpenType === 'tab' || item.OpenType === 'blank') {
+      } else if (item.OpenType === 'tab') {
         return (
           <TabButton
             key={item.uuid}
             btn={item}
-            show={show}
             MenuID={MenuID}
             setting={setting}
             selectedData={[data]}
-            updateStatus={this.updateStatus}
           />
         )
       } else if (item.OpenType === 'innerpage' || item.OpenType === 'outerpage') {
@@ -181,38 +191,32 @@
           <NewPageButton
             key={item.uuid}
             btn={item}
-            show={show}
             setting={setting}
             selectedData={[data]}
-            updateStatus={this.updateStatus}
           />
         )
       } else if (item.OpenType === 'funcbutton') {
-        if (item.funcType === 'changeuser') {
+        if (item.funcType === 'changeuser' || item.funcType === 'closetab') {
           return (
             <ChangeUserButton
               key={item.uuid}
-              BID={BID}
+              BID={data.$$BID}
               btn={item}
-              show={show}
               setting={setting}
               selectedData={[data]}
-              updateStatus={this.updateStatus}
             />
           )
         } else if (item.funcType === 'print') {
           return (
             <PrintButton
               key={item.uuid}
-              BID={BID}
+              BID={data.$$BID}
               Tab={Tab}
               btn={item}
-              show={show}
               BData={BData}
               setting={setting}
               selectedData={[data]}
               ContainerId={ContainerId}
-              updateStatus={this.updateStatus}
             />
           )
         }
@@ -220,15 +224,6 @@
 
       return null
     })
-  }
-
-  /**
-   * @description 鎿嶄綔瀹屾垚鍚庯紝鏁版嵁鍒锋柊
-   */
-  updateStatus = (type, positon) => {
-    if (type === 'refresh') {
-      this.props.refreshdata(positon)
-    }
   }
 
   /**
@@ -262,7 +257,7 @@
           if (isNaN(originVal) || isNaN(contrastVal)) {
             originVal = ''
           }
-        } catch {
+        } catch (e) {
           originVal = ''
         }
       }
@@ -290,7 +285,7 @@
         if (mark.position === 'front') {
           position = 'front'
         }
-        icon = <Icon className={'font ' + className} type={mark.icon} />
+        icon = <MkIcon className={'font ' + className} type={mark.icon} />
         className = ''
       }
 
@@ -349,7 +344,7 @@
           if (isNaN(content)) {
             content = ''
           }
-        } catch {
+        } catch (e) {
           content = ''
         }
       }
@@ -456,6 +451,7 @@
         title = card.header.content
       }
     }
+    let style = {fontSize: plusSize + 'px'}
 
     return (
       <div className={'chart-card-box ' + card.outclass}>
@@ -503,15 +499,12 @@
             <NormalButton
               BID={this.props.BID}
               Tab={this.props.Tab}
-              btn={card.insertAction}
-              show={'plus' + plusSize}
+              btn={{...card.insertAction, style}}
               BData={this.props.BData}
               setting={this.props.setting}
-              MenuName={this.props.MenuName}
-              columns={this.props.logcolumns}
+              columns={this.props.columns}
               selectedData={[]}
               ContainerId={this.props.ContainerId}
-              updateStatus={this.updateStatus}
             />
           </div>
         </Card> : null}
@@ -526,17 +519,13 @@
     BData: PropTypes.any,             // 涓昏〃鏁版嵁
     Tab: PropTypes.any,               // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
     MenuID: PropTypes.string,         // 鑿滃崟ID
-    MenuName: PropTypes.any,          // 鑿滃崟鍚嶇О
     config: PropTypes.object,         // 椤甸潰閰嶇疆淇℃伅
-    logcolumns: PropTypes.array,      // 鏄剧ず鍒�
+    columns: PropTypes.array,         // 鏄剧ず鍒�
     ContainerId: PropTypes.any,       // tab椤甸潰ID锛岀敤浜庡脊绐楁帶鍒�
     plot: PropTypes.object,
     tableId: PropTypes.string,
     loading: PropTypes.bool,
     data: PropTypes.array,
-    refreshdata: PropTypes.func,
-    getexceloutparam: PropTypes.func,
-    handleTableId: PropTypes.func
   }
 
   state = {
@@ -577,8 +566,10 @@
       if ((item.Ot && item.Ot !== 'notRequired' && !['excelIn', 'excelOut'].includes(item.OpenType)) || item.funcType === 'changeuser') {
         actionMap.set(item.uuid, item)
       } else if (plot.extraAction && plot.extraAction === item.uuid && ['pop', 'prompt', 'exec'].includes(item.OpenType) && item.Ot === 'notRequired') {
+        item.show = 'icon'
         insertAction = item
       } else if (plot.actions && plot.actions.length > 0 && plot.actions.includes(item.uuid) && (item.OpenType === 'excelOut' || (item.OpenType === 'excelIn' && item.Ot === 'notRequired'))) {
+        item.show = 'icon'
         actionList.push(item)
       }
     })
@@ -758,11 +749,11 @@
 
     this.setState({selectKey: data.key})
 
-    this.props.handleTableId(this.props.tableId, _id, data)
+    MKEmitter.emit('changeTableLine', this.props.ContainerId, this.props.tableId, _id, data)
   }
 
   render() {
-    const { plot, data, loading, BID, BData, Tab, MenuID, config, logcolumns, ContainerId, MenuName } = this.props
+    const { plot, data, loading, BID, BData, Tab, MenuID, config, columns, ContainerId } = this.props
     const { card, colMap, selectKey, actionList } = this.state
     
     return (
@@ -784,10 +775,7 @@
                     BID={BID}
                     Tab={Tab}
                     btn={action}
-                    show="icon"
-                    MenuName={MenuName}
                     setting={config.setting}
-                    updateStatus={() => {}}
                   />
                 )
               } else {
@@ -797,11 +785,7 @@
                     BID={BID}
                     Tab={Tab}
                     btn={action}
-                    show="icon"
-                    MenuName={MenuName}
                     setting={config.setting}
-                    getexceloutparam={this.props.getexceloutparam}
-                    updateStatus={() => {}}
                   />
                 )
               }
@@ -820,13 +804,11 @@
               BData={BData}
               MenuID={MenuID}
               colMap={colMap}
-              MenuName={MenuName}
+              columns={columns}
               selectKey={selectKey}
-              logcolumns={logcolumns}
               setting={config.setting}
               ContainerId={ContainerId}
               switchCard={this.switchCard}
-              refreshdata={this.props.refreshdata}
             />
           ))
         }
@@ -840,11 +822,9 @@
             data={{key: 'insert'}}
             BData={BData}
             MenuID={MenuID}
-            MenuName={MenuName}
             setting={config.setting}
             ContainerId={ContainerId}
             switchCard={() => {}}
-            refreshdata={this.props.refreshdata}
           /> : null
         }
         {(loading || !card.insertAction) && (!data || data.length === 0) ? <Empty description={false}/> : null}

--
Gitblit v1.8.0