From e5fc2d92b1036aabf9ffc2c9706ed401bd9735c8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 09 九月 2021 18:14:29 +0800
Subject: [PATCH] 2021-09-09

---
 src/tabviews/zshare/actionList/printbutton/index.jsx | 2573 ++++++++++++++++-------------------------------------------
 1 files changed, 710 insertions(+), 1,863 deletions(-)

diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index c6d4324..95a955f 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -1,85 +1,126 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import moment from 'moment'
+import {connect} from 'react-redux'
 import { is, fromJS } from 'immutable'
-import { Button, Affix, Modal, notification, Spin, message } from 'antd'
+import { Button, Modal, notification, message, Icon } from 'antd'
+
+import Api from '@/api'
 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 asyncSpinComponent from '@/utils/asyncSpinComponent'
+import { updateForm } from '@/utils/utils-update.js'
+import MKEmitter from '@/utils/events.js'
 import './index.scss'
 
+const MutilForm = asyncSpinComponent(() => import('@/tabviews/zshare/mutilform'))
+const { confirm } = Modal
 let socket = null
 
 class PrintButton extends Component {
   static propTpyes = {
-    menuType: PropTypes.any,          // 鑿滃崟绫诲瀷锛屾櫘閫氳彍鍗曟垨HS
+    show: PropTypes.any,              // 鎸夐挳鏄剧ず鏍峰紡鎺у埗
+    position: PropTypes.any,          // 鎸夐挳浣嶇疆锛屽伐鍏锋爮涓簍oolbar
     BID: PropTypes.string,            // 涓昏〃ID
     BData: PropTypes.any,             // 涓昏〃鏁版嵁
+    selectedData: PropTypes.any,      // 瀛愯〃涓�夋嫨鏁版嵁
     Tab: PropTypes.any,               // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
-    type: PropTypes.string,           // 鍒ゆ柇褰撳墠涓轰富琛紙main锛夈�佸瓙琛紙sub锛夈�佸瓙琛ㄦ爣绛撅紙subtab锛�
     MenuID: PropTypes.string,         // 鑿滃崟ID
-    actions: PropTypes.array,         // 鎸夐挳缁�
-    logcolumns: PropTypes.array,      // 鏄剧ず鍒�
-    dict: PropTypes.object,           // 瀛楀吀椤�
+    btn: PropTypes.object,            // 鎸夐挳
     setting: PropTypes.any,           // 椤甸潰閫氱敤璁剧疆
     ContainerId: PropTypes.any,       // tab椤甸潰ID锛岀敤浜庡脊绐楁帶鍒�
-    refreshdata: PropTypes.func,      // 鎵ц瀹屾垚鍚庢暟鎹埛鏂�
-    triggerPopview: PropTypes.func,   // 寮圭獥鏍囩椤佃Е鍙�
-    getexceloutparam: PropTypes.func, // 鑾峰彇excel瀵煎嚭鏁版嵁
-    gettableselected: PropTypes.func, // 鑾峰彇琛ㄦ牸涓暟鎹�
-    triggerBtn: PropTypes.any,
   }
 
   state = {
+    dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
     visible: false,
     formdata: null,
     tabledata: null,
-    confirmLoading: false,
-    execAction: null,
-    loadingUuid: '',
-    btnloading: false,
-    configMap: {},
-    running: false,
+    btnconfig: null,
+    loading: false,
+    disabled: false,
     loadingNumber: ''
   }
 
-  /**
-   * @description 涓婄骇鑿滃崟id鍙樺寲鏃讹紝鍒锋柊鏁版嵁
-   */
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (nextProps.triggerBtn && !is(fromJS(this.props.triggerBtn), fromJS(nextProps.triggerBtn)) && nextProps.triggerBtn.parentId === this.props.MenuID) {
-      if (!this.state.loadingUuid && !this.state.visible && !this.state.running) {
-        let _btn = nextProps.triggerBtn.button
-        if (!_btn.OpenType) {
-          _btn = this.props.actions.filter(item => item.uuid === _btn.uuid)[0]
+  UNSAFE_componentWillMount () {
+    const { btn, selectedData } = this.props
+    let disabled = false
+
+    if (btn.controlField && selectedData && selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
+      selectedData.forEach(item => {
+        let s = item[btn.controlField] + ''
+        if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
+          disabled = true
         }
-        if (_btn) {
-          this.actionTrigger(_btn, nextProps.triggerBtn.data)
-        }
-      }
+      })
+      this.setState({disabled})
     }
   }
 
-  refreshdata = (item, type) => {
-    this.props.refreshdata(item, type)
+  shouldComponentUpdate (nextProps, nextState) {
+    return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
+  }
+
+  componentDidMount () {
+    const { position } = this.props
+
+    if (position === 'toolbar') {
+      MKEmitter.addListener('triggerBtnId', this.actionTrigger)
+    }
+  }
+
+  UNSAFE_componentWillReceiveProps (nextProps) {
+    const { btn, selectedData } = this.props
+
+    if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
+      let disabled = false
+
+      if (nextProps.selectedData && nextProps.selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
+        nextProps.selectedData.forEach(item => {
+          let s = item[btn.controlField] + ''
+          if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
+            disabled = true
+          }
+        })
+      }
+      this.setState({disabled})
+    }
+  }
+
+  componentWillUnmount () {
+    this.setState = () => {
+      return
+    }
+    MKEmitter.removeListener('triggerBtnId', this.actionTrigger)
+  }
+
+  /**
+   * @description 鎸夐挳鐘舵�佹敼鍙�
+   */
+  updateStatus = (type) => {
+    if (type === 'start') {
+      this.setState({
+        loading: true
+      })
+    } else if (type === 'over') {
+      this.setState({
+        loading: false
+      })
+    }
   }
   
   /**
    * @description 瑙﹀彂鎸夐挳鎿嶄綔
    */
-  actionTrigger = (item, record) => {
-    const { setting, type, Tab, BID } = this.props
+  actionTrigger = (triggerId, record) => {
+    const { Tab, BID, btn, selectedData, setting } = this.props
+    const { loading } = this.state
 
-    if (this.state.loadingUuid || this.state.visible || this.state.running) {
-      notification.warning({
-        top: 92,
-        message: '浠诲姟鎵ц涓紝璇风◢鍚庯紒',
-        duration: 5
-      })
-      return
-    }
+    if ((triggerId && btn.uuid !== triggerId) || loading) return
 
-    if (type === 'sub' && Tab && Tab.supMenu && !BID) {
+    if (((Tab && Tab.supMenu) || setting.supModule) && !BID) {
       notification.warning({
         top: 92,
         message: '闇�瑕佷笂绾т富閿�硷紒',
@@ -89,187 +130,29 @@
     }
 
     let _this = this
-    let data = this.props.gettableselected() || []
-    
-    if (record) { // 琛ㄦ牸涓Е鍙戞寜閽�
-      data = [record]
-    }
+    let data = record || selectedData || []
 
-    if (item.Ot !== 'notRequired' && data.length === 0) {
+    if (btn.Ot !== 'notRequired' && data.length === 0) {
       // 闇�瑕侀�夋嫨琛屾椂锛屾牎楠屾暟鎹�
       notification.warning({
         top: 92,
-        message: this.props.dict['main.action.confirm.selectline'],
+        message: this.state.dict['main.action.confirm.selectline'],
         duration: 5
       })
       return
-    } else if (item.Ot === 'requiredSgl' && data.length !== 1) {
+    } else if (btn.Ot === 'requiredSgl' && data.length !== 1) {
       // 闇�瑕侀�夋嫨鍗曡鏃讹紝鏍¢獙鏁版嵁
       notification.warning({
         top: 92,
-        message: this.props.dict['main.action.confirm.selectSingleLine'],
+        message: this.state.dict['main.action.confirm.selectSingleLine'],
         duration: 5
       })
       return
-    } else if (item.Ot !== 'notRequired' && !setting.primaryKey) {
-      // 闇�瑕侀�夋嫨琛屾椂锛屾牎楠屾槸鍚﹁缃富閿�
-      notification.warning({
-        top: 92,
-        message: '鏈缃富閿紒',
-        duration: 5
-      })
+    } else if (!['requiredSgl', 'notRequired', 'requiredOnce', 'required'].includes(btn.Ot)) {
+      // 鏁版嵁閫夋嫨绫诲瀷鏍¢獙
+      this.actionSettingError()
       return
-    }
-
-    if (item.OpenType === 'prompt') {
-      this.setState({
-        running: true
-      })
-      confirm({
-        title: this.props.dict['main.action.confirm.tip'],
-        onOk() {
-          _this.setState({
-            loadingUuid: item.uuid
-          })
-
-          return new Promise(resolve => {
-            _this.execSubmit(item, data, resolve)
-          })
-        },
-        onCancel() {
-          _this.setState({
-            running: false
-          })
-        }
-      })
-    } else if (item.OpenType === 'exec') {
-      this.setState({loadingUuid: item.uuid})
-      this.execSubmit(item, data, () => {
-        this.setState({loadingUuid: ''})
-      })
-    } else if (item.OpenType === 'pop') {
-      this.setState({
-        execAction: item,
-        tabledata: data,
-        btnloading: true
-      }, () => {
-        this.improveAction(item)
-      })
-    } else if (item.OpenType === 'excelOut') {
-      if (
-        item.intertype === 'inner' && !item.innerFunc &&
-        ((setting.interType === 'inner' && setting.innerFunc) || setting.interType === 'outer')
-      ) {
-        notification.warning({
-          top: 92,
-          message: '瀵煎嚭鎸夐挳閰嶇疆閿欒锛�',
-          duration: 5
-        })
-        return
-      }
-
-      this.triggerExcelout(item)
-
-    } else if (item.OpenType === 'excelIn') {
-      if (item.verify && item.verify.sheet && item.verify.columns && item.verify.columns.length > 0) {
-        let primaryId = '' // 瀵煎叆鏃惰Id
-        if (item.Ot === 'requiredSgl') {
-          primaryId = data[0][setting.primaryKey] || ''
-        }
-
-        this.refs.excelIn.exceltrigger(item, primaryId)
-      } else {
-        notification.warning({
-          top: 92,
-          message: 'excel瀵煎叆楠岃瘉淇℃伅鏈缃紒',
-          duration: 5
-        })
-      }
-    } else if (item.OpenType === 'popview' && this.props.type !== 'subtab') {
-      // 寮圭獥鏍囩璁剧疆涓轰笉閫夊垯琛屾椂锛屼笉浼犻�掓暟鎹�
-      this.props.triggerPopview(item, item.Ot === 'notRequired' ? [] : data)
-    } else if (item.OpenType === 'popview' && this.props.type === 'subtab') {
-      notification.warning({
-        top: 92,
-        message: '寮圭獥椤甸潰涓嶆敮鎸佹璁剧疆锛�',
-        duration: 5
-      })
-    } else if (item.OpenType === 'innerpage') {
-      let Id = data[0][setting.primaryKey]
-
-      if (item.pageTemplate === 'print') {
-        let cloudmsg = '&cuid=' + (sessionStorage.getItem('CloudUserID') || '') + '&csid=' + (sessionStorage.getItem('CloudSessionUid') || '') + '&clid=' + (sessionStorage.getItem('CloudLoginUID') || '') + '&cun=' + (sessionStorage.getItem('CloudUserName') || '')
-        let msg = '&uid=' + sessionStorage.getItem('UserID') + '&sid=' + sessionStorage.getItem('SessionUid') + '&lid=' + sessionStorage.getItem('LoginUID') + '&un=' + sessionStorage.getItem('User_Name')
-        let src = '#/print/' + window.btoa('ID=' + Id + msg + cloudmsg)
-        window.open(src)
-      } else {
-        notification.warning({
-          top: 92,
-          message: '椤甸潰绫诲瀷璁剧疆閿欒锛�',
-          duration: 5
-        })
-      }
-    } else if (item.OpenType === 'outerpage') {
-      let url = item.url
-      if (item.Ot === 'requiredSgl' && setting.primaryKey) {
-        url = url + '?ID=' + data[0][setting.primaryKey]
-      } else if (item.Ot !== 'notRequired' && !setting.primaryKey) {
-        let ids = data.map(_data => _data[setting.primaryKey]).join(',')
-        url = url + '?ID=' + ids
-      }
-      window.open(url)
-    } else if (item.OpenType === 'tab' || item.OpenType === 'blank') {
-      this.props.triggerPopview(item, data)
-    } else if (item.OpenType === 'funcbutton') {
-      if (item.funcType === 'changeuser') {
-        this.changeUser(item, data)
-      } else if (item.funcType === 'print') {
-        if (item.execMode === 'pop') {
-          this.setState({
-            execAction: item,
-            tabledata: data,
-            btnloading: true
-          }, () => {
-            this.improveAction(item)
-          })
-        } else if (item.execMode === 'prompt') {
-          this.setState({
-            running: true
-          })
-          confirm({
-            title: this.props.dict['main.action.confirm.tip'],
-            onOk() {
-              _this.triggerPrint(item, data)
-            },
-            onCancel() {
-              _this.setState({
-                running: false
-              })
-            }
-          })
-        } else {
-          this.triggerPrint(item, data)
-        }
-      }
-    } else {
-      notification.warning({
-        top: 92,
-        message: '瀹屽杽涓�傘�傘��',
-        duration: 5
-      })
-    }
-  }
-
-  /**
-   * @description 瑙﹀彂鎵撳嵃
-   */
-  triggerPrint = (btn, data, formlist = []) => {
-    let formdata = {}
-    formlist.forEach(_data => {
-      formdata[_data.key] = _data.value
-    })
-
-    if (
+    } else if (
       !btn.verify ||
       (btn.verify.printMode === 'normal' && (!btn.verify.Template || !btn.verify.linkUrl)) ||
       (btn.verify.printMode === 'custom' && (!btn.verify.printFunc || !btn.verify.linkUrl))
@@ -282,21 +165,63 @@
       return
     }
 
-    let printlist = []
-    let templates = []
-    let printCount = 1
+    if (btn.execMode === 'pop') {
+      this.updateStatus('start')
+      let modal = this.state.btnconfig
+      if (!modal && btn.modal) {
+        modal = this.handleModelConfig(btn.modal)
+      }
 
-    if (formdata.printCount && typeof(formdata.printCount) === 'number' && formdata.printCount >= 1) {
-      printCount = formdata.printCount
+      this.setState({
+        tabledata: data,
+        btnconfig: modal
+      }, () => {
+        this.improveAction()
+      })
+    } else if (btn.execMode === 'prompt') {
+      this.updateStatus('start')
+      confirm({
+        title: this.state.dict['main.action.confirm.tip'],
+        onOk() {
+          _this.triggerPrint(data)
+        },
+        onCancel() {
+          _this.updateStatus('over')
+        }
+      })
+    } else {
+      this.triggerPrint(data)
     }
 
-    this.setState({loadingUuid: btn.uuid})
+    if (window.GLOB.systemType === 'production') {
+      MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: '鏍囩鎵撳嵃'})
+    }
+  }
+
+  /**
+   * @description 瑙﹀彂鎵撳嵃
+   */
+  triggerPrint = (data, formlist = []) => {
+    const { btn } = this.props
+    let formdata = {}
+    
+    formlist.forEach(_data => {
+      formdata[_data.key] = _data.value
+    })
+
+    let printlist = []
+    let templates = []
+    let printCount = +(formdata.printCount || formdata.PrintCount || formdata.printcount || formdata.Printcount || 1)
+
+    if (isNaN(printCount) || printCount < 1) {
+      printCount = 1
+    }
 
     new Promise(resolve => {
-      if (btn.intertype === 'inner' && !btn.innerFunc) {
+      if (btn.intertype === 'system') { // 浣跨敤绯荤粺鏃讹紝鐩存帴浠庤〃鏍兼垨琛ㄥ崟涓�夊彇鏁版嵁
         let printcell = {}
 
-        printcell.printType = formdata.printType || ''
+        printcell.printType = formdata.printType || formdata.PrintType || formdata.printtype || formdata.Printtype || ''
         printcell.printCount = printCount
         printcell.templateID = btn.verify.Template || ''
 
@@ -316,20 +241,24 @@
       } else {
         this.getprintdata(btn, data, formdata, formlist).then(result => {
           if (result.next) {
-            printlist = result.list.map(cell => {
-              cell.templateID = cell.templateID || btn.verify.Template
-              cell.printType = cell.printType || formdata.printType || ''
+            result.list.forEach(cell => {
+              // 绯荤粺鎵撳嵃鏁版嵁锛屾牎楠宒ata瀛楁
+              if (btn.verify.printMode !== 'custom' && (!cell.data || cell.data.length === 0)) return
 
-              let _printCount = printCount
-              if (cell.printCount && typeof(cell.printCount) === 'number' && cell.printCount >= 1) {
-                _printCount = cell.printCount
+              cell.templateID = cell.templateID || cell.TemplateID || cell.Templateid || cell.templateid || btn.verify.Template
+              cell.printType = cell.printType || cell.PrintType || cell.printtype || cell.Printtype || formdata.printType || formdata.PrintType || formdata.printtype || formdata.Printtype || ''
+
+              let _printCount = +(cell.printCount || cell.PrintCount || cell.printcount || cell.Printcount || 0)
+
+              if (isNaN(_printCount) || _printCount < 1) {
+                _printCount = printCount
               }
               
               cell.printCount = _printCount
 
               templates.push(cell.templateID)
 
-              return cell
+              printlist.push(cell)
             })
           }
           
@@ -341,7 +270,7 @@
       if (!res) return false
 
       if (btn.verify.printMode === 'custom') {
-        this.execCustomPrint(btn, printlist, formdata)
+        this.execCustomPrint(printlist, formdata)
 
         return false
       }
@@ -374,6 +303,7 @@
 
       let errorMsg = ''
       let _temps = {}
+      let images = []
 
       result.forEach(res => {
         if (res.status && !errorMsg) {
@@ -387,6 +317,7 @@
               status: false
             }
           } else {
+            images = [...images, ..._temp.imgs]
             _temps[res.tempId] = _temp
           }
         } else if (!errorMsg) {
@@ -395,16 +326,51 @@
       })
 
       if (!errorMsg) {
-        this.execPrint(btn, printlist, _temps, formdata)
+        if (images.length > 0) {
+          let errorUrls = []
+          images.forEach(url => {
+            let img = new Image()
+            img.onerror = () => {
+              errorUrls.push(url)
+            }
+            img.src = url
+          })
+
+          setTimeout(() => {
+            if (errorUrls.length > 0) {
+              notification.warning({
+                top: 92,
+                message: '妯℃澘涓浘鐗� ' + errorUrls.join('锛�') + ' 宸插け鏁堬紒',
+                duration: 5
+              })
+              Object.keys(_temps).forEach(key => {
+                _temps[key].config.ReportHeader.Control = _temps[key].config.ReportHeader.Control.map(item => {
+                  if (item.Type === 'image' && errorUrls.includes(item.Value)) {
+                    item.Value = ''
+                  }
+                  return item
+                })
+              })
+            }
+
+            this.execPrint(printlist, _temps, formdata)
+          }, 500)
+        } else {
+          this.execPrint(printlist, _temps, formdata)
+        }
       } else {
-        this.execError(errorMsg, btn)
+        this.execError(errorMsg)
       }
     })
   }
 
-  execCustomPrint = (item, printlist, formdata) => {
-    this.setState({loadingUuid: ''})
-    this.execSuccess(item, {
+  /**
+   * @description 鑷畾涔夋墦鍗帮紝瑙f瀽鑷畾涔塲s
+   */
+  execCustomPrint = (printlist, formdata) => {
+    const { btn } = this.props
+
+    this.execSuccess({
       ErrCode: '-1',
       message: '',
       ErrMesg: '',
@@ -413,15 +379,195 @@
 
     try {
       // eslint-disable-next-line
-      let func = new Function('data', 'form', 'printer', 'notification', item.verify.printFunc)
-      func(printlist, formdata, item.verify, notification)
+      let func = new Function('data', 'form', 'printer', 'notification', btn.verify.printFunc)
+      func(printlist, formdata, btn.verify, notification)
+
+      // 鑷畾涔夋墦鍗扮ず渚�
+      // let defaultPrinter = printer.defaultPrinter || 'lackprinter'
+      // let printers = {}
+      // let getuuid = () => {
+      //   let uuid = []
+      //   let _options = '0123456789abcdefghigklmnopqrstuv'
+      //   for (let i = 0; i < 32; i++) {
+      //     uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
+      //   }
+      //   uuid = uuid.join('')
+      //   return uuid
+      // }
+      // if (printer.printerTypeList && printer.printerTypeList.length > 0) {
+      //   printer.printerTypeList.forEach(cell => {
+      //     if (cell.printer) {
+      //       printers[cell.Value] = cell.printer
+      //     }
+      //   })
+      // }
+
+      // let jdList = []
+      // let otherList = []
+      // data.forEach(item => {
+      //   if (item.CustomData) {
+      //     item.CustomData = JSON.parse(item.CustomData.replace(/\n/g,"\\n").replace(/\r/g,"\\r"))
+      //   }
+      //   if (item.PrintData) {
+      //     item.PrintData = JSON.parse(item.PrintData.replace(/\n/g,"\\n").replace(/\r/g,"\\r"))
+      //     item.PrintData.data = {...form, ...item.PrintData.data}
+      //   }
+        
+      //   if (!item.PrintData) {
+      //     return
+      //   }
+
+      //   if (item.PrintData.ectype === 'jdpop') {
+      //     jdList.push(item)
+      //   } else {
+      //     otherList.push(item)
+      //   }
+      // })
+
+      // if (jdList.length === 0 && otherList.length === 0) {
+      //   notification.warning({
+      //     top: 92,
+      //     message: '鏃犳墦鍗版暟鎹紒',
+      //     duration: 5
+      //   })
+      //   return
+      // }
+
+      // let execPrint = (list, linkUrl) => {
+      //   let printdata = {}
+
+      //   list.forEach(res => {
+      //     let _printer = defaultPrinter
+
+      //     if (res.printType && printers[res.printType]) {
+      //       _printer = printers[res.printType]
+      //     }
+
+      //     printdata[_printer] = printdata[_printer] || []
+
+      //     printdata[_printer].push(res)
+      //   })
+
+      //   let printerList = []
+
+      //   Object.keys(printdata).forEach(printer => {
+      //     let _documents = []
+      //     printdata[printer].forEach(item => {
+      //       let _cell = {
+      //         documentID: getuuid(),
+      //         contents: []
+      //       }
+
+      //       if (item.PrintData) {
+      //         _cell.contents.push(item.PrintData)
+      //       }
+      //       if (item.CustomData) {
+      //         _cell.contents.push(item.CustomData)
+      //       }
+
+      //       for (let i = 0; i < item.printCount; i++) {
+      //         _documents.push(_cell)
+      //       }
+      //     })
+      //     printerList.push({
+      //       cmd: 'print',
+      //       requestID: '',
+      //       version: '',
+      //       task: {
+      //         taskID: getuuid(),
+      //         preview: false,
+      //         printer: printer,
+      //         documents: _documents
+      //       }
+      //     })
+      //   })
+
+      //   let lackItems = printerList.filter(cell => cell.task.printer === 'lackprinter')[0]
+
+      //   let socket = new WebSocket('ws://' + linkUrl)
+
+      //   // 鎵撳紑Socket
+      //   socket.onopen = () =>{
+      //     if (lackItems) {
+      //       let request  = {
+      //         requestID: '',
+      //         version: '',
+      //         cmd: 'getPrinters'
+      //       }
+      //       socket.send(JSON.stringify(request))
+      //     } else {
+      //       printerList.forEach(cell => {
+      //         socket.send(JSON.stringify(cell).replace(/\\r/g,"\r").replace(/\\n/g,"\n"))
+      //       })
+
+      //       notification.success({
+      //         top: 92,
+      //         message: '鎵撳嵃璇锋眰宸插彂鍑恒��',
+      //         duration: 2
+      //       })
+      //     }
+      //   }
+      //   // 鐩戝惉娑堟伅
+      //   socket.onmessage = (event) => {
+      //     let data = ''
+
+      //     if (event.data) {
+      //       try {
+      //         data = JSON.parse(event.data)
+      //       } catch (e) {
+      //         notification.warning({
+      //           top: 92,
+      //           message: event.data,
+      //           duration: 10
+      //         })
+      //         data = ''
+      //       }
+      //     }
+
+      //     if (data && data.cmd === 'getPrinters' && data.status) {
+      //       printerList.forEach(cell => {
+      //         if (cell.task.printer === 'lackprinter') {
+      //           cell.task.printer = data.defaultPrinter
+      //         }
+      //         socket.send(JSON.stringify(cell).replace(/\\r/g,"\r").replace(/\\n/g,"\n"))
+      //       })
+
+      //       notification.success({
+      //         top: 92,
+      //         message: '鎵撳嵃璇锋眰宸插彂鍑恒��',
+      //         duration: 2
+      //       })
+      //     } else if (data && data.message && !data.status) {
+      //       notification.warning({
+      //         top: 92,
+      //         message: data.message,
+      //         duration: 10
+      //       })
+      //     }
+      //   }
+
+      //   socket.onerror = () => {
+      //     notification.warning({
+      //       top: 92,
+      //       message: '鏃犳硶杩炴帴鍒�:' + linkUrl,
+      //       duration: 10
+      //     })
+      //   }
+      // }
+
+      // if (jdList.length > 0) {
+      //   execPrint(jdList, '127.0.0.1:13529')
+      // }
+      // if (otherList.length > 0) {
+      //   execPrint(otherList, '127.0.0.1:13528')
+      // }
     } catch (e) {
       console.warn(e)
 
       try {
         // eslint-disable-next-line
-        let evalfunc = eval('(true && function (data, form, printer, notification) {' + item.verify.printFunc + '})')
-        evalfunc(printlist, formdata, item.verify, notification)
+        let evalfunc = eval('(true && function (data, form, printer, notification) {' + btn.verify.printFunc + '})')
+        evalfunc(printlist, formdata, btn.verify, notification)
       } catch (error) {
         console.warn(error)
         notification.warning({
@@ -452,17 +598,21 @@
         let _param = { ...param, ...formdata }
         params.push(_param)
       } else if (btn.Ot === 'requiredSgl') {
-        param[setting.primaryKey] = data[0][setting.primaryKey]
+        if (setting.primaryKey) {
+          param[setting.primaryKey] = data[0][setting.primaryKey]
+        }
 
         let _param = { ...param, ...formdata }
 
         params.push(_param)
       } else if (btn.Ot === 'requiredOnce') {
-        let ids = data.map(d => { return d[setting.primaryKey]})
-        ids = ids.filter(Boolean)
-        ids = ids.join(',')
-
-        param[setting.primaryKey] = ids
+        if (setting.primaryKey) {
+          let ids = data.map(d => { return d[setting.primaryKey]})
+          ids = ids.filter(Boolean)
+          ids = ids.join(',')
+  
+          param[setting.primaryKey] = ids
+        }
 
         let _param = { ...param, ...formdata }
 
@@ -470,7 +620,10 @@
       } else if (btn.Ot === 'required') {
         params = data.map((cell, index) => {
           let _param = { ...param }
-          _param[setting.primaryKey] = cell[setting.primaryKey]
+          
+          if (setting.primaryKey) {
+            _param[setting.primaryKey] = cell[setting.primaryKey]
+          }
 
           formlist.forEach(_data => {
             if (index !== 0 && _data.readin && cell.hasOwnProperty(_data.key)) {
@@ -508,7 +661,7 @@
             if (!errorMsg) {
               resolve({next: true, list: result})
             } else {
-              this.execError(errorMsg, btn)
+              this.execError(errorMsg)
               resolve({next: false, list: []})
             }
           })
@@ -548,7 +701,7 @@
             
             resolve(res)
           } else {
-            this.execError(res, btn)
+            this.execError(res)
             resolve(false)
             _resolve({next: false, list: []})
           }
@@ -565,13 +718,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
+          }
         }
       }
 
@@ -604,7 +765,7 @@
           this.printOuterLoopRequest(params, btn, _list, _resolve)
         }
       } else {
-        this.execError(response, btn)
+        this.execError(response)
         _resolve({next: false, list: []})
       }
     }).then(response => {
@@ -620,7 +781,7 @@
           this.printOuterLoopRequest(params, btn, _list, _resolve)
         }
       } else {
-        this.execError(response, btn)
+        this.execError(response)
         _resolve({next: false, list: []})
       }
     })
@@ -642,7 +803,7 @@
           this.printInnerLoopRequest(params, btn, _list, _resolve)
         }
       } else {
-        this.execError(res, btn)
+        this.execError(res)
         _resolve({next: false, list: []})
       }
     })
@@ -654,6 +815,7 @@
     let _configparam = ''  // 鎵撳嵃閰嶇疆淇℃伅
     let fields = []        // 妯℃澘涓墍闇�瀛楁
     let nonEFields = []    // 闈炵┖瀛楁
+    let imgs = []
 
     if (!res.ConfigParam) {
       error = '鏈幏鍙栧埌鎵撳嵃妯℃澘淇℃伅锛�'
@@ -663,11 +825,10 @@
       } catch (e) {
         configParam = ''
       }
-  
+
       if (!configParam) {
         error = '鎵撳嵃妯℃澘瑙f瀽閿欒锛�'
       } else {
-        
         let control = configParam.elements.map(element => {
           let _field = element.field
 
@@ -702,10 +863,24 @@
             item.FontStyle = (!element.fontWeight || element.fontWeight === 'normal') ? 'regular' : element.fontWeight
             item.Padding = 0
             item.Trimming = ''
+            if (!item.Width) {
+              item.Width = item.BorderSize
+              item.Left = item.Left - item.Width
+            } else if (!item.Height) {
+              item.Height = item.BorderSize
+              item.Top = item.Top - item.Height
+            }
+            item.BorderSize = 0
           } else if (item.Type === 'image') {
             item.ImageWidth = element.imgWidth
             item.ImageHeight = element.imgHeight
             item.Trimming = ''
+            if (element.productValue && window.GLOB.systemType === 'production') {
+              item.Value = element.productValue
+              imgs.push(item.Value)
+            } else if (item.Value) {
+              imgs.push(item.Value)
+            }
           } else if (item.Type === 'text') {
             item.FontFamily = element.fontFamily
             item.FontSize = element.fontSize
@@ -720,7 +895,7 @@
             item.LabelSize = element.fontSize
           } else if (item.Type === 'qrcode') {
             item.Type = 'barcode'
-            item.BarcodeType = element.barcodeType
+            item.BarcodeType = element.qrcodeType
             item.BarcodeWidth = element.qrcodeWidth
             item.BarcodeHeight = element.qrcodeWidth
             item.BarcodeLabel = false
@@ -736,7 +911,7 @@
 
           return item
         })
-  
+
         _configparam = {
           Version: '',
           Title: configParam.name,
@@ -766,17 +941,19 @@
       error: error,
       config: _configparam,
       fields: fields,
-      nonEFields: nonEFields
+      nonEFields: nonEFields,
+      imgs: imgs
     }
   }
 
-  execPrint = (item, list, template, formdata) => {
+  execPrint = (list, template, formdata) => {
+    const { btn } = this.props
     let _errors = []
     
-    let defaultPrinter = item.verify.defaultPrinter || 'lackprinter'
+    let defaultPrinter = btn.verify.defaultPrinter || 'lackprinter'
     let printers = {}
-    if (item.verify.printerTypeList && item.verify.printerTypeList.length > 0) {
-      item.verify.printerTypeList.forEach(cell => {
+    if (btn.verify.printerTypeList && btn.verify.printerTypeList.length > 0) {
+      btn.verify.printerTypeList.forEach(cell => {
         if (cell.printer) {
           printers[cell.Value] = cell.printer
         }
@@ -800,83 +977,85 @@
     let printerList = []
 
     Object.keys(printdata).forEach(printer => {
-      let _documents = []
       Object.keys(template).forEach(key => {
         let _datalist = printdata[printer].filter(cell => cell.templateID === key)
-  
-        if (_datalist.length > 0) {
-          let _data = []
-          _datalist.forEach(res => {
-            res.data.forEach(_cell => {
-              for (let i = 0; i < res.printCount; i++) {
-                _data.push({...formdata, ..._cell})
-              }
-            })
-          })
 
-          let _fields = Array.from(new Set(template[key].fields))
-          let _nonEFields = Array.from(new Set(template[key].nonEFields))
-          let lacks = []
-          let emptys = []
-  
-          _data.forEach(d => {
-            _fields.forEach(f => {
-              if (!d.hasOwnProperty(f)) {
-                lacks.push(f)
-              } else if (_nonEFields.includes(f) && !d[f] && d[f] !== 0) {
-                emptys.push(f)
-              }
-            })
+        if (_datalist.length === 0) return
+
+        let _data = []
+        _datalist.forEach(res => {
+          res.data.forEach(_cell => {
+            for (let i = 0; i < res.printCount; i++) {
+              _data.push({...formdata, ..._cell})
+            }
           })
-  
+        })
+
+        let _fields = Array.from(new Set(template[key].fields))
+        let _nonEFields = Array.from(new Set(template[key].nonEFields))
+        let lacks = []
+        let emptys = []
+
+        _data.forEach(d => {
+          _fields.forEach(f => {
+            if (!d.hasOwnProperty(f)) {
+              lacks.push(f)
+            } else if (_nonEFields.includes(f) && !d[f] && d[f] !== 0) {
+              emptys.push(f)
+            }
+          })
+        })
+
+        if (lacks.length > 0 || emptys.length > 0) {
+          lacks = Array.from(new Set(lacks))
+          emptys = Array.from(new Set(emptys))
+
+          _errors.push({
+            title: template[key].config.Title,
+            lacks: lacks,
+            emptys: emptys
+          })
+        }
+
+        let results = []
+        let num = 100
+        for(let i = 0, len = _data.length; i < len; i += num){
+          results.push(_data.slice(i, i + num))
+        }
+
+        results.forEach(result => {
           let _cell = {
             documentID: Utils.getuuid(),
             contents: [
               {
-                data: _data,
+                data: result,
                 templateURL: JSON.stringify(template[key].config)
               }
             ]
           }
   
-          if (lacks.length > 0 || emptys.length > 0) {
-            lacks = Array.from(new Set(lacks))
-            emptys = Array.from(new Set(emptys))
-  
-            _errors.push({
-              title: template[key].config.Title,
-              lacks: lacks,
-              emptys: emptys
-            })
-          }
-  
-          _documents.push(_cell)
-        }
-      })
-
-      if (_documents.length > 0) {
-        printerList.push({
-          cmd: 'print',
-          requestID: Utils.getuuid(),
-          version: Utils.getuuid(),
-          task: {
-            taskID: Utils.getuuid(),
-            preview: false,
-            printer: printer,
-            documents: _documents
-          }
+          printerList.push({
+            cmd: 'print',
+            requestID: Utils.getuuid(),
+            version: Utils.getuuid(),
+            task: {
+              taskID: Utils.getuuid(),
+              preview: false,
+              printer: printer === 'lackprinter' ? '' : printer,
+              documents: [_cell]
+            }
+          })
         })
-      }
+      })
     })
 
     if (list.length === 0) {
-      this.setState({loadingUuid: ''})
       this.execError({
         ErrCode: 'N',
         message: '鏈幏鍙栧埌鎵撳嵃淇℃伅锛�',
         ErrMesg: '',
         status: false
-      }, item)
+      })
       return
     } else if (_errors.length > 0) {
       let lackerror = []
@@ -900,64 +1079,58 @@
         msg.push(emptyerror.join(' ; '))
       }
 
-      this.setState({loadingUuid: ''})
       this.execError({
         ErrCode: 'N',
         message: msg.join(' ; ') + ' !',
         ErrMesg: '',
         status: false
-      }, item)
+      })
       return
     }
 
-    let lackItems = printerList.filter(cell => cell.task.printer === 'lackprinter')[0]
+    // let lackItems = printerList.filter(cell => cell.task.printer === 'lackprinter')[0]
 
-    if (!socket || socket.readyState !== 1 || socket.url !== 'ws://' + item.verify.linkUrl) {
-      socket = new WebSocket('ws://' + item.verify.linkUrl)
+    if (!socket || socket.readyState !== 1 || socket.url !== 'ws://' + btn.verify.linkUrl) {
+      socket = new WebSocket('ws://' + btn.verify.linkUrl)
     } else {
-      if (lackItems) {
-        let request  = {
-          requestID: '',
-          version: '',
-          cmd: 'getPrinters'
-        }
-        socket.send(JSON.stringify(request))
-      } else {
-        printerList.forEach(cell => {
-          socket.send(JSON.stringify(cell))
-        })
+      // if (lackItems) {
+      //   let request  = {
+      //     requestID: '',
+      //     version: '',
+      //     cmd: 'getPrinters'
+      //   }
+      //   socket.send(JSON.stringify(request))
+      // } else {
+        this.syncMessageSend(printerList)
 
-        this.setState({loadingUuid: ''})
-        this.execSuccess(item, {
+        this.execSuccess({
           ErrCode: 'S',
           message: '',
           ErrMesg: '鎵撳嵃璇锋眰宸插彂鍑恒��',
           status: true
         })
-      }
+      // }
     }
+
     // 鎵撳紑Socket
     socket.onopen = () =>{
-      if (lackItems) {
-        let request  = {
-          requestID: '',
-          version: '',
-          cmd: 'getPrinters'
-        }
-        socket.send(JSON.stringify(request))
-      } else {
-        printerList.forEach(cell => {
-          socket.send(JSON.stringify(cell))
-        })
+      // if (lackItems) {
+      //   let request  = {
+      //     requestID: '',
+      //     version: '',
+      //     cmd: 'getPrinters'
+      //   }
+      //   socket.send(JSON.stringify(request))
+      // } else {
+        this.syncMessageSend(printerList)
 
-        this.setState({loadingUuid: ''})
-        this.execSuccess(item, {
+        this.execSuccess({
           ErrCode: 'S',
           message: '',
           ErrMesg: '鎵撳嵃璇锋眰宸插彂鍑恒��',
           status: true
         })
-      }
+      // }
     }
     // 鐩戝惉娑堟伅
     socket.onmessage = (event) => {
@@ -966,596 +1139,66 @@
       if (event.data) {
         try {
           data = JSON.parse(event.data)
-        } catch {
-          this.setState({loadingUuid: ''})
+        } catch (e) {
           this.execError({
             ErrCode: 'N',
             message: event.data,
             ErrMesg: '',
             status: false
-          }, item)
+          })
 
           data = ''
         }
       }
 
-      if (data && data.cmd === 'getPrinters' && data.status) {
-        printerList.forEach(cell => {
-          if (cell.task.printer === 'lackprinter') {
-            cell.task.printer = data.defaultPrinter
-          }
-          socket.send(JSON.stringify(cell))
-        })
+      // if (data && data.cmd === 'getPrinters' && data.status) {
+      //   printerList = printerList.map(cell => {
+      //     if (cell.task.printer === 'lackprinter') {
+      //       cell.task.printer = data.defaultPrinter
+      //     }
+      //     return cell
+      //   })
 
-        this.setState({loadingUuid: ''})
-        this.execSuccess(item, {
-          ErrCode: 'S',
-          message: '',
-          ErrMesg: '鎵撳嵃璇锋眰宸插彂鍑恒��',
-          status: true
-        })
-      } else if (data && data.message && !data.status) {
-        this.setState({loadingUuid: ''})
+      //   this.syncMessageSend(printerList)
+
+      //   this.execSuccess({
+      //     ErrCode: 'S',
+      //     message: '',
+      //     ErrMesg: '鎵撳嵃璇锋眰宸插彂鍑恒��',
+      //     status: true
+      //   })
+      // } else if (data && data.message && !data.status) {
+      if (data && data.message && !data.status) {
         this.execError({
           ErrCode: 'N',
           message: data.message,
           ErrMesg: '',
           status: false
-        }, item)
+        })
       }
     }
 
     socket.onerror = () => {
-      this.setState({loadingUuid: ''})
       this.execError({
         ErrCode: 'N',
-        message: '鏃犳硶杩炴帴鍒�:' + item.verify.linkUrl,
+        message: '鏃犳硶杩炴帴鍒�:' + btn.verify.linkUrl,
         ErrMesg: '',
         status: false
-      }, item)
-    }
-  }
-
-  /**
-   * @description 鍒囨崲鐢ㄦ埛
-   */
-  changeUser = (btn, data) => {
-    const { setting } = this.props
-    let _this = this
-
-    let param = {
-      func: 'webapi_ChangeUser'
-    }
-
-    if (this.props.BID) {
-      param.BID = this.props.BID
-    }
-
-    if (window.GLOB.mainSystemApi) {
-      param.rduri = window.GLOB.mainSystemApi
-    }
-
-    param[setting.primaryKey] = data[0][setting.primaryKey]
-
-    this.setState({
-      running: true
-    })
-    confirm({
-      title: this.props.dict['main.action.confirm.tip'],
-      onOk() {
-        return new Promise(resolve => {
-          Api.genericInterface(param).then(res => {
-            resolve()
-            if (res.status) {
-              sessionStorage.setItem('avatar', res.icon || '')
-              sessionStorage.setItem('UserID', res.UserID)
-              sessionStorage.setItem('SessionUid', Utils.getuuid())
-              sessionStorage.setItem('LoginUID', res.LoginUID)
-              sessionStorage.setItem('User_Name', res.UserName)
-              sessionStorage.setItem('Full_Name', res.FullName)
-              
-              window.location.reload()
-            } else {
-              notification.error({
-                top: 92,
-                message: res.message || res.ErrMesg,
-                duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 10
-              })
-            }
-          })
-        })
-      },
-      onCancel() {
-        _this.setState({
-          running: false
-        })
-      }
-    })
-  }
-
-  /**
-   * @description 鎸夐挳鎻愪氦鎵ц
-   */
-  execSubmit = (btn, data, _resolve, formdata) => {
-    const { setting, logcolumns } = this.props
-
-    if (btn.OpenType === 'funcbutton' && btn.funcType === 'print' && btn.execMode === 'pop') {
-      this.setState({
-        confirmLoading: false,
-        visible: false
-      })
-      this.triggerPrint(btn, data, formdata)
-      return
-    }
-    if (btn.intertype === 'inner') {
-      // 浣跨敤鍐呴儴鎺ュ彛鏃讹紝鍐呴儴鍑芥暟鍜屾暟鎹簮涓嶅彲鍚屾椂涓虹┖, 浣跨敤绯荤粺鍑芥暟鏃讹紝绫诲瀷涓嶅彲涓虹┖
-      if (!btn.innerFunc && (!btn.sql || (btn.sql && !btn.sqlType))) {
-        this.actionSettingError()
-        _resolve()
-        return
-      }
-
-      // 鎵ц鏂瑰紡涓哄琛屾嫾鎺ワ紝涓旀墦寮�鏂瑰紡涓鸿〃鍗曟椂锛屼細杞负寰幆鍙戦�佽姹�
-      // 鎵撳紑鏂瑰紡涓烘ā鎬佹锛屼娇鐢ㄥ唴閮ㄥ嚱鏁版坊鍔�(鏈夋壒閲忔坊鍔犲満鏅紝宸插幓闄�)
-      if (
-        btn.Ot === 'notRequired' ||
-        btn.Ot === 'requiredSgl' ||
-        btn.Ot === 'requiredOnce'
-      ) {
-
-        // 鍒涘缓鍑瘉鏃讹紝闇�瑕侀�夋嫨琛屾椂
-        if (data.length === 0 && !btn.innerFunc && btn.verify && btn.verify.voucher && btn.verify.voucher.enabled) {
-          notification.warning({
-            top: 92,
-            message: '浣跨敤鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒',
-            duration: 5
-          })
-          return
-        }
-
-        let param = { // 绯荤粺瀛樺偍杩囩▼
-          func: 'sPC_TableData_InUpDe'
-        }
-
-        if (this.props.BID) {
-          param.BID = this.props.BID
-        }
-        
-        let primaryId = ''
-
-        if (btn.Ot === 'requiredSgl' || btn.Ot === 'requiredOnce') {
-          let ids = data.map(d => { return d[setting.primaryKey] || ''})
-          ids = ids.filter(Boolean)
-          primaryId = ids.join(',')
-        }
-
-        if (btn.OpenType === 'prompt' || btn.OpenType === 'exec') { // 鏄惁寮规鎴栫洿鎺ユ墽琛�
-          if (btn.innerFunc) { // 浣跨敤鑷畾涔夊嚱鏁�
-            param.func = btn.innerFunc
-            if (setting.primaryKey) { // 涓婚敭瀛樺湪鏃讹紝璁剧疆涓婚敭鍙傛暟
-              param[setting.primaryKey] = primaryId
-            }
-          } else if (btn.sql) {
-            param.ID = primaryId
-            param.LText = Utils.getSysDefaultSql(btn, setting, '', param, data[0], logcolumns, this.props.Tab) // 鏁版嵁婧�
-
-            if (this.props.dataManager) { // 鏁版嵁鏉冮檺
-              param.LText = param.LText.replace(/\$@/ig, '/*')
-              param.LText = param.LText.replace(/@\$/ig, '*/')
-            } else {
-              param.LText = param.LText.replace(/@\$|\$@/ig, '')
-            }
-
-            param.LText = Utils.formatOptions(param.LText)
-            param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
-            param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-          }
-        } else if (btn.OpenType === 'pop') { // 琛ㄥ崟
-          if (btn.innerFunc) {
-            param.func = btn.innerFunc
-
-            if (setting.primaryKey) { // 涓婚敭瀛樺湪鏃讹紝璁剧疆涓婚敭鍙傛暟
-              param[setting.primaryKey] = primaryId
-            }
-
-            formdata.forEach(_data => {
-              param[_data.key] = _data.value
-            })
-
-          } else if (btn.sql && btn.sqlType === 'insert') { // 绯荤粺鍑芥暟娣诲姞鏃讹紝鐢熸垚uuid
-            primaryId = ''
-
-            if (formdata && setting.primaryKey) { // 琛ㄥ崟涓瓨鍦ㄤ富閿瓧娈碉紝涓婚敭鍊间互琛ㄥ崟涓殑鍊间负鍑�
-              let _form = formdata.filter(_form => _form.key === setting.primaryKey)[0]
-              if (_form) {
-                primaryId = _form.value
-              }
-            }
-
-            param.ID = primaryId || Utils.getguid()
-            param.LText = Utils.getSysDefaultSql(btn, setting, formdata, param, data[0], logcolumns, this.props.Tab) // 鏁版嵁婧�
-            
-            if (this.props.dataManager) { // 鏁版嵁鏉冮檺
-              param.LText = param.LText.replace(/\$@/ig, '/*')
-              param.LText = param.LText.replace(/@\$/ig, '*/')
-            } else {
-              param.LText = param.LText.replace(/@\$|\$@/ig, '')
-            }
-
-            param.LText = Utils.formatOptions(param.LText)
-            param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
-            param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-          } else if (btn.sql) {
-            param.ID = primaryId
-            param.LText = Utils.getSysDefaultSql(btn, setting, formdata, param, data[0], logcolumns, this.props.Tab) // 鏁版嵁婧�
-            
-            if (this.props.dataManager) { // 鏁版嵁鏉冮檺
-              param.LText = param.LText.replace(/\$@/ig, '/*')
-              param.LText = param.LText.replace(/@\$/ig, '*/')
-            } else {
-              param.LText = param.LText.replace(/@\$|\$@/ig, '')
-            }
-            
-            param.LText = Utils.formatOptions(param.LText)
-            param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
-            param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-          }
-        }
-
-        Api.genericInterface(param).then((res) => {
-          if (res.status) {
-            this.execSuccess(btn, res)
-          } else {
-            this.execError(res, btn)
-          }
-          _resolve()
-        })
-      } else if (btn.Ot === 'required') {
-        let _formPrimaryId = ''
-        if (formdata && setting.primaryKey) { // 琛ㄥ崟涓瓨鍦ㄤ富閿瓧娈碉紝涓婚敭鍊间互琛ㄥ崟涓殑鍊间负鍑�
-          let _form = formdata.filter(_form => _form.key === setting.primaryKey)[0]
-          if (_form) {
-            _formPrimaryId = _form.value
-          }
-        }
-
-        let _params = data.map((cell, index) => {
-          let param = {
-            func: 'sPC_TableData_InUpDe'
-          }
-
-          if (this.props.BID) {
-            param.BID = this.props.BID
-          }
-
-          let primaryId = setting.primaryKey ? cell[setting.primaryKey] || '' : ''
-
-          if (btn.OpenType === 'prompt' || btn.OpenType === 'exec') { // 鏄惁寮规鎴栫洿鎺ユ墽琛�
-
-            if (btn.innerFunc) {
-              param.func = btn.innerFunc
-              if (setting.primaryKey) {
-                param[setting.primaryKey] = primaryId
-              }
-            } else if (btn.sql) {
-              param.ID = primaryId
-              param.LText = Utils.getSysDefaultSql(btn, setting, '', param, cell, logcolumns, this.props.Tab) // 鏁版嵁婧�
-              
-              if (this.props.dataManager) { // 鏁版嵁鏉冮檺
-                param.LText = param.LText.replace(/\$@/ig, '/*')
-                param.LText = param.LText.replace(/@\$/ig, '*/')
-              } else {
-                param.LText = param.LText.replace(/@\$|\$@/ig, '')
-              }
-
-              param.LText = Utils.formatOptions(param.LText)
-              param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
-              param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-            }
-          } else if (btn.OpenType === 'pop') { // 琛ㄥ崟
-            if (index !== 0) {
-              formdata = formdata.map(_data => {
-                if (_data.readin && cell.hasOwnProperty(_data.key)) {
-                  _data.value = cell[_data.key]
-                }
-                return _data
-              })
-            }
-
-            if (btn.innerFunc) {
-              param.func = btn.innerFunc
-
-              formdata.forEach(_data => {
-                param[_data.key] = _data.value
-              })
-
-              if (setting.primaryKey) {
-                param[setting.primaryKey] = primaryId
-              }
-            } else if (btn.sql && btn.sqlType === 'insert') { // 绯荤粺鍑芥暟娣诲姞鏃讹紝鐢熸垚uuid
-              param.ID = _formPrimaryId || Utils.getguid()
-              param.LText = Utils.getSysDefaultSql(btn, setting, formdata, param, cell, logcolumns, this.props.Tab) // 鏁版嵁婧�
-              
-              if (this.props.dataManager) { // 鏁版嵁鏉冮檺
-                param.LText = param.LText.replace(/\$@/ig, '/*')
-                param.LText = param.LText.replace(/@\$/ig, '*/')
-              } else {
-                param.LText = param.LText.replace(/@\$|\$@/ig, '')
-              }
-
-              param.LText = Utils.formatOptions(param.LText)
-              param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
-              param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-            } else if (btn.sql) {
-              param.ID = primaryId
-              param.LText = Utils.getSysDefaultSql(btn, setting, formdata, param, cell, logcolumns, this.props.Tab) // 鏁版嵁婧�
-              
-              if (this.props.dataManager) { // 鏁版嵁鏉冮檺
-                param.LText = param.LText.replace(/\$@/ig, '/*')
-                param.LText = param.LText.replace(/@\$/ig, '*/')
-              } else {
-                param.LText = param.LText.replace(/@\$|\$@/ig, '')
-              }
-
-              param.LText = Utils.formatOptions(param.LText)
-              param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
-              param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-            }
-          }
-
-          return param
-        })
-
-        if (_params.length <= 20) {
-          let deffers = _params.map(param => {
-            return new Promise(resolve => {
-              Api.genericInterface(param).then(res => {
-                resolve(res)
-              })
-            })
-          })
-          Promise.all(deffers).then(result => {
-            let iserror = false
-            let errorMsg = ''
-            result.forEach(res => {
-              if (res.status) {
-                errorMsg = res
-              } else {
-                iserror = true
-                errorMsg = res
-              }
-            })
-            if (!iserror) {
-              this.execSuccess(btn, errorMsg)
-            } else {
-              this.execError(errorMsg, btn)
-            }
-            _resolve()
-          })
-        } else { // 瓒呭嚭20涓姹傛椂寰幆鎵ц
-          this.innerLoopRequest(_params, btn, _resolve)
-        }
-      } else {
-        this.actionSettingError()
-        _resolve()
-        return
-      }
-    } else if (btn.intertype === 'outer') {
-      /** *********************璋冪敤澶栭儴鎺ュ彛************************* */
-      if (!btn.interface) { // 鎺ュ彛鍦板潃涓嶅瓨鍦ㄦ椂鎶ラ敊
-        this.actionSettingError()
-        _resolve()
-        return
-      }
-
-      let _params = [] // 璇锋眰鍙傛暟鏁扮粍
-
-      if (btn.Ot === 'notRequired' || btn.Ot === 'requiredSgl' || btn.Ot === 'requiredOnce') {
-        let param = {}
-
-        if (this.props.BID) {
-          param.BID = this.props.BID
-        }
-
-        if (btn.OpenType === 'pop' && formdata) { // 琛ㄥ崟
-          formdata.forEach(_data => {
-            param[_data.key] = _data.value
-          })
-        }
-
-        // 鑾峰彇id
-        if (btn.Ot === 'notRequired') {
-          
-        } else if (btn.Ot === 'requiredSgl' && setting.primaryKey) {
-          param[setting.primaryKey] = data[0][setting.primaryKey]
-        } else if (btn.Ot === 'requiredOnce' && setting.primaryKey) {
-          let ids = data.map(d => { return d[setting.primaryKey]})
-          param[setting.primaryKey] = ids.join(',')
-        }
-
-        _params.push(param)
-      } else if (btn.Ot === 'required') {
-        // 閫夋嫨澶氳锛屽惊鐜皟鐢�
-        _params = data.map((cell, index) => {
-          let _cell = {}
-
-          if (this.props.BID) {
-            _cell.BID = this.props.BID
-          }
-
-          let _formparam = {}
-          if (btn.OpenType === 'pop' && formdata) { // 琛ㄥ崟
-            formdata.forEach(_data => {
-              if (index !== 0 && _data.readin && cell.hasOwnProperty(_data.key)) {
-                _formparam[_data.key] = cell[_data.key]
-              } else {
-                _formparam[_data.key] = _data.value
-              }
-            })
-          }
-
-          if (setting.primaryKey) {
-            _cell[setting.primaryKey] = cell[setting.primaryKey]
-          }
-
-          _cell = {..._formparam, ..._cell}
-
-          return _cell
-        })
-      } else {
-        this.actionSettingError()
-        _resolve()
-        return
-      }
-
-      // 寰幆璋冪敤澶栭儴鎺ュ彛锛堝寘鎷唴閮ㄥ強鍥炶皟鍑芥暟锛�
-      this.outerLoopRequest(_params, btn, _resolve, _params.length > 20)
-      
-    } else {
-      this.actionSettingError()
-      _resolve()
-      return
-    }
-  }
-
-  /**
-   * @description 鍐呴儴璇锋眰寰幆鎵ц
-   */
-  innerLoopRequest = (params, btn, _resolve) => {
-    if (!params && params.length === 0) return
-
-    let param = params.shift()
-
-    this.setState({
-      loadingNumber: params.length || ''
-    })
-
-    Api.genericInterface(param).then(res => {
-      if (res.status) {
-        if (params.length === 0) {
-          this.execSuccess(btn, res)
-          _resolve()
-        } else {
-          this.innerLoopRequest(params, btn, _resolve)
-        }
-      } else {
-        this.execError(res, btn)
-        _resolve()
-      }
-    })
-  }
-
-  /**
-   * @description 澶栭儴璇锋眰寰幆鎵ц
-   */
-  outerLoopRequest = (params, btn, _resolve, widthNumber) => {
-    if (!params && params.length === 0) return
-
-    let param = params.shift()
-    let _outParam = null
-
-    if (widthNumber) {
-      this.setState({
-        loadingNumber: params.length || ''
       })
     }
-
-    new Promise(resolve => {
-      // 鍐呴儴璇锋眰
-      if (btn.innerFunc) {
-        param.func = btn.innerFunc
-        // 瀛樺湪鍐呴儴鍑芥暟鏃讹紝鏁版嵁棰勫鐞�
-        Api.genericInterface(param).then(res => {
-          if (res.status) {
-            delete res.ErrCode
-            delete res.ErrMesg
-            delete res.message
-            delete res.status
-
-            // 浣跨敤澶勭悊鍚庣殑鏁版嵁璋冪敤澶栭儴鎺ュ彛
-            let keys = Object.keys(res) // 鎻愪氦澶栭儴鎺ュ彛鍓嶏紝娣诲姞BID
-            if (this.props.BID && keys.filter(key => key.toLowerCase() === 'bid').length === 0) {
-              res.BID = this.props.BID
-            }
-            
-            resolve(res)
-          } else {
-            this.execError(res, btn)
-            resolve(false)
-            _resolve()
-          }
-        })
-      } else {
-        resolve(param)
-      }
-    }).then(res => {
-      if (!res) return
-      // 澶栭儴璇锋眰
-      _outParam = JSON.parse(JSON.stringify(res))
-
-      if (this.props.menuType === 'HS') {
-        if (btn.sysInterface === 'true' && options.cloudServiceApi) {
-          res.rduri = options.cloudServiceApi
-        } else if (btn.sysInterface !== 'true') {
-          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 (btn.outerFunc) {
-        res.func = btn.outerFunc
-      }
-
-      return Api.genericInterface(res)
-    }).then(response => {
-      if (!response) return
-      // 鍥炶皟璇锋眰
-      if (btn.callbackFunc) {
-        // 瀛樺湪鍥炶皟鍑芥暟鏃讹紝璋冪敤
-        delete response.message
-        delete response.status
-
-        response.func = btn.callbackFunc
-
-        let _callbackparam = {..._outParam, ...response}
-        return Api.genericInterface(_callbackparam)
-      } else {
-        if (response.status) {
-          // 涓�娆¤姹傛垚鍔燂紝杩涜涓嬩竴椤硅姹�
-
-          if (params.length === 0) {
-            this.execSuccess(btn, response)
-            _resolve()
-          } else {
-            this.outerLoopRequest(params, btn, _resolve, widthNumber)
-          }
-        } else {
-          this.execError(response, btn)
-          _resolve()
-        }
-      }
-    }).then(res => {
-      if (!res) return
-
-      if (res.status) {
-        if (params.length === 0) {
-          this.execSuccess(btn, res)
-          _resolve()
-        } else {
-          this.outerLoopRequest(params, btn, _resolve, widthNumber)
-        }
-      } else {
-        this.execError(res, btn)
-        _resolve()
-      }
-    })
   }
 
+  syncMessageSend = (list) => {
+    let param = list.shift()
+
+    if (socket && param) {
+      socket.send(JSON.stringify(param))
+    }
+
+    if (list && list.length > 0) {
+      setTimeout(() => {this.syncMessageSend(list)}, 3000)
+    }
+  }
   /**
    * @description 鎿嶄綔鎴愬姛鍚庡鐞�
    * 1銆乪xcel瀵煎嚭锛屾垚鍔熷悗鍙栨秷瀵煎嚭鎸夐挳鍔犺浇涓姸鎬�
@@ -1564,34 +1207,30 @@
    * 4銆佹ā鎬佹鎵ц鎴愬姛鍚庢槸鍚﹀叧闂�
    * 5銆侀�氱煡涓诲垪琛ㄥ埛鏂�
    */
-  execSuccess = (btn, res) => {
+  execSuccess = (res) => {
+    const { btn } = this.props
+
     if (res && res.ErrCode === 'S') { // 鎵ц鎴愬姛
       notification.success({
         top: 92,
-        message: res.ErrMesg || this.props.dict['main.action.confirm.success'],
+        message: res.ErrMesg || this.state.dict['main.action.confirm.success'],
         duration: btn.verify && btn.verify.stime ? btn.verify.stime : 2
       })
     } else if (res && res.ErrCode === 'Y') { // 鎵ц鎴愬姛
       Modal.success({
-        title: res.ErrMesg || this.props.dict['main.action.confirm.success']
+        title: res.ErrMesg || this.state.dict['main.action.confirm.success']
       })
     } else if (res && res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
 
     }
     
-    if (btn.OpenType === 'pop' && btn.setting && btn.setting.finish !== 'unclose') {
-      this.setState({
-        visible: false
-      })
-    }
-
     this.setState({
-      loadingUuid: '',
-      running: false,
-      loadingNumber: ''
+      loading: false
     })
 
-    this.refreshdata(btn, 'success')
+    if (btn.execSuccess !== 'never') {
+      MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execSuccess, btn)
+    }
   }
 
   /**
@@ -1600,7 +1239,9 @@
    * 2銆乪xcel瀵煎嚭锛屽け璐ュ悗鍙栨秷瀵煎嚭鎸夐挳鍔犺浇涓姸鎬�
    * 3銆侀�氱煡涓诲垪琛ㄥ埛鏂�
    */
-  execError = (res, btn) => {
+  execError = (res) => {
+    const { btn } = this.props
+
     if (res.ErrCode === 'E') {
       Modal.error({
         title: res.message || res.ErrMesg,
@@ -1623,46 +1264,67 @@
     }
     
     this.setState({
-      loadingUuid: '',
-      running: false,
-      loadingNumber: ''
+      loading: false
     })
-    
-    this.refreshdata(btn, 'error')
+
+    if (btn.execError !== 'never') {
+      MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execError, btn)
+    }
   }
 
   /**
    * @description 鎸夐挳閰嶇疆淇℃伅閿欒鎻愮ず
    */
   actionSettingError = () => {
-    this.setState({
-      running: false
-    })
     notification.warning({
       top: 92,
-      message: this.props.dict['main.action.settingerror'],
+      message: this.state.dict['main.action.settingerror'],
       duration: 5
     })
+  }
+
+  handleModelConfig = (config) => {
+    let roleId = sessionStorage.getItem('role_id') || '' // 瑙掕壊ID
+    config.fields = config.fields.map(cell => {
+      // 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗�
+      if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(cell.type) && cell.resourceType === '1') {
+        let _option = Utils.getSelectQueryOptions(cell)
+
+        cell.data_sql = Utils.formatOptions(_option.sql)
+        cell.base_sql = window.btoa(window.encodeURIComponent(_option.sql))
+        cell.arr_field = _option.field
+      }
+
+      // 瀛楁鏉冮檺榛戝悕鍗�
+      if (!cell.blacklist || cell.blacklist.length === 0) return cell
+      if (cell.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
+        cell.hidden = 'true'
+      }
+
+      return cell
+    })
+    return config
   }
 
   /**
    * @description 鑾峰彇鎸夐挳閰嶇疆淇℃伅
    */
-  improveAction = (action) => {
-    const { configMap, execAction } = this.state
+  improveAction = () => {
+    const { btn } = this.props
+    const { btnconfig } = this.state
 
-    let _config = configMap[action.uuid]
-
-    if (_config) {
-      this.setState({
-        execAction: {..._config, ...execAction}
-      }, () => {
-        this.improveActionForm()
-      })
+    if (btnconfig) {
+      if (btnconfig.setting.display === 'prompt') { // 濡傛灉琛ㄥ崟浠ユ槸鍚︽灞曠ず
+        this.modelconfirm()
+      } else {
+        this.setState({
+          visible: true
+        })
+      }
     } else {
-      Api.getSystemCacheConfig({
+      Api.getCacheConfig({
         func: 'sPC_Get_LongParam',
-        MenuID: action.uuid
+        MenuID: btn.uuid
       }).then(res => {
         let _LongParam = ''
 
@@ -1681,827 +1343,32 @@
             message: res.message,
             duration: 5
           })
-          this.setState({
-            execAction: null,
-            tabledata: null,
-            btnloading: false
-          })
-        } else if (!_LongParam || (action.OpenType === 'pop' && _LongParam.type !== 'Modal')) {
+          this.updateStatus('over')
+        } else if (!_LongParam || (btn.execMode === 'pop' && _LongParam.type !== 'Modal')) {
           notification.warning({
             top: 92,
             message: '鏈幏鍙栧埌鎸夐挳閰嶇疆淇℃伅锛�',
             duration: 5
           })
-          this.setState({
-            execAction: null,
-            tabledata: null,
-            btnloading: false
-          })
+          this.updateStatus('over')
         } else {
-          if (_LongParam.groups.length > 0) {
-            _LongParam.groups.forEach(group => {
-              group.sublist = group.sublist.filter(cell => {
-                if (!cell.blacklist || cell.blacklist.length === 0) return true
-
-                let _black = cell.blacklist.filter(v => {
-                  return this.props.permRoles.indexOf(v) !== -1
-                })
-
-                if (_black.length > 0) {
-                  return false
-                } else {
-                  return true
-                }
-              })
-            })
-          } else {
-            _LongParam.fields = _LongParam.fields.filter(cell => {
-              if (!cell.blacklist || cell.blacklist.length === 0) return true
-
-              let _black = cell.blacklist.filter(v => {
-                return this.props.permRoles.indexOf(v) !== -1
-              })
-
-              if (_black.length > 0) {
-                return false
-              } else {
-                return true
-              }
-            })
-          }
+          _LongParam = updateForm(_LongParam)
+          _LongParam = this.handleModelConfig(_LongParam)
 
           this.setState({
-            configMap: {...configMap, [action.uuid]: _LongParam},
-            execAction: {..._LongParam, ...execAction}
+            btnconfig: _LongParam
           }, () => {
-            this.improveActionForm()
-          })
-        }
-      })
-    }
-  }
-
-  /**
-   * @description 鑾峰彇涓嬫媺琛ㄥ崟閫夐」淇℃伅
-   */
-  improveActionForm = () => {
-    const { configMap, execAction } = this.state
-    let subfields = []
-
-    if (execAction.setting.display === 'prompt') { // 濡傛灉琛ㄥ崟浠ユ槸鍚︽灞曠ず锛屼笉璇锋眰涓嬫媺鑿滃崟淇℃伅
-      this.setState({
-        btnloading: false
-      })
-      this.modelconfirm()
-      return
-    }
-
-    if (execAction.groups.length > 0) {
-      execAction.groups.forEach(group => {
-        group.sublist.forEach(field => {
-          if ((field.type === 'select' || field.type === 'link' || field.type === 'multiselect') && field.resourceType === '1' && field.dataSource) {
-            subfields.push(field)
-          }
-        })
-      })
-    } else {
-      execAction.fields.forEach(field => {
-        if ((field.type === 'select' || field.type === 'link' || field.type === 'multiselect') && field.resourceType === '1' && field.dataSource) {
-          subfields.push(field)
-        }
-      })
-    }
-
-    if (subfields.length === 0) {
-      this.setState({
-        visible: true,
-        btnloading: false
-      })
-      return
-    }
-
-    let deffers = subfields.map(item => {
-      let _option = Utils.getSelectQueryOptions(item)
-      let _sql = Utils.formatOptions(_option.sql)
-      let isSSO = item.database === 'sso'
-
-      let param = {
-        func: 'sPC_Get_SelectedList',
-        LText: _sql,
-        obj_name: 'data',
-        arr_field: _option.field
-      }
-
-      if (this.props.BID) {
-        param.BID = this.props.BID
-      }
-      if (this.props.dataManager) { // 鏁版嵁鏉冮檺
-        param.LText = param.LText.replace(/\$@/ig, '/*')
-        param.LText = param.LText.replace(/@\$/ig, '*/')
-      } else {
-        param.LText = param.LText.replace(/@\$|\$@/ig, '')
-      }
-
-      param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
-      param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-
-      return new Promise(resolve => {
-        Api.getSystemCacheConfig(param, isSSO).then(res => {
-          res.search = item
-          resolve(res)
-        })
-      })
-    })
-
-    let _field = {}
-    let error = ''
-    Promise.all(deffers).then(result => {
-      result.forEach(res => {
-        if (res.status) {
-          let options = res.data.map(cell => {
-            let item = {
-              key: Utils.getuuid(),
-              Value: cell[res.search.valueField],
-              Text: cell[res.search.valueText]
-            }
-
-            if (res.search.type === 'link') {
-              item.parentId = cell[res.search.linkField]
-            } else if (res.search.type === 'select' && res.search.linkSubField && res.search.linkSubField.length > 0) {
-              res.search.linkSubField.forEach(_field => {
-                item[_field] = (cell[_field] || cell[_field] === 0) ? cell[_field] : ''
+            if (_LongParam.setting.display === 'prompt') { // 濡傛灉琛ㄥ崟浠ユ槸鍚︽灞曠ず
+              this.modelconfirm()
+            } else {
+              this.setState({
+                visible: true
               })
             }
-
-            return item
-          })
-
-          _field[res.search.uuid] = options
-        } else {
-          error = res
-        }
-      })
-
-      if (error) {
-        notification.warning({
-          top: 92,
-          message: error.message,
-          duration: 5
-        })
-      }
-
-      this.setState({
-        configMap: {...configMap, ..._field}
-      }, () => {
-        this.setState({
-          visible: true,
-          btnloading: false
-        })
-      })
-    })
-  }
-
-  /**
-   * @description Excel 瀵煎叆
-   */
-  getexceldata = (data, btn, errors, primaryId) => {
-    if (errors) {
-      if (errors === 'notexit') {
-        notification.warning({
-          top: 92,
-          message: '宸ヤ綔琛ㄣ��' + btn.verify.sheet + '銆嬩笉瀛樺湪锛�',
-          duration: 5
-        })
-      } else if (errors === 'empty') {
-        notification.warning({
-          top: 92,
-          message: '宸ヤ綔琛ㄣ��' + btn.verify.sheet + '銆嬩负绌猴紒',
-          duration: 5
-        })
-      } else if (errors === 'headerError') {
-        notification.warning({
-          top: 92,
-          message: '宸ヤ綔琛ㄣ��' + btn.verify.sheet + '銆嬭〃澶磋缃敊璇紒',
-          duration: 5
-        })
-      }
-      
-      return
-    }
-
-    if (!data || data.length === 0) {
-      notification.warning({
-        top: 92,
-        message: '鏈幏鍙栧埌宸ヤ綔琛ㄣ��' + btn.verify.sheet + '銆嬫暟鎹紒',
-        duration: 5
-      })
-      return
-    }
-
-    let result = Utils.getExcelInSql(btn, data, this.props.dict)
-    if (result.errors) {
-      notification.warning({
-        top: 92,
-        message: result.errors,
-        duration: 5
-      })
-      return
-    }
-
-    let param = {
-      ID: primaryId
-    }
-
-    if (this.props.BID) {
-      param.BID = this.props.BID
-    }
-
-    if (this.props.dataManager) { // 鏁版嵁鏉冮檺
-      result.sql = result.sql.replace(/\$@/ig, '/*')
-      result.sql = result.sql.replace(/@\$/ig, '*/')
-    } else {
-      result.sql = result.sql.replace(/@\$|\$@/ig, '')
-    }
-
-    param.LText = Utils.formatOptions(result.sql)
-    param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
-    param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-
-    this.setState({loadingUuid: btn.uuid})
-
-    if (btn.intertype === 'inner' && !btn.innerFunc) { // 绯荤粺瀛樺偍杩囩▼
-      param.func = 'sPC_TableData_InUpDe'
-
-      Api.genericInterface(param).then((res) => {
-        if (res.status) {
-          this.execSuccess(btn, res)
-        } else {
-          this.execError(res, btn)
-        }
-      })
-    } else if (btn.intertype === 'inner' && btn.innerFunc) { // 鑷畾涔夊瓨鍌ㄨ繃绋�
-      param.func = btn.innerFunc
-
-      Api.genericInterface(param).then((res) => {
-        if (res.status) {
-          this.execSuccess(btn, res)
-        } else {
-          this.execError(res, btn)
-        }
-      })
-    } else if (btn.intertype === 'outer') { // 澶栭儴鎺ュ彛
-      let _outParam = null
-
-      new Promise(resolve => {
-        // 鍐呴儴璇锋眰
-        if (btn.innerFunc) {
-          param.func = btn.innerFunc
-          // 瀛樺湪鍐呴儴鍑芥暟鏃讹紝鏁版嵁棰勫鐞�
-          Api.genericInterface(param).then(res => {
-            if (res.status) {
-              delete res.ErrCode
-              delete res.ErrMesg
-              delete res.message
-              delete res.status
-
-              // 浣跨敤澶勭悊鍚庣殑鏁版嵁璋冪敤澶栭儴鎺ュ彛
-              let keys = Object.keys(res) // 鎻愪氦澶栭儴鎺ュ彛鍓嶏紝娣诲姞BID
-              if (this.props.BID && keys.filter(key => key.toLowerCase() === 'bid').length === 0) {
-                res.BID = this.props.BID
-              }
-              resolve(res)
-            } else {
-              this.execError(res, btn)
-              resolve(false)
-            }
-          })
-        } else {
-          resolve(param)
-        }
-      }).then(res => {
-        if (!res) return
-        // 澶栭儴璇锋眰
-        _outParam = JSON.parse(JSON.stringify(res))
-
-        if (this.props.menuType === 'HS') {
-          if (btn.sysInterface === 'true' && options.cloudServiceApi) {
-            param.rduri = options.cloudServiceApi
-          } else if (btn.sysInterface !== 'true') {
-            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 (btn.outerFunc) {
-          res.func = btn.outerFunc
-        }
-
-        return Api.genericInterface(res)
-      }).then(response => {
-        if (!response) return
-        // 鍥炶皟璇锋眰
-        if (btn.callbackFunc) {
-          // 瀛樺湪鍥炶皟鍑芥暟鏃讹紝璋冪敤
-          delete response.message
-          delete response.status
-
-          response.func = btn.callbackFunc
-
-          let _callbackparam = {..._outParam, ...response}
-          return Api.genericInterface(_callbackparam)
-        } else {
-          if (response.status) {
-            this.execSuccess(btn, response)
-          } else {
-            this.execError(response, btn)
-          }
-        }
-      }).then(res => {
-        if (!res) return
-
-        if (res.status) {
-          this.execSuccess(btn, res)
-        } else {
-          this.execError(res, btn)
-        }
-      })
-    }
-  }
-
-  /**
-   * @description Excel 瀵煎嚭
-   */
-  triggerExcelout = (btn) => {
-    let viewParam = this.props.getexceloutparam()
-    let name = `${viewParam.menuName}${moment().format('YYYYMMDDHHmmss')}.xlsx`
-    let pageSize = 1000
-
-    if (btn.search === 'true' && viewParam.search && viewParam.search.length > 0) {
-      let valid = false
-      viewParam.search.forEach(item => {
-        if (Array.isArray(item.value)) {
-          if (item.value.length > 0) {
-            valid = true
-          }
-        } else if (item.value || item.value === 0) {
-          valid = true
-        }
-      })
-
-      if (!valid) {
-        notification.warning({
-          top: 92,
-          message: '鎼滅储鏉′欢涓嶅彲涓虹┖锛�',
-          duration: 5
-        })
-        return
-      }
-    }
-    
-    this.setState({loadingUuid: btn.uuid})
-
-    if (btn.pagination !== 'true') {
-      if (btn.intertype === 'inner' && !btn.innerFunc) { // 浣跨敤绯荤粺鍑芥暟
-        if (!viewParam.arr_field) {
-          this.execError({ErrCode: 'N', message: '鏈缃樉绀哄垪锛�'}, btn)
-          return
-        }
-
-        let param = this.getExcelDefaultParam(viewParam.arr_field, viewParam.orderBy, viewParam.search)
-
-        Api.genericInterface(param).then(result => {
-          if (result.status) {
-            this.exportExcel(result.data, btn, name)
-          } else {
-            this.execError(result, btn)
-          }
-        })
-      } else if (btn.intertype === 'inner' && btn.innerFunc) { // 浣跨敤鍐呴儴鍑芥暟
-        let param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search)
-        param.func = btn.innerFunc
-
-        Api.genericInterface(param).then(result => {
-          if (result.status) {
-            this.exportExcel(result.data, btn, name)
-          } else {
-            this.execError(result, btn)
-          }
-        })
-      } else if (btn.intertype === 'outer' && !btn.innerFunc) { // 浣跨敤澶栭儴鍑芥暟
-        let param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search)
-
-        if (this.props.menuType === 'HS') {
-          if (btn.sysInterface === 'true' && options.cloudServiceApi) {
-            param.rduri = options.cloudServiceApi
-          } else if (btn.sysInterface !== 'true') {
-            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 (btn.outerFunc) {
-          param.func = btn.outerFunc
-        }
-
-        Api.genericInterface(param).then(result => {
-          if (result.status) {
-            this.exportExcel(result.data, btn, name)
-          } else {
-            this.execError(result, btn)
-          }
-        })
-      } else if (btn.intertype === 'outer' && btn.innerFunc) {
-        let param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search)
-        param.func = btn.innerFunc
-
-        Api.genericInterface(param).then(res => {
-          if (res.status) {
-            delete res.ErrCode
-            delete res.ErrMesg
-            delete res.message
-            delete res.status
-
-            if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
-              res.rduri = window.GLOB.mainSystemApi
-            } else if (btn.sysInterface !== 'true') {
-              res.rduri = btn.interface
-            }
-  
-            if (btn.outerFunc) {
-              res.func = btn.outerFunc
-            }
-      
-            Api.genericInterface(res).then(result => {
-              if (result.status) {
-                this.exportExcel(result.data, btn, name)
-              } else {
-                this.execError(result, btn)
-              }
-            })
-          } else {
-            this.execError(res, btn)
-          }
-        })
-      } else {
-        this.execError({ErrCode: 'N', message: '瀵煎嚭鎸夐挳璁剧疆閿欒锛�'}, btn)
-      }
-    } else if (btn.intertype === 'outer' && btn.innerFunc) { // 鍒嗛〉锛屼笖涓ゆ璇锋眰
-      this.getExcelOutDoubleData(btn, viewParam, 1, pageSize, [], name)
-    } else { // 鍒嗛〉锛屼竴姝ヨ姹�
-      this.getExcelOutData(btn, viewParam, 1, pageSize, [], name)
-    }
-  }
-
-  /**
-   * @description 涓ゆ鍒嗛〉璇锋眰
-   */
-  getExcelOutDoubleData = (btn, viewParam, pageIndex, pageSize, data, name) => {
-    let param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
-    param.func = btn.innerFunc
-
-    Api.genericInterface(param).then(res => {
-      if (res.status) {
-        delete res.ErrCode
-        delete res.ErrMesg
-        delete res.message
-        delete res.status
-
-        if (this.props.menuType === 'HS') {
-          if (btn.sysInterface === 'true' && options.cloudServiceApi) {
-            param.rduri = options.cloudServiceApi
-          } else if (btn.sysInterface !== 'true') {
-            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 (btn.outerFunc) {
-          res.func = btn.outerFunc
-        }
-  
-        Api.genericInterface(res).then(result => {
-          if (result.status) {
-            if (!result.data) {
-              this.execError({ErrCode: 'N', message: '鏈幏鍙栧埌鏁版嵁淇℃伅锛�'}, btn)
-            } else if (result.data.length >= pageSize) {
-              data = data.concat(result.data)
-              pageIndex++
-              this.getExcelOutDoubleData(btn, viewParam, pageIndex, pageSize, data, name)
-            } else {
-              data = data.concat(result.data)
-              this.exportExcel(data, btn, name)
-            }
-          } else {
-            this.execError(result, btn)
-          }
-        })
-      } else {
-        this.execError(res, btn)
-      }
-    })
-  }
-
-  /**
-   * @description 涓�姝ュ垎椤佃姹�
-   */
-  getExcelOutData = (btn, viewParam, pageIndex, pageSize, data, name) => {
-    let param = null
-    if (btn.intertype === 'inner' && !btn.innerFunc) { // 浣跨敤绯荤粺鍑芥暟
-      if (!viewParam.arr_field) {
-        this.execError({ErrCode: 'N', message: '鏈缃樉绀哄垪锛�'}, btn)
-        return
-      }
-
-      param = this.getExcelDefaultParam(viewParam.arr_field, viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
-
-      
-    } else if (btn.intertype === 'inner' && btn.innerFunc) { // 浣跨敤鍐呴儴鍑芥暟
-      param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
-      param.func = btn.innerFunc
-
-    } else if (btn.intertype === 'outer' && !btn.innerFunc) { // 浣跨敤澶栭儴鍑芥暟
-      param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize)
-
-      if (this.props.menuType === 'HS') {
-        if (btn.sysInterface === 'true' && options.cloudServiceApi) {
-          param.rduri = options.cloudServiceApi
-        } else if (btn.sysInterface !== 'true') {
-          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 (btn.outerFunc) {
-        param.func = btn.outerFunc
-      }
-    }
-
-    Api.genericInterface(param).then(result => {
-      if (result.status) {
-        if (!result.data) {
-          this.execError({ErrCode: 'N', message: '鏈幏鍙栧埌鏁版嵁淇℃伅锛�'}, btn)
-        } else if (result.data.length >= pageSize) {
-          data = data.concat(result.data)
-          pageIndex++
-          this.getExcelOutData(btn, viewParam, pageIndex, pageSize, data, name)
-        } else {
-          data = data.concat(result.data)
-          this.exportExcel(data, btn, name)
-        }
-      } else {
-        this.execError(result, btn)
-      }
-    })
-  }
-
-  /**
-   * @description Excel 鐢熸垚
-   */
-  exportExcel = (data, btn, name) => {
-    const { logcolumns } = this.props
-    if (data && data.length > 0) {
-      try {
-        let _header = []
-        let _topRow = {}
-        let colwidth = []
-
-        let hidecolumns = []
-
-        let verifyColumn = {} // 璁板綍楠岃瘉淇℃伅涓殑Excel鍒楅厤缃�
-        if (btn.verify && btn.verify.columns && btn.verify.columns.length > 0) {
-          btn.verify.columns.forEach(col => {
-            verifyColumn[col.Column] = col
           })
         }
-
-        logcolumns.forEach(col => {
-          if (col.Hide === 'true') {
-            hidecolumns.push(col.field)
-            return
-          }
-          if (!data[0].hasOwnProperty(col.field)) return
-          if (_topRow[col.field]) return
-
-          if (verifyColumn[col.field]) { // 浼樺厛浣跨敤楠岃瘉淇℃伅涓殑鍒楄缃�
-            _header.push(col.field)
-            _topRow[col.field] = verifyColumn[col.field].Text
-  
-            colwidth.push({width: verifyColumn[col.field].Width})
-          } else {
-            _header.push(col.field)
-            _topRow[col.field] = col.label
-  
-            let _colwidth = Math.floor(col.Width / 6)
-  
-            if (!_colwidth || _colwidth < 5) {
-              _colwidth = 5
-            }
-  
-            colwidth.push({width: _colwidth})
-          }
-        })
-
-        if (btn.verify && btn.verify.columns && btn.verify.columns.length > 0) {
-          btn.verify.columns.forEach(col => {
-            if (hidecolumns.includes(col.Column)) return
-            if (!data[0].hasOwnProperty(col.Column)) return
-            if (_topRow[col.Column]) return
-
-            _header.push(col.Column)
-            _topRow[col.Column] = col.Text
-
-            colwidth.push({width: col.Width})
-          })
-        }
-
-        Object.keys(data[0]).forEach(key => {
-          if (hidecolumns.includes(key)) return
-          if (_topRow[key]) return
-
-          _header.push(key)
-          _topRow[key] = key
-
-          colwidth.push({width: 12})
-        })
-
-        let table = []
-
-        table.push(_topRow)
-
-        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})
-
-        ws['!cols'] = colwidth
-
-        const wb = XLSX.utils.book_new()
-        XLSX.utils.book_append_sheet(wb, ws, 'Sheet1')
-
-        XLSX.writeFile(wb, name)
-
-        this.execSuccess(btn, {ErrCode: 'S', ErrMesg: '瀵煎嚭鎴愬姛锛�'})
-      } catch {
-        this.execError({ErrCode: 'N', message: 'Excel鐢熸垚澶辫触锛�'}, btn)
-      }
-      
-    } else {
-      this.execError({ErrCode: 'N', message: '鏈煡璇㈠埌瀵煎嚭鏁版嵁锛�'}, btn)
-    }
-  }
-
-  /**
-   * @description 鑾峰彇鐢ㄦ埛鑷畾涔夊瓨鍌ㄨ繃绋嬩紶鍙�
-   */
-  getExcelCustomParam = (orderBy, search, pagination = false, pageIndex = 1, pageSize = 100) => {
-    let _search = Utils.formatCustomMainSearch(search)
-
-    let param = {
-      OrderCol: orderBy,
-      ..._search
-    }
-
-    if (this.props.BID) {
-      param.BID = this.props.BID
-    }
-
-    if (pagination) {
-      param.PageIndex = pageIndex
-      param.PageSize = pageSize
-    }
-
-    return param
-  }
-
-  /**
-   * @description 鑾峰彇榛樿瀛樺偍杩囩▼璇锋眰鍙傛暟
-   */
-  getExcelDefaultParam = (arr_field, orderBy, search, pagination = false, pageIndex = 1, pageSize = 100) => {
-    const { setting } = this.props
-
-    let _search = Utils.joinMainSearchkey(search)
-
-    _search = _search ? 'where ' + _search : ''
-    
-    let param = {
-      func: 'sPC_Get_TableData',
-      obj_name: 'data',
-      arr_field: arr_field,
-      custom_script: setting.customScript || '',
-      default_sql: setting.default || 'true',
-      dataM: this.props.dataManager ? 'Y' : ''
-    }
-
-    if (this.props.BID) {
-      param.BID = this.props.BID
-    }
-    
-    let _dataresource = setting.dataresource
-
-    if (/\s/.test(_dataresource)) {
-      _dataresource = '(' + _dataresource + ') tb'
-    }
-
-    if (this.props.dataManager) { // 鏁版嵁鏉冮檺
-      _dataresource = _dataresource.replace(/\$@/ig, '/*')
-      _dataresource = _dataresource.replace(/@\$/ig, '*/')
-      param.custom_script = param.custom_script.replace(/\$@/ig, '/*')
-      param.custom_script = param.custom_script.replace(/@\$/ig, '*/')
-    } else {
-      _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
-      param.custom_script = param.custom_script.replace(/@\$|\$@/ig, '')
-    }
-
-    let regoptions = null
-    if (setting.queryType === 'statistics' || param.custom_script) {
-      let allSearch = Utils.getAllSearchOptions(search)
-
-      regoptions = allSearch.map(item => {
-        return {
-          reg: new RegExp('@' + item.key + '@', 'ig'),
-          value: `'${item.value}'`
-        }
-      })
-
-      regoptions.push({
-        reg: new RegExp('@orderBy@', 'ig'),
-        value: orderBy
-      }, {
-        reg: new RegExp('@pageSize@', 'ig'),
-        value: pageSize
-      }, {
-        reg: new RegExp('@pageIndex@', 'ig'),
-        value: pageIndex
       })
     }
-
-    if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
-      regoptions.forEach(item => {
-        _dataresource = _dataresource.replace(item.reg, item.value)
-      })
-      _search = ''
-    }
-
-    let LText = `select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows`
-    
-    if (pagination) {
-      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) {
-      regoptions.forEach(item => {
-        param.custom_script = param.custom_script.replace(item.reg, item.value)
-      })
-
-      if (this.props.dataManager) { // 鏁版嵁鏉冮檺
-        param.custom_script = param.custom_script.replace(/\$@/ig, '/*')
-        param.custom_script = param.custom_script.replace(/@\$/ig, '*/')
-      } else {
-        param.custom_script = param.custom_script.replace(/@\$|\$@/ig, '')
-      }
-
-      param.custom_script = Utils.formatOptions(param.custom_script)
-    }
-
-    if (this.props.dataManager) { // 鏁版嵁鏉冮檺
-      LText = LText.replace(/\$@/ig, '/*')
-      LText = LText.replace(/@\$/ig, '*/')
-    } else {
-      LText = LText.replace(/@\$|\$@/ig, '')
-    }
-
-    param.LText = Utils.formatOptions(LText)
-    param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
-    param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-    param.DateCount = ''
-
-    return param
   }
 
   /**
@@ -2510,15 +1377,10 @@
   handleOk = () => {
     this.formRef.handleConfirm().then(res => {
       this.setState({
-        confirmLoading: true
+        visible: false
       })
-
-      this.execSubmit(this.state.execAction, this.state.tabledata, () => {
-        this.setState({
-          confirmLoading: false
-        })
-      }, res)
-    }, () => {})
+      this.triggerPrint(this.state.tabledata, res)
+    })
   }
 
   /**
@@ -2526,26 +1388,19 @@
    */
   handleCancel = () => {
     this.setState({
-      visible: false,
-      confirmLoading: false
+      visible: false
     })
+    this.updateStatus('over')
   }
 
   modelconfirm = () => {
     const { BData } = this.props
-    const { execAction, tabledata } = this.state
+    const { btnconfig, tabledata } = this.state
     let _this = this
-    let _fields = []
+    let result = []
     
-    if (execAction.groups.length > 0) {
-      execAction.groups.forEach(group => {
-        _fields = [..._fields, ...group.sublist]
-      })
-    } else {
-      _fields = execAction.fields
-    }
-
-    let result = _fields.map(item => {
+    btnconfig.fields.forEach(item => {
+      if (!item.field) return
       let _readin = item.readin !== 'false'
       let _initval = item.initval
 
@@ -2557,6 +1412,12 @@
         _initval = BData[item.field]
       } else if (_readin && tabledata[0] && tabledata[0].hasOwnProperty(item.field)) {
         _initval = tabledata[0][item.field]
+      } else if (item.type === 'date' && _initval) {
+        _initval = moment().subtract(_initval, 'days').format('YYYY-MM-DD')
+      } else if (item.type === 'datemonth' && _initval) {
+        _initval = moment().subtract(_initval, 'month').format('YYYY-MM')
+      } else if (item.type === 'datetime' && _initval) {
+        _initval = moment().subtract(_initval, 'days').format('YYYY-MM-DD HH:mm:ss')
       }
 
       let _fieldlen = item.fieldlength || 50
@@ -2566,36 +1427,27 @@
         _fieldlen = item.decimal ? item.decimal : 0
       }
 
-      return {
+      if (_initval === undefined) {
+        _initval = ''
+      }
+
+      result.push({
         key: item.field,
         readonly: item.readonly === 'true',
         readin: _readin,
         fieldlen: _fieldlen,
         type: item.type,
         value: _initval
-      }
-    })
-
-    _this.setState({
-      running: true
+      })
     })
 
     confirm({
-      title: this.props.dict['main.action.confirm.tip'],
+      title: this.state.dict['main.action.confirm.tip'],
       onOk() {
-        _this.setState({
-          loadingUuid: execAction.uuid
-        })
-
-        return new Promise(resolve => {
-          _this.execSubmit(execAction, tabledata, resolve, result)
-        })
+        _this.triggerPrint(tabledata, result)
       },
       onCancel() {
-        _this.setState({
-          loadingUuid: '',
-          running: false
-        })
+        _this.updateStatus('over')
       }
     })
   }
@@ -2604,31 +1456,26 @@
    * @description 鏄剧ず妯℃�佹
    */
   getModels = () => {
-    const { execAction } = this.state
+    const { setting, BID, btn } = this.props
+    const { btnconfig } = this.state
 
-    if (!execAction || !this.state.visible) return null
+    if (!this.state.visible || !btnconfig || !btnconfig.setting) return null
 
-    let title = ''
-    let width = '62vw'
+    let title = btnconfig.setting.title
+    let width = btnconfig.setting.width + 'vw'
     let clickouter = false
     let container = document.body
 
-    if (execAction && execAction.setting) {
-      title = execAction.setting.title
-      width = execAction.setting.width + 'vw'
-
-      if (this.props.type === 'main' && execAction.setting.container === 'tab' && this.props.ContainerId) {
-        width = execAction.setting.width + '%'
-        container = () => document.getElementById(this.props.ContainerId)
-      }
-
-      if (execAction.setting.clickouter === 'close') {
-        clickouter = true
-      }
+    if (
+      (setting.tabType === 'main' && btnconfig.setting.container === 'tab' && this.props.ContainerId) ||
+      (btnconfig.setting.container === 'tab' && btn.ContainerId)
+    ) {
+      width = btnconfig.setting.width + '%'
+      container = () => document.getElementById(this.props.ContainerId || btn.ContainerId)
     }
 
-    if (this.props.type === 'subtab') {
-      container = document.body
+    if (btnconfig.setting.clickouter === 'close') {
+      clickouter = true
     }
 
     return (
@@ -2640,15 +1487,15 @@
         visible={this.state.visible}
         width={width}
         onOk={this.handleOk}
-        confirmLoading={this.state.confirmLoading}
         onCancel={this.handleCancel}
         destroyOnClose
       >
         <MutilForm
-          dict={this.props.dict}
-          action={execAction}
+          BID={BID}
+          dict={this.state.dict}
+          menuType={this.props.menuType}
+          action={btnconfig}
           inputSubmit={this.handleOk}
-          configMap={this.state.configMap}
           data={this.state.tabledata[0]}
           BData={this.props.BData}
           wrappedComponentRef={(inst) => this.formRef = inst}
@@ -2658,62 +1505,62 @@
   }
 
   render() {
-    const { loadingUuid, btnloading, loadingNumber } = this.state
+    const { btn, show } = this.props
+    const { loadingNumber, loading, disabled } = this.state
 
-    let fixed = this.props.setting.actionfixed && this.props.type === 'main' // 鎸夐挳鏄惁鍥哄畾鍦ㄥご閮�
+    if (show === 'actionList') {
+      return <div style={{display: 'inline-block'}} onClick={(e) => e.stopPropagation()}>
+        <Button
+          icon={btn.icon}
+          loading={loading}
+          disabled={disabled}
+          className={'mk-btn mk-' + btn.class}
+          onClick={() => {this.actionTrigger()}}
+        >{loadingNumber ? `(${loadingNumber})` : '' + btn.label}</Button>
+        {this.getModels()}
+      </div>
+    } else { // icon銆乼ext銆� all 鍗$墖
+      let label = ''
+      let icon = ''
 
-    if (fixed) {
-      return (
-        <Affix offsetTop={48}>
-          <div className="button-list toolbar-button" id={fixed ? this.props.MenuID + 'mainaction' : ''}>
-            {this.props.actions.map((item, index) => {
-              let label = item.label
-              if (loadingUuid === item.uuid && loadingNumber !== '') {
-                label = label + '(' + loadingNumber + ')'
-              }
+      if (show === 'button') {
+        label = btn.label
+        icon = btn.icon || ''
+      } else if (show === 'link') {
+        label = <span>{btn.label}{btn.icon ? <Icon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
+        icon = ''
+      } else if (show === 'icon') {
+        icon = btn.icon || ''
+      // } else if (show === 'text') {
+      } else {
+        label = btn.label
+      }
 
-              return (
-                <Button
-                  className={'mk-btn mk-' + item.class}
-                  icon={item.icon}
-                  key={'action' + index}
-                  onClick={() => {this.actionTrigger(item)}}
-                  loading={loadingUuid === item.uuid}
-                >{label}</Button>
-              )
-            })}
-            {this.getModels()}
-            {btnloading && <Spin size="large" />}
-            <ExcelIn MenuID={this.props.MenuID} returndata={this.getexceldata} ref="excelIn" />
-          </div>
-        </Affix>
-      )
-    } else {
-      return (
-        <div className="button-list toolbar-button" id={fixed ? this.props.MenuID + 'mainaction' : ''}>
-          {this.props.actions.map((item, index) => {
-            let label = item.label
-            if (loadingUuid === item.uuid && loadingNumber !== '') {
-              label = label + '(' + loadingNumber + ')'
-            }
-
-            return (
-              <Button
-                className={'mk-btn mk-' + item.class}
-                icon={item.icon}
-                key={'action' + index}
-                onClick={() => {this.actionTrigger(item)}}
-                loading={loadingUuid === item.uuid}
-              >{label}</Button>
-            )
-          })}
-          {this.getModels()}
-          {btnloading && <Spin size="large" />}
-          <ExcelIn MenuID={this.props.MenuID} returndata={this.getexceldata} ref="excelIn" />
-        </div>
-      )
+      return <div style={{display: 'inline-block'}} onClick={(e) => e.stopPropagation()}>
+        <Button
+          type="link"
+          title={show === 'icon' ? btn.label : ''}
+          loading={loading}
+          disabled={disabled}
+          style={btn.style}
+          icon={icon}
+          onClick={() => {this.actionTrigger()}}
+        >{label}</Button>
+        {this.getModels()}
+      </div>
     }
   }
 }
 
-export default PrintButton
\ No newline at end of file
+const mapStateToProps = (state) => {
+  return {
+    tabviews: state.tabviews,
+    menuType: state.editLevel
+  }
+}
+
+const mapDispatchToProps = () => {
+  return {}
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(PrintButton)
\ No newline at end of file

--
Gitblit v1.8.0