Merge branch 'master' into positec

king

2025-04-21 f3d4db769ba9b51b799d981511a710fd443d0e08

 src/menu/components/share/markcomponent/markform/index.jsx

@@ -8,7 +8,6 @@

class UniqueForm extends Component {
  static propTpyes = {
    dict: PropTypes.object,         // 字典项
    field: PropTypes.any,
    columns: PropTypes.array,       // 列名集合
    signs: PropTypes.array,         // 标记类型
@@ -19,6 +18,9 @@
    // 表单提交时检查输入值是否正确
    this.props.form.validateFieldsAndScroll((err, values) => {
      if (!err) {
        if (values.contrastValue) {
          values.contrastValue = values.contrastValue.replace(/\t+|\v+|\s+/g, '')
        }
        this.props.markChange(values)
      }
    })
@@ -53,7 +55,16 @@
                rules: [
                  {
                    required: true,
                    message: this.props.dict['form.required.select'] + '对比字段!'
                    message: '请选择对比字段!'
                  },
                  {
                    validator: (rule, value, callback) => {
                      if (value[1] === 'dynamic' && value[0] === value[2]) {
                        callback('对比字段不可相同！')
                      } else {
                        callback()
                      }
                    }
                  }
                ]
              })(
@@ -68,7 +79,7 @@
                rules: [
                  {
                    required: true,
                    message: this.props.dict['form.required.select'] + '对比方式!'
                    message: '请选择对比方式!'
                  }
                ]
              })(
@@ -100,7 +111,7 @@
                rules: [
                  {
                    required: true,
                    message: this.props.dict['form.required.select'] + '颜色!'
                    message: '请选择颜色!'
                  }
                ]
              })(
@@ -115,7 +126,7 @@
                rules: [
                  {
                    required: true,
                    message: this.props.dict['form.required.select'] + '标记方式!'
                    message: '请选择标记方式!'
                  }
                ]
              })(