@zykjcommon/questions 0.0.13 → 0.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zykjcommon/questions",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "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.11",
+    "@zykjcommon/questions": "^0.0.14",
     "alife-logger": "^1.8.30",
     "axios": "^0.26.0",
     "cookie": "^0.4.1",

package/src/App.vue

@@ -27,6 +27,8 @@ export default {
     VUE_APP_VERSION:process.env.VUE_APP_VERSION
   }),
   mounted() {
+    let token = fun.getToken()
+    this.setToken(token)
   },
   watch:{
   }

package/src/assets/js/fun.js

@@ -3,6 +3,8 @@
  ****************************************************/
 // import {postWeb} from "./http.js";
 // import helper from "./helper";
+import Vue from "vue";
+
 /**
  * 字典排序
  * @param <Object> dict
@@ -777,8 +779,8 @@ function closeContentDialogByUid(uid){
 
 let getToken = function() {
   // let token = getQueryVariable('a')
-  // let token = helper.cookieUtils.getItem('token',true)
-  // return token;
+  let token = '962b31f683668129f8b9f3716777c132j63rxr0z'
+  return token;
 };
 
 function getQueryVariable(variable)
@@ -843,7 +845,26 @@ function fbError(message, source, lineno, colno, error) {
 }
 
 
+function getVueVersion(){
+  let version = ''
+  /*if(!Vue){
+    if(createApp){
+      let v = createApp({})
+      version = v.version
+    }else{
+      version = 'undefined'
+    }
+  }else{
+    version = Vue.version || 'undefined'
+  }*/
+  let Vue = require('vue')
+  Vue = Vue.default || Vue
+  version = Vue.version || 'undefined'
+  return version
+}
+
 export default {
+  getVueVersion,
   getToken,
   getQueryVariable,
   debounce2,

package/src/assets/js/http.js

@@ -27,7 +27,7 @@ let createSign = function(method, URL, param, ClientTimestamp) {
   let StringToSign =
     method +
     "\n" +
-     "/education"+URL +
+     "/student-web"+URL +
     "\n" +
     ClientTimestamp +
     "\n" +

package/src/assets/scss/questions/index.scss

@@ -135,28 +135,6 @@
       margin-top: 10px;
     }
   }
-  .editor-textarea{
-    margin-top: 15px;
-    position: relative;
-    display: inline-block;
-    width: 100%;
-    textarea{
-      font-size: 14px;
-      min-width: 100%;max-width: 100%;min-height: 107px;
-      padding: 15px;
-      outline-color: #FFBC00;
-      border-radius: 6px;
-      border: 1px solid #DFDFDF;
-      color:#000;
-    }
-    .len{
-      right: 10px;
-      bottom: 10px;
-      position: absolute;
-      color:#999999;
-      font-size: 12px;
-    }
-  }
   .question-analysis{
     position: relative;
     margin-top: 16px;
@@ -265,6 +243,103 @@
     min-width: 80px;
     margin-right:5px;
   }
