Merge branch 'master' into positec

king

2023-08-09 315ba06bfe8692ba4d454bd7a373d4362d342797

Merge branch 'master' into positec

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

@@ -1714,10 +1714,15 @@
          this.checkLoopRequest(params, _resolve)
        }
      } else if (res.ErrCode === 'C') {
        let msg = res.message || ''
        if (/\n|\r/.test(msg)) {
          msg = msg.replace(/\n|\r/ig, '<br/>')
          msg = <span dangerouslySetInnerHTML={{__html: msg}}></span>
        }
        const _this = this
        confirm({
          title: '请确认',
          content: res.message,
          content: msg,
          onOk() {
            return new Promise(resolve => {
              Api.genericInterface(unCheckParam).then(result => {