fix:解决合并快捷排序冲突

src/modules/teach-tool/question-manage/components/OperateQuestionTab.jsx

@@ -2,7 +2,7 @@
  * @Author: yuananting
  * @Date: 2021-02-25 14:34:29
  * @LastEditors: yuananting
- * @LastEditTime: 2021-06-04 17:06:46
+ * @LastEditTime: 2021-06-09 12:00:12
  * @Description: 助学工具-题库-操作题目Tab
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -66,12 +66,17 @@ class OperateQuestionTab extends Component {
   }
 
   componentDidMount() {
-    const { chooseOptions } = this.state;
     const { questionTypeKey } = this.props;
-    const isEditCurrent = getParameterByName("id") && getParameterByName("type") === questionTypeKey;
+    const isEditCurrent =
+      getParameterByName("id") &&
+      getParameterByName("type") === questionTypeKey;
     const optionSize = isEditCurrent ? 20 : 4;
-    if (["INDEFINITE_CHOICE", "MULTI_CHOICE", "SINGLE_CHOICE"].includes(questionTypeKey)) {
-        // 选择题（单选 多选 不定项）-插入4条默认选项
+    if (
+      ["INDEFINITE_CHOICE", "MULTI_CHOICE", "SINGLE_CHOICE"].includes(
+        questionTypeKey
+      )
+    ) {
+      // 选择题（单选 多选 不定项）-插入4条默认选项
       for (var i = 0; i < optionSize; i++) {
         this.handleAddOption();
         this.setState({
@@ -631,9 +636,9 @@ class OperateQuestionTab extends Component {
       this.state.stemContent,
       (contentItem) => contentItem.type === "RICH_TEXT"
     );
-    if(stemContent.textLength > 1000) {
+    if (stemContent.textLength > 1000) {
       validateError++;
-    } 
+    }
     let stem = stemContent.content.replace(/<[^>]+>/g, "");
     stem = stem.replace(/\&nbsp\;/gi, "");
     stem = stem.replace(/\s+/g, "");
@@ -691,7 +696,7 @@ class OperateQuestionTab extends Component {
         optionUnChecked = item.isCorrectAnswer
           ? optionUnChecked
           : optionUnChecked + 1;
-        if(optionContent[0].textLength > 1000) {
+        if (optionContent[0].textLength > 1000) {
           validateError++;
         }
         let optionInput = optionContent[0].content.replace(/<[^>]+>/g, "");
@@ -1037,11 +1042,11 @@ class OperateQuestionTab extends Component {
             return dom ? (
               <div
                 className="question-item_question-content"
-                style={{
-                  display: ["PICTURE", "VIDEO"].includes(type)
-                    ? "inline-grid"
-                    : "flex",
-                }}
+                style={
+                  !["PICTURE", "VIDEO"].includes(type)
+                    ? { display: "flex" }
+                    : { float: "left" }
+                }
                 key={index}
               >
                 {dom}
@@ -1191,10 +1196,8 @@ class OperateQuestionTab extends Component {
                 data-label="正确答案"
               >
                 {_.map(chooseOptions, (optionItem, optionIndex) => {
-                  const {
-                    questionOptionContentList,
-                    isCorrectAnswer,
-                  } = optionItem;
+                  const { questionOptionContentList, isCorrectAnswer } =
+                    optionItem;
                   optionItem.optionSort = optionIndex;
                   const mediaBtn = ["VOICE", "AUDIO", "PICTURE"];
                   const placeHold =

src/modules/teach-tool/question-manage/modal/PreviewQuestionModal.less

@@ -32,7 +32,7 @@
       color: #666666;
       .input-box {
         margin-bottom: 8px;
-        display: inline-block;
+        // display: inline-block;
         *:not(p) {
           font-weight: normal !important;
           font-size: 14px !important;