From 5e1d4d5155c57c43739d61914e2d29a64f9bb683 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 17:40:38 +0800
Subject: [PATCH] Merge branch 'develop'

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

diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 30bcbf7..0cab6e9 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -168,7 +168,7 @@
 
         Api.genericInterface(param).then(result => {
           if (result.status) {
-            this.exportExcel(result.data)
+            this.exportExcel(result.data, result.ErrCode, result.message)
           } else {
             this.execError(result)
           }
@@ -180,9 +180,14 @@
         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') || ''
+        }
+
         Api.genericInterface(param).then(result => {
           if (result.status) {
-            this.exportExcel(result.data)
+            this.exportExcel(result.data, result.ErrCode, result.message)
           } else {
             this.execError(result)
           }
@@ -235,7 +240,7 @@
 
         Api.genericInterface(param).then(result => {
           if (result.status) {
-            this.exportExcel(result.data)
+            this.exportExcel(result.data, result.ErrCode, result.message)
           } else {
             this.execError(result)
           }
@@ -296,7 +301,7 @@
       
             Api.genericInterface(res).then(result => {
               if (result.status) {
-                this.exportExcel(result.data)
+                this.exportExcel(result.data, result.ErrCode, result.message)
               } else {
                 this.execError(result)
               }
@@ -390,7 +395,7 @@
               this.getExcelOutDoubleData(viewParam, pageIndex, pageSize, data)
             } else {
               data = data.concat(result.data)
-              this.exportExcel(data)
+              this.exportExcel(data, result.ErrCode, result.message)
             }
           } else {
             this.execError(result)
@@ -419,6 +424,11 @@
     } 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') || ''
+      }
 
     } else if (btn.intertype === 'outer' && !btn.innerFunc) { // 浣跨敤澶栭儴鍑芥暟
       param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
@@ -475,7 +485,7 @@
           this.getExcelOutData(viewParam, pageIndex, pageSize, data)
         } else {
           data = data.concat(result.data)
-          this.exportExcel(data)
+          this.exportExcel(data, result.ErrCode, result.message)
         }
       } else {
         this.execError(result)
@@ -489,7 +499,7 @@
   /**
    * @description Excel 鐢熸垚
    */
-  exportExcel = (data) => {
+  exportExcel = (data, ErrCode, message) => {
     const { btn } = this.props
     
     let imgCol = false
@@ -573,7 +583,7 @@
 
         this.table2excel(column, table)
 
-        this.execSuccess({ErrCode: 'S', message: '瀵煎嚭鎴愬姛锛�'})
+        this.execSuccess({ErrCode: ErrCode || 'S', message: message || '瀵煎嚭鎴愬姛锛�'})
       } else {
         let letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
         let cols = []
@@ -710,7 +720,7 @@
   
         XLSX.writeFile(wb, `${btn.$menuName || ''}${moment().format('YYYYMMDDHHmmss')}.xlsx`)
   
-        this.execSuccess({ErrCode: 'S', message: '瀵煎嚭鎴愬姛锛�'})
+        this.execSuccess({ErrCode: ErrCode || 'S', message: message || '瀵煎嚭鎴愬姛锛�'})
       }
     } catch (e) {
       this.execError({ErrCode: 'N', message: 'Excel鐢熸垚澶辫触锛�'})
@@ -818,6 +828,10 @@
         _setting.dataresource = ''
       }
 
+      if (/\s/.test(_setting.dataresource)) {
+        _setting.dataresource = '(' + _setting.dataresource + ') tb'
+      }
+
       let _customScript = ''
       let _tailScript = ''
       btn.verify.scripts && btn.verify.scripts.forEach(script => {
@@ -847,10 +861,7 @@
       _setting.tailScript = _tailScript     // 鍚庣疆鑷畾涔夎剼鏈�
 
       _setting.laypage = pagination
-
-      if (_setting.laypage) {
-        _setting.custompage = /@pageSize@/i.test(_setting.dataresource + _setting.customScript)
-      }
+      _setting.custompage = /@pageSize@|@orderBy@/i.test(_setting.dataresource + _setting.customScript)
 
       _setting.queryType = btn.verify.queryType
       _setting.$name = btn.logLabel
@@ -891,18 +902,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') { // 瀹屾垚鍚庝笉鎻愮ず
 

--
Gitblit v1.8.0