zydx-plus 1.32.229 → 1.32.231

package/package.json

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

package/src/components/biz_header/src/button_name.js

@@ -1253,7 +1253,7 @@ let buttonNames = {
                                 power: '学习动力'
                             }
                         },
-                        1: {
+                        2: {
                             headLevel: {
                                 default: "allClass",
                                 allClass: this.getPrefix(item) + '检测',
@@ -1506,7 +1506,7 @@ let buttonNames = {
                                 power: '学习动力'
                             },
                         },
-                        1: {
+                        2: {
                             headLevel: {
                                 default: "allClass",
                                 allClass: this.getPrefix(item) + '训练',
@@ -2182,7 +2182,7 @@ let buttonNames = {
                                 demand: '分析要求',
                                 resourceIndex: '题  目',
                                 review: '分析点评',
-                                analyse: '分析分析',
+                                analyse: '分析资源',
                                 countermeasure: '教学对策'
                             },
                             otherLevel: {
@@ -2420,7 +2420,7 @@ let buttonNames = {
                                 default: "demand",
                                 demand: '考试须知',
                                 resourceIndex: '考试试题',
-                                analyse: '创新分析',
+                                analyse: '考试分析',
                                 countermeasure: '教学对策'
                             },
                             otherLevel: {

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

@@ -360,7 +360,7 @@ export default {
         readOnlyPage() { // 只读分页
             this.htmlArr = []
             const data = document.querySelectorAll('.editing-cont')[0].childNodes[0].childNodes
-            this.wit = document.getElementsByClassName('editor-content')[0].offsetWidth
+            this.wit = document.getElementsByClassName('editor-content')[0].offsetWidth + 20
             if(this.wit > 900) this.wit = 900
             let max = this.wit * 1.4 - 200
             let pHeight = 0
@@ -823,6 +823,7 @@ export default {
 </script>
 
 <style scoped>
+
 :deep(.ProseMirror-separator) {
     display: none !important;
 }
@@ -852,8 +853,10 @@ export default {
     background-color: #fff;
     box-sizing: border-box;
     position: relative;
-    border: 1px solid #ccc;
-    margin: 10px 10px 20px 10px;
+    border-bottom: 10px solid #e5e5e5;
+}
+.read-only-page:last-child{
+    border-bottom: 0;
 }
 
 .read-only-p {
@@ -865,6 +868,9 @@ export default {
     line-height: 24px;
     text-align: justify;
 }
+:deep(.text){
+    text-indent: 2em;
+}
 
 .read-only-a {
     position: absolute;
@@ -957,7 +963,11 @@ label {
     font-size: 12px;
     font-weight: 400;
 }
-
+.read-only-down{
+    background-color: #e5e5e5;
+    height: 10px;
+    width: 100%;
+}
 :deep(.ProseMirror) p.is-editor-empty:first-child::before {
     content: attr(data-placeholder);
     float: left;
@@ -1050,7 +1060,6 @@ li {
 
 .editor-content {
     margin: 10px;
-    border: 1px solid rgba(204, 204, 204, 1);
     max-height: 900px;
     overflow: auto;
 }

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

@@ -450,9 +450,6 @@ export default {
 </script>
 
 <style scoped>
-.edit{
-    margin-bottom: 14px;
-}
 :deep(.imgCont) {
     line-height: 0 !important;
 }

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

@@ -7,9 +7,9 @@
                     <div class="tip-title" v-html="title"></div>
                 </div>
                 <div class="tip-boxContent">
-                    <div class="tap-p">
-                        <div class="tip-title2" v-if="type === 'text'"
-                             :style="{'text-align': (middle)? 'center': 'left' }" v-html="promptContent"></div>
+                    <div class="tap-p" ref="tapP">
+                        <div class="tip-title2" ref="tipTitle" v-if="type === 'text'"
+                             :style="{'text-align': (middles)? 'center': 'left', 'text-indent': indent? '2em': '0' }" v-html="promptContent"></div>
                         <div class="tip-img" v-if="type === 'img'">
                             <img :src="url" alt=""/>
                         </div>
@@ -101,7 +101,9 @@ export default {
         return {
             tip: false,
             tipYear: false,
-            fileName: ''
+            fileName: '',
+            middles: this.middle,
+            indent: false
         }
     },
     props: {
@@ -170,6 +172,16 @@ export default {
             }
         }
     },
+    mounted() {
+        this.$nextTick(() => {
+            if(this.type === 'text') {
+                if(this.$refs.tapP.offsetHeight > 25) {
+                    this.middles = false
+                    this.indent = true
+                }
+            }
+        })
+    },
     methods: {
         checkboxTao(index) {
             this.checkboxArr[index].checked = !this.checkboxArr[index].checked

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

@@ -47,9 +47,6 @@
     font-size: 20px;
     margin-top: 5px;
 }
-.parer-cont{
-    padding: 10px 0;
-}
 .parer-cont>p{
     font-size: 12px;
     line-height: 18px;
@@ -89,7 +86,7 @@
 .subject-title{
     flex: 1;
     position: relative;
-    line-height: 26px;
+    line-height: 24px;
 }
 .subject-title label{
     display: inline-block;
@@ -109,9 +106,8 @@
 }
 .choice-box{
     text-indent: 2em;
-    line-height: 25px;
+    line-height: 24px;
     font-size: 14px;
-    margin: 2px 0;
     position: relative;
 }
 .choice-input{
@@ -168,21 +164,15 @@ input[name='check'] {
     z-index: 1;
     display: flex;
 }
-.subject-html{
-    margin: 2px 0;
-}
-.subject-html :deep(p){
-    margin: 2px 0;
-}
 .subject-html-title{
     text-indent: 2em;
     font-weight: bold;
     font-size: 14px;
-    line-height: 26px;
+    line-height: 24px;
 }
 .subject-html-cont{
     text-align: justify;
-    line-height: 26px;
+    line-height: 24px;
     text-indent: 2em;
 }
 .table{

package/src/index.js

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