From 102be577a7f8df2ae30045d55a1a5fc584f90363 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 19 十二月 2022 18:31:38 +0800
Subject: [PATCH] 2022-12-19

---
 src/tabviews/zshare/actionList/exceloutbutton/index.jsx |  161 +++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 112 insertions(+), 49 deletions(-)

diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index c2f7668..8dc3084 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -18,7 +18,6 @@
   static propTpyes = {
     BID: PropTypes.string,            // 涓昏〃ID
     BData: PropTypes.any,             // 涓昏〃鏁版嵁
-    Tab: PropTypes.any,               // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
     btn: PropTypes.object,            // 鎸夐挳
     setting: PropTypes.any,           // 椤甸潰閫氱敤璁剧疆
     updateStatus: PropTypes.func,     // 鎸夐挳鐘舵�佹洿鏂�
@@ -61,7 +60,6 @@
 
   componentDidMount () {
     MKEmitter.addListener('triggerBtnId', this.actionTrigger)
-    MKEmitter.addListener('returnModuleParam', this.triggerExcelout)
   }
 
   UNSAFE_componentWillReceiveProps (nextProps) {
@@ -92,7 +90,6 @@
       return
     }
     MKEmitter.removeListener('triggerBtnId', this.actionTrigger)
-    MKEmitter.removeListener('returnModuleParam', this.triggerExcelout)
   }
 
   /**
@@ -115,13 +112,13 @@
    * @description 瑙﹀彂鎸夐挳鎿嶄綔
    */
   actionTrigger = (triggerId, record, type) => {
-    const { setting, Tab, BID, btn } = this.props
+    const { setting, BID, btn } = this.props
     const { loading, disabled } = this.state
 
     if (loading || disabled) return
     if (triggerId && btn.uuid !== triggerId) return
 
-    if (((Tab && Tab.supMenu) || setting.supModule) && !BID) {
+    if (setting.supModule && !BID) {
       notification.warning({
         top: 92,
         message: '闇�瑕佷笂绾т富閿�硷紒',
@@ -148,7 +145,7 @@
       return
     }
 
-    MKEmitter.emit('queryModuleParam', btn.$menuId, btn.uuid)
+    MKEmitter.emit('queryModuleParam', btn.$menuId, this.triggerExcelout)
     if (window.GLOB.systemType === 'production') {
       MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'})
     }
@@ -157,10 +154,8 @@
   /**
    * @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
@@ -200,7 +195,7 @@
         })
         viewParam.arr_field = viewParam.arr_field.join(',')
 
-        viewParam.orderBy = btn.verify.order || viewParam.orderBy
+        viewParam.orderBy = btn.verify.order || ''
       }
     }
     if (btn.intertype === 'system' && btn.verify.enable === 'true') {
@@ -246,6 +241,8 @@
         if (window.GLOB.mkHS) {
           if (btn.sysInterface === 'true' && options.cloudServiceApi) {
             param.rduri = options.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
@@ -254,13 +251,25 @@
             }
           }
         } else {
-          if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
-            param.rduri = window.GLOB.mainSystemApi
-          } else if (btn.sysInterface !== 'true') {
+          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 (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
             }
           }
         }
@@ -292,6 +301,8 @@
             if (window.GLOB.mkHS) {
               if (btn.sysInterface === 'true' && options.cloudServiceApi) {
                 res.rduri = options.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
@@ -300,13 +311,25 @@
                 }
               }
             } else {
-              if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
-                res.rduri = window.GLOB.mainSystemApi
-              } else if (btn.sysInterface !== 'true') {
+              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 (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
                 }
               }
             }
@@ -361,6 +384,8 @@
         if (window.GLOB.mkHS) {
           if (btn.sysInterface === 'true' && options.cloudServiceApi) {
             res.rduri = options.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
@@ -369,13 +394,25 @@
             }
           }
         } else {
-          if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
-            res.rduri = window.GLOB.mainSystemApi
-          } else if (btn.sysInterface !== 'true') {
+          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 (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
             }
           }
         }
@@ -433,6 +470,8 @@
       if (window.GLOB.mkHS) {
         if (btn.sysInterface === 'true' && options.cloudServiceApi) {
           param.rduri = options.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
@@ -441,13 +480,26 @@
           }
         }
       } else {
-        if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
-          param.rduri = window.GLOB.mainSystemApi
-        } else if (btn.sysInterface !== 'true') {
+        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 (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
           }
         }
       }
@@ -483,11 +535,22 @@
   exportExcel = (data) => {
     const { btn } = this.props
     
-    let columns = btn.verify.columns.filter(col => col.output !== 'false')
+    let imgCol = false
+    let columns = btn.verify.columns.filter(col => {
+      if (col.output === 'false') return false
+
+      if (col.type === 'image') {
+        imgCol = true
+      }
+
+      if (col.type === 'number' && (col.decimal || col.decimal === 0) ) {
+        col.round = Math.pow(10, col.decimal)
+      }
+
+      return col
+    })
     
     try {
-      let imgCol = columns.filter(col => col.type === 'image')[0]
-
       if (imgCol) {
         const column = columns.map(item => {
           let col = {
@@ -511,11 +574,18 @@
           item.$Index = index + 1 + ''
   
           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]
+            let val = item[col.Column]
+            if (typeof(val) === 'number') {
+              if (col.abs === 'true') {
+                val = Math.abs(val)
+              }
+              if (col.round) {
+                val = Math.round(val * col.round) / col.round
+                val = val.toFixed(col.decimal)
+              }
             }
+
+            _row[col.Column] = val
           })
   
           table.push(_row)
@@ -528,23 +598,14 @@
         } else {
           this.execSuccess({ErrCode: 'S', ErrMesg: '瀵煎嚭鎴愬姛锛�'})
         }
-
       } else {
         let _header = []
         let _topRow = {}
         let colwidth = []
-        let abses = []
   
         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})
         })
   
@@ -557,12 +618,20 @@
   
           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 (typeof(val) === 'number') {
+              if (col.abs === 'true') {
+                val = Math.abs(val)
+              }
+              if (col.round) {
+                val = Math.round(val * col.round) / col.round
+                val = val.toFixed(col.decimal)
+              }
             }
+
+            _row[col.Column] = val
           })
   
           table.push(_row)
@@ -727,13 +796,11 @@
     let customScript = setting.customScript || ''
     let _dataresource = setting.dataresource || ''
     let queryType = setting.queryType
-    let transaction = setting.transaction
 
     if (btn.verify.dataType === 'custom') {
       defaultSql = btn.verify.defaultSql || 'true'
       _dataresource = btn.verify.dataresource || ''
       queryType = btn.verify.queryType
-      transaction = btn.verify.transaction
 
       if (/\s/.test(_dataresource)) {
         _dataresource = '(' + _dataresource + ') tb'
@@ -882,10 +949,6 @@
 
     if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
       param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
-    }
-
-    if (transaction === 'true') {
-      param.func = 'sPC_Get_TableData_try'
     }
 
     return param

--
Gitblit v1.8.0