@zykjcommon/questions 0.0.26 → 0.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zykjcommon/questions",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "main": "src/components/questions/entry.js",
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -12,7 +12,7 @@
     "build:lib": "vue-cli-service build --target lib src/components/questions/buildEntry.js --name zykjcommon-questions"
   },
   "dependencies": {
-    "@zykjcommon/questions": "^0.0.24",
+    "@zykjcommon/questions": "^0.0.27",
     "alife-logger": "^1.8.30",
     "axios": "^0.26.0",
     "cookie": "^0.4.1",

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

@@ -16,7 +16,6 @@ $greenItemFontSize:0.14em;
   }
   .question-type{
     font-size: 18px;
-    font-family: PingFang-SC-Medium, PingFang-SC;
     font-weight: bold;
     color: #000000;
     margin-bottom: 20px;
@@ -26,6 +25,11 @@ $greenItemFontSize:0.14em;
       font-weight: normal;
     }
   }
+  .question-hint{
+    margin-bottom: 20px;
+    font-size: 16px;
+    color: #333333;
+  }
   .question-box{
     padding-left: 30px;
   }

package/src/components/questions/Question_BriefAnswer.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="zykjcommon-question">
-    <div v-if="!isSub" class="question-type">{{questionInfo.questionIndex}}、{{questionInfo.hint ? questionInfo.hint : questionInfo.question_type_str}}<span v-if="questionInfo.score!=='null'"><!--（{{questionInfo.score}}分）--></span>
+    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<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-stem">{{questionInfo.hint}}</div>-->
+      <div class="question-hint" v-if="questionInfo.hint && !isSub">{{ questionInfo.hint }}</div>
       <div class="editor-content" v-html="questionInfo.htmlContent"></div>
 
       <!--      <div class="editor-tit">样例输入</div>
