Merge branch 'develop'

king

2022-11-29 b0c7a660750a8b29e7f8b3a648296d56c50fd2ca

 src/views/design/sidemenu/editthdmenu/index.jsx

@@ -136,6 +136,7 @@
  }

  handleSubBtn = (type) => {
    const that = this
    // 操作按钮：添加、解除冻结、确认及关闭
    if (type === 'confirm') {
      let param  = {
@@ -170,15 +171,12 @@
      })
    } else if (type === 'close') {
      if (this.state.change) {
        let _this = this

        confirm({
          title: '菜单顺序已调整，放弃保存吗？',
          content: '',
          onOk() {
            _this.props.exitEdit()
          },
          onCancel() {}
            that.props.exitEdit()
          }
        })
      } else {
        this.props.exitEdit()