From decf1f6555b6e003860401a692faea259cc565af Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 23 三月 2021 21:00:08 +0800
Subject: [PATCH] 2021-03-23

---
 src/tabviews/zshare/actionList/exceloutbutton/index.jsx |   82 +++++++++++++++++++++++++++++++++-------
 1 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index e99d2dd..ec8f827 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -193,13 +193,21 @@
           if (btn.sysInterface === 'true' && options.cloudServiceApi) {
             param.rduri = options.cloudServiceApi
           } else if (btn.sysInterface !== 'true') {
-            param.rduri = btn.interface
+            if (window.GLOB.systemType === 'production' && btn.proInterface) {
+              param.rduri = btn.proInterface
+            } else {
+              param.rduri = btn.interface
+            }
           }
         } else {
           if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
             param.rduri = window.GLOB.mainSystemApi
           } else if (btn.sysInterface !== 'true') {
-            param.rduri = btn.interface
+            if (window.GLOB.systemType === 'production' && btn.proInterface) {
+              param.rduri = btn.proInterface
+            } else {
+              param.rduri = btn.interface
+            }
           }
         }
   
@@ -231,13 +239,21 @@
               if (btn.sysInterface === 'true' && options.cloudServiceApi) {
                 res.rduri = options.cloudServiceApi
               } else if (btn.sysInterface !== 'true') {
-                res.rduri = btn.interface
+                if (window.GLOB.systemType === 'production' && btn.proInterface) {
+                  res.rduri = btn.proInterface
+                } else {
+                  res.rduri = btn.interface
+                }
               }
             } else {
               if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
                 res.rduri = window.GLOB.mainSystemApi
               } else if (btn.sysInterface !== 'true') {
-                res.rduri = btn.interface
+                if (window.GLOB.systemType === 'production' && btn.proInterface) {
+                  res.rduri = btn.proInterface
+                } else {
+                  res.rduri = btn.interface
+                }
               }
             }
   
@@ -292,13 +308,21 @@
           if (btn.sysInterface === 'true' && options.cloudServiceApi) {
             res.rduri = options.cloudServiceApi
           } else if (btn.sysInterface !== 'true') {
-            res.rduri = btn.interface
+            if (window.GLOB.systemType === 'production' && btn.proInterface) {
+              res.rduri = btn.proInterface
+            } else {
+              res.rduri = btn.interface
+            }
           }
         } else {
           if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
             res.rduri = window.GLOB.mainSystemApi
           } else if (btn.sysInterface !== 'true') {
-            res.rduri = btn.interface
+            if (window.GLOB.systemType === 'production' && btn.proInterface) {
+              res.rduri = btn.proInterface
+            } else {
+              res.rduri = btn.interface
+            }
           }
         }
 
@@ -356,13 +380,21 @@
         if (btn.sysInterface === 'true' && options.cloudServiceApi) {
           param.rduri = options.cloudServiceApi
         } else if (btn.sysInterface !== 'true') {
-          param.rduri = btn.interface
+          if (window.GLOB.systemType === 'production' && btn.proInterface) {
+            param.rduri = btn.proInterface
+          } else {
+            param.rduri = btn.interface
+          }
         }
       } else {
         if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
           param.rduri = window.GLOB.mainSystemApi
         } else if (btn.sysInterface !== 'true') {
-          param.rduri = btn.interface
+          if (window.GLOB.systemType === 'production' && btn.proInterface) {
+            param.rduri = btn.proInterface
+          } else {
+            param.rduri = btn.interface
+          }
         }
       }
       
@@ -401,12 +433,17 @@
       let _header = []
       let _topRow = {}
       let colwidth = []
+      let abses = []
 
       btn.verify.columns.forEach(col => {
         if (_topRow[col.Column]) return
 
         _header.push(col.Column)
         _topRow[col.Column] = col.Text
+
+        if (col.abs === 'true') {
+          abses.push(col.Column)
+        }
 
         colwidth.push({width: col.Width || 20})
       })
@@ -415,14 +452,29 @@
 
       table.push(_topRow)
 
-      data && data.forEach(item => {
-        let _row = {}
-        _header.forEach(field => {
-          _row[field] = item[field]
+      if (data && abses.length > 0) {
+        data.forEach(item => {
+          let _row = {}
+          _header.forEach(field => {
+            if (item[field] && abses.includes(field)) {
+              _row[field] = Math.abs(item[field])
+            } else {
+              _row[field] = item[field]
+            }
+          })
+  
+          table.push(_row)
         })
-
-        table.push(_row)
-      })
+      } else if (data) {
+        data.forEach(item => {
+          let _row = {}
+          _header.forEach(field => {
+            _row[field] = item[field]
+          })
+  
+          table.push(_row)
+        })
+      }
 
       const ws = XLSX.utils.json_to_sheet(table, {header: _header, skipHeader: true})
 

--
Gitblit v1.8.0