@zykjcommon/questions 0.0.48 → 0.0.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zykjcommon/questions",
-  "version": "0.0.48",
+  "version": "0.0.50",
   "main": "src/components/questions/entry.js",
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/assets/scss/questions/zykjcommon-questions.scss

@@ -25,11 +25,17 @@ $greenItemFontSize:0.13em;
       color: #666666;
       font-weight: normal;
     }
+    .question-type-str{
+      display: inline-block;
+    }
   }
   .question-hint{
     margin-bottom: 20px;
     font-size: 16px;
     color: #333333;
+    &.bold{
+      font-weight: bold;
+    }
   }
   .question-box{
     padding-left: 30px;
@@ -400,8 +406,8 @@ $greenItemFontSize:0.13em;
         //justify-content: space-between;
         align-content: start;
         &::-webkit-scrollbar {
-          width: 7px;
-          height: 7px;
+          width: 17px;
+          height: 17px;
         }
         &.noScrollBar::-webkit-scrollbar {
           width: 0;

package/src/components/questions/Question_BriefAnswer.vue

@@ -1,10 +1,13 @@
 <template>
   <div class="zykjcommon-question">
-    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
+    <div class="question-type" v-if="!isSub">
+      <div class="question-type-str" v-if="showQuestionType"><span v-if="showQuestionIndex">{{questionInfo.questionIndex}}、</span>{{ questionInfo.question_type_str }}</div>
+      <span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
       <span class="score fr" v-if="mode==='analysis'">得分：{{questionInfo.answerMap ? questionInfo.answerMap.user_score : '-'}}分</span>
     </div>
     <div class="question-box">
-      <div class="question-hint" v-if="questionInfo.hint && !isSub">{{ questionInfo.hint }}</div>
+      <div class="question-hint"
+           :class="{'bold':!showQuestionType}" v-if="showQuestionHint && questionInfo.hint && !isSub">{{ questionInfo.hint }}</div>
       <div class="editor-content" v-html="questionInfo.htmlContent"></div>
 
       <!--      <div class="editor-tit">样例输入</div>
@@ -78,6 +81,18 @@ export default {
     showScore: {
       type: Boolean,
       default: false
+    },
+    showQuestionType: {
+      type: Boolean,
+      default: true
+    },
+    showQuestionHint: {
+      type: Boolean,
+      default: true
+    },
+    showQuestionIndex: {
+      type: Boolean,
+      default: true
     }
   },
   mounted() {

package/src/components/questions/Question_Classify.vue

@@ -163,9 +163,20 @@ export default {
       }
     },
     isAnswered(){
-      let len = $(this.$el).find('.list .list-item').length
-      let answerd = len === 0
-      return answerd
+      // let len = $(this.$el).find('.list .list-item').length
+      // let answerd = len === 0
+      //每个选中框至少要有一个选项才是已答
+      let arr = []
+      let mainAppend = $(this.$el).find('.main-append')
+      mainAppend.each((index,item)=>{
+        let appendItem = $(item).find('.append-item')
+        arr.push(appendItem.length)
+      })
+      if(arr.length === 2){
+        return arr[0] && arr[1]
+      }else{
+        return false
+      }
     },
     isCorrect(){
       let correct = this.questionInfo.answerMap.is_correct === '1' ? true : false

package/src/components/questions/Question_FillBlank.vue

@@ -1,10 +1,13 @@
 <template>
   <div class="zykjcommon-question">
-    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
+    <div class="question-type" v-if="!isSub">
+      <div class="question-type-str" v-if="showQuestionType"><span v-if="showQuestionIndex">{{questionInfo.questionIndex}}、</span>{{ questionInfo.question_type_str }}</div>
+      <span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
       <span class="score fr" v-if="mode==='analysis'">得分：{{questionInfo.answerMap ? questionInfo.answerMap.user_score : '-'}}分</span>
     </div>
     <div class="question-box">
-      <div class="question-hint" v-if="questionInfo.hint && !isSub">{{ questionInfo.hint }}</div>
+      <div class="question-hint"
+           :class="{'bold':!showQuestionType}" v-if="showQuestionHint && questionInfo.hint && !isSub">{{ questionInfo.hint }}</div>
       <div class="editor-content"
            style="line-height: 40px;"
            v-if="questionInfo.htmlContent" v-html="questionInfo.htmlContent"></div>
@@ -58,6 +61,18 @@ export default {
     showScore: {
       type: Boolean,
       default: false
+    },
+    showQuestionType: {
+      type: Boolean,
+      default: true
+    },
+    showQuestionHint: {
+      type: Boolean,
+      default: true
+    },
+    showQuestionIndex: {
+      type: Boolean,
+      default: true
     }
   },
   mounted() {

package/src/components/questions/Question_MultipleChoice.vue

@@ -1,10 +1,13 @@
 <template>
   <div class="zykjcommon-question">
-    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
+    <div class="question-type" v-if="!isSub">
+      <div class="question-type-str" v-if="showQuestionType"><span v-if="showQuestionIndex">{{questionInfo.questionIndex}}、</span>{{ questionInfo.question_type_str }}</div>
+      <span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
       <span class="score fr" v-if="mode==='analysis'">得分：{{questionInfo.answerMap ? questionInfo.answerMap.user_score : '-'}}分</span>
     </div>
     <div class="question-box">
-      <div class="question-hint" v-if="questionInfo.hint && !isSub">{{ questionInfo.hint }}</div>
+      <div class="question-hint"
+           :class="{'bold':!showQuestionType}" v-if="showQuestionHint && questionInfo.hint && !isSub">{{ questionInfo.hint }}</div>
       <div class="editor-content" v-if="!isSub" v-html="questionInfo.htmlContent"></div>
 
       <div class="question-stem" v-if="isSub"><span v-if="questionInfo.hint">{{questionInfo.questionIndex2}}、</span>{{questionInfo.hint}}</div>
@@ -101,6 +104,18 @@ export default {
     showScore: {
       type: Boolean,
       default: false
+    },
+    showQuestionType: {
+      type: Boolean,
+      default: true
+    },
+    showQuestionHint: {
+      type: Boolean,
+      default: true
+    },
+    showQuestionIndex: {
+      type: Boolean,
+      default: true
     }
   },
   mounted() {
@@ -163,7 +178,7 @@ export default {
       return {multiple_index_set:self.checkboxList}
     },
     isAnswered(){
-      let answerd = this.checkboxList.length !== 0
+      let answerd = this.checkboxList.length > 1
       return answerd
     },
     isCorrect(){

package/src/components/questions/Question_Programming.vue

@@ -1,10 +1,15 @@
 <template>
   <div class="zykjcommon-question">
-    <div class="question-type" v-show="!isEnterCodeByInit" v-if="!isSub">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
+    <div class="question-type"
+         v-show="!isEnterCodeByInit"
+         v-if="!isSub">
+      <div class="question-type-str" v-if="showQuestionType"><span v-if="showQuestionIndex">{{questionInfo.questionIndex}}、</span>{{ questionInfo.question_type_str }}</div>
+      <span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
       <span class="score fr" v-if="mode==='analysis'">得分：{{questionInfo.answerMap ? questionInfo.answerMap.user_score : '-'}}分</span>
     </div>
     <div class="question-box" v-show="!isEnterCodeByInit">
-      <div class="question-hint" v-if="questionInfo.hint && !isSub">{{ questionInfo.hint }}</div>
+      <div class="question-hint"
+           :class="{'bold':!showQuestionType}" v-if="showQuestionHint && questionInfo.hint && !isSub">{{ questionInfo.hint }}</div>
       <div class="editor-content" v-html="questionInfo.htmlContent"></div>
       <button class="bcdt-btn"
               v-if="(mode==='exam' && !oss_temp_url) || mode==='review'"
@@ -65,6 +70,7 @@
                      @saveCodeOnly="saveCodeOnly"
                      @iframeLoaded="iframeLoaded"
                      @getQuestionInfo="getQuestionInfo"
+                     @menuBarloaded="menuBarloaded"
                      v-if="showFrame"></IframeComponent>
     <Loading :loading="loading"></Loading>
   </div>
@@ -107,6 +113,18 @@ export default {
     showScore: {
       type: Boolean,
       default: false
+    },
+    showQuestionType: {
+      type: Boolean,
+      default: true
+    },
+    showQuestionHint: {
+      type: Boolean,
+      default: true
+    },
+    showQuestionIndex: {
+      type: Boolean,
+      default: true
     }
   },
   mounted() {
@@ -136,6 +154,7 @@ export default {
   },
   data() {
     return {
+      findIframeTimer:null,
       iframe:null,
       showFrame:false,
       analyCorrectAnswer:'',
@@ -182,6 +201,24 @@ export default {
   },
   methods: {
     ...mapActions('zykjcommonQuestions',['getEditorUrlActions']),
+    menuBarloaded(){
+      this.$emit('menuBarloaded')
+    },
+    getIframeContentWindow(){
+      return new Promise((resolve,reject)=>{
+        if(this.iframe){
+          resolve(this.iframe.contentWindow)
+        }else{
+          this.findIframeTimer = setInterval(()=>{
+            if(this.iframe){
+              this.findIframeTimer && clearInterval(this.findIframeTimer)
+              this.findIframeTimer = null
+              resolve(this.iframe.contentWindow)
+            }
+          },200)
+        }
+      })
+    },
     getAnswer(){
       return {
         code_file_oss_temp_path:this.code_file_oss_temp_path,

package/src/components/questions/Question_Reading.vue

@@ -1,10 +1,13 @@
 <template>
   <div class="zykjcommon-question">
-    <div class="question-type">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
+    <div class="question-type">
+      <div class="question-type-str" v-if="showQuestionType"><span v-if="showQuestionIndex">{{questionInfo.questionIndex}}、</span>{{ questionInfo.question_type_str }}</div>
+      <span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
       <span class="score fr" v-if="mode==='analysis'">得分：{{questionInfo.answerMap ? questionInfo.answerMap.user_score : '-'}}分</span>
     </div>
     <div class="question-box">
-      <div class="question-hint" v-if="questionInfo.hint">{{ questionInfo.hint }}</div>
+      <div class="question-hint"
+           :class="{'bold':!showQuestionType}" v-if="showQuestionHint && questionInfo.hint">{{ questionInfo.hint }}</div>
       <div class="editor-content editor-content-bor" v-html="questionInfo.htmlContent"></div>
       <div class="question-tabs">
         <div class="question-tab-item"
@@ -67,6 +70,18 @@ export default {
     showScore: {
       type: Boolean,
       default: false
+    },
+    showQuestionType: {
+      type: Boolean,
+      default: true
+    },
+    showQuestionHint: {
+      type: Boolean,
+      default: true
+    },
+    showQuestionIndex: {
+      type: Boolean,
+      default: true
     }
   },
   created() {

package/src/components/questions/Question_SingleChoice.vue

@@ -1,10 +1,13 @@
 <template>
   <div class="zykjcommon-question">
-    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
+    <div class="question-type" v-if="!isSub">
+      <div class="question-type-str" v-if="showQuestionType"><span v-if="showQuestionIndex">{{questionInfo.questionIndex}}、</span>{{ questionInfo.question_type_str }}</div>
+      <span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
       <span class="score fr" v-if="mode==='analysis'">得分：{{questionInfo.answerMap ? questionInfo.answerMap.user_score : '-'}}分</span>
     </div>
     <div class="question-box">
-      <div class="question-hint" v-if="questionInfo.hint && !isSub">{{ questionInfo.hint }}</div>
+      <div class="question-hint"
+           :class="{'bold':!showQuestionType}" v-if="showQuestionHint && questionInfo.hint && !isSub">{{ questionInfo.hint }}</div>
       <div class="editor-content" v-if="!isSub" v-html="questionInfo.htmlContent"></div>
 
       <div class="question-stem" v-if="isSub"><span v-if="questionInfo.hint">{{questionInfo.questionIndex2}}、</span>{{questionInfo.hint}}</div>
@@ -109,6 +112,18 @@ export default {
     showScore: {
       type: Boolean,
       default: false
+    },
+    showQuestionType: {
+      type: Boolean,
+      default: true
+    },
+    showQuestionHint: {
+      type: Boolean,
+      default: true
+    },
+    showQuestionIndex: {
+      type: Boolean,
+      default: true
     }
   },
   mounted() {