Merge branch 'master' of http://git.hugeinfo.com.cn/r/nsjcy/frontEnd/nsjcy

xuxj

2020-04-26 b8fa0fa65e994fb0a7067e3348ee8604db815a9b

 SunshineIns/src/view/QuestionnairEditor/index.js

@@ -386,7 +386,7 @@
    }
  };
  render() {
    const { index, curMoveItem, drag, acitveAnswer } = this.props;
    const { index, curMoveItem, drag, acitveAnswer, disabled } = this.props;
    const {
      toggleMutiOption,
      editor,
@@ -660,6 +660,7 @@
              <input
                type="radio"
                name="radio"
                disabled={disabled || false}
                data-index={index}
                value={data}
                defaultChecked={
@@ -710,11 +711,12 @@
              <input
                type="checkbox"
                name="checkbox"
                disabled={disabled || false}
                value={data}
                data-index={index}
                defaultChecked={
                  answer &&
                  this.answer.checkbox !== '' &&
                  this.answer.checkbox &&
                  this.answer.checkbox.optionIndex.includes(index + '')
                }
                onChange={this.handleAnswerChange}