From 0227c25e4ed573d3095ada3f9c9a4ba5f18b0de5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 20 一月 2021 10:53:01 +0800
Subject: [PATCH] 2021-01-20

---
 src/tabviews/zshare/actionList/excelInbutton/index.jsx |   56 ++++++++++++++++++++++++++++++++------------------------
 1 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index a1e7dd3..0ffe673 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -17,13 +17,12 @@
 class ExcelInButton extends Component {
   static propTpyes = {
     show: PropTypes.any,              // 鏄剧ず鏍峰紡
+    position: PropTypes.any,          // 鎸夐挳浣嶇疆锛屽伐鍏锋爮涓簍oolbar
     BID: PropTypes.string,            // 涓昏〃ID
-    MenuName: PropTypes.any,          // 鑿滃崟鍚嶇О
     selectedData: PropTypes.any,      // 瀛愯〃涓�夋嫨鏁版嵁
     Tab: PropTypes.any,               // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
     btn: PropTypes.object,            // 鎸夐挳
     setting: PropTypes.any,           // 椤甸潰閫氱敤璁剧疆
-    updateStatus: PropTypes.func,     // 鎸夐挳鐘舵�佹洿鏂�
   }
 
   state = {
@@ -37,9 +36,9 @@
   }
 
   componentDidMount () {
-    const { show } = this.props
+    const { position } = this.props
 
-    if (show === 'actionList') {
+    if (position === 'toolbar') {
       MKEmitter.addListener('triggerBtnId', this.actionTrigger)
     }
   }
@@ -69,7 +68,7 @@
   /**
    * @description 瑙﹀彂鎸夐挳鎿嶄綔
    */
-  actionTrigger = (triggerId) => {
+  actionTrigger = (triggerId, record) => {
     const { setting, Tab, BID, btn, selectedData } = this.props
     const { loading } = this.state
 
@@ -84,7 +83,7 @@
       return
     }
 
-    let data = selectedData || []
+    let data = record || selectedData || []
     
     if (btn.Ot === 'requiredSgl' && data.length !== 1) {
       // 闇�瑕侀�夋嫨鍗曡鏃讹紝鏍￠獙鏁版嵁
@@ -94,25 +93,28 @@
         duration: 5
       })
       return
-    }
-
-    if (btn.verify && btn.verify.sheet && btn.verify.columns && btn.verify.columns.length > 0) {
-      let primaryId = '' // 瀵煎叆鏃惰Id
-      if (btn.Ot === 'requiredSgl') {
-        primaryId = data[0][setting.primaryKey] || ''
-      }
-
-      this.setState({
-        primaryId: primaryId
-      }, () => {
-        this.refs.excelIn.exceltrigger()
-      })
-    } else {
+    } else if (!btn.verify || !btn.verify.sheet || !btn.verify.columns || btn.verify.columns.length === 0) {
       notification.warning({
         top: 92,
         message: 'excel瀵煎叆楠岃瘉淇℃伅鏈缃紒',
         duration: 5
       })
+      return
+    }
+
+    let primaryId = '' // 瀵煎叆鏃惰Id
+    if (btn.Ot === 'requiredSgl') {
+      primaryId = data[0][setting.primaryKey] || ''
+    }
+
+    this.setState({
+      primaryId: primaryId
+    }, () => {
+      this.refs.excelIn.exceltrigger()
+    })
+
+    if (window.GLOB.systemType === 'production') {
+      MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎叆Excel'})
     }
   }
 
@@ -145,7 +147,9 @@
       loading: false
     })
 
-    this.props.updateStatus('refresh', btn.execSuccess, btn)
+    if (btn.execSuccess !== 'never') {
+      MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execSuccess, btn)
+    }
   }
 
   /**
@@ -182,14 +186,16 @@
       loading: false
     })
 
-    this.props.updateStatus('refresh', btn.execError, btn)
+    if (btn.execError !== 'never') {
+      MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execError, btn)
+    }
   }
 
   /**
    * @description Excel 瀵煎叆
    */
   getexceldata = (data, errors, sheetName) => {
-    const { btn, MenuName } = this.props
+    const { btn } = this.props
 
     if (errors) {
       if (errors === 'notexit') {
@@ -276,7 +282,7 @@
         param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
       }
 
-      param.menuname = `${MenuName ? MenuName + '-' : ''}${btn.label}`
+      param.menuname = btn.logLabel
 
       Api.genericInterface(param).then((res) => {
         if (res.status) {
@@ -410,7 +416,9 @@
       return <div style={{display: 'inline-block'}} onClick={(e) => e.stopPropagation()}>
         <Button
           type="link"
+          title={show === 'icon' ? btn.label : ''}
           loading={loading}
+          style={btn.btnstyle}
           icon={show === 'text' ? '' : (show === 'icon' ? (btn.icon || 'upload') : (btn.icon || ''))}
           onClick={() => {this.actionTrigger()}}
         >{show === 'icon' ? '' : btn.label}</Button>

--
Gitblit v1.8.0