zydx-plus 1.32.281 → 1.32.283

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.32.281",
+  "version": "1.32.283",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [

package/src/components/editor2/src/editor.vue

@@ -94,7 +94,6 @@
 </template>
 <script>
 import Recorder from 'js-audio-recorder'
-import zydxTextarea from '../../textarea/src/textarea'
 import {html2json, json2html} from 'html2json'
 import {Editor, EditorContent} from '@tiptap/vue-3'
 import StarterKit from '@tiptap/starter-kit'
@@ -113,8 +112,7 @@ export default {
   name: 'zydx-xiao-editor',
   components: {
     EditorContent,
-    svgs,
-    zydxTextarea
+    svgs
   },
   data() {
     return {
@@ -253,8 +251,8 @@ export default {
     // 强制监听data变化
     data: {
       handler: function (e, oldVal) {
-        this.editor?.commands.setContent(json2html({node: "root", child: (e.html === undefined || e.html === null) ? [] : e.html}))
-        this.uploadAttData = (e.enclosure === undefined || e.enclosure === null) ? [] : this.enclosureAction(e.enclosure)
+        this.editor?.commands.setContent(json2html({node: "root", child: (e.html === undefined || e.html === null || e.html === 'null') ? [] : e.html}))
+        this.uploadAttData = (e.enclosure === undefined || e.enclosure === null || e.html === 'null') ? [] : this.enclosureAction(e.enclosure)
       },
       deep: true
     },
@@ -269,12 +267,12 @@ export default {
   },
   mounted() {
     let _this = this
-    this.uploadAttData = (this.data.enclosure === undefined) ? [] : this.enclosureAction(this.data.enclosure)
+    this.uploadAttData = (this.data.enclosure === undefined || this.data.enclosure === null || this.data.enclosure === 'null') ? [] : this.enclosureAction(this.data.enclosure)
     this.heightStyle = (this.height === '100%') ? {height: '100%'} : {'min-height': this.height}
     const height = this.height.split('px')[0] - 44
     this.heightStyleCont = (this.height === '100%') ? {height: 'calc(100% - 44px)'} : {'min-height': `${height}px`}
     this.editor = new Editor({
-      content: json2html({node: "root", child: (this.data.html === undefined || null) ? [] : this.data.html}),
+      content: json2html({node: "root", child: (this.data.html === undefined || this.data.html === null || this.data.html.html === 'null') ? [] : this.data.html}),
       editable: this.readOnly,
       enablePasteRules: true,
       extensions: [
@@ -306,12 +304,12 @@ export default {
           enclosure: this.uploadAttData
         })
       },
-      onBlur: ({editor}) => {
+      onBlur: () => {
         this.limits = false
         this.close()
       },
       // 获取焦点
-      onFocus: ({editor}) => {
+      onFocus: () => {
         this.limits = true
       },
     })
@@ -341,7 +339,7 @@ export default {
       this.x = event.clientX - this.left;
       this.y = event.clientY - this.top;
     })
-    document.addEventListener('click', (event) => {
+    document.addEventListener('click', () => {
       if(this.limits) return
       this.close()
     })
@@ -430,7 +428,7 @@ export default {
           this.y = this.speech.y + ((this.height === '100%') ? 40 : Number(h) - 10)
           this.voiceShows = this.voiceStatus
           this.appID()
-        }, (error) => {
+        }, () => {
           this.$message({
             type: 'text',
             cancelShow: false,
@@ -555,7 +553,7 @@ export default {
       this.$emit('see', this.uploadAttData[index])
     },
     uploadFile(file, data) {
-      return new Promise((rl, re) => {
+      return new Promise((rl) => {
         const meta = data.meta ? Object.keys(data.meta) : []
         const param = new FormData()
         param.append('file', file)

package/src/components/word/src/icon.vue

@@ -0,0 +1,92 @@
+<template>
+  <div class="svg-choice" v-if="radio">
+    <div v-if="state === 'default'">
+      <svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200" width="14"
+           height="14">
+        <path :fill="disabled? 'rgba(0, 0, 0, .2)': 'rgba(24, 144, 255, 1)'"
+              d="M100,200A100,100,0,1,1,200,100,100,100,0,0,1,100,200Zm0-12.5A87.5,87.5,0,1,0,12.5,100,87.51,87.51,0,0,0,100,187.5Z"/>
+        <circle v-if="select" fill="rgba(24, 144, 255, 1)" cx="98.5" cy="98.5" r="62.5"/>
+      </svg>
+    </div>
+    <div v-else>
+      <svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 174.95 174.95" width="14"
+           height="14">
+        <path :fill="state === 'correct'?'rgba(67, 207, 124, 1)': 'rgba(255, 0, 0, 1)'"
+              d="M100.91,12.49A87.48,87.48,0,1,0,188.39,100,87.48,87.48,0,0,0,100.91,12.49Z"
+              transform="translate(-13.44 -12.49)"/>
+        <path v-if="state === 'correct'" fill="rgba(255, 255, 255, 1)"
+              d="M160.36,76.87,97.93,139.3l-.07.08a12.51,12.51,0,0,1-17.68,0l-.08-.08L42.68,101.87A12.49,12.49,0,1,1,60.35,84.2L89,112.86,142.68,59.2a12.5,12.5,0,1,1,17.68,17.67Z"
+              transform="translate(-15.01 -10.54)"/>
+        <path v-else fill="rgba(255, 255, 255, 1)" d="M151.43,134.15a35.64,35.64,0,0,1,5.81,7.52q1.84,3.41-.61,7.79c-.37.55-.87,1.21-1.51,2s-1.3,1.53-2,2.26a26.89,26.89,0,0,1-2,2,13.1,13.1,0,0,1-1.71,1.3,10.89,10.89,0,0,1-8.07,1.09,16.26,16.26,0,0,1-8.34-4.65l-5.74-5.74L119.57,140l-9-9-9.85-9.84-17.5,17.5q-8.07,8.07-13.12,13.26-5.2,5.19-10.33,6.43A9.56,9.56,0,0,1,50.66,156l-1-1-1.5-1.5-1.5-1.5a5.93,5.93,0,0,1-1-1.1A8.08,8.08,0,0,1,44,147.07a8.74,8.74,0,0,1,.34-3.9,13.88,13.88,0,0,1,1.85-3.69,23.41,23.41,0,0,1,2.73-3.28q1.23-1.09,4.38-4.11l7.38-7.65q4.52-4.38,10-9.85t11.56-11.48q-6.57-6.57-12.52-12.44L59.07,80.14q-4.73-4.65-7.73-7.59l-3.69-3.62c-2.37-2.37-3.57-4.72-3.62-7.05a11.89,11.89,0,0,1,2.39-7,28.65,28.65,0,0,1,3.15-3.21,29.25,29.25,0,0,1,2.87-2.39c2.73-1.83,5.19-2.62,7.38-2.4s4.38,1.49,6.56,3.76l4.24,4.24q3.15,3.15,7.8,7.66T88.88,72.69L101,84.51q5.19-5.19,10.18-10.12t9.3-9.22q4.31-4.32,7.79-7.73t5.82-5.74a16.23,16.23,0,0,1,7.11-4.17,8.12,8.12,0,0,1,7.38,1.71,10.87,10.87,0,0,0,.89.68,18,18,0,0,1,1.5,1.23l1.44,1.3a5.46,5.46,0,0,0,1,.75c2.47,2.37,3.67,4.95,3.63,7.73a11.07,11.07,0,0,1-3.63,7.72q-2.46,2.46-6.08,6.15c-2.42,2.47-5.1,5.16-8.07,8.07s-6.08,6-9.36,9.3l-10.39,10.39q5.06,4.92,9.91,9.64c3.23,3.15,6.24,6.08,9,8.82s5.29,5.24,7.52,7.52,4.08,4.15,5.54,5.61Z"
+              transform="translate(14.88 14.81) scale(0.7)"/>
+      </svg>
+    </div>
+  </div>
+  <div v-else class="svg-choice">
+    <div v-if="state === 'default'">
+      <svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 175 175" width="14" height="14">
+        <path :fill="disabled? 'rgba(0, 0, 0, .2)': 'rgba(24, 144, 255, 1)'"
+              d="M172.92,12.5H27.08A14.58,14.58,0,0,0,12.5,27.08V172.92A14.58,14.58,0,0,0,27.08,187.5H172.92a14.58,14.58,0,0,0,14.58-14.58V27.08A14.58,14.58,0,0,0,172.92,12.5Zm0,160.42H27.08V27.08H172.92V172.92Z"
+              transform="translate(-12.5 -12.5)"/>
+        <path v-if="select" fill="rgba(24, 144, 255, 1)"
+              d="M45.56,38.76H154.44a6.79,6.79,0,0,1,6.8,6.8h0V154.44a6.79,6.79,0,0,1-6.8,6.8H45.56a6.8,6.8,0,0,1-6.8-6.8h0V45.56a6.8,6.8,0,0,1,6.8-6.8Z"
+              transform="translate(-12.5 -12.5)"/>
+      </svg>
+    </div>
+    <div v-else>
+      <svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 175 175" width="19" height="19">
+        <path :fill="state === 'correct'?'rgba(67, 207, 124, 1)': 'rgba(255, 0, 0, 1)'"
+              d="M45.56,38.76H154.44a6.79,6.79,0,0,1,6.8,6.8h0V154.44a6.79,6.79,0,0,1-6.8,6.8H45.56a6.8,6.8,0,0,1-6.8-6.8h0V45.56a6.8,6.8,0,0,1,6.8-6.8Z"
+              transform="translate(-32.5 -12.5)"/>
+        <path v-if="state === 'correct'" fill="rgba(255, 255, 255, 1)"
+              d="M160.36,76.87,97.93,139.3l-.07.08a12.51,12.51,0,0,1-17.68,0l-.08-.08L42.68,101.87A12.49,12.49,0,1,1,60.35,84.2L89,112.86,142.68,59.2a12.5,12.5,0,1,1,17.68,17.67Z"
+              transform="translate(1.01 16.54) scale(0.7)"/>
+        <path v-else fill="rgba(255, 255, 255, 1)" d="M151.43,134.15a35.64,35.64,0,0,1,5.81,7.52q1.84,3.41-.61,7.79c-.37.55-.87,1.21-1.51,2s-1.3,1.53-2,2.26a26.89,26.89,0,0,1-2,2,13.1,13.1,0,0,1-1.71,1.3,10.89,10.89,0,0,1-8.07,1.09,16.26,16.26,0,0,1-8.34-4.65l-5.74-5.74L119.57,140l-9-9-9.85-9.84-17.5,17.5q-8.07,8.07-13.12,13.26-5.2,5.19-10.33,6.43A9.56,9.56,0,0,1,50.66,156l-1-1-1.5-1.5-1.5-1.5a5.93,5.93,0,0,1-1-1.1A8.08,8.08,0,0,1,44,147.07a8.74,8.74,0,0,1,.34-3.9,13.88,13.88,0,0,1,1.85-3.69,23.41,23.41,0,0,1,2.73-3.28q1.23-1.09,4.38-4.11l7.38-7.65q4.52-4.38,10-9.85t11.56-11.48q-6.57-6.57-12.52-12.44L59.07,80.14q-4.73-4.65-7.73-7.59l-3.69-3.62c-2.37-2.37-3.57-4.72-3.62-7.05a11.89,11.89,0,0,1,2.39-7,28.65,28.65,0,0,1,3.15-3.21,29.25,29.25,0,0,1,2.87-2.39c2.73-1.83,5.19-2.62,7.38-2.4s4.38,1.49,6.56,3.76l4.24,4.24q3.15,3.15,7.8,7.66T88.88,72.69L101,84.51q5.19-5.19,10.18-10.12t9.3-9.22q4.31-4.32,7.79-7.73t5.82-5.74a16.23,16.23,0,0,1,7.11-4.17,8.12,8.12,0,0,1,7.38,1.71,10.87,10.87,0,0,0,.89.68,18,18,0,0,1,1.5,1.23l1.44,1.3a5.46,5.46,0,0,0,1,.75c2.47,2.37,3.67,4.95,3.63,7.73a11.07,11.07,0,0,1-3.63,7.72q-2.46,2.46-6.08,6.15c-2.42,2.47-5.1,5.16-8.07,8.07s-6.08,6-9.36,9.3l-10.39,10.39q5.06,4.92,9.91,9.64c3.23,3.15,6.24,6.08,9,8.82s5.29,5.24,7.52,7.52,4.08,4.15,5.54,5.61Z"
+              transform="translate(6.88 24.81) scale(0.6)"/>
+      </svg>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {}
+  },
+  props: {
+    radio: { // 单选
+      type: Boolean,
+      default: false
+    },
+    select: { // 选中
+      type: Boolean,
+      default: false
+    },
+    state: { // 状态
+      type: String,
+      default: 'default'
+    },
+    disabled: { // 禁用
+      type: Boolean,
+      default: false
+    }
+  },
+  watch: {
+    select: {
+      handler(val) {
+        console.log(val)
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.svg-choice {
+  position: absolute;
+  top: 2px;
+  left: 0;
+  z-index: 1;
+}
+</style>

package/src/components/word/src/word.css

@@ -241,25 +241,3 @@ input[name='check'] {
     font-weight: 700;
     flex: 1;
 }
-.choice-ico{
-    width: 15px;
-    height: 15px;
-    display: inline-block;
-    border: 1px solid #666;
-    border-radius: 3px;
-    position: absolute;
-    top: 4px;
-    left: 2em;
-    z-index: 1;
-}
-.check-active{
-    background-color: #007acc;
-    border: 1px solid #007acc;
-}
-.check-dis{
-    background-color: #d0d0d0;
-    border: 1px solid #d0d0d0;
-}
-.check-dis-bor{
-    border: 1px solid #d0d0d0;
-}

package/src/components/word/src/word.vue

@@ -71,22 +71,12 @@
         </div>
         <div class="choice" v-if="item.testKey" v-show="item.open">
           <div class="choice-box" v-for="(ts,ind) in item.testKey">
-            <label v-if="ques(item.quesType)">
-              <input class="choice-input" v-if="chooseAnswer" :disabled="disabled" :checked="ts.checked"
-                     @change="answerChange($event,item,`${id}${index}`,null)" type="radio"
+            <label>
+              <input class="choice-input" style="display: none;" :disabled="disabled" :checked="ts.checked"
+                     @change="answerChange($event,item,`${id}${index}`,ts)" :type="ques(item.quesType)? 'radio': 'checkbox'"
                      :name="`${id}${index}`"/>
-              <span
-                  :class="{'choice-span': chooseAnswer,'choice-color': disabled&&ts.checked&&!item.error&&!nothing,'choice-red': disabled&&ts.checked&&item.error&&!nothing}">{{
-                  ts.index
-                }}. {{ ts.content[0] }}</span>
-            </label>
-            <label v-else>
-              <input class="choice-input" style="display: none;" v-if="chooseAnswer" :disabled="disabled" :checked="ts.checked"
-                     @change="answerChange($event,item,`${id}${index}`,ts)" type="checkbox"
-                     :name="`${id}${index}`"/>
-              <i class="choice-ico" :class="{'check-active': ts.checked, 'check-dis': disabled&&ts.checked,'check-dis-bor': disabled&&!ts.checked}"></i>
-              <span
-                  :class="{'choice-span': chooseAnswer,'choice-color': disabled&&ts.checked&&!item.error&&!nothing,'choice-red': disabled&&ts.checked&&item.error&&!nothing}">{{
+              <svgs v-if="chooseAnswer" :radio="ques(item.quesType)" :select="ts.checked" :disabled="disabled" :state="stateFun(ts,item)"></svgs>
+              <span :class="{'choice-span': chooseAnswer}">{{
                   ts.index
                 }}. {{ ts.content[0] }}</span>
             </label>
@@ -140,9 +130,11 @@
 
 <script>
 import {html2json, json2html} from 'html2json'
+import svgs from './icon.vue'
 
 export default {
   name: "zydx-seek",
+  components: {svgs},
   data() {
     return {
       value: [],
@@ -265,6 +257,11 @@ export default {
   },
   emits: ['change', 'modify', 'del', 'changeAll', 'replaceData', 'choiceData', 'judgeAnswer', 'openReasoning', 'review', 'subject'],
   methods: {
+    stateFun(ts,item) {
+      if(this.disabled&&ts.checked&&!item.error&&!this.nothing) return 'correct'
+      if(this.disabled&&ts.checked&&item.error&&!this.nothing) return 'error'
+      return 'default'
+    },
     customButTap(e,d) {
       if(e.key === 'option') d.open = !d.open
       if(e.key === 'modify') {
@@ -275,7 +272,7 @@ export default {
         this.$emit('del', d)
         return
       }
-      e.onClick(e)
+      e.onClick(e,d)
     },
     init() {
       this.value = JSON.parse(JSON.stringify(this.data))
@@ -354,7 +351,13 @@ export default {
       this.value[i].replace = !this.value[i].replace
     },
     answerChange(e, v, id, check) {
-      if(check !== null) check.checked = e.target.checked
+      if(this.ques(v.quesType)) {
+        v.testKey.map(x => {
+          x.checked = false
+          return x
+        })
+      }
+      check.checked = e.target.checked
       let answerArr = []
       const ids = document.getElementsByName(id)
       ids.forEach((x, index) => {

package/src/index.js

@@ -79,7 +79,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.32.281',
+    version: '1.32.283',
     install,
     Calendar,
     Message,