+
+  .question-tabs{
+    margin-top: 20px;
+    display: flex;
+    flex-wrap: wrap;
+    width: 100%;
+    margin-bottom: -15px;
+    .question-tab-item{
+      cursor: pointer;
+      border-radius: 6px;
+      width: 80px;
+      height: 36px;
+      line-height: 36px;
+      text-align: center;
+      border:1px solid #999;
+      position: relative;
+      margin-right: 5px;
+      margin-bottom: 10px;
+      &:hover{
+        border:1px solid #FF7D30;
+      }
+      &.cur{
+        border:1px solid #ddd;
+        background: #ddd;
+        &:before{
+          content:' ';
+          display: inline-block;
+          border-top:8px solid #ddd;
+          border-left:8px solid transparent;
+          border-right:8px solid transparent;
+          width: 0;
+          height: 0;
+          position:absolute;
+          bottom: -6px;
+        }
+        &:hover{
+          border:1px solid #ddd;
+        }
+      }
+      .tab-mark{
+        position: absolute;
+        width: 20px;
+        height: 20px;
+        background:url("~@src/assets/img/tab-mark.png") no-repeat center;
+        background-size: 100% 100%;
+        right: -3px;
+        top: -5px;
+      }
+    }
+  }
+  .editor-textarea{
+    margin-top: 15px;
+    position: relative;
+    display: inline-block;
+    width: 100%;
+    textarea{
+      font-size: 14px;
+      min-width: 100%;max-width: 100%;min-height: 107px;
+      padding: 15px;
+      outline-color: #FFBC00;
+      border-radius: 6px;
+      border: 1px solid #DFDFDF;
+      color:#000;
+    }
+    .len{
+      right: 10px;
+      bottom: 10px;
+      position: absolute;
+      color:#999999;
+      font-size: 12px;
+    }
+  }
+
+  .iframeBox{
+    z-index:100;
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    left: 0;
+    top: 0;
+    iframe{
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  .loading{
+    width: 50px;
+    height: 50px;
+    display: block;
+    position: fixed;
+    left:50%;
+    top:50%;
+    margin-left:-25px;
+    margin-top: -25px;
+    z-index:99999;
+  }
 }
 
 .imgLookerDialog{

package/src/components/common/IframeComponent.vue

@@ -1,5 +1,5 @@
 <template>
-  <teleport to="#app">
+<!--  <teleport to="#app">
     <div class="iframeBox">
       <iframe :src ="iframeUrl"
               id="codeIframe"
@@ -10,92 +10,76 @@
         <p>Your browser does not support iframes.</p>
       </iframe>
     </div>
-  </teleport>
-  <Loading :loading="loading"></Loading>
+  </teleport>-->
+  <div>
+    <div class="iframeBox">
+      <iframe :src ="iframeUrl"
+              id="codeIframe"
+              loop
+              allow="microphone;camera;midi;encrypted-media;unsized-media;vr;xr-spatial-tracking;autoplay"
+              frameborder="0"
+      >
+        <p>Your browser does not support iframes.</p>
+      </iframe>
+    </div>
+    <Loading :loading="loading"></Loading>
+  </div>
 </template>
 
-<script lang="ts">
-import {defineComponent, toRefs, reactive, onMounted, onUnmounted} from 'vue'
-interface dataInterface{
-  loading:boolean
-}
-export default defineComponent({
+<script>
+import Loading from "./Loading.vue";
+export default {
   props: {
     iframeUrl:{
       type:String,
       default:''
     }
   },
-  emits:['uploadCodingFileSuccess','close','closeAndSave','iframeLoaded','getQuestionInfo','saveCodeOnly'],
-  setup(props, context) {
-    let iframe:any = null
-    let data:dataInterface = reactive({
-      loading:true
-    })
-
-
-
-    function iframeLoadEvent(){
-      data.loading = false
-      context.emit('iframeLoaded',iframe)
-    }
-
-    function messageEvent(data:any){
-      // let iframeOrigin = ''+window.location.protocol+'//'+props.iframeUrl.replace(/^(http|https):\/\//g,'').split('/')[0];
-      // if(data.origin===iframeOrigin){
-        //判断是否json字符串
-        if(typeof(data.data)==='string'){
-          try {
-            let obj = JSON.parse(data.data)
-            context.emit(obj.type,obj.data)
-          } catch(e) {
-            let res = data.data
-            context.emit(res,data)
-          }
+  data() {
+    return {
+      loading:true,
+      iframe:null
+    };
+  },
+  mounted() {
+    this.iframe = document.getElementById('codeIframe')
+    this.iframe.addEventListener('load',this.iframeLoadEvent)
+    window.addEventListener('message',this.messageEvent)
+  },
+  unmounted() {
+    this.removeIframeEvents()
+  },
+  destroyed() {
+    this.removeIframeEvents()
+  },
+  methods:{
+    iframeLoadEvent(){
+      this.loading = false
+      this.$emit('iframeLoaded',this.iframe)
+    },
+    messageEvent(data){
+      if(typeof(data.data)==='string'){
+        try {
+          let obj = JSON.parse(data.data)
+          this.$emit(obj.type,obj.data)
+        } catch(e) {
+          let res = data.data
+          this.$emit(res,data)
         }
-      // }
-    }
-
-
-
-    function removeIframeEvents(){
-      iframe && iframe.removeEventListener('load',iframeLoadEvent)
-      window.removeEventListener('message',messageEvent)
-    }
-
-
-    onMounted(()=>{
-      iframe = document.getElementById('codeIframe')
-      iframe.addEventListener('load',iframeLoadEvent)
-      window.addEventListener('message',messageEvent)
-    })
-
-    onUnmounted(()=>{
-      removeIframeEvents()
-    })
-
+      }
+    },
+    removeIframeEvents(){
+      this.iframe && this.iframe.removeEventListener('load',this.iframeLoadEvent)
+      window.removeEventListener('message',this.messageEvent)
+    },
 
-
-
-
-    return {
-      ...toRefs(data)
-    }
+  },
+  components:{
+    Loading
   }
-})
+}
 </script>
 
-<style scoped lang="scss">
-.iframeBox{
-  z-index:100;
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  left: 0;
-  top: 0;
-  iframe{
-    width: 100%;
-    height: 100%;
-  }
-}
+<style scoped>
+
 </style>

package/src/components/common/Loading.vue

@@ -1,45 +1,23 @@
 <template>
-  <teleport to="body">
-    <img class="loading" src="~@src/assets/img/loading.gif" alt="" v-if="loading">
-  </teleport>
+  <div class="loading-box">
+    <img class="loading" src="../../assets/img/loading.gif" alt="" v-if="loading">
+  </div>
 </template>
 
-<script lang="ts">
-import {defineComponent, toRefs, reactive, onMounted, onUnmounted} from 'vue'
-interface dataInterface{
-
-}
-export default defineComponent({
+<script>
+export default {
   props: {
     loading:{
       type:Boolean,
       default:false
     }
   },
-  setup(props, context) {
-    let data:dataInterface = reactive({
-
-    })
-
-
-
+  data() {
     return {
-      ...toRefs(data)
-    }
+    };
   }
-})
+}
 </script>
 
-<style scoped lang="scss">
-.loading{
-  width: 50px;
-  height: 50px;
-  display: block;
-  position: fixed;
-  left:50%;
-  top:50%;
-  margin-left:-25px;
-  margin-top: -25px;
-  z-index:99999;
-}
+<style scoped>
 </style>

package/src/components/common/TextAreaEditor.vue

@@ -8,25 +8,9 @@
     <div class="len">{{textareaStr.length}}/5000</div>
   </div>
 </template>
+<script>
 
-<script lang="ts">
-import {
-  defineComponent,
-  onMounted,
-  onUnmounted,
-  reactive,
-  ref,
-  toRef,
-  toRefs,
-  watch,
-  onActivated,
-  onDeactivated,
-  getCurrentInstance
-} from 'vue'
-interface dataInterface{
-  textareaStr:string
-}
-export default defineComponent({
+export default {
   props: {
     placeHolder:{
       type:String,
@@ -41,81 +25,82 @@ export default defineComponent({
       default:false
     }
   },
-  setup(props, context) {
-    let data:dataInterface = reactive({
-      textareaStr:'',
-    })
-    const currentInstance:any = getCurrentInstance()
-    let _this = currentInstance.proxy
-    let observer:any
-    onMounted(()=>{
-      let textareaComponent = _this.$el.querySelector('.textareaComponent')
-      let ele = textareaComponent as HTMLElement
-      let textareaInitH = textareaComponent.clientHeight
-      const MutationObserver = window.MutationObserver|| window.WebKitMutationObserver || window.MozMutationObserver
-      const config = { attributes: true, childList: false, subtree: true, attributeFilter:['style'],attributeOldValue:true };
-      observer = new MutationObserver( (mutationsList, observer) => {
-        let appNode = document.querySelector('.content-outter')
-        if(appNode){
-          let height = parseInt(getComputedStyle(ele).getPropertyValue('height'))
-          let scrollDistance = height - textareaInitH
-          // console.log(scrollDistance,appNode.scrollTop);
-          appNode.scrollTop = appNode.scrollTop + scrollDistance
-          // if(scrollDistance > 0){
-          //   console.log(scrollDistance,appNode.scrollTop);
-          //   appNode.scrollTop = appNode.scrollTop + scrollDistance
-          // }
-          textareaInitH = height
-        }
-      });
-      observer.observe(ele, config);
-    })
-
-    onUnmounted(()=>{
-      observer && observer.disconnect()
-    })
-
-    watch(() => data.textareaStr, (nv) => {
-      context.emit("getTextareaStr", nv);
-    })
+  mounted() {
+    let textareaComponent = this.$el.querySelector('.textareaComponent')
+    let initTextAreaWidth = parseInt(getComputedStyle(textareaComponent).getPropertyValue('width'))
+    // console.log(initTextAreaWidth,2211);
+    let ele = textareaComponent
+    let textareaInitH = textareaComponent.clientHeight
+    const MutationObserver = window.MutationObserver|| window.WebKitMutationObserver || window.MozMutationObserver
+    const config = { attributes: true, childList: false, subtree: true, attributeFilter:['style'],attributeOldValue:true };
+    this.observer = new MutationObserver( (mutationsList, observer) => {
+      let appNode = document.querySelector('.content-outter')
+      if(appNode){
+        let height = parseInt(getComputedStyle(ele).getPropertyValue('height'))
+        let scrollDistance = height - textareaInitH
+        appNode.scrollTop = appNode.scrollTop + scrollDistance
+        textareaInitH = height
+      }
 
-    watch(() => props.value, (nv) => {
-      if(nv){
-        data.textareaStr = nv
+      let curTextAreaWidth = parseInt(getComputedStyle(textareaComponent).getPropertyValue('width'))
+      // console.log(initTextAreaWidth,curTextAreaWidth,2233);
+      //自定义拉伸到宽度比容器还长后，把宽度固定到容器宽度
+      if(curTextAreaWidth > initTextAreaWidth){
+        textareaComponent.style.width = initTextAreaWidth + 'px'
       }
+    });
+    this.observer.observe(ele, config);
+
+    this.$watch('textareaStr',(nv)=>{
+      this.$emit("getTextareaStr", nv);
     },{
       immediate:true
     })
-
-
-
+  },
+  unmounted() {
+    this.observer && this.observer.disconnect()
+  },
+  destroyed() {
+    this.observer && this.observer.disconnect()
+  },
+  data() {
     return {
-      ...toRefs(data)
+      observer:null,
+      textareaStr:''
+    };
+  },
+  watch: {
+    value:{
+      handler(nv,ov){
+        if(nv){
+          this.textareaStr = nv
+        }
+      },
+      immediate:true
+    }
+  },
+  computed:{
+  },
+  methods: {
+    getAnswer(){
+      let self = this
+      return {multiple_index_set:self.checkboxList}
+    },
+    isAnswered(){
+      let answerd = this.checkboxList.length !== 0
+      return answerd
+    },
+    isCorrect(){
+      let correct = this.questionInfo.answerMap.is_correct === '1' ? true : false
+      return correct
+    },
+    getCorrectStr(correct_multiple_index_set){
+      let str = ''
+      correct_multiple_index_set.forEach((item,index)=>{
+        str += `${fun.indexToEnIndex(item)}${index === correct_multiple_index_set.length -1?'':'、'}`
+      })
+      return str
     }
   }
-})
+};
 </script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style  lang="scss" scoped>
-.editor-textarea{
-  margin-top: 15px;
-  position: relative;
-  display: inline-block;
-  textarea{
-    font-size: 18px;min-width: 800px;max-width: 1600px;min-height: 300px;
-    padding: 10px 15px 15px 15px;
-    outline-color: deepskyblue;
-  }
-  .len{
-    right: 15px;
-    bottom: 4px;
-    position: absolute;
-    color:blue;
-    font-weight: bold;
-
-  }
-}
-
-
-</style>

package/src/components/exam/QuestionCard.vue

@@ -280,9 +280,9 @@ export default defineComponent({
       let t = 1000 * 60
       // let t = 1000 * 2
       clearAutoTimer()
-      data.autoSubmitTimer = setInterval(()=>{
-        submitQuestion(0)
-      },t)
+      // data.autoSubmitTimer = setInterval(()=>{
+      //   submitQuestion(0)
+      // },t)
     }
 
     function btnQuit(){

package/src/components/questions/QuestionReader.js

@@ -3,19 +3,19 @@
  */
 import '../../assets/scss/questions/index.scss';
 import Question_SingleChoice from './Question_SingleChoice.vue'
-// import Question_MultipleChoice from '@src/components/questions/Question_MultipleChoice.vue'
+import Question_MultipleChoice from './Question_MultipleChoice.vue'
 // import Question_Programming from '@src/components/questions/Question_Programming.vue'
 // import Question_BriefAnswer from '@src/components/questions/Question_BriefAnswer.vue'
-// import Question_Reading from '@src/components/questions/Question_Reading.vue'
+import Question_Reading from './Question_Reading.vue'
 // import Question_FillBlank from '@src/components/questions/Question_FillBlank.vue'
 
 
 
 export default {
   Question_SingleChoice,
-  // Question_MultipleChoice,
+  Question_MultipleChoice,
   // Question_Programming,
   // Question_BriefAnswer,
-  // Question_Reading,
+  Question_Reading,
   // Question_FillBlank
 }