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 |  531 ++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 296 insertions(+), 235 deletions(-)

diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 3dfd201..0317ad6 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -90,12 +90,13 @@
   /**
    * @description 瑙﹀彂鎸夐挳鎿嶄綔
    */
-  actionTrigger = (triggerId, record, type) => {
-    const { setting, BID, btn } = this.props
+  actionTrigger = (triggerId, _, type, lid) => {
+    const { setting, BID, btn, LID } = this.props
     const { loading, disabled } = this.state
 
     if (loading || disabled) return
     if (triggerId && btn.uuid !== triggerId) return
+    if (type === 'linkbtn' && !btn.$toolbtn && LID !== lid) return
 
     if (setting.supModule && !BID) {
       notification.warning({
@@ -103,30 +104,23 @@
         message: '闇�瑕佷笂绾т富閿�硷紒',
         duration: 5
       })
-      return
-    } else if (type === 'linkbtn' && !btn.$toolbtn && !is(fromJS(this.props.selectedData || []), fromJS(record))) {
-      return
-    }
-
-    if (btn.errorType === 'error1') {
+    } else if (btn.errorType === 'error1') {
       notification.warning({
         top: 92,
         message: '璇疯缃鍑哄垪锛�',
         duration: 5
       })
-      return
     } else if (btn.errorType === 'error2') {
       notification.warning({
         top: 92,
         message: '鎸夐挳闇�鑷畾涔夊鍑烘暟鎹簮锛�',
         duration: 5
       })
-      return
-    }
-
-    MKEmitter.emit('queryModuleParam', btn.$menuId, this.triggerExcelout)
-    if (window.GLOB.systemType === 'production') {
-      MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'})
+    } else {
+      MKEmitter.emit('queryModuleParam', btn.$menuId, this.triggerExcelout)
+      if (window.GLOB.systemType === 'production') {
+        MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'})
+      }
     }
   }
 
@@ -168,7 +162,7 @@
 
         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)
           }
@@ -180,9 +174,17 @@
         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)
           }
@@ -193,39 +195,25 @@
       } else if (btn.intertype === 'outer' && !btn.innerFunc) { // 浣跨敤澶栭儴鍑芥暟
         let param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search)
 
-        if (window.GLOB.mkHS) {
-          if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
-            param.rduri = window.GLOB.cloudServiceApi
-            param.userid = sessionStorage.getItem('CloudUserID') || ''
-            param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
-          } 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') {
-            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 || ''
-            }
+          if (window.GLOB.systemType === 'production' && btn.proInterface) {
+            param.rduri = btn.proInterface
           } else {
-            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
-            }
+            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
           }
         }
   
@@ -235,7 +223,7 @@
 
         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)
           }
@@ -254,39 +242,25 @@
             delete res.message
             delete res.status
 
-            if (window.GLOB.mkHS) {
-              if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
-                res.rduri = window.GLOB.cloudServiceApi
-                res.userid = sessionStorage.getItem('CloudUserID') || ''
-                res.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
-              } 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') {
-                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 || ''
-                }
+              if (window.GLOB.systemType === 'production' && btn.proInterface) {
+                res.rduri = btn.proInterface
               } else {
-                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
-                }
+                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
               }
             }
   
@@ -296,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)
               }
@@ -340,39 +314,25 @@
         delete res.message
         delete res.status
 
-        if (window.GLOB.mkHS) {
-          if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
-            res.rduri = window.GLOB.cloudServiceApi
-            res.userid = sessionStorage.getItem('CloudUserID') || ''
-            res.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
-          } 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') {
-            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 || ''
-            }
+          if (window.GLOB.systemType === 'production' && btn.proInterface) {
+            res.rduri = btn.proInterface
           } else {
-            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
-            }
+            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
           }
         }
 
@@ -390,7 +350,7 @@
               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)
@@ -420,43 +380,37 @@
       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 (window.GLOB.mkHS) {
-        if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
-          param.rduri = window.GLOB.cloudServiceApi
-          param.userid = sessionStorage.getItem('CloudUserID') || ''
-          param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
-        } 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') {
-          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 || ''
-          }
+        if (window.GLOB.systemType === 'production' && btn.proInterface) {
+          param.rduri = btn.proInterface
         } else {
-          if (window.GLOB.systemType === 'production' && btn.proInterface) {
-            param.rduri = btn.proInterface
-          } else {
-            param.rduri = btn.interface
-          }
+          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
-          }
+        let host = window.GLOB.baseurl.replace(/http(s):\/\//, '')
+        if (param.rduri.indexOf(host) === -1 && /\/dostars/.test(param.rduri)) {
+          param.$login = true
         }
       }
       
@@ -475,7 +429,7 @@
           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)
@@ -489,27 +443,73 @@
   /**
    * @description Excel 鐢熸垚
    */
