zydx-plus 1.35.622 → 1.35.624

package/package.json

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

package/src/components/choice/src/choice.vue

@@ -252,9 +252,6 @@ export default {
 </script>
 
 <style scoped>
-.choice-list{
-    text-indent: 27px;
-}
 .list-cont-input{
     width: 100%;
     height: 30px;

package/src/components/preface/src/preface.vue

@@ -37,8 +37,8 @@ export default {
             type: Object,
             default: () => {
                 return {
-                    diffLeve: 1,
-                    quesNo: ''
+                    difficulty: 1,
+                    sort: ''
                 }
             }
         }
@@ -58,24 +58,24 @@ export default {
     emits: ['change'],
     methods: {
         updateData(v) {
-            this.radioValue = (v.diffLeve === undefined)? null :v.diffLeve;
+            this.radioValue = (v.difficulty === undefined)? null :v.difficulty;
             this.radioList.map(x => {
-                x.checked = x.value === v.diffLeve;
+                x.checked = x.value === v.difficulty;
             })
-            this.inputValue = (v.quesNo === undefined)? '': v.quesNo;
+            this.inputValue = (v.sort === undefined)? '': v.sort;
         },
         radioTao(v) {
             this.radioValue = v;
             this.$emit('change', {
-                diffLeve: this.radioValue,
-                quesNo: this.inputValue
+                difficulty: this.radioValue,
+                sort: this.inputValue
             })
         },
         numbers(v) {
             this.inputValue = v.target.value;
             this.$emit('change', {
-                diffLeve: this.radioValue,
-                quesNo: this.inputValue
+                difficulty: this.radioValue,
+                sort: this.inputValue
             })
         },
         isNumberKey(event) {

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

@@ -36,9 +36,9 @@
           <div class="choice-box" v-for="(ts,ind) in item.testKey">
             <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'"
+                     @change="answerChange($event,item,`${id}${index}`,ts)" :type="ques(item.type)? 'radio': 'checkbox'"
                      :name="`${id}${index}`"/>
-<!--              <svgs v-if="chooseAnswer" :radio="ques(item.quesType)" :select="ts.checked" :disabled="disabled" :state="stateFun(ts,item)"></svgs>-->
+<!--              <svgs v-if="chooseAnswer" :radio="ques(item.type)" :select="ts.checked" :disabled="disabled" :state="stateFun(ts,item)"></svgs>-->
               <svgs v-if="chooseAnswer" :radio="false" :select="ts.checked" :disabled="disabled" :state="stateFun(ts,item)"></svgs>
               <span :class="{'choice-span': chooseAnswer}">{{
                   ts.index
@@ -174,7 +174,7 @@ export default {
           let judge = item?.judgeAnswer
           if (item.stuAnswer) judge = item.stuAnswer?.answer
           item.testKey = item.testKey.map(x => {
-            if (this.ques(item.quesType)) { // 判断是否单选
+            if (this.ques(item.type)) { // 判断是否单选
               x.checked = x.index === judge;  //答案
             } else {
               for (let i = 0; i < judge?.length; i++) {
@@ -194,9 +194,9 @@ export default {
       if( copy.length && this.value.length) {
         copy.forEach((item, index) => {
           if(this.value[index]){
-            if(item.resourceId===this.value[index].resourceId){
+            if(item.questionId===this.value[index].questionId){
               this.value[index].open = item.open
-              if (item.quesType === '101' || item.quesType === '102' || item.quesType === '102_1' || item.quesType === '102_2') { // 解决主观题点击完成按钮‘试题设置’按钮收起问题
+              if (item.type === '101' || item.type === '102' || item.type === '102_1' || item.type === '102_2') { // 解决主观题点击完成按钮‘试题设置’按钮收起问题
                 if (this.isLook) {
                   if(this.value[index].customBut) this.value[index].customBut[0].active = item.open
                 }
@@ -220,7 +220,7 @@ export default {
       return id.replace(/[0-9]/g, '')
     },
     answerChange(e, v, id, check) {
-      if(this.ques(v.quesType)) {
+      if(this.ques(v.type)) {
         v.testKey.map(x => {
           x.checked = false
           return x
@@ -236,7 +236,7 @@ export default {
       })
       this.$emit('judgeAnswer', {
         ...v,
-        judgeAnswer: this.ques(v.quesType) ? answerArr[0] : answerArr
+        judgeAnswer: this.ques(v.type) ? answerArr[0] : answerArr
       })
     },
     checkboxChange(e, index) {

package/src/components/textarea/src/textarea.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="textarea">
-    <div class="text" :style="{
+    <div class="textarea-text" :style="{
+      'text-indent': `${indent? '17px': '0'}`,
             'min-height': height + 'px',
             border: (readable)? '1px solid #ccc': 'none',
             'background-color': (readable)? '#fff': 'transparent'
@@ -27,7 +28,7 @@ export default {
     },
     height: {
       type: Number,
-      default: 200
+      default: 100
     },
     maxLength: {
       type: Number,
@@ -44,6 +45,10 @@ export default {
     lineNum: {
       type: Number,
       default: 5
+    },
+    indent: {
+      type: Boolean,
+      default: true
     }
   },
   watch: {
@@ -144,16 +149,17 @@ export default {
   color: #666;
 }
 
-.text {
+.textarea-text {
   width: 100%;
   border: 1px solid #ccc;
   line-height: 24px;
   box-sizing: border-box;
-  text-indent: 2em;
   background-color: #fff;
+  padding: 0 10px;
+  text-align: justify;
 }
 
-.text[contenteditable]:empty:before {
+.textarea-text[contenteditable]:empty:before {
   content: attr(placeholder);
   color: gray;
 }

package/src/components/tipBox/index.js

@@ -8,7 +8,7 @@ render(divNode, document.body)
 const container = divNode.el
 
 // 导出函数可通过调用 Confirm() 函数动态创建 XtxConfirm 组件
-const Confirm = ({ className, type, url ,title,radioArr,checkboxArr,submitText,cancelText,closeShow, promptContent, middle, cancelShow, inputArr, countdown, components }) => {
+const Confirm = ({ className, type, url ,title,radioArr,checkboxArr,submitText,cancelText,closeShow, promptContent, middle, cancelShow, inputArr, countdown, components, slotProps }) => {
     // 返回 Promise 对象
     return new Promise((resolve, reject) => {
         // 2. 点击确认按钮，触发resolve同时销毁组件
@@ -52,7 +52,7 @@ const Confirm = ({ className, type, url ,title,radioArr,checkboxArr,submitText,c
             render(null, container)
         }
         // 1. 创建 XtxConfirm 组件
-        const VNode = createVNode(XtxConfirm, { className, type, url ,title, submitText, cancelText, closeShow,promptContent,radioArr,checkboxArr, middle, cancelShow, inputArr,countdown,components, submit, cancel, close })
+        const VNode = createVNode(XtxConfirm, { className, type, url ,title, submitText, cancelText, closeShow,promptContent,radioArr,checkboxArr, middle, cancelShow, inputArr,countdown,components, slotProps, submit, cancel, close })
         render(VNode, container)
     })
 }

package/src/components/tipBox/src/main.vue

@@ -11,7 +11,7 @@
         <div class="tip-boxContent" ref="tip-boxContent" :style="overflowShow?'overflow-y: scroll':''">
           <div class="tap-p" ref="tapP">
             <div v-if="type === 'slot'">
-              <component :is="components"></component>
+              <component :is="components" v-bind="slotProps"></component>
             </div>
             <div class="tip-title2" ref="tipTitle" v-if="type === 'text'"
                  :style="{'text-align': (middles)? 'center': 'left', 'text-indent': indent? '2em': '0' }">
@@ -79,6 +79,7 @@
                         :height="item.height?item.height:100"
                         :placeholder="item.placeholder"
                         :value="item.value"
+                        :indent="item.indent"
                         :maxLength="item.maxLength?item.maxLength:0"
                         :lineNum="item.lineNum?item.lineNum:3">
                     </zydx-textarea>
@@ -241,6 +242,10 @@ export default {
     components: { // 模版组件
       type: Object,
       default: () => {}
+    },
+    slotProps: {
+      type: Object,
+      default: () => {}
     }
   },
   mounted() {

package/src/index.js

@@ -87,7 +87,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.35.622',
+    version: '1.35.624',
     install,
     Calendar,
     Message,