From 24842b40de5cd60700bf69dfd38a0332f5431e36 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 五月 2025 10:55:07 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/tabviews/zshare/actionList/exceloutbutton/index.jsx |  992 ++++++++++++++++++++++++++--------------------------------
 1 files changed, 442 insertions(+), 550 deletions(-)

diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index c24ba02..053530d 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -6,10 +6,8 @@
 import * as XLSX from 'sheetjs-style'
 
 import Utils from '@/utils/utils.js'
-import options from '@/store/options.js'
 import Api from '@/api'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
+import UtilsDM from '@/utils/utils-datamanage.js'
 import MKEmitter from '@/utils/events.js'
 import MkIcon from '@/components/mk-icon'
 // import './index.scss'
@@ -21,17 +19,14 @@
     selectedData: PropTypes.any,      // 瀛愯〃涓�夋嫨鏁版嵁
     btn: PropTypes.object,            // 鎸夐挳
     setting: PropTypes.any,           // 椤甸潰閫氱敤璁剧疆
-    updateStatus: PropTypes.func,     // 鎸夐挳鐘舵�佹洿鏂�
     disabled: PropTypes.any,          // 琛屾寜閽鐢�
   }
 
   state = {
-    dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
-    excelName: '',  // 鏂囦欢鍚�
-    search: '',     // 鎼滅储鏉′欢
-    loading: false, // 瀵煎嚭涓�
+    loading: false,
     hidden: false,
-    disabled: false
+    disabled: false,
+    dict: window.GLOB.dict
   }
 
   UNSAFE_componentWillMount () {
@@ -92,63 +87,29 @@
     }
     MKEmitter.removeListener('triggerBtnId', this.actionTrigger)
   }
-
-  /**
-   * @description 鎸夐挳鐘舵�佹敼鍙�
-   */
-  updateStatus = (type, name) => {
-    if (type === 'start') {
-      this.setState({
-        loading: true,
-        excelName: name
-      })
-    } else if (type === 'over') {
-      this.setState({
-        loading: false
-      })
-    }
-  }
   
   /**
    * @description 瑙﹀彂鎸夐挳鎿嶄綔
    */
-  actionTrigger = (triggerId, record, type) => {
-    const { setting, BID, btn } = this.props
-    const { loading, disabled } = this.state
+  actionTrigger = (triggerId, _, type, lid) => {
+    const { setting, BID, btn, LID } = this.props
+    const { loading, disabled, dict } = 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({
         top: 92,
-        message: '闇�瑕佷笂绾т富閿�硷紒',
+        message: setting.supModTip || dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
         duration: 5
       })
-      return
-    } else if (type === 'linkbtn' && !btn.$toolbtn && !is(fromJS(this.props.selectedData || []), fromJS(record))) {
-      return
-    }
-
-    if (!btn.verify || !btn.verify.columns || btn.verify.columns.length === 0) {
-      notification.warning({
-        top: 92,
-        message: '璇疯缃鍑哄垪锛�',
-        duration: 5
-      })
-      return
-    } else if (btn.intertype === 'system' && setting.interType !== 'system' && btn.verify.dataType !== 'custom') {
-      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'})
+      }
     }
   }
 
