Merge branch 'master' into positec

king

2023-09-07 d823c59ba0b5f73e06c90d8bcae4dd25f5dfab64

 src/components/normalform/modalform/mkSelect/index.jsx

@@ -31,6 +31,17 @@
    MKEmitter.addListener('mkFC', this.mkFormControl)
  }

  UNSAFE_componentWillReceiveProps (nextProps) {
    const { config } = this.state

    if (!is(fromJS(config.oriOptions), fromJS(nextProps.config.oriOptions))) {
      this.setState({
        config: fromJS(nextProps.config).toJS(),
        options: fromJS(nextProps.config.options).toJS()
      })
    }
  }

  shouldComponentUpdate (nextProps, nextState) {
    return !is(fromJS(this.state), fromJS(nextState))
  }