Merge branch 'develop'

king

2 天以前 729fb5e7f41f45c6962993d86c3a4eb81c2c784b

 src/tabviews/zshare/actionList/normalbutton/index.jsx

@@ -2682,11 +2682,16 @@
      delete result.message
      delete result.status

      param = {
        ...outParam,
        ...result,
        func: btn.callbackFunc
      }
      param = {}

      Object.keys(outParam).forEach(key => {
        param[key.toLowerCase()] = outParam[key]
      })
      Object.keys(result).forEach(key => {
        param[key.toLowerCase()] = result[key]
      })

      param.func = btn.callbackFunc

      if (window.GLOB.mkHS) {
        if (btn.callbackFunc === 's_sVersion_Local_add' && window.GLOB.forcedUpdate) { // special 传输号添加回调处理
@@ -3011,6 +3016,7 @@
    if (focusField) {
      MKEmitter.emit('resetFocus', btn.uuid, focusField)
    }
    window.GLOB.errFocusId = ''

    this.setState({
      loadingNumber: '',
@@ -3837,7 +3843,11 @@
      loadingTotal: '',
    })

    if (btnconfig && btnconfig.setting && btnconfig.setting.errFocus) {
    if (window.GLOB.errFocusId && (btnconfig || btn.OpenType === 'formSubmit')) {
      MKEmitter.emit('mkFC', 'focus', window.GLOB.errFocusId)

      window.GLOB.errFocusId = ''
    } else if (btnconfig && btnconfig.setting && btnconfig.setting.errFocus) {
      MKEmitter.emit('mkFC', 'focus', btnconfig.setting.errFocus)
    }