@@ -158,10 +119,11 @@
   triggerExcelout = (viewParam) => {
     const { btn } = this.props
 
-    let name = `${viewParam.menuName}${moment().format('YYYYMMDDHHmmss')}.xlsx`
     let pageSize = 1000
 
-    if (((btn.intertype === 'system' && btn.verify.dataType === 'custom' && btn.verify.useSearch === 'true') || btn.intertype !== 'system' || btn.verify.dataType !== 'custom') && btn.search === 'true' && viewParam.search && viewParam.search.length > 0) {
+    if (btn.intertype === 'system' && btn.verify.dataType === 'custom' && btn.verify.useSearch === 'false') {
+      viewParam.search = []
+    } else if (((btn.intertype === 'system' && btn.verify.dataType === 'custom' && btn.verify.useSearch === 'true') || btn.intertype !== 'system' || btn.verify.dataType !== 'custom') && btn.search === 'true' && viewParam.search && viewParam.search.length > 0) {
       let valid = false
       viewParam.search.forEach(item => {
         if (item.value || item.value === 0) {
@@ -172,51 +134,26 @@
       if (!valid) {
         notification.warning({
           top: 92,
-          message: '鎼滅储鏉′欢涓嶅彲涓虹┖锛�',
+          message: window.GLOB.dict['miss_search'] || '鎼滅储鏉′欢涓嶅彲涓虹┖锛�',
           duration: 5
         })
         return
       }
     }
 
-    if (btn.intertype === 'system') { // 浣跨敤绯荤粺鍑芥暟
-      if (btn.verify.dataType !== 'custom' && !viewParam.arr_field) {
-        notification.warning({
-          top: 92,
-          message: '鎸夐挳闇�鑷畾涔夊鍑烘暟鎹紒',
-          duration: 5
-        })
-        return
-      } else if (btn.verify.dataType === 'custom') {
-        viewParam.arr_field = []
-        btn.verify.columns.forEach(col => {
-          if (col.Column && col.Column !== '$Index') {
-            viewParam.arr_field.push(col.Column)
-          }
-        })
-        viewParam.arr_field = viewParam.arr_field.join(',')
-
-        viewParam.orderBy = btn.verify.order || ''
-      }
-    }
-    if (btn.intertype === 'system' && btn.verify.enable === 'true') {
-      this.setState({search: fromJS(viewParam.search).toJS()})
-    }
-    if (btn.intertype === 'system' && btn.verify.dataType === 'custom' && btn.verify.useSearch === 'false') {
-      viewParam.search = []
-    }
-
-    viewParam.orderBy = viewParam.orderBy || viewParam.arr_field.split(',')[0]
-    
-    this.updateStatus('start', name)
+    this.setState({
+      loading: true
+    })
 
     if (btn.pagination !== 'true') {
       if (btn.intertype === 'system') { // 浣跨敤绯荤粺鍑芥暟
-        let param = this.getExcelDefaultParam(viewParam.arr_field, viewParam.orderBy, viewParam.search)
-
+        let param = this.getExcelDefaultParam(viewParam.orderBy, viewParam.search)
+        if (btn.database === 'sso' && window.GLOB.mainSystemApi) {
+          param.rduri = window.GLOB.mainSystemApi
+        }
         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)
           }
@@ -228,9 +165,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)
           }
@@ -241,39 +186,25 @@
       } else if (btn.intertype === 'outer' && !btn.innerFunc) { // 浣跨敤澶栭儴鍑芥暟
         let param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search)
 
-        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
-            } 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
           }
         }
   
@@ -283,7 +214,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)
           }
@@ -302,39 +233,25 @@
             delete res.message
             delete res.status
 
-            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
-                } 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
               }
             }
   
@@ -344,7 +261,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)
               }
@@ -362,7 +279,9 @@
           message: '瀵煎嚭鎸夐挳璁剧疆閿欒锛�',
           duration: 5
         })
-        this.updateStatus('over')
+        this.setState({
+          loading: false
+        })
       }
     } else if (btn.intertype === 'outer' && btn.innerFunc) { // 鍒嗛〉锛屼笖涓ゆ璇锋眰
       this.getExcelOutDoubleData(viewParam, 1, pageSize, [])
@@ -386,39 +305,25 @@
         delete res.message
         delete res.status
 
-        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
-            } 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
           }
         }
 
