Merge branch 'master' into bms

king

2021-01-05 4de5be49a7d128118def405c5ce24771526cc188

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

@@ -1045,7 +1045,7 @@
            duration: 5
          })
          this.updateStatus('over')
        } else if (!_LongParam || (btn.OpenType === 'pop' && _LongParam.type !== 'Modal')) {
        } else if (!_LongParam || (btn.execMode === 'pop' && _LongParam.type !== 'Modal')) {
          notification.warning({
            top: 92,
            message: '未获取到按钮配置信息！',