From b69b5f6329ca5f87932436b7a6c1ddfc3377e10f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 五月 2024 10:56:41 +0800
Subject: [PATCH] 2024-05-16

---
 src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 1030 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 575 insertions(+), 455 deletions(-)

diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 66b4f90..0317ad6 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -1,16 +1,13 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import moment from 'moment'
-import {connect} from 'react-redux'
 import { is, fromJS } from 'immutable'
 import { Button, Modal, notification, message } from 'antd'
-import * as XLSX from 'xlsx'
+import * as XLSX from 'sheetjs-style'
 
 import Utils from '@/utils/utils.js'
-import options from '@/store/options.js'
 import Api from '@/api'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
+import UtilsDM from '@/utils/utils-datamanage.js'
 import MKEmitter from '@/utils/events.js'
 import MkIcon from '@/components/mk-icon'
 // import './index.scss'
@@ -19,18 +16,13 @@
   static propTpyes = {
     BID: PropTypes.string,            // 涓昏〃ID
     BData: PropTypes.any,             // 涓昏〃鏁版嵁
-    show: PropTypes.any,              // 鏄剧ず鏍峰紡
-    Tab: PropTypes.any,               // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
+    selectedData: PropTypes.any,      // 瀛愯〃涓�夋嫨鏁版嵁
     btn: PropTypes.object,            // 鎸夐挳
     setting: PropTypes.any,           // 椤甸潰閫氱敤璁剧疆
-    updateStatus: PropTypes.func,     // 鎸夐挳鐘舵�佹洿鏂�
     disabled: PropTypes.any,          // 琛屾寜閽鐢�
   }
 
   state = {
-    dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
-    excelName: '',  // 鏂囦欢鍚�
-    search: '',     // 鎼滅储鏉′欢
     loading: false, // 瀵煎嚭涓�
     hidden: false,
     disabled: false
@@ -44,7 +36,7 @@
         this.setState({hidden: true})
       } else {
         let s = BData[btn.controlField] + ''
-        if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
+        if (btn.controlVals.includes(s)) {
           this.setState({hidden: true})
         } else {
           this.setState({hidden: false})
@@ -63,7 +55,6 @@
 
   componentDidMount () {
     MKEmitter.addListener('triggerBtnId', this.actionTrigger)
-    MKEmitter.addListener('returnModuleParam', this.triggerExcelout)
   }
 
   UNSAFE_componentWillReceiveProps (nextProps) {
@@ -74,7 +65,7 @@
         this.setState({hidden: true})
       } else {
         let s = nextProps.BData[btn.controlField] + ''
-        if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
+        if (btn.controlVals.includes(s)) {
           this.setState({hidden: true})
         } else {
           this.setState({hidden: false})
@@ -94,84 +85,56 @@
       return
     }
     MKEmitter.removeListener('triggerBtnId', this.actionTrigger)
-    MKEmitter.removeListener('returnModuleParam', this.triggerExcelout)
-  }
-
-  /**
-   * @description 鎸夐挳鐘舵�佹敼鍙�
-   */
-  updateStatus = (type, name) => {
-    if (type === 'start') {
-      this.setState({
-        loading: true,
-        excelName: name
-      })
-    } else if (type === 'over') {
-      this.setState({
-        loading: false
-      })
-    }
   }
   
   /**
    * @description 瑙﹀彂鎸夐挳鎿嶄綔
    */
-  actionTrigger = (triggerId) => {
-    const { setting, Tab, BID, btn } = this.props
+  actionTrigger = (triggerId, _, type, lid) => {
+    const { setting, BID, btn, LID } = this.props
     const { loading, disabled } = this.state
 
-    if ((triggerId && btn.uuid !== triggerId) || loading || disabled) return
+    if (loading || disabled) return
+    if (triggerId && btn.uuid !== triggerId) return
+    if (type === 'linkbtn' && !btn.$toolbtn && LID !== lid) return
 
-    if (((Tab && Tab.supMenu) || setting.supModule) && !BID) {
+    if (setting.supModule && !BID) {
       notification.warning({
         top: 92,
         message: '闇�瑕佷笂绾т富閿�硷紒',
         duration: 5
       })
-      return
-    }
-
-    if (btn.intertype === 'system' && setting.interType !== 'system') {
-      notification.warning({
-        top: 92,
-        message: '瀵煎嚭鎸夐挳閰嶇疆閿欒锛�',
-        duration: 5
-      })
-      return
-    } else if (btn.intertype === 'inner' && !btn.innerFunc) {
-      notification.warning({
-        top: 92,
-        message: '瀵煎嚭鎸夐挳閰嶇疆閿欒锛�',
-        duration: 5
-      })
-      return
-    } else if (!btn.verify || !btn.verify.columns || btn.verify.columns.length === 0) {
+    } else if (btn.errorType === 'error1') {
       notification.warning({
         top: 92,
         message: '璇疯缃鍑哄垪锛�',
         duration: 5
       })
-      return
-    }
-
-    MKEmitter.emit('queryModuleParam', btn.$menuId, btn.uuid)
-    if (window.GLOB.systemType === 'production') {
-      MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'})
+    } else if (btn.errorType === 'error2') {
+      notification.warning({
+        top: 92,
+        message: '鎸夐挳闇�鑷畾涔夊鍑烘暟鎹簮锛�',
+        duration: 5
+      })
+    } else {
+      MKEmitter.emit('queryModuleParam', btn.$menuId, this.triggerExcelout)
+      if (window.GLOB.systemType === 'production') {
+        MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'})
+      }
     }
   }
 
   /**
    * @description Excel 瀵煎嚭
    */
-  triggerExcelout = (menuId, btnId, viewParam) => {
+  triggerExcelout = (viewParam) => {
     const { btn } = this.props
-    
-    if (btn.$menuId !== menuId || btn.uuid !== btnId || !viewParam) return
 
-    let name = `${viewParam.menuName}${moment().format('YYYYMMDDHHmmss')}.xlsx`
     let pageSize = 1000
 
-    if (btn.search === 'true' && viewParam.search && viewParam.search.length > 0) {
+    if (btn.intertype === 'system' && btn.verify.dataType === 'custom' && btn.verify.useSearch === 'false') {
+      viewParam.search = []
+    } else if (((btn.intertype === 'system' && btn.verify.dataType === 'custom' && btn.verify.useSearch === 'true') || btn.intertype !== 'system' || btn.verify.dataType !== 'custom') && btn.search === 'true' && viewParam.search && viewParam.search.length > 0) {
       let valid = false
       viewParam.search.forEach(item => {
         if (item.value || item.value === 0) {
@@ -189,67 +152,68 @@
       }
     }
 
-    if (btn.intertype === 'system' && !viewParam.arr_field) { // 浣跨敤绯荤粺鍑芥暟
-      notification.warning({
-        top: 92,
-        message: '鏈缃樉绀哄垪锛�',
-        duration: 5
-      })
-      return
-    } else if (btn.intertype === 'system' && btn.verify && btn.verify.enable === 'true') {
-      this.setState({search: fromJS(viewParam.search).toJS()})
-    }
-    
-    this.updateStatus('start', name)
+    this.setState({
+      loading: true
+    })
 
     if (btn.pagination !== 'true') {
       if (btn.intertype === 'system') { // 浣跨敤绯荤粺鍑芥暟
-        let param = this.getExcelDefaultParam(viewParam.arr_field, viewParam.orderBy, viewParam.search)
+        let param = this.getExcelDefaultParam(viewParam.orderBy, viewParam.search)
 
         Api.genericInterface(param).then(result => {
           if (result.status) {
-            this.exportExcel(result.data)
+            this.exportExcel(result.data, result.ErrCode, result.message, viewParam.search)
           } else {
             this.execError(result)
           }
-        }, () => {
+        }, (error) => {
+          if (error && error.ErrCode === 'LoginError') return
           this.execError({})
         })
       } else if (btn.intertype === 'inner') { // 浣跨敤鍐呴儴鍑芥暟
         let param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search)
         param.func = btn.innerFunc
 
+        if (btn.recordUser === 'true') {
+          param.username = sessionStorage.getItem('User_Name') || ''
+          param.fullname = sessionStorage.getItem('Full_Name') || ''
+        }
+        if (btn.dataM === 'true') {
+          param.dataM = sessionStorage.getItem('dataM') === 'true' ? 'Y' : ''
+        }
+
         Api.genericInterface(param).then(result => {
           if (result.status) {
-            this.exportExcel(result.data)
+            this.exportExcel(result.data, result.ErrCode, result.message, viewParam.search)
           } else {
             this.execError(result)
           }
-        }, () => {
+        }, (error) => {
+          if (error && error.ErrCode === 'LoginError') return
           this.execError({})
         })
       } else if (btn.intertype === 'outer' && !btn.innerFunc) { // 浣跨敤澶栭儴鍑芥暟
         let param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search)
 
-        if (this.props.menuType === 'HS') {
-          if (btn.sysInterface === 'true' && options.cloudServiceApi) {
-            param.rduri = options.cloudServiceApi
-          } else if (btn.sysInterface !== 'true') {
-            if (window.GLOB.systemType === 'production' && btn.proInterface) {
-              param.rduri = btn.proInterface
-            } else {
-              param.rduri = btn.interface
-            }
+        if (btn.sysInterface === 'true') {
+          if (window.GLOB.mainSystemApi) {
+            param.rduri = window.GLOB.mainSystemApi
+          }
+        } else if (btn.sysInterface === 'external') {
+          if (window.GLOB.systemType === 'production') {
+            param.$token = btn.exProInterface || ''
+          } else {
+            param.$token = btn.exInterface || ''
           }
         } else {
-          if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
-            param.rduri = window.GLOB.mainSystemApi
-          } else if (btn.sysInterface !== 'true') {
-            if (window.GLOB.systemType === 'production' && btn.proInterface) {
-              param.rduri = btn.proInterface
-            } else {
-              param.rduri = btn.interface
-            }
+          if (window.GLOB.systemType === 'production' && btn.proInterface) {
+            param.rduri = btn.proInterface
+          } else {
+            param.rduri = btn.interface
+          }
+          let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
+          if (param.rduri.indexOf(host) === -1 && /\/dostars/.test(param.rduri)) {
+            param.$login = true
           }
         }
   
@@ -259,11 +223,12 @@
 
         Api.genericInterface(param).then(result => {
           if (result.status) {
-            this.exportExcel(result.data)
+            this.exportExcel(result.data, result.ErrCode, result.message, viewParam.search)
           } else {
             this.execError(result)
           }
-        }, () => {
+        }, (error) => {
+          if (error && error.ErrCode === 'LoginError') return
           this.execError({})
         })
       } else if (btn.intertype === 'outer' && btn.innerFunc) {
@@ -277,25 +242,25 @@
             delete res.message
             delete res.status
 
-            if (this.props.menuType === 'HS') {
-              if (btn.sysInterface === 'true' && options.cloudServiceApi) {
-                res.rduri = options.cloudServiceApi
-              } else if (btn.sysInterface !== 'true') {
-                if (window.GLOB.systemType === 'production' && btn.proInterface) {
-                  res.rduri = btn.proInterface
-                } else {
-                  res.rduri = btn.interface
-                }
+            if (btn.sysInterface === 'true') {
+              if (window.GLOB.mainSystemApi) {
+                res.rduri = window.GLOB.mainSystemApi
+              }
+            } else if (btn.sysInterface === 'external') {
+              if (window.GLOB.systemType === 'production') {
+                res.$token = btn.exProInterface || ''
+              } else {
+                res.$token = btn.exInterface || ''
               }
             } else {
-              if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
-                res.rduri = window.GLOB.mainSystemApi
-              } else if (btn.sysInterface !== 'true') {
-                if (window.GLOB.systemType === 'production' && btn.proInterface) {
-                  res.rduri = btn.proInterface
-                } else {
-                  res.rduri = btn.interface
-                }
+              if (window.GLOB.systemType === 'production' && btn.proInterface) {
+                res.rduri = btn.proInterface
+              } else {
+                res.rduri = btn.interface
+              }
+              let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
+              if (res.rduri.indexOf(host) === -1 && /\/dostars/.test(res.rduri)) {
+                res.$login = true
               }
             }
   
@@ -305,7 +270,7 @@
       
             Api.genericInterface(res).then(result => {
               if (result.status) {
-                this.exportExcel(result.data)
+                this.exportExcel(result.data, result.ErrCode, result.message, viewParam.search)
               } else {
                 this.execError(result)
               }
@@ -313,7 +278,8 @@
           } else {
             this.execError(res)
           }
-        }, () => {
+        }, (error) => {
+          if (error && error.ErrCode === 'LoginError') return
           this.execError({})
         })
       } else {
@@ -322,7 +288,9 @@
           message: '瀵煎嚭鎸夐挳璁剧疆閿欒锛�',
           duration: 5
         })
-        this.updateStatus('over')
+        this.setState({
+          loading: false
+        })
       }
     } else if (btn.intertype === 'outer' && btn.innerFunc) { // 鍒嗛〉锛屼笖涓ゆ璇锋眰
       this.getExcelOutDoubleData(viewParam, 1, pageSize, [])
@@ -346,25 +314,25 @@
         delete res.message
         delete res.status
 
-        if (this.props.menuType === 'HS') {
-          if (btn.sysInterface === 'true' && options.cloudServiceApi) {
-            res.rduri = options.cloudServiceApi
-          } else if (btn.sysInterface !== 'true') {
-            if (window.GLOB.systemType === 'production' && btn.proInterface) {
-              res.rduri = btn.proInterface
-            } else {
-              res.rduri = btn.interface
-            }
+        if (btn.sysInterface === 'true') {
+          if (window.GLOB.mainSystemApi) {
+            res.rduri = window.GLOB.mainSystemApi
+          }
+        } else if (btn.sysInterface === 'external') {
+          if (window.GLOB.systemType === 'production') {
+            res.$token = btn.exProInterface || ''
+          } else {
+            res.$token = btn.exInterface || ''
           }
         } else {
-          if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
-            res.rduri = window.GLOB.mainSystemApi
-          } else if (btn.sysInterface !== 'true') {
-            if (window.GLOB.systemType === 'production' && btn.proInterface) {
-              res.rduri = btn.proInterface
-            } else {
-              res.rduri = btn.interface
-            }
+          if (window.GLOB.systemType === 'production' && btn.proInterface) {
+            res.rduri = btn.proInterface
+          } else {
+            res.rduri = btn.interface
+          }
+          let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
+          if (res.rduri.indexOf(host) === -1 && /\/dostars/.test(res.rduri)) {
+            res.$login = true
           }
         }
 
@@ -382,18 +350,20 @@
               this.getExcelOutDoubleData(viewParam, pageIndex, pageSize, data)
             } else {
               data = data.concat(result.data)
-              this.exportExcel(data)
+              this.exportExcel(data, result.ErrCode, result.message, viewParam.search)
             }
           } else {
             this.execError(result)
           }
-        }, () => {
+        }, (error) => {
+          if (error && error.ErrCode === 'LoginError') return
           this.execError({})
         })
       } else {
         this.execError(res)
       }
-    }, () => {
+    }, (error) => {
+      if (error && error.ErrCode === 'LoginError') return
       this.execError({})
     })
   }
@@ -405,38 +375,42 @@
     const { btn } = this.props
     let param = null
     if (btn.intertype === 'system') { // 浣跨敤绯荤粺鍑芥暟
-      if (!viewParam.arr_field) {
-        this.execError({ErrCode: 'N', message: '鏈缃樉绀哄垪锛�'})
-        return
-      }
-
-      param = this.getExcelDefaultParam(viewParam.arr_field, viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
+      param = this.getExcelDefaultParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
     } else if (btn.intertype === 'inner') { // 浣跨敤鍐呴儴鍑芥暟
       param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
       param.func = btn.innerFunc
 
+      if (btn.recordUser === 'true') {
+        param.username = sessionStorage.getItem('User_Name') || ''
+        param.fullname = sessionStorage.getItem('Full_Name') || ''
+      }
+      if (btn.dataM === 'true') {
+        param.dataM = sessionStorage.getItem('dataM') === 'true' ? 'Y' : ''
+      }
+
     } else if (btn.intertype === 'outer' && !btn.innerFunc) { // 浣跨敤澶栭儴鍑芥暟
       param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
 
-      if (this.props.menuType === 'HS') {
-        if (btn.sysInterface === 'true' && options.cloudServiceApi) {
-          param.rduri = options.cloudServiceApi
-        } else if (btn.sysInterface !== 'true') {
-          if (window.GLOB.systemType === 'production' && btn.proInterface) {
-            param.rduri = btn.proInterface
-          } else {
-            param.rduri = btn.interface
-          }
+      if (btn.sysInterface === 'true') {
+        if (window.GLOB.mainSystemApi) {
+          param.rduri = window.GLOB.mainSystemApi
+        }
+      } else if (btn.sysInterface === 'external') {
+        if (window.GLOB.systemType === 'production') {
+          param.$token = btn.exProInterface || ''
+        } else {
+          param.$token = btn.exInterface || ''
         }
       } else {
-        if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
-          param.rduri = window.GLOB.mainSystemApi
-        } else if (btn.sysInterface !== 'true') {
-          if (window.GLOB.systemType === 'production' && btn.proInterface) {
-            param.rduri = btn.proInterface
-          } else {
-            param.rduri = btn.interface
-          }
+        if (window.GLOB.systemType === 'production' && btn.proInterface) {
+          param.rduri = btn.proInterface
+        } else {
+          param.rduri = btn.interface
+        }
+
+        let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
+        if (param.rduri.indexOf(host) === -1 && /\/dostars/.test(param.rduri)) {
+          param.$login = true
         }
       }
       
@@ -455,12 +429,13 @@
           this.getExcelOutData(viewParam, pageIndex, pageSize, data)
         } else {
           data = data.concat(result.data)
-          this.exportExcel(data)
+          this.exportExcel(data, result.ErrCode, result.message, viewParam.search)
         }
       } else {
         this.execError(result)
       }
-    }, () => {
+    }, (error) => {
+      if (error && error.ErrCode === 'LoginError') return
       this.execError({})
     })
   }
@@ -468,14 +443,103 @@
   /**
    * @description Excel 鐢熸垚
    */
-  exportExcel = (data) => {
+  exportExcel = (data = [], ErrCode, msg, search) => {
     const { btn } = this.props
     
-    try {
-      let imgCol = btn.verify.columns.filter(col => col.type === 'image')[0]
+    let imgCol = false
+    let merge = false
+    let styles = []
+    let letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 
-      if (imgCol) {
-        const column = btn.verify.columns.map(item => {
+    let columns = btn.verify.columns.map((col, index) => {
+      if (col.type === 'image') {
+        imgCol = true
+      }
+      if (btn.verify.merge === 'true' && /.+-.+/.test(col.Text)) {
+        merge = true
+      }
+
+      let i = Math.floor(index / 26)
+      let s = letters[i - 1] || ''
+      col.name = s + letters[index % 26]
+
+      if (col.type === 'number') {
+        if (col.decimal || col.decimal === 0) {
+          col.round = Math.pow(10, col.decimal)
+
+          if (col.format) {
+            let dec = Array(col.decimal).fill(0).join('')
+            dec = dec ? '.' + dec : ''
+            if (col.format === 'thdSeparator') {
+              col.z = '#,##0' + dec
+            } else if (col.format === 'thdSepPm') {
+              col.z = '#,##0' + dec + ';'
+              col.z = col.z + '[Red]-' + col.z
+            } else if (col.format === 'percent') {
+              let _dec = ''
+              if (col.decimal > 2) {
+                Array(col.decimal - 2).fill(0).join('')
+                _dec = _dec ? '.' + _dec : ''
+              }
+
+              col.z = '0' + _dec + '%'
+            }
+          }
+        }
+      } else if (col.type === 'text') {
+        if (col.wrapText === 'true') {
+          col.s = {alignment: { wrapText: true }}
+        }
+        if (col.textFormat) {
+          if (col.textFormat === 'YYYY-MM-DD') {
+            col.z = 'yyyy-mm-dd;@'
+          } else if (col.textFormat === 'YYYY-MM-DD HH:mm:ss') {
+            col.z = 'yyyy-mm-dd hh:mm:ss'
+          }
+        }
+      }
+
+      if (col.z || col.s) {
+        styles.push(col)
+      }
+
+      return col
+    })
+
+    if (data[0]) {
+      let errors = []
+      columns.forEach(col => {
+        if (col.output === 'false') return
+        if (col.Column && data[0][col.Column] === undefined) {
+          errors.push(col.Text)
+        }
+      })
+
+      if (errors.length) {
+        notification.error({
+          top: 92,
+          message: '鏁版嵁涓己灏戝瓧娈碉細' + errors.join('銆�'),
+          duration: 5
+        })
+
+        this.setState({
+          loading: false
+        })
+        
+        return
+      }
+    }
+    
+    try {
+      if (btn.verify.excelHandle === 'true') {
+        // eslint-disable-next-line
+        let func = new Function('XLSX', 'data', 'columns', 'searches', 'callback', btn.verify.excel_func)
+        func(XLSX, data, columns, search, (res) => {
+          res = res || {ErrCode: ErrCode || 'S', message: msg || '瀵煎嚭鎴愬姛锛�'}
+          this.execSuccess(res)
+        })
+      } else if (imgCol) {
+        const column = columns.map(item => {
           let col = {
             title: item.Text, 
             key: item.Column,
@@ -491,90 +555,236 @@
 
         let table = []
 
-        data && data.forEach((item, index) => {
+        data.forEach((item, index) => {
           let _row = {}
   
           item.$Index = index + 1 + ''
   
-          btn.verify.columns.forEach((col, i) => {
-            if (item[col.Column] && col.abs === 'true') {
-              _row[col.Column] = Math.abs(item[col.Column])
-            } else {
-              _row[col.Column] = item[col.Column]
+          columns.forEach((col, i) => {
+            let val = item[col.Column]
+            if (col.output === 'false') {
+              if (col.type === 'number' && col.noValue !== 'false') {
+                val = 0
+              } else {
+                val = ''
+              }
+            } else if (col.type === 'number') {
+              if (val && typeof(val) === 'string' && !isNaN(val)) {
+                val = +val
+              }
+              if (typeof(val) === 'number') {
+                if (col.abs === 'true') {
+                  val = Math.abs(val)
+                }
+                if (col.round) {
+                  val = Math.round(val * col.round) / col.round
+                }
+                if (col.noValue === 'false' && val === 0) {
+                  val = ''
+                }
+              }
+            } else if (col.type === 'text') {
+              val = val + ''
+              
+              if (col.textFormat) {
+                if (col.textFormat === 'YYYY-MM-DD' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1])/.test(val)) {
+                  val = `${val.substr(0, 4)}-${val.substr(5, 2)}-${val.substr(8, 2)}`
+                } else if (col.textFormat === 'YYYY-MM-DD HH:mm:ss' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1]).([0-1][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]/.test(val)) {
+                  val = `${val.substr(0, 4)}-${val.substr(5, 2)}-${val.substr(8, 2)} ${val.substr(11, 2)}:${val.substr(14, 2)}:${val.substr(17, 2)}`
+                }
+              }
+
+              if (col.noValue === 'false' && val < '1949-10-02') {
+                val = ''
+              }
             }
+
+            if (val !== '') {
+              if (col.prefix) {
+                val = col.prefix + val
+              }
+              if (col.postfix) {
+                val = val + col.postfix
+              }
+            }
+
+            _row[col.Column] = val
           })
   
           table.push(_row)
         })
 
-        this.table2excel(column, table, this.state.excelName.replace(/\.xlsx/ig, '.xls'))
+        this.table2excel(column, table)
 
-        if (btn.verify && btn.verify.enable === 'true' && btn.verify.script) {
-          this.execCustomScript()
-        } else {
-          this.execSuccess({ErrCode: 'S', ErrMesg: '瀵煎嚭鎴愬姛锛�'})
-        }
-
+        this.execSuccess({ErrCode: ErrCode || 'S', message: msg || '瀵煎嚭鎴愬姛锛�'})
       } else {
+        let table = []
         let _header = []
         let _topRow = {}
         let colwidth = []
-        let abses = []
-  
-        btn.verify.columns.forEach(col => {
-          if (_topRow[col.Column]) return
-  
+        let requires = []
+        let merges = []
+
+        columns.forEach(col => {
           _header.push(col.Column)
           _topRow[col.Column] = col.Text
-  
-          if (col.abs === 'true') {
-            abses.push(col.Column)
+          colwidth.push({wch: col.Width || 20})
+          if (col.required === 'true') {
+            requires.push(col.name)
           }
-  
-          colwidth.push({width: col.Width || 20})
         })
+
+        if (merge) {
+          let fLine = {}
+          let sLine = {}
+          let sign = ''
+          columns.forEach((col, i) => {
+            if (/.+-.+/.test(col.Text)) {
+              let _sign = col.Text.split('-')[0]
+              let _name = col.Text.split('-')[1]
+              fLine[col.Column] = _sign
+              sLine[col.Column] = _name
+
+              if (sign === _sign) {
+                merges[merges.length - 1] = merges[merges.length - 1].split(':')[0] + `:${col.name}1`
+              } else {
+                merges.push(`${col.name}1:${col.name}2`)
+                sign = _sign
+              }
+            } else {
+              fLine[col.Column] = col.Text
+              sLine[col.Column] = col.Text
+              sign = ''
+              merges.push(`${col.name}1:${col.name}2`)
+            }
+          })
+
+          table.push(fLine)
+          table.push(sLine)
+        } else {
+          table.push(_topRow)
+        }
   
-        let table = []
-  
-        table.push(_topRow)
-  
-        data && data.forEach((item, index) => {
+        data.forEach((item, index) => {
           let _row = {}
   
           item.$Index = index + 1 + ''
   
-          _header.forEach(field => {
-            if (item[field] && abses.includes(field)) {
-              _row[field] = Math.abs(item[field])
-            } else {
-              _row[field] = item[field]
+          columns.forEach((col, i) => {
+            let val = item[col.Column]
+
+            if (col.output === 'false') {
+              if (col.type === 'number' && col.noValue !== 'false') {
+                val = 0
+              } else {
+                val = ''
+              }
+            } else if (col.type === 'number') {
+              if (val && typeof(val) === 'string' && !isNaN(val)) {
+                val = +val
+              }
+              if (typeof(val) === 'number') {
+                if (col.abs === 'true') {
+                  val = Math.abs(val)
+                }
+                if (col.round) {
+                  val = Math.round(val * col.round) / col.round
+                }
+                if (col.noValue === 'false' && val === 0) {
+                  val = ''
+                }
+              }
+            } else if (col.type === 'text') {
+              val = val + ''
+              
+              if (col.textFormat) {
+                if (col.textFormat === 'YYYY-MM-DD' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1])/.test(val)) {
+                  val = `${val.substr(0, 4)}-${val.substr(5, 2)}-${val.substr(8, 2)}`
+                } else if (col.textFormat === 'YYYY-MM-DD HH:mm:ss' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1]).([0-1][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]/.test(val)) {
+                  val = `${val.substr(0, 4)}-${val.substr(5, 2)}-${val.substr(8, 2)} ${val.substr(11, 2)}:${val.substr(14, 2)}:${val.substr(17, 2)}`
+                }
+              }
+
+              if (col.noValue === 'false' && val < '1949-10-02') {
+                val = ''
+              }
             }
+
+            if (val !== '') {
+              if (col.prefix) {
+                val = col.prefix + val
+              }
+              if (col.postfix) {
+                val = val + col.postfix
+              }
+            }
+
+            _row[col.Column] = val
           })
   
           table.push(_row)
         })
   
         const ws = XLSX.utils.json_to_sheet(table, {header: _header, skipHeader: true})
-  
+
         ws['!cols'] = colwidth
-  
-        const wb = XLSX.utils.book_new()
-        XLSX.utils.book_append_sheet(wb, ws, 'Sheet1')
-  
-        XLSX.writeFile(wb, this.state.excelName)
-  
-        if (btn.verify && btn.verify.enable === 'true' && btn.verify.script) {
-          this.execCustomScript()
-        } else {
-          this.execSuccess({ErrCode: 'S', ErrMesg: '瀵煎嚭鎴愬姛锛�'})
+
+        if (btn.verify.rowHeight) {
+          ws['!rows'] = Array(table.length).fill({hpx: btn.verify.rowHeight})
         }
+
+        if (requires.length) {
+          requires.forEach(col => {
+            ws[col + '1'].s = {font: { color: { rgb: 'F5222D' } }}
+          })
+        }
+
+        if (merge) {
+          ws['!merges'] = []
+          merges.forEach(item => {
+            ws['!merges'].push(XLSX.utils.decode_range(item))
+          })
+
+          columns.forEach(col => {
+            ws[col.name + '1'].s = ws[col.name + '1'].s || {}
+            ws[col.name + '1'].s.alignment = { horizontal: 'center', vertical: 'center' }
+
+            ws[col.name + '2'].s = {alignment: { horizontal: 'center', vertical: 'center' }}
+          })
+        }
+
+        // ws['A3'].s = {font: { sz: 10 , bold: true }, alignment: { horizontal: 'center', vertical: 'center' }, border: {top: {style: 'thin', color: '000000'}, left: {style: 'thin', color: '000000'}, bottom: {style: 'thin', color: '000000'}, right: {style: 'thin', color: '000000'}}};
+        // ws['A3'].z = '#,##0.00';
+        // ws['A3'].z = '#,##0.00;[Red]-#,##0.00;';
+        // ws["A1"].s = {fill: { bgColor: { rgb: "FFFFAA"  }}, font: { color: { rgb: "1890FF" } }}
+
+        if (data.length && styles.length) {
+          for (let n = table.length - data.length + 1; n <= table.length; n++) {
+            styles.forEach(col => {
+              if (col.z) {
+                ws[col.name + n].z = col.z
+              }
+              if (col.s) {
+                ws[col.name + n].s = col.s
+              }
+            })
+          }
+        }
+
+        const wb = XLSX.utils.book_new()
+        XLSX.utils.book_append_sheet(wb, ws, btn.verify.sheet || 'Sheet1')
+  
+        XLSX.writeFile(wb, `${btn.verify.excelName || btn.$menuName || ''}${moment().format('YYYYMMDDHHmmss')}.xlsx`)
+  
+        this.execSuccess({ErrCode: ErrCode || 'S', message: msg || '瀵煎嚭鎴愬姛锛�'})
       }
     } catch (e) {
+      console.warn(e)
       this.execError({ErrCode: 'N', message: 'Excel鐢熸垚澶辫触锛�'})
     }
   }
 
-  table2excel = (column, data, excelName) => {
+  table2excel = (column, data) => {
     let thead = column.reduce((result, item) => {
       return result + `<th>${item.title}</th>`
     }, '')
@@ -608,77 +818,17 @@
     // let url = 'data:application/vnd.ms-excel;base64,' + window.btoa(unescape(encodeURIComponent(html)))
     let link = document.createElement('a')
     link.href = url
-    link.download = excelName
+    link.download = `${this.props.btn.$menuName || ''}${moment().format('YYYYMMDDHHmmss')}.xls`
     document.body.appendChild(link)
     link.click()
     document.body.removeChild(link)
-  }
-  
-
-  /**
-   * @description 鎵ц鑷畾涔夎剼鏈�
-   */
-  execCustomScript = () => {
-    const { btn } = this.props
-    const { search } = this.state
-    let script = btn.verify.script
-
-    if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
-      script = script.replace(/\$@/ig, '/*')
-      script = script.replace(/@\$/ig, '*/')
-    } else {
-      script = script.replace(/@\$|\$@/ig, '')
-    }
-
-    let allSearch = Utils.getAllSearchOptions(search)
-    let regoptions = allSearch.map(item => {
-      return {
-        reg: new RegExp('@' + item.key + '@', 'ig'),
-        value: `'${item.value}'`
-      }
-    })
-
-    regoptions.forEach(item => {
-      script = script.replace(item.reg, item.value)
-    })
-
-    let param = {
-      func: 'sPC_TableData_InUpDe',
-      menuname: btn.logLabel
-    }
-
-    if (this.props.BID) {
-      param.BID = this.props.BID
-    }
-
-    param.exec_type = 'y' // 鍚庡彴瑙g爜
-    param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-    param.secretkey = Utils.encrypt('', param.timestamp)
-    param.LText = Utils.formatOptions(script)
-
-    if (this.props.menuType === 'HS') { // 鍑芥暟 sPC_TableData_InUpDe 浜戠楠岃瘉
-      param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
-    }
-
-    if (window.GLOB.probation) {
-      param.s_debug_type = 'Y'
-    }
-
-    Api.genericInterface(param).then((res) => {
-      if (res.status) {
-        this.execSuccess({ErrCode: 'S', ErrMesg: '瀵煎嚭鎴愬姛锛�'})
-      } else {
-        this.execError(res)
-      }
-    }, () => {
-      this.updateStatus('over')
-    })
   }
 
   /**
    * @description 鑾峰彇鐢ㄦ埛鑷畾涔夊瓨鍌ㄨ繃绋嬩紶鍙�
    */
   getExcelCustomParam = (orderBy, search, pagination = false, pageIndex = 1, pageSize = 100) => {
+    const { btn, selectedData } = this.props
     let _search = Utils.formatCustomMainSearch(search)
 
     let param = {
@@ -689,6 +839,13 @@
     // 鏁版嵁绠$悊鏉冮檺
     if (sessionStorage.getItem('dataM') === 'true') {
       param.dataM = 'Y'
+    }
+
+    if (btn.Ot === 'requiredOnce' && selectedData && selectedData.length > 0) {
+      let primaryId = selectedData.map(d => d.$$uuid || '').filter(Boolean).join(',')
+      if (primaryId) {
+        param.ID = primaryId
+      }
     }
 
     if (this.props.BID) {
@@ -706,133 +863,92 @@
   /**
    * @description 鑾峰彇榛樿瀛樺偍杩囩▼璇锋眰鍙傛暟
    */
-  getExcelDefaultParam = (arr_field, orderBy, search, pagination = false, pageIndex = 1, pageSize = 100) => {
-    const { setting, btn } = this.props
+  getExcelDefaultParam = (orderBy, search, pagination = false, pageIndex = 1, pageSize = 9999) => {
+    const { setting, btn, selectedData, BID } = this.props
 
-    let _search = Utils.joinMainSearchkey(search)
+    let _setting = {}
+    let _orderBy = orderBy || ''
+    if (btn.verify.dataType === 'custom') {
+      _setting.arr_field = []
 
-    _search = _search ? 'where ' + _search : ''
-    
-    let param = {
-      func: 'sPC_Get_TableData',
-      obj_name: 'data',
-      arr_field: arr_field,
-      custom_script: setting.customScript,
-      default_sql: setting.default || 'true',
-      menuname: btn.logLabel
+      btn.verify.columns.forEach(col => {
+        if (col.output === 'false' || !col.Column || col.Column === '$Index') return
+        
+        _setting.arr_field.push(col.Column)
+      })
+      _setting.arr_field = _setting.arr_field.join(',')
+      _setting.execute = btn.verify.defaultSql !== 'false'
+      _setting.dataresource = btn.verify.dataresource || ''
+      _setting.primaryKey = btn.verify.primaryKey || setting.primaryKey || 'ID'
+
+      if (!_setting.execute) {
+        _setting.dataresource = ''
+      }
+
+      if (/\s/.test(_setting.dataresource)) {
+        _setting.dataresource = '(' + _setting.dataresource + ') tb'
+      }
+
+      let _customScript = ''
+      let _tailScript = ''
+      btn.verify.scripts && btn.verify.scripts.forEach(script => {
+        if (script.status === 'false') return
+        if (script.position !== 'back') {
+          _customScript += `
+          ${script.sql}
+          `
+        } else {
+          _tailScript += `
+          ${script.sql}
+          `
+        }
+      })
+
+      if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+        _setting.dataresource = _setting.dataresource.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+        _customScript = _customScript.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+        _tailScript = _tailScript.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+      } else {
+        _setting.dataresource = _setting.dataresource.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+        _customScript = _customScript.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+        _tailScript = _tailScript.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+      }
+
+      _setting.customScript = _customScript // 鏁寸悊鍚庤嚜瀹氫箟鑴氭湰
+      _setting.tailScript = _tailScript     // 鍚庣疆鑷畾涔夎剼鏈�
+
+      _setting.laypage = pagination
+      _setting.custompage = /@pageSize@|@orderBy@/i.test(_setting.dataresource + _setting.customScript)
+
+      _setting.queryType = btn.verify.queryType
+      _setting.$name = btn.logLabel
+
+      _orderBy = btn.verify.order || ''
+    } else {
+      _setting = {...setting}
+      _setting.$name = btn.logLabel
+      _setting.laypage = pagination
+      _setting.arr_field = _setting.all_field || _setting.arr_field
+
+      delete _setting.sub_field
     }
+
+    let primaryId = ''
+    if (btn.Ot === 'requiredOnce' && selectedData && selectedData.length > 0) {
+      primaryId = selectedData.map(d => d.$$uuid || '').filter(Boolean).join(',')
+      primaryId = primaryId ? 'excel:' + primaryId : ''
+    }
+
+    let param = UtilsDM.getDefaultQueryParam(_setting, search, _orderBy, pageIndex, pageSize, primaryId, BID)
+    
+    param.DateCount = ''
 
     // 鏁版嵁绠$悊鏉冮檺
     if (sessionStorage.getItem('dataM') === 'true') {
       param.dataM = 'Y'
     }
-
-    if (this.props.BID) {
-      param.BID = this.props.BID
-    }
-
-    let userName = sessionStorage.getItem('User_Name') || ''
-    let fullName = sessionStorage.getItem('Full_Name') || ''
-    let RoleID = sessionStorage.getItem('role_id') || ''
-    let departmentcode = sessionStorage.getItem('departmentcode') || ''
-    let organization = sessionStorage.getItem('organization') || ''
-    let city = sessionStorage.getItem('city') || ''
-
-    if (sessionStorage.getItem('isEditState') === 'true') {
-      userName = sessionStorage.getItem('CloudUserName') || ''
-      fullName = sessionStorage.getItem('CloudFullName') || ''
-    }
-    
-    let _dataresource = setting.dataresource
-
-    let regoptions = null
-    if (setting.queryType === 'statistics' || param.custom_script) {
-      let allSearch = Utils.getAllSearchOptions(search)
-
-      regoptions = allSearch.map(item => {
-        return {
-          reg: new RegExp('@' + item.key + '@', 'ig'),
-          value: `'${item.value}'`
-        }
-      })
-
-      regoptions.push({
-        reg: new RegExp('@login_city@', 'ig'),
-        value: city
-      }, {
-        reg: new RegExp('@userName@', 'ig'),
-        value: userName
-      }, {
-        reg: new RegExp('@fullName@', 'ig'),
-        value: fullName
-      }, {
-        reg: new RegExp('@orderBy@', 'ig'),
-        value: orderBy
-      }, {
-        reg: new RegExp('@pageSize@', 'ig'),
-        value: pageSize
-      }, {
-        reg: new RegExp('@pageIndex@', 'ig'),
-        value: pageIndex
-      })
-    }
-
-    if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
-      regoptions.forEach(item => {
-        _dataresource = _dataresource.replace(item.reg, item.value)
-      })
-      _search = ''
-    }
-
-    let LText = ''
-
-    if (setting.default !== 'false' && !pagination) {
-      LText = ` select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows `
-    } else if (setting.default !== 'false') {
-      LText = ` select top ${pageSize} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable where rows > ${pageSize * (pageIndex - 1)} order by tmptable.rows `
-    }
-
-    if (param.custom_script) {
-      param.custom_script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @login_city='${city}'
-        ${param.custom_script}
-      `
-      regoptions.forEach(item => {
-        param.custom_script = param.custom_script.replace(item.reg, item.value)
-      })
-
-      if (LText) {
-        LText += `
-          aaa:
-          if @ErrorCode!=''
-            insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@ 
-        `
-      } else {
-        param.custom_script += `
-          aaa:
-          if @ErrorCode!=''
-            insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
-        `
-      }
-    }
-
-    // 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
-    if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
-      param.custom_script && console.info(`${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${param.custom_script}`)
-      LText && console.info(LText)
-    }
-    
-    param.custom_script = Utils.formatOptions(param.custom_script)
-    param.LText = Utils.formatOptions(LText)
-    param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-    param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-    param.DateCount = ''
-
-    if (this.props.menuType === 'HS') { // 浜戠鏁版嵁楠岃瘉
-      param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
-    }
-
-    if (setting.transaction === 'true') {
-      param.func = 'sPC_Get_TableData_try'
+    if (BID) {
+      param.BID = BID
     }
 
     return param
@@ -849,17 +965,17 @@
   execSuccess = (res) => {
     const { btn } = this.props
 
-    if (res && res.ErrCode === 'S') { // 鎵ц鎴愬姛
+    if (res.ErrCode === 'S') { // 鎵ц鎴愬姛
       notification.success({
         top: 92,
-        message: res.ErrMesg || this.state.dict['main.action.confirm.success'],
+        message: res.message,
         duration: btn.verify && btn.verify.stime ? btn.verify.stime : 2
       })
-    } else if (res && res.ErrCode === 'Y') { // 鎵ц鎴愬姛
+    } else if (res.ErrCode === 'Y') { // 鎵ц鎴愬姛
       Modal.success({
-        title: res.ErrMesg || this.state.dict['main.action.confirm.success']
+        title: res.message
       })
-    } else if (res && res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
+    } else if (res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
 
     }
     
@@ -872,10 +988,33 @@
     } else if (btn.execSuccess !== 'never') {
       MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execSuccess, btn, '', [])
     }
+    
+    if (btn.syncComponentId) {
+      if (btn.syncComponentId === 'multiComponent') {
+        btn.syncComponentIds.forEach((id, i) => {
+          setTimeout(() => {
+            if (/\$focus/.test(id)) {
+              MKEmitter.emit('reloadData', id.split('$')[0], id.split('$')[1])
+            } else {
+              MKEmitter.emit('reloadData', id)
+            }
+          }, 20 * i)
+        })
+      } else if (/\$focus/.test(btn.syncComponentId)) {
+        MKEmitter.emit('reloadData', btn.syncComponentId.split('$')[0], btn.syncComponentId.split('$')[1])
+      } else {
+        MKEmitter.emit('reloadData', btn.syncComponentId)
+      }
+    }
+    
     if (btn.switchTab && btn.switchTab.length > 0) {
       let id = btn.switchTab[btn.switchTab.length - 1]
       let node = document.getElementById('tab' + id)
       node && node.click()
+    }
+
+    if (btn.execSuccess === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
+      MKEmitter.emit('refreshPopButton', btn.$tabId)
     }
   }
 
@@ -885,28 +1024,32 @@
    * 2銆乪xcel瀵煎嚭锛屽け璐ュ悗鍙栨秷瀵煎嚭鎸夐挳鍔犺浇涓姸鎬�
    * 3銆侀�氱煡涓诲垪琛ㄥ埛鏂�
    */
-  execError = (res) => {
+  execError = (res = {}) => {
     const { btn } = this.props
+
+    if (!['LoginError', 'C', '-2', 'E', 'N', 'F', 'NM'].includes(res.ErrCode)) {
+      res.ErrCode = 'E'
+    }
 
     if (res.ErrCode === 'E') {
       Modal.error({
-        title: res.message || res.ErrMesg,
+        title: res.message || '鎵ц澶辫触锛�',
       })
     } else if (res.ErrCode === 'N') {
       notification.error({
         top: 92,
-        message: res.message || res.ErrMesg,
+        message: res.message || '鎵ц澶辫触锛�',
         duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 10
       })
     } else if (res.ErrCode === 'F') {
       notification.error({
         className: 'notification-custom-error',
         top: 92,
-        message: res.message || res.ErrMesg,
+        message: res.message || '鎵ц澶辫触锛�',
         duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 10
       })
     } else if (res.ErrCode === 'NM') {
-      message.error(res.message || res.ErrMesg)
+      message.error(res.message || '鎵ц澶辫触锛�')
     }
     
     this.setState({
@@ -918,64 +1061,41 @@
     } else if (btn.execError !== 'never') {
       MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execError, btn, '', [])
     }
+
+    if (btn.execError === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
+      MKEmitter.emit('refreshPopButton', btn.$tabId)
+    }
   }
 
   render() {
-    const { btn, show } = this.props
+    const { btn } = this.props
     const { loading, hidden, disabled } = this.state
 
     if (hidden) return null
 
-    if (show === 'actionList') {
-      return (
-        <Button
-          className={'mk-btn mk-' + btn.class}
-          icon={btn.icon}
-          disabled={disabled}
-          onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
-          loading={loading}
-        >{btn.label}</Button>
-      )
-    } else { // icon銆乼ext銆� all 鍗$墖
-      let label = ''
-      let icon = ''
+    let label = ''
 
-      if (show === 'button') {
-        label = btn.label
-        icon = btn.icon || ''
-      } else if (show === 'link') {
-        label = <span>{btn.label}{btn.icon ? <MkIcon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
-        icon = ''
-      } else if (show === 'icon') {
-        icon = btn.icon || 'download'
-      // } else if (show === 'text') {
-      } else {
-        label = btn.label
-      }
-
-      return (
-        <Button
-          type="link"
-          title={show === 'icon' ? btn.label : ''}
-          loading={loading}
-          disabled={disabled}
-          style={btn.style}
-          icon={icon}
-          onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
-        >{label}</Button>
-      )
+    if (btn.show === 'link') {
+      label = <span>{btn.label}{btn.icon ? <MkIcon style={{marginLeft: '8px'}} type={btn.icon} /> : ''}</span>
+    } else if (btn.show === 'icon') {
+      label = !loading ? <MkIcon type={btn.icon} /> : null
+    } else {
+      label = <span>{!loading && btn.icon ? <MkIcon style={{marginRight: '8px'}} type={btn.icon} /> : ''}{btn.label}</span>
     }
+
+    return (
+      <Button
+        type="link"
+        id={'button' + btn.uuid}
+        title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
+        loading={loading}
+        disabled={disabled}
+        style={btn.style || null}
+        className={btn.hover || ''}
+        onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
+      >{label}</Button>
+    )
   }
 }
 
-const mapStateToProps = (state) => {
-  return {
-    menuType: state.editLevel
-  }
-}
-
-const mapDispatchToProps = () => {
-  return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(ExcelOutButton)
\ No newline at end of file
+export default ExcelOutButton
\ No newline at end of file

--
Gitblit v1.8.0