@@ -429,14 +334,14 @@
         Api.genericInterface(res).then(result => {
           if (result.status) {
             if (!result.data) {
-              this.execError({ErrCode: 'N', message: '鏈幏鍙栧埌鏁版嵁淇℃伅锛�'})
+              this.execError({ErrCode: 'N', message: window.GLOB.dict['no_data'] || '鏈幏鍙栧埌鏁版嵁淇℃伅锛�'})
             } else if (result.data.length >= pageSize) {
               data = data.concat(result.data)
               pageIndex++
               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)
@@ -461,53 +366,44 @@
     const { btn } = this.props
     let param = null
     if (btn.intertype === 'system') { // 浣跨敤绯荤粺鍑芥暟
-      if (!viewParam.arr_field) {
-        this.execError({ErrCode: 'N', message: '鏈缃樉绀哄垪锛�'})
-        return
+      param = this.getExcelDefaultParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
+      if (btn.database === 'sso' && window.GLOB.mainSystemApi) {
+        param.rduri = window.GLOB.mainSystemApi
       }
-
-      param = this.getExcelDefaultParam(viewParam.arr_field, viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
     } 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') || ''
+      }
+      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' && 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
-          } 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
         }
       }
       
@@ -519,14 +415,14 @@
     Api.genericInterface(param).then(result => {
       if (result.status) {
         if (!result.data) {
-          this.execError({ErrCode: 'N', message: '鏈幏鍙栧埌鏁版嵁淇℃伅锛�'})
+          this.execError({ErrCode: 'N', message: window.GLOB.dict['no_data'] || '鏈幏鍙栧埌鏁版嵁淇℃伅锛�'})
         } else if (result.data.length >= pageSize) {
           data = data.concat(result.data)
           pageIndex++
           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)
@@ -540,27 +436,74 @@
   /**
    * @description Excel 鐢熸垚
    */
-  exportExcel = (data) => {
+  exportExcel = (data = [], ErrCode, msg, search) => {
     const { btn } = this.props
+    const { dict } = this.state
     
     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)
         }
@@ -569,7 +512,7 @@
       if (errors.length) {
         notification.error({
           top: 92,
-          message: '鏁版嵁涓己灏戝瓧娈碉細' + errors.join('銆�'),
+          message: (dict['miss_field'] || '鏁版嵁涓己灏戝瓧娈�') + '锛�' + errors.join('銆�'),
           duration: 5
         })
 
@@ -582,7 +525,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 || dict['exc_success'] || '瀵煎嚭鎴愬姛锛�'}
+          this.execSuccess(res)
+        })
+      } else if (imgCol) {
         const column = columns.map(item => {
           let col = {
             title: item.Text, 
@@ -599,20 +549,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
               }
             }
 
@@ -622,24 +608,10 @@
           table.push(_row)
         })
 
-        this.table2excel(column, table, this.state.excelName.replace(/\.xlsx/ig, '.xls'))
+        this.table2excel(column, table)
 
-        if (btn.verify.enable === 'true' && btn.verify.script) {
-          this.execCustomScript()
-        } else {
-          this.execSuccess({ErrCode: 'S', ErrMesg: '瀵煎嚭鎴愬姛锛�'})
-        }
+        this.execSuccess({ErrCode: ErrCode || 'S', message: msg || dict['exc_success'] || '瀵煎嚭鎴愬姛锛�'})
       } 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 = {}