-  exportExcel = (data) => {
+  exportExcel = (data = [], ErrCode, msg, search) => {
     const { btn } = this.props
     
     let imgCol = false
-    let columns = btn.verify.columns.filter(col => {
-      if (col.output === 'false') return false
+    let merge = false
+    let styles = []
+    let letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 
+    let columns = btn.verify.columns.map((col, index) => {
       if (col.type === 'image') {
         imgCol = true
       }
+      if (btn.verify.merge === 'true' && /.+-.+/.test(col.Text)) {
+        merge = true
+      }
 
-      if (col.type === 'number' && (col.decimal || col.decimal === 0) ) {
-        col.round = Math.pow(10, col.decimal)
+      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 && data[0]) {
+    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)
         }
@@ -531,7 +531,14 @@
     }
     
     try {
-      if (imgCol) {
+      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, 
@@ -548,20 +555,56 @@
 
         let table = []
 
-        data && data.forEach((item, index) => {
+        data.forEach((item, index) => {
           let _row = {}
   
           item.$Index = index + 1 + ''
   
           columns.forEach((col, i) => {
             let val = item[col.Column]
-            if (col.type === 'number' && typeof(val) === 'number') {
-              if (col.abs === 'true') {
-                val = Math.abs(val)
+            if (col.output === 'false') {
+              if (col.type === 'number' && col.noValue !== 'false') {
+                val = 0
+              } else {
+                val = ''
               }
-              if (col.round) {
-                val = Math.round(val * col.round) / col.round
-                // val = val.toFixed(col.decimal)
+            } 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
               }
             }
 
@@ -573,18 +616,8 @@
 
         this.table2excel(column, table)
 
-        this.execSuccess({ErrCode: 'S', message: '瀵煎嚭鎴愬姛锛�'})
+        this.execSuccess({ErrCode: ErrCode || 'S', message: msg || '瀵煎嚭鎴愬姛锛�'})
       } else {
-        let letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        let cols = []
-
-        for (let index = 0; index < columns.length; index++) {
-          let i = Math.floor(index / 26)
-          let s = letters[i - 1] || ''
-          
-          cols.push(s + letters[index % 26])
-        }
-
         let table = []
         let _header = []
         let _topRow = {}
@@ -592,16 +625,16 @@
         let requires = []
         let merges = []
 
-        columns.forEach((col, i) => {
+        columns.forEach(col => {
           _header.push(col.Column)
           _topRow[col.Column] = col.Text
           colwidth.push({wch: col.Width || 20})
           if (col.required === 'true') {
-            requires.push(i)
+            requires.push(col.name)
           }
         })
 
-        if (btn.verify.merge === 'true') {
+        if (merge) {
           let fLine = {}
           let sLine = {}
           let sign = ''
@@ -613,16 +646,16 @@
               sLine[col.Column] = _name
 
               if (sign === _sign) {
-                merges[merges.length - 1] = merges[merges.length - 1].split(':')[0] + `:${cols[i]}1`
+                merges[merges.length - 1] = merges[merges.length - 1].split(':')[0] + `:${col.name}1`
               } else {
-                merges.push(`${cols[i]}1:${cols[i]}2`)
+                merges.push(`${col.name}1:${col.name}2`)
                 sign = _sign
               }
             } else {
               fLine[col.Column] = col.Text
               sLine[col.Column] = col.Text
               sign = ''
-              merges.push(`${cols[i]}1:${cols[i]}2`)
+              merges.push(`${col.name}1:${col.name}2`)
             }
           })
 
@@ -632,7 +665,7 @@
           table.push(_topRow)
         }
   
-        data && data.forEach((item, index) => {
+        data.forEach((item, index) => {
           let _row = {}
   
           item.$Index = index + 1 + ''
@@ -640,13 +673,49 @@
           columns.forEach((col, i) => {
             let val = item[col.Column]
 
-            if (col.type === 'number' && typeof(val) === 'number') {
-              if (col.abs === 'true') {
-                val = Math.abs(val)
+            if (col.output === 'false') {
+              if (col.type === 'number' && col.noValue !== 'false') {
+                val = 0
+              } else {
+                val = ''
               }
-              if (col.round) {
-                val = Math.round(val * col.round) / col.round
-                // val = val.toFixed(col.decimal)
+            } 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
               }
             }
 
@@ -666,53 +735,51 @@
 
         if (requires.length) {
           requires.forEach(col => {
-            if (cols[col]) {
-              ws[cols[col] + '1'].s = {font: { color: { rgb: 'F5222D' } }}
-            }
+            ws[col + '1'].s = {font: { color: { rgb: 'F5222D' } }}
           })
         }
 
-        if (merges.length) {
+        if (merge) {
           ws['!merges'] = []
           merges.forEach(item => {
             ws['!merges'].push(XLSX.utils.decode_range(item))
           })
 
-          cols.forEach(col => {
-            if (ws[col + '1'].s) {
-              ws[col + '1'].s = {font: { color: { rgb: 'F5222D' } }, alignment: { horizontal: 'center', vertical: 'center' }}
-            } else {
-              ws[col + '1'].s = {alignment: { horizontal: 'center', vertical: 'center' }}
-            }
-            ws[col + '2'].s = {alignment: { horizontal: 'center', vertical: 'center' }}
+          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' }}
           })
         }
 
-        if (btn.verify.wrapText === 'true' && data) {
-          let lines = data.length + 1
-          let start = 2
-          if (btn.verify.merge === 'true') {
-            lines = data.length + 2
-          }
-          for (let n = 0; n < cols.length; n++) {
-            for (let m = start; m <= lines; m++) {
-              if (ws[cols[n] + m] && !ws[cols[n] + m].s) {
-                ws[cols[n] + m].s = {alignment: { wrapText: true }}
+        // 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
+              }
+            })
           }
         }
-
-        // ws["A1"].s = {fill: { bgColor: { rgb: "FFFFAA"  }}, font: { color: { rgb: "1890FF" } }}
 
         const wb = XLSX.utils.book_new()
         XLSX.utils.book_append_sheet(wb, ws, btn.verify.sheet || 'Sheet1')
   
-        XLSX.writeFile(wb, `${btn.$menuName || ''}${moment().format('YYYYMMDDHHmmss')}.xlsx`)
+        XLSX.writeFile(wb, `${btn.verify.excelName || btn.$menuName || ''}${moment().format('YYYYMMDDHHmmss')}.xlsx`)
   
-        this.execSuccess({ErrCode: 'S', message: '瀵煎嚭鎴愬姛锛�'})
+        this.execSuccess({ErrCode: ErrCode || 'S', message: msg || '瀵煎嚭鎴愬姛锛�'})
       }
     } catch (e) {
+      console.warn(e)
       this.execError({ErrCode: 'N', message: 'Excel鐢熸垚澶辫触锛�'})
     }
   }
@@ -805,14 +872,14 @@
       _setting.arr_field = []
 
       btn.verify.columns.forEach(col => {
-        if (col.Column && col.Column !== '$Index') {
-          _setting.arr_field.push(col.Column)
-        }
+        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 = _setting.primaryKey || setting.primaryKey || 'ID'
+      _setting.primaryKey = btn.verify.primaryKey || setting.primaryKey || 'ID'
 
       if (!_setting.execute) {
         _setting.dataresource = ''
@@ -859,8 +926,11 @@
       _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 = ''
@@ -892,18 +962,18 @@
    * 4銆佹ā鎬佹鎵ц鎴愬姛鍚庢槸鍚﹀叧闂�
    * 5銆侀�氱煡涓诲垪琛ㄥ埛鏂�
    */
-  execSuccess = (res = {}) => {
+  execSuccess = (res) => {
     const { btn } = this.props
 
-    if (res.ErrCode === 'S' || !res.ErrCode) { // 鎵ц鎴愬姛
+    if (res.ErrCode === 'S') { // 鎵ц鎴愬姛
       notification.success({
         top: 92,
-        message: res.message || '鎵ц鎴愬姛锛�',
+        message: res.message,
         duration: btn.verify && btn.verify.stime ? btn.verify.stime : 2
       })
     } else if (res.ErrCode === 'Y') { // 鎵ц鎴愬姛
       Modal.success({
-        title: res.message || '鎵ц鎴愬姛锛�'
+        title: res.message
       })
     } else if (res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
 
@@ -923,9 +993,15 @@
       if (btn.syncComponentId === 'multiComponent') {
         btn.syncComponentIds.forEach((id, i) => {
           setTimeout(() => {
-            MKEmitter.emit('reloadData', id)
+            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)
       }
@@ -998,39 +1074,24 @@
     if (hidden) return null
 
     let label = ''
-    let icon = ''
-    let type = 'link'
-    let className = ''
 
-    if (btn.show === 'button') {
-      label = btn.label
-      icon = btn.icon || ''
-    } else if (btn.show === 'link') {
-      label = <span>{btn.label}{btn.icon ? <MkIcon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
-      icon = ''
+    if (btn.show === 'link') {
+      label = <span>{btn.label}{btn.icon ? <MkIcon style={{marginLeft: '8px'}} type={btn.icon} /> : ''}</span>
     } else if (btn.show === 'icon') {
-      icon = btn.icon || 'download'
-    } else if (!btn.$toolbtn) {
-      icon = btn.icon || ''
-      label = btn.label
-      className = 'mk-btn mk-' + btn.class
+      label = !loading ? <MkIcon type={btn.icon} /> : null
     } else {
-      type = ''
-      icon = btn.icon || ''
-      label = btn.label
-      className = 'mk-btn mk-' + btn.class
+      label = <span>{!loading && btn.icon ? <MkIcon style={{marginRight: '8px'}} type={btn.icon} /> : ''}{btn.label}</span>
     }
 
     return (
       <Button
-        type={type}
+        type="link"
         id={'button' + btn.uuid}
         title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
         loading={loading}
         disabled={disabled}
         style={btn.style || null}
-        icon={icon}
-        className={className}
+        className={btn.hover || ''}
         onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
       >{label}</Button>
     )

--
Gitblit v1.8.0