Merge branch 'master' into positec

king

2024-05-21 8a6ce370f1aa1c061b76fa3e9d2d4d1df53ca4c5

 src/views/tabledesign/popview/index.jsx

@@ -68,13 +68,13 @@
    const { oriConfig, config } = this.state

    if (!is(fromJS(oriConfig), fromJS(config))) {
      const _this = this
      const that = this

      confirm({
        title: '配置已修改，放弃保存吗？',
        content: '',
        onOk() {
          _this.props.cancel()
          that.props.cancel()
        },
        onCancel() {}
      })