@@ -647,16 +619,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 = ''
@@ -668,16 +640,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`)
             }
           })
 
@@ -687,7 +659,7 @@
           table.push(_topRow)
         }
   
-        data && data.forEach((item, index) => {
+        data.forEach((item, index) => {
           let _row = {}
   
           item.$Index = index + 1 + ''
@@ -695,13 +667,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
               }
             }
 
@@ -721,62 +729,56 @@
 
         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, this.state.excelName)
+        XLSX.writeFile(wb, `${btn.verify.excelName || btn.$menuName || ''}${moment().format('YYYYMMDDHHmmss')}.xlsx`)
   
-        if (btn.verify.enable === 'true' && btn.verify.script) {
-          this.execCustomScript()
-        } else {
-          this.execSuccess({ErrCode: 'S', ErrMesg: '瀵煎嚭鎴愬姛锛�'})
-        }
+        this.execSuccess({ErrCode: ErrCode || 'S', message: msg || dict['exc_success'] || '瀵煎嚭鎴愬姛锛�'})
       }
     } catch (e) {
+      console.warn(e)
       this.execError({ErrCode: 'N', message: 'Excel鐢熸垚澶辫触锛�'})
     }
   }
 
-  table2excel = (column, data, excelName) => {
+  table2excel = (column, data) => {
     let thead = column.reduce((result, item) => {
       return result + `<th>${item.title}</th>`
     }, '')
@@ -810,71 +812,10 @@
     // let url = 'data:application/vnd.ms-excel;base64,' + window.btoa(unescape(encodeURIComponent(html)))
     let link = document.createElement('a')
     link.href = url
-    link.download = excelName
+    link.download = `${this.props.btn.$menuName || ''}${moment().format('YYYYMMDDHHmmss')}.xls`
     document.body.appendChild(link)
     link.click()
     document.body.removeChild(link)
-  }
-  
-
-  /**
-   * @description 鎵ц鑷畾涔夎剼鏈�
-   */
-  execCustomScript = () => {
-    const { btn } = this.props
-    const { search } = this.state
-    let script = btn.verify.script
-
-    if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
-      script = script.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
-    } else {
-      script = script.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
-    }
-
-    let allSearch = Utils.getAllSearchOptions(search)
-    let regoptions = allSearch.map(item => {
-      return {
-        reg: new RegExp('@' + item.key + '@', 'ig'),
-        value: `'${item.value}'`
-      }
-    })
-
-    regoptions.forEach(item => {
-      script = script.replace(item.reg, item.value)
-    })
-
-    let param = {
-      func: 'sPC_TableData_InUpDe',
-      menuname: btn.logLabel
-    }
-
-    if (this.props.BID) {
-      param.BID = this.props.BID
-    }
-
-    param.exec_type = 'y' // 鍚庡彴瑙g爜
-    param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-    param.secretkey = Utils.encrypt('', param.timestamp)
-    param.LText = Utils.formatOptions(script)
-
-    if (window.GLOB.mkHS) { // 绯荤粺鍑芥暟浜戠楠岃瘉
-      param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
-    }
-
-    if (window.GLOB.probation) {
-      param.s_debug_type = 'Y'
-    }
-
-    Api.genericInterface(param).then((res) => {
-      if (res.status) {
-        this.execSuccess({ErrCode: 'S', ErrMesg: '瀵煎嚭鎴愬姛锛�'})
-      } else {
-        this.execError(res)
-      }
-    }, (error) => {
-      if (error && error.ErrCode === 'LoginError') return
-      this.updateStatus('over')
-    })
   }
 
   /**
@@ -916,197 +857,105 @@
   /**
    * @description 鑾峰彇榛樿瀛樺偍杩囩▼璇锋眰鍙傛暟
    */
-  getExcelDefaultParam = (arr_field, orderBy, search, pagination = false, pageIndex = 1, pageSize = 100) => {
+  getExcelDefaultParam = (orderBy, search, pagination = false, pageIndex = 1, pageSize = 9999) => {
     const { setting, btn, selectedData, BID } = this.props
 
-    let defaultSql = setting.execute || setting.default || 'true'
-    let customScript = setting.customScript || ''
-    let _dataresource = setting.dataresource || ''
-    let queryType = setting.queryType
-    let primaryKey = setting.primaryKey || 'ID'
+    let _setting = {}
+    let _orderBy = orderBy || ''
 
     if (btn.verify.dataType === 'custom') {
-      defaultSql = btn.verify.defaultSql || 'true'
-      _dataresource = btn.verify.dataresource || ''
-      queryType = btn.verify.queryType
-      // primaryKey = btn.verify.primaryKey || 'ID'
+      _setting.uuid = btn.uuid
+      _setting.interType = 'system'
+      _setting.arr_field = []
 
-      if (/\s/.test(_dataresource)) {
-        _dataresource = '(' + _dataresource + ') tb'
+      btn.verify.columns.forEach(col => {
+        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 = btn.verify.primaryKey || setting.primaryKey || 'ID'
+
+      if (!_setting.execute) {
+        _setting.dataresource = ''
       }
-      customScript = ''
+
+      let _customScript = ''
+      let _tailScript = ''
       btn.verify.scripts && btn.verify.scripts.forEach(script => {
-        if (script.status !== 'false') {
-          customScript += `
+        if (script.status === 'false') return
+        if (script.position !== 'back') {
+          _customScript += `
+          ${script.sql}
+          `
+        } else {
+          _tailScript += `
           ${script.sql}
           `
         }
       })
 
       if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
