@zykjcommon/questions 0.0.42 → 0.0.44

package/package.json

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

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

@@ -41,6 +41,8 @@ $greenItemFontSize:0.13em;
     color:#fff;
     background: #FFBC00;
     font-size: 12px;
+    border:none;
+    outline: none;
   }
   .question-option-list{
     margin-top: 30px;
@@ -391,19 +393,21 @@ $greenItemFontSize:0.13em;
       padding: 0 0.28em 0.15em 0.35em;
       flex: 1;
       .main-append{
-        height: 2.74em;
+        height: 2.8em;
         overflow: auto;
-        display: flex;
+        //display: flex;
         flex-wrap: wrap;
-        justify-content: space-between;
+        //justify-content: space-between;
         align-content: start;
-        &.noScrollBar::-webkit-scrollbar {
+        /*&.noScrollBar::-webkit-scrollbar {
           width: 0;
           height: 0;
-        }
+        }*/
       }
     }
     .append-item{
+      margin-left: 0.2em;
+      float: left;
       /*background: url("../../img/classify-green-item.png") no-repeat center;*/
       background-repeat: no-repeat;
       background-position: center;
@@ -434,12 +438,12 @@ $greenItemFontSize:0.13em;
         display: -webkit-box;
         -webkit-box-orient: vertical;
       }
-      &:nth-child(2n+1){
+      /*&:nth-child(2n+1){
         margin-left: 0.2em;
       }
       &:nth-child(2n){
         margin-right: 0.2em;
-      }
+      }*/
     }
     .list-outter{
       padding: 0 0.33em;

package/src/components/questions/Question_Classify.vue

@@ -219,8 +219,6 @@ export default {
       $(this.$el).find(`.question-classify .next`).off('click')
       $(this.$el).find(`.question-classify .prev`).off('click')
       $(document).off(this.mouseup)
-      let html = document.getElementsByTagName("html")[0];
-      html.style.fontSize = "";
       document.onselectstart = null
     },
     answeredNotify(){
@@ -468,10 +466,10 @@ export default {
       this.lazyDragTimer && clearTimeout(this.lazyDragTimer)
       this.lazyDragTimer = null
       $('.list').css({
-        overflow:'auto'
+        overflowX:'auto'
       })
       $('.main-append').css({
-        overflow:'auto'
+        overflowY:'auto'
       })
     },
     //回显答案

package/src/components/questions/Question_Programming.vue

@@ -1,9 +1,9 @@
 <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-show="!isEnterCodeByInit" 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-box" v-show="!isEnterCodeByInit">
       <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"
@@ -260,12 +260,12 @@ export default {
       this.iframe = node
       //用于浮动倒计时样式
       this.enterCode = true
-      this.bus.$emit('enterCode',true)
+      this.bus.$emit && this.bus.$emit('enterCode',true)
     },
     //只关闭iframe不保存（考试已经结束）
     closeIframe(){
       this.enterCode = false
-      this.bus.$emit('enterCode',false)
+      this.bus.$emit && this.bus.$emit('enterCode',false)
       this.showFrame = false
     },
     //关闭iframe并且保存（考试中）
@@ -281,7 +281,7 @@ export default {
       this.code_file_oss_temp_path = res.codeFileOssTempPath
       this.oss_temp_url = res.ossTempUrl
       this.scratch_answer_json = res.scratch_answer_json
-      this.bus.$emit('submitQuestion',{saveType:1,submitRequestAutoQuit:false,needSubmitRequest:false})
+      this.bus.$emit && this.bus.$emit('submitQuestion',{saveType:1,submitRequestAutoQuit:false,needSubmitRequest:false})
       let answered = this.isAnswered()
       this.mode === 'exam' && this.bus.$emit('questionCardChange',{
         questionIndex:self.questionInfo.questionIndex - 1,
@@ -293,7 +293,7 @@ export default {
       this.code_file_oss_temp_path = res.codeFileOssTempPath
       this.oss_temp_url = res.ossTempUrl
       this.scratch_answer_json = res.scratch_answer_json
-      this.bus.$emit('uploadCodingFileSuccess')
+      this.bus.$emit && this.bus.$emit('uploadCodingFileSuccess')
     }
   },
   components:{

package/src/views/exam/FullScreen.vue

@@ -3,6 +3,7 @@
     <QuestionHeader></QuestionHeader>
     <div class="content-outter" style="overflow: inherit">
       <component :is="responsiveObj.curQuestionInfo.questionComponent"
+                 :isEnterCodeByInit="true"
                  :bus="eventBus"
                  :questionInfo="responsiveObj.curQuestionInfo"
                  :screenRepairH="140"
@@ -405,6 +406,40 @@ export default defineComponent({
                 "judge_percent": "",
                 "knowledge_id": "367",
                 "read_content": ""
+              },
+              {
+                "question_type_str": "编程题",
+                "data_mode": 1,
+                "correct_judge": "",
+                "is_auto_check": "",
+                "content": "[{\"<>\":\"p\",\"text\":\"1、准备工作\"},{\"<>\":\"p\",\"text\":\" (1) 选择背景 Desert,Galaxy；\"},{\"<>\":\"p\",\"text\":\" (2) 选择角色 Rocketship。\"},{\"<>\":\"p\",\"text\":\" 2、功能实现\"},{\"<>\":\"p\",\"text\":\" (1)火箭初始造型为 rocketship-a,初始位置为舞台下端，初始背景为 Dessert；\"},{\"<>\":\"p\",\"text\":\" (2)点击绿旗，火箭垂直向上移动，一直移动到舞台顶端，并在移动过 程中切换造型；\"},{\"<>\":\"p\",\"text\":\" (3)当火箭达到舞台顶端时，背景切换为 Galaxy；\"},{\"<>\":\"p\",\"html\":[{\"<>\":\"span\",\"style\":\"\",\"text\":\" (4)火箭最后移到舞台下端的位置（初始位置），造型不限。\"}]},{\"<>\":\"p\",\"html\":[{\"<>\":\"span\",\"style\":\"\",\"html\":[{\"<>\":\"img\",\"src\":\"https://dev-resource.thedeer.cn/pre/resource-testing/image/3ae47ad6586554f0cd57b4858b800034qve9a1g4zs6twrc5.jpg\",\"width\":\"89\",\"height\":\"89\",\"base_src\":\"resource-testing/image/3ae47ad6586554f0cd57b4858b800034qve9a1g4zs6twrc5.jpg\"}]}]}]",
+                "correct_subjective_answer": "",
+                "auto_check": false,
+                "options_data": [],
+                "score": "30.00",
+                "sub_questions": [],
+                "style_type": "CODING",
+                "template_file_full_url": "https://dev-resource.thedeer.cn/pre/resource-testing/coding/d489ef8637c0198c9905b9628536ef875jsskgofnaulimvh.sb3",
+                "question_name": "1、准备工作 (1) 选择背景 Desert,Galaxy； (2) 选择角色 Rocketship。 2、功能实现 (1)火箭初始造型为 rocketship-a,初始位置为舞台下端，初始背景为 Dessert； (2)点击绿旗，火箭垂直向上移动，一直移动到舞台顶端，并在移动过 程中切换造型； (3)当火箭达到舞台顶端时，背景切换为 Galaxy； (4)火箭最后移到舞台下端的位置（初始位置），造型不限。",
+                "correct_rate": "",
+                "knowledge_name": "",
+                "page_location_list": [],
+                "code_type": 1,
+                "difficulty_level": "2",
+                "question_index": "",
+                "correct_single_index": 0,
+                "question_type": "16",
+                "media_resources": [],
+                "analysis": "",
+                "question_id": "12918",
+                "difficulty_level_str": "困难",
+                "update_date": "2023-05-13 10:09:59",
+                "exam_options_data": [],
+                "exam_link_answer_data": [],
+                "reference_file_full_url": "",
+                "correct_multiple_index_set": [],
+                "hint": "飞向太空",
+                "knowledge_id": ""
               }
             ],
             "examination_duration": 5400,
@@ -437,7 +472,7 @@ export default defineComponent({
                   "small_type_index_list": [
                     1,
                     2,
-                    4
+                    3
                   ]
                 },
                 {

package/src/views/exam/ReviewQuestion.vue

@@ -7,6 +7,7 @@
             <ul class="question-list">
               <li v-for="(item,index) in responsiveObj.questionList" :id="'question'+ index">
                 <component :is="item.questionComponent"
+                           :bus="eventBus"
                            :mode="'review'"
                            :questionInfo="item"
                            :key="'question'+ index"
@@ -35,7 +36,8 @@ interface dataInterface{
   warnVisible:boolean,
   enterCode:boolean,
   autoSubmitTimer:any,
-  routeName:string
+  routeName:string,
+  eventBus:any
 }
 
 interface responsiveData{
@@ -60,7 +62,8 @@ export default defineComponent({
       autoSubmitTimer:null,
       warnVisible:false,
       enterCode:false,
-      routeName:route.name as string
+      routeName:route.name as string,
+      eventBus:bus
     })
 
     //需要响应式放里面
@@ -75,6 +78,44 @@ export default defineComponent({
       bus.$on('enterCode',(bol)=>{
         data.enterCode = bol as boolean
       })
+      let questionList = [
+        {
+          "question_type_str": "编程题",
+          "data_mode": 1,
+          "correct_judge": "",
+          "is_auto_check": "",
+          "content": "[{\"<>\":\"p\",\"text\":\"1、准备工作\"},{\"<>\":\"p\",\"text\":\" (1) 选择背景 Desert,Galaxy；\"},{\"<>\":\"p\",\"text\":\" (2) 选择角色 Rocketship。\"},{\"<>\":\"p\",\"text\":\" 2、功能实现\"},{\"<>\":\"p\",\"text\":\" (1)火箭初始造型为 rocketship-a,初始位置为舞台下端，初始背景为 Dessert；\"},{\"<>\":\"p\",\"text\":\" (2)点击绿旗，火箭垂直向上移动，一直移动到舞台顶端，并在移动过 程中切换造型；\"},{\"<>\":\"p\",\"text\":\" (3)当火箭达到舞台顶端时，背景切换为 Galaxy；\"},{\"<>\":\"p\",\"html\":[{\"<>\":\"span\",\"style\":\"\",\"text\":\" (4)火箭最后移到舞台下端的位置（初始位置），造型不限。\"}]},{\"<>\":\"p\",\"html\":[{\"<>\":\"span\",\"style\":\"\",\"html\":[{\"<>\":\"img\",\"src\":\"https://dev-resource.thedeer.cn/pre/resource-testing/image/3ae47ad6586554f0cd57b4858b800034qve9a1g4zs6twrc5.jpg\",\"width\":\"89\",\"height\":\"89\",\"base_src\":\"resource-testing/image/3ae47ad6586554f0cd57b4858b800034qve9a1g4zs6twrc5.jpg\"}]}]}]",
+          "correct_subjective_answer": "",
+          "auto_check": false,
+          "options_data": [],
+          "score": "30.00",
+          "sub_questions": [],
+          "style_type": "CODING",
+          "template_file_full_url": "https://dev-resource.thedeer.cn/pre/resource-testing/coding/d489ef8637c0198c9905b9628536ef875jsskgofnaulimvh.sb3",
+          "question_name": "1、准备工作 (1) 选择背景 Desert,Galaxy； (2) 选择角色 Rocketship。 2、功能实现 (1)火箭初始造型为 rocketship-a,初始位置为舞台下端，初始背景为 Dessert； (2)点击绿旗，火箭垂直向上移动，一直移动到舞台顶端，并在移动过 程中切换造型； (3)当火箭达到舞台顶端时，背景切换为 Galaxy； (4)火箭最后移到舞台下端的位置（初始位置），造型不限。",
+          "correct_rate": "",
+          "knowledge_name": "",
+          "page_location_list": [],
+          "code_type": 1,
+          "difficulty_level": "2",
+          "question_index": "",
+          "correct_single_index": 0,
+          "question_type": "16",
+          "media_resources": [],
+          "analysis": "",
+          "question_id": "12918",
+          "difficulty_level_str": "困难",
+          "update_date": "2023-05-13 10:09:59",
+          "exam_options_data": [],
+          "exam_link_answer_data": [],
+          "reference_file_full_url": "",
+          "correct_multiple_index_set": [],
+          "hint": "飞向太空",
+          "knowledge_id": ""
+        }
+      ]
+      parseQuestionListItem(questionList)
+      responsiveObj.value.questionList = questionList
     })
 
     onUnmounted(()=>{

package/tasks/setPublishPackageJson.js

@@ -13,8 +13,11 @@ function getPublishJson(jsonStr){
   let result = ''
   let json = JSON.parse(jsonStr)
   needOpKeyArr.forEach((item)=>{
-    json.devDependencies[item] = json.dependencies[item]
-    delete json.dependencies[item]
+    let dependenciesVal = json.dependencies[item]
+    if(dependenciesVal){
+      json.devDependencies[item] = dependenciesVal
+      delete json.dependencies[item]
+    }
   })
   result = JSON.stringify(json,null,2)
   return result