@@ -74,6 +74,10 @@ export default {
     mode: {
       type: String,
       default: 'exam'
+    },
+    showScore: {
+      type: Boolean,
+      default: false
     }
   },
   mounted() {

package/src/components/questions/Question_Classify.vue

@@ -60,7 +60,7 @@ export default {
     },
     screenScale:{
       type: Number,
-      default: 0
+      default: 1
     }
   },
   created() {
@@ -170,34 +170,36 @@ export default {
     parseLists(nv){
       this.classify_question_info = nv.classify_question_info
       let exam_options_data = nv.exam_options_data
-      if(this.classify_question_info.background_file){
-        this.bigBgCss = `background: url(${this.classify_question_info.background_file.file_url}) no-repeat center;background-size: 100% 100%`
-      }
-      if(this.classify_question_info.bottom_img_file){
-        this.bottomBgCss = `background: url(${this.classify_question_info.bottom_img_file.file_url}) no-repeat center;background-size: 100% 100%`
-      }
-      let optionList = []
-      exam_options_data.forEach((item)=>{
-        optionList.push({
-          content:item.data.option_content,
-          bgUrlCss:`background: url(${item.data.file_url}) no-repeat center;background-size: 100% 100%`,
-          idx:item.index
+      if(this.classify_question_info){
+        if(this.classify_question_info.background_file){
+          this.bigBgCss = `background: url(${this.classify_question_info.background_file.file_url}) no-repeat center;background-size: 100% 100%`
+        }
+        if(this.classify_question_info.bottom_img_file){
+          this.bottomBgCss = `background: url(${this.classify_question_info.bottom_img_file.file_url}) no-repeat center;background-size: 100% 100%`
+        }
+        let optionList = []
+        exam_options_data.forEach((item)=>{
+          optionList.push({
+            content:item.data.option_content,
+            bgUrlCss:`background: url(${item.data.file_url}) no-repeat center;background-size: 100% 100%`,
+            idx:item.index
+          })
         })
-      })
-      this.optionList = optionList
-      this.listItemBgCss = !optionList[0]?'':optionList[0].bgUrlCss
+        this.optionList = optionList
+        this.listItemBgCss = !optionList[0]?'':optionList[0].bgUrlCss
 
-      let bigBoxItemList = []
-      let big_type_box_image_list = this.classify_question_info.big_type_box_image_list
-      let big_type_option_list = this.classify_question_info.big_type_option_list
-      big_type_box_image_list.forEach((item,index)=>{
-        bigBoxItemList.push({
-          imgUrl:big_type_option_list[index].file_url,
-          bgUrl:item.file_url,
-          bgUrlCss:`background: url(${item.file_url}) no-repeat center;background-size: 100% 100%`
+        let bigBoxItemList = []
+        let big_type_box_image_list = this.classify_question_info.big_type_box_image_list
+        let big_type_option_list = this.classify_question_info.big_type_option_list
+        big_type_box_image_list.forEach((item,index)=>{
+          bigBoxItemList.push({
+            imgUrl:big_type_option_list[index].file_url,
+            bgUrl:item.file_url,
+            bgUrlCss:`background: url(${item.file_url}) no-repeat center;background-size: 100% 100%`
+          })
         })
-      })
-      this.bigBoxItemList = bigBoxItemList
+        this.bigBoxItemList = bigBoxItemList
+      }
     },
     setRootFontSize() {
       // setRemFixedHeight(1000,140,1.08)
@@ -206,7 +208,6 @@ export default {
     unmountedDo(){
       window.removeEventListener('resize',this.setRootFontSize)
       document.removeEventListener('gesturestart', this.gesturestartListener)
-      this.$el
       $(this.$el).find('.question-classify .append-item').off(this.mousedown)
       $(this.$el).find('.question-classify .list-item').off(this.mousedown)
       $(document).off(this.mouseup)

package/src/components/questions/Question_FillBlank.vue

@@ -1,9 +1,10 @@
 <template>
   <div class="zykjcommon-question">
-    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{questionInfo.hint ? questionInfo.hint :questionInfo.question_type_str}}<span v-if="questionInfo.score!=='null'"><!--（{{questionInfo.score}}分）--></span>
+    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<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="editor-content"
            style="line-height: 40px;"
            v-if="questionInfo.htmlContent" v-html="questionInfo.htmlContent"></div>
@@ -53,6 +54,10 @@ export default {
     mode: {
       type: String,
       default: 'exam'
+    },
+    showScore: {
+      type: Boolean,
+      default: false
     }
   },
   mounted() {

package/src/components/questions/Question_MultipleChoice.vue

@@ -1,16 +1,18 @@
 <template>
   <div class="zykjcommon-question">
-    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{questionInfo.hint ? questionInfo.hint : questionInfo.question_type_str}}<span v-if="questionInfo.score!=='null'"><!--（{{questionInfo.score}}分）--></span>
+    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<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-stem" v-if="!isSub">{{questionInfo.hint}}</div>-->
-      <div class="question-stem" v-if="isSub"><span v-if="questionInfo.hint">{{questionInfo.questionIndex2}}、</span>{{questionInfo.hint}}</div>
+      <div class="question-hint" v-if="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>
       <div class="editor-content" style="display: flex" v-if="isSub">
         <span v-if="!questionInfo.hint">{{questionInfo.questionIndex2}}、</span><div style="display: inline-block;flex:1;" v-html="questionInfo.htmlContent"></div>
       </div>
-      <div class="question-option-list">
+
+      <div class="question-option-list" :style="(!questionInfo.htmlContent && !questionInfo.hint)?{'margin-top':0}:{}">
         <div class="question-option" v-for="(item,index) in exam_options_data">
           <div class="checkbox-box" :class="{'checked':checkboxList.indexOf(item.index) > -1}">
             <input type="checkbox"
@@ -95,6 +97,10 @@ export default {
     mode: {
       type: String,
       default: 'exam'
+    },
+    showScore: {
+      type: Boolean,
+      default: false
     }
   },
   mounted() {

package/src/components/questions/Question_Programming.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="zykjcommon-question">
-    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{questionInfo.hint ? questionInfo.hint : questionInfo.question_type_str}}<span v-if="questionInfo.score!=='null'"><!--（{{questionInfo.score}}分）--></span>
+    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<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-stem">{{questionInfo.hint}}</div>-->
+      <div class="question-hint" v-if="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'"
@@ -103,6 +103,10 @@ export default {
     mode: {
       type: String,
       default: 'exam'
+    },
+    showScore: {
+      type: Boolean,
+      default: false
     }
   },
   mounted() {

package/src/components/questions/Question_Reading.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="zykjcommon-question">
-    <div class="question-type">{{questionInfo.questionIndex}}、{{questionInfo.hint ? questionInfo.hint : questionInfo.question_type_str}}<span v-if="questionInfo.score!=='null'"><!--（{{questionInfo.score}}分）--></span>
+    <div class="question-type">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<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-stem">{{questionInfo.hint}}</div>-->
+      <div class="question-hint" v-if="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"
@@ -63,6 +63,10 @@ export default {
     mode: {
       type: String,
       default: 'exam'
+    },
+    showScore: {
+      type: Boolean,
+      default: false
     }
   },
   created() {

package/src/components/questions/Question_SingleChoice.vue

@@ -1,15 +1,19 @@
 <template>
   <div class="zykjcommon-question">
-    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{questionInfo.hint ? questionInfo.hint : questionInfo.question_type_str}}<span v-if="questionInfo.score!=='null'"><!--（{{questionInfo.score}}分）--></span>
+    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<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-stem" v-if="questionInfo.hint">{{questionInfo.hint}}</div>-->
-      <!--      <div class="question-stem" v-if="isSub"><span v-if="questionInfo.hint">{{questionInfo.questionIndex2}}、</span>{{questionInfo.hint}}</div>-->
-      <div class="editor-content" v-if="questionInfo.htmlContent" v-html="questionInfo.htmlContent"></div>
-      <!--      <div class="editor-content" style="display: flex" v-if="isSub">
-              <span v-if="!questionInfo.hint">{{questionInfo.questionIndex2}}、</span><div style="display: inline-block;flex: 1;" v-html="questionInfo.htmlContent"></div>
-            </div>-->
+      <div class="question-hint" v-if="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>
+      <div class="editor-content" style="display: flex" v-if="isSub">
+        <span v-if="!questionInfo.hint">{{questionInfo.questionIndex2}}、</span><div style="display: inline-block;flex:1;" v-html="questionInfo.htmlContent"></div>
+      </div>
+
+
+
       <div class="question-option-list" :style="(!questionInfo.htmlContent && !questionInfo.hint)?{'margin-top':0}:{}">
         <div class="question-option" v-for="(item,index) in exam_options_data">
           <div class="radio-box" :class="{'checked':radio == item.index}">
@@ -67,7 +71,7 @@
     v-model:visible="visible"
     -->
     <MediaLooker :visible.sync="visible"
-                  v-model:visible="visible"
+                 v-model:visible="visible"
                  v-if="visible"
                  :mediaCount="curMediaCount"
                  :mediaLookerList="mediaLookerList"></MediaLooker>
@@ -101,6 +105,10 @@ export default {
     mode: {
       type: String,
       default: 'exam'
+    },
+    showScore: {
+      type: Boolean,
+      default: false
     }
   },
   mounted() {

package/src/components/questions/buildEntry.js

@@ -2,6 +2,7 @@
  * Created by Allen Liu on 2023/7/14.
  */
 //此文件作为打包入口，打包后的dist文件给vue3用
+import '../../assets/scss/questions/zykjcommon-questions.scss';
 import Question_SingleChoice from './Question_SingleChoice.vue'
 import Question_MultipleChoice from './Question_MultipleChoice.vue'
 import Question_Reading from './Question_Reading.vue'
@@ -128,6 +129,7 @@ export default function(store){
       Vue.component('Question_Programming',Question_Programming)
       Vue.component('Question_Classify',Question_Classify)
     },
+    questionMapper,
     Question_SingleChoice,
     Question_MultipleChoice,
     Question_Reading,

package/src/components/questions/developmentEntry.js

@@ -128,6 +128,7 @@ export default function(store){
       Vue.component('Question_Programming',Question_Programming)
       Vue.component('Question_Classify',Question_Classify)
     },
+    questionMapper,
     Question_SingleChoice,
     Question_MultipleChoice,
     Question_Reading,

package/src/main.ts

@@ -179,8 +179,8 @@ import ZYKJQuestionsPlugin from "@src/components/questions/developmentEntry.js"
 // import ZYKJQuestionsPlugin from "../dist/zykjcommon-questions.umd.min"
 // import ZYKJQuestionsPlugin from "@zykjcommon/questions"
 vueInstance.use((ZYKJQuestionsPlugin as any)(store))
+import '@zykjcommon/questions/dist/zykjcommon-questions.css';
 // import '@zykjcommon/questions/src/assets/scss/questions/zykjcommon-questions.scss';
-import '@src/assets/scss/questions/zykjcommon-questions.scss';
 // import '@src/assets/scss/questions/zykjcommon-questions.scss';