-        _dataresource = _dataresource.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
-        customScript = customScript.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+        _setting.dataresource = _setting.dataresource.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+        _customScript = _customScript.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+        _tailScript = _tailScript.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
       } else {
-        _dataresource = _dataresource.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
-        customScript = customScript.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+        _setting.dataresource = _setting.dataresource.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+        _customScript = _customScript.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+        _tailScript = _tailScript.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
       }
-    }
 
-    let _search = Utils.joinMainSearchkey(search)
+      if (btn.$flowId && window.GLOB.UserCacheMap.has(btn.$flowId)) {
+        let flow = window.GLOB.UserCacheMap.get(btn.$flowId)
+        _setting.dataresource = _setting.dataresource.replace(/@works_flow_code@/ig, `'${flow.flow_code}'`)
+        _customScript = _customScript.replace(/@works_flow_code@/ig, `'${flow.flow_code}'`)
+        _tailScript = _tailScript.replace(/@works_flow_code@/ig, `'${flow.flow_code}'`)
+      }
 
-    _search = _search ? 'where ' + _search : ''
-    
-    let param = {
-      func: 'sPC_Get_TableData',
-      obj_name: 'data',
-      arr_field: arr_field,
-      custom_script: customScript,
-      default_sql: defaultSql,
-      menuname: btn.logLabel
-    }
+      _setting.customScript = _customScript // 鏁寸悊鍚庤嚜瀹氫箟鑴氭湰
+      _setting.tailScript = _tailScript     // 鍚庣疆鑷畾涔夎剼鏈�
 
-    if (btn.verify.dataType !== 'custom' && setting.sub_field) {
-      arr_field = arr_field + ',' + setting.sub_field
-      param.arr_field = arr_field
-    }
+      _setting.laypage = pagination
+      _setting.custompage = false
 
-    // 鏁版嵁绠$悊鏉冮檺
-    if (sessionStorage.getItem('dataM') === 'true') {
-      param.dataM = 'Y'
-    }
+      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 (BID) {
-      param.BID = BID
-    }
+      if (/\s/.test(_setting.dataresource)) {
+        _setting.dataresource = '(' + _setting.dataresource + ') tb'
+      }
 
-    let userName = sessionStorage.getItem('User_Name') || ''
-    let fullName = sessionStorage.getItem('Full_Name') || ''
-    let RoleID = sessionStorage.getItem('role_id') || ''
-    let departmentcode = sessionStorage.getItem('departmentcode') || ''
-    let organization = sessionStorage.getItem('organization') || ''
-    let mk_user_type = sessionStorage.getItem('mk_user_type') || ''
-    let nation = sessionStorage.getItem('nation') || ''
-    let province = sessionStorage.getItem('province') || ''
-    let city = sessionStorage.getItem('city') || ''
-    let district = sessionStorage.getItem('district') || ''
-    let address = sessionStorage.getItem('address') || ''
+      _setting.queryType = btn.verify.queryType
+      _setting.$name = btn.logLabel
 
