From b09b821ef36fd1ea979e9a5daa98e95732ac81d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 16 七月 2025 18:16:00 +0800
Subject: [PATCH] 2025-07-16

---
 src/tabviews/zshare/actionList/exceloutbutton/index.jsx |   56 +++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index f56642a..f59a12f 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -102,14 +102,14 @@
     if (setting.supModule && !BID) {
       notification.warning({
         top: 92,
-        message: dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+        message: setting.supModTip || dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
         duration: 5
       })
     } else {
       MKEmitter.emit('queryModuleParam', btn.$menuId, this.triggerExcelout)
-      // if (window.GLOB.systemType === 'production') {
-      //   MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'})
-      // }
+      if (window.GLOB.systemType === 'production') {
+        MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '瀵煎嚭Excel'})
+      }
     }
   }
 
@@ -437,7 +437,7 @@
    * @description Excel 鐢熸垚
    */
   exportExcel = (data = [], ErrCode, msg, search) => {
-    const { btn } = this.props
+    const { btn, BID } = this.props
     const { dict } = this.state
     
     let imgCol = false
@@ -521,6 +521,18 @@
         })
         
         return
+      }
+    }
+
+    let excelName = `${btn.verify.excelName || btn.$menuName || ''}${moment().format('YYYYMMDDHHmmss')}`
+    if (btn.verify.excelName && /@.*@/.test(btn.verify.excelName)) {
+      excelName = btn.verify.excelName.replace(/@bid@/ig, BID)
+      excelName = excelName.replace(/@getdate@/ig, moment().format('YYYYMMDDHHmmss'))
+      if (data[0]) {
+        Object.keys(data[0]).forEach(key => {
+          let reg = new RegExp('@' + key + '@', 'ig')
+          excelName = excelName.replace(reg, data[0][key])
+        })
       }
     }
     
@@ -608,7 +620,7 @@
           table.push(_row)
         })
 
-        this.table2excel(column, table)
+        this.table2excel(column, table, excelName)
 
         this.execSuccess({ErrCode: ErrCode || 'S', message: msg || dict['exc_success'] || '瀵煎嚭鎴愬姛锛�'})
       } else {
@@ -768,7 +780,7 @@
         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`)
+        XLSX.writeFile(wb, excelName + '.xlsx')
   
         this.execSuccess({ErrCode: ErrCode || 'S', message: msg || dict['exc_success'] || '瀵煎嚭鎴愬姛锛�'})
       }
@@ -778,7 +790,7 @@
     }
   }
 
-  table2excel = (column, data) => {
+  table2excel = (column, data, excelName) => {
     let thead = column.reduce((result, item) => {
       return result + `<th>${item.title}</th>`
     }, '')
@@ -812,7 +824,7 @@
     // let url = 'data:application/vnd.ms-excel;base64,' + window.btoa(unescape(encodeURIComponent(html)))
     let link = document.createElement('a')
     link.href = url
-    link.download = `${this.props.btn.$menuName || ''}${moment().format('YYYYMMDDHHmmss')}.xls`
+    link.download = excelName + '.xls'
     document.body.appendChild(link)
     link.click()
     document.body.removeChild(link)
@@ -882,10 +894,6 @@
         _setting.dataresource = ''
       }
 
-      if (/\s/.test(_setting.dataresource)) {
-        _setting.dataresource = '(' + _setting.dataresource + ') tb'
-      }
-
       let _customScript = ''
       let _tailScript = ''
       btn.verify.scripts && btn.verify.scripts.forEach(script => {
@@ -922,7 +930,17 @@
       _setting.tailScript = _tailScript     // 鍚庣疆鑷畾涔夎剼鏈�
 
       _setting.laypage = pagination
-      _setting.custompage = /@pageSize@|@orderBy@|@mk_total/i.test(_setting.dataresource + _setting.customScript)
+      _setting.custompage = false
+
+      if (/order\s+by\s+sort_id\s*$/i.test(_setting.dataresource)) {
+        _setting.custompage = true
+      } else if (/@pageSize@|@orderBy@|@mk_total/i.test(_setting.dataresource + _setting.customScript)) {
+        _setting.custompage = true
+      }
+
+      if (/\s/.test(_setting.dataresource)) {
+        _setting.dataresource = '(' + _setting.dataresource + ') tb'
+      }
 
       _setting.queryType = btn.verify.queryType
       _setting.$name = btn.logLabel
@@ -934,7 +952,7 @@
       _setting.laypage = pagination
       _setting.arr_field = _setting.all_field || _setting.arr_field
 
-      if (setting.sub_field) {
+      if (setting.sub_field || setting.laypage !== pagination) {
         _setting.uuid = btn.uuid
       }
 
@@ -990,7 +1008,7 @@
     }
 
     if (tabId && btn.$MenuID === tabId) { // 鍒锋柊褰撳墠鑿滃崟鏃讹紝鍋滄鍏朵粬鎿嶄綔
-      MKEmitter.emit('reloadMenuView', tabId)
+      MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
       return
     }
 
@@ -1019,7 +1037,7 @@
     }
 
     if (tabId) {
-      MKEmitter.emit('reloadMenuView', tabId)
+      MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
     }
     
     if (btn.switchTab && btn.switchTab.length > 0) {
@@ -1081,7 +1099,7 @@
         tabId = btn.refreshTab[btn.refreshTab.length - 1]
       }
       if (tabId && btn.$MenuID === tabId) { // 鍒锋柊褰撳墠鑿滃崟鏃讹紝鍋滄鍏朵粬鎿嶄綔
-        MKEmitter.emit('reloadMenuView', tabId)
+        MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
         return
       }
 
@@ -1106,7 +1124,7 @@
       }
 
       if (tabId) {
-        MKEmitter.emit('reloadMenuView', tabId)
+        MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
       }
     }
 

--
Gitblit v1.8.0