-    if (sessionStorage.getItem('isEditState') === 'true') {
-      userName = sessionStorage.getItem('CloudUserName') || ''
-      fullName = sessionStorage.getItem('CloudFullName') || ''
-    }
+      _orderBy = btn.verify.order || ''
+    } else {
+      _setting = {...setting}
+      _setting.$name = btn.logLabel
+      _setting.laypage = pagination
+      _setting.arr_field = _setting.all_field || _setting.arr_field
 
-    let regoptions = null
-    if (queryType === 'statistics' || param.custom_script) {
-      let allSearch = Utils.getAllSearchOptions(search)
+      if (setting.sub_field || setting.laypage !== pagination) {
+        _setting.uuid = btn.uuid
+      }
 
-      regoptions = allSearch.map(item => {
-        return {
-          reg: new RegExp('@' + item.key + '@', 'ig'),
-          value: `'${item.value}'`
-        }
-      })
-
-      regoptions.push({
-        reg: new RegExp('@userName@', 'ig'),
-        value: userName
-      }, {
-        reg: new RegExp('@fullName@', 'ig'),
-        value: fullName
-      }, {
-        reg: new RegExp('@orderBy@', 'ig'),
-        value: orderBy || ''
-      }, {
-        reg: new RegExp('@pageSize@', 'ig'),
-        value: pageSize
-      }, {
-        reg: new RegExp('@pageIndex@', 'ig'),
-        value: pageIndex
-      })
-    }
-
-    if (queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
-      regoptions.forEach(item => {
-        _dataresource = _dataresource.replace(item.reg, item.value)
-      })
-      _search = ''
+      delete _setting.sub_field
     }
 
     let primaryId = ''
     if (btn.Ot === 'requiredOnce' && selectedData && selectedData.length > 0) {
       primaryId = selectedData.map(d => d.$$uuid || '').filter(Boolean).join(',')
-      if (_search && primaryId) {
-        _search += ` and ${primaryKey} in (select ID from dbo.SplitComma('${primaryId}'))`
-      } else if (primaryId) {
-        _search = `where ${primaryKey} in (select ID from dbo.SplitComma('${primaryId}'))`
-      }
+      primaryId = primaryId ? 'excel:' + primaryId : ''
     }
 
-    let LText = ''
-
-    if (defaultSql !== 'false' && !pagination) {
-      LText = ` select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows `
-    } else if (defaultSql !== 'false') {
-      LText = ` select top ${pageSize} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable where rows > ${pageSize * (pageIndex - 1)} order by tmptable.rows `
-    }
-
-    if (param.custom_script) {
-      param.custom_script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100) select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
-        ${param.custom_script}
-      `
-      regoptions.forEach(item => {
-        param.custom_script = param.custom_script.replace(item.reg, item.value)
-      })
-
-      if (LText) {
-        LText += `
-          aaa:
-          if @ErrorCode!=''
-            insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@ 
-        `
-      } else {
-        param.custom_script += `
-          aaa:
-          if @ErrorCode!=''
-            insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
-        `
-      }
-    } else if (LText) {
-      LText = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100) select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
-        ${LText}
-      `
-    }
-
-    LText = LText.replace(/@ID@/ig, `'${primaryId || ''}'`)
-    param.custom_script = param.custom_script.replace(/@ID@/ig, `'${primaryId || ''}'`)
-    LText = LText.replace(/@BID@/ig, `'${BID}'`)
-    param.custom_script = param.custom_script.replace(/@BID@/ig, `'${BID}'`)
-    LText = LText.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
-    param.custom_script = param.custom_script.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
-    LText = LText.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
-    param.custom_script = param.custom_script.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
-    LText = LText.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
-    param.custom_script = param.custom_script.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
-    LText = LText.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
-    param.custom_script = param.custom_script.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
-    LText = LText.replace(/@typename@/ig, `'admin'`)
-    param.custom_script = param.custom_script.replace(/@typename@/ig, `'admin'`)
-
-    // 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
-    if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
-      param.custom_script && console.info(`${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${param.custom_script}`)
-      LText && console.info(LText)
-    }
+    let param = UtilsDM.getQueryDataParams(_setting, search, _orderBy, pageIndex, pageSize, BID, primaryId)
     
-    param.custom_script = Utils.formatOptions(param.custom_script)
-    param.LText = Utils.formatOptions(LText)
-    param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-    param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-    param.DateCount = ''
-
-    if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
-      param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
-    }
+    delete param.DateCount
 
     return param
   }
@@ -1122,23 +971,34 @@
   execSuccess = (res) => {
     const { btn } = this.props
 
-    if (res && (res.ErrCode === 'S' || !res.ErrCode)) { // 鎵ц鎴愬姛
+    if (res.ErrCode === 'S') { // 鎵ц鎴愬姛
       notification.success({
         top: 92,
-        message: res.ErrMesg || this.state.dict['main.action.confirm.success'],
+        message: res.message,
         duration: btn.verify && btn.verify.stime ? btn.verify.stime : 2
       })
-    } else if (res && res.ErrCode === 'Y') { // 鎵ц鎴愬姛
+    } else if (res.ErrCode === 'Y') { // 鎵ц鎴愬姛
       Modal.success({
-        title: res.ErrMesg || this.state.dict['main.action.confirm.success']
+        title: res.message,
+        okText: window.GLOB.dict['got_it'] || '鐭ラ亾浜�'
       })
-    } else if (res && res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
+    } else if (res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
 
     }
     
     this.setState({
       loading: false
     })
+
+    let tabId = ''
+    if (btn.refreshTab && btn.refreshTab.length > 0) {
+      tabId = btn.refreshTab[btn.refreshTab.length - 1]
+    }
+
+    if (tabId && btn.$MenuID === tabId) { // 鍒锋柊褰撳墠鑿滃崟鏃讹紝鍋滄鍏朵粬鎿嶄綔
+      MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
+      return
+    }
 
     if (btn.execSuccess === 'closepoptab') {
       MKEmitter.emit('popclose')
@@ -1150,12 +1010,22 @@
       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)
       }
+    }
+
+    if (tabId) {
+      MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
     }
     
     if (btn.switchTab && btn.switchTab.length > 0) {
@@ -1175,28 +1045,34 @@
    * 2銆乪xcel瀵煎嚭锛屽け璐ュ悗鍙栨秷瀵煎嚭鎸夐挳鍔犺浇涓姸鎬�
    * 3銆侀�氱煡涓诲垪琛ㄥ埛鏂�
    */
-  execError = (res) => {
+  execError = (res = {}) => {
     const { btn } = this.props
+    const { dict } = this.state
+
+    if (!['LoginError', 'C', '-2', 'E', 'N', 'F', 'NM'].includes(res.ErrCode)) {
+      res.ErrCode = 'E'
+    }
 
     if (res.ErrCode === 'E') {
       Modal.error({
-        title: res.message || res.ErrMesg,
+        title: res.message || dict['exc_fail'] || '鎵ц澶辫触锛�',
+        okText: dict['got_it'] || '鐭ラ亾浜�'
       })
     } else if (res.ErrCode === 'N') {
       notification.error({
         top: 92,
-        message: res.message || res.ErrMesg,
+        message: res.message || dict['exc_fail'] || '鎵ц澶辫触锛�',
         duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 10
       })
     } else if (res.ErrCode === 'F') {
       notification.error({
         className: 'notification-custom-error',
         top: 92,
-        message: res.message || res.ErrMesg,
+        message: res.message || dict['exc_fail'] || '鎵ц澶辫触锛�',
         duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 10
       })
     } else if (res.ErrCode === 'NM') {
-      message.error(res.message || res.ErrMesg)
+      message.error(res.message || dict['exc_fail'] || '鎵ц澶辫触锛�')
     }
     
     this.setState({
@@ -1206,7 +1082,38 @@
     if (btn.execError === 'closepoptab') {
       MKEmitter.emit('popclose')
     } else if (btn.execError !== 'never') {
+      let tabId = ''
+      if (btn.refreshTab && btn.refreshTab.length > 0) {
+        tabId = btn.refreshTab[btn.refreshTab.length - 1]
+      }
+      if (tabId && btn.$MenuID === tabId) { // 鍒锋柊褰撳墠鑿滃崟鏃讹紝鍋滄鍏朵粬鎿嶄綔
+        MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
+        return
+      }
+
       MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execError, btn, '', [])
+
+      if (btn.syncComponentId) {
+        if (btn.syncComponentId === 'multiComponent') {
+          btn.syncComponentIds.forEach((id, i) => {
+            setTimeout(() => {
+              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)
+        }
+      }
+
+      if (tabId) {
+        MKEmitter.emit('reloadMenuView', tabId, btn.urlPar === 'true')
+      }
     }
 
     if (btn.execError === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
@@ -1221,39 +1128,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