zydx-plus 1.35.536 → 1.35.538

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.35.536",
+  "version": "1.35.538",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [
@@ -48,7 +48,7 @@
     "js-audio-recorder": "^1.0.7",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "tldraw": "^2.0.2",
+    "tldraw": "^2.4.6",
     "@tldraw/editor": "^2.0.2",
     "buffer": "^5.7.1",
     "interactjs": "^1.10.27"

package/src/components/chat/src/chat.vue

@@ -40,7 +40,7 @@
               <span>AI回答</span>
               <span>（以下内容为AI生成，请注意辨别信息真伪）</span>
             </div>
-            <div class="operate" v-if="currentMessage">
+            <div :class="{'operate':true, 'operate-position': isHideInput }" v-if="currentMessage">
               <div @click="send('')" :class="{'disabled': disabled}">
                 <i class="theme-text iconfont zydx-a-zhongzhiAi"></i>
                 <span class="theme-text">重新生成</span>
@@ -430,6 +430,10 @@ export default {
   font-size: 12px;
   padding-right: 14px;
 }
+.AI-tips-line .operate-position{
+  width: 130px;
+  padding-right: 0;
+}
 .operate >div{
   float: left;
   cursor: pointer;

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

@@ -7,14 +7,14 @@
                <em>({{ text }})</em>
            </div>
            <div class="choice-title-right">
-               <button class="but" @click="add('correct')" v-if="!single">增正确项</button>
-               <button class="but" @click="add('interfere')">增干扰项</button>
+               <button class="sees-but" @click="add('correct')" v-if="!single">增正确项</button>
+               <button class="sees-but" @click="add('interfere')">增干扰项</button>
            </div>
        </div>
        <div class="choice-list" v-for="(item,index) in list">
            <div class="list-title" :class="{'lv-color': item.type === 'correct','red-color': item.type === 'interfere'}">
                <span>{{ item.letter }} . {{ item.title }}</span>
-               <button class="but" @click="alternative(index)">增加备选</button>
+               <button class="sees-but" @click="alternative(index)">增加备选</button>
            </div>
            <div class="list-cont">
                <div class="list-cont-li" v-for="(it,ins) in item.list">
@@ -31,7 +31,7 @@
         <div class="choice-list">
             <div class="list-title">
               <span>试题选项：<em>(必填项)</em></span>
-              <button class="but" @click="addOption">增加选项</button>
+              <button class="sees-but" @click="addOption">增加选项</button>
             </div>
             <div class="list-cont">
                 <div class="list-cont-li" v-for="(item,index) in list">
@@ -298,9 +298,10 @@ export default {
     font-size: 12px;
     font-style: normal;
 }
-.but{
+.sees-but{
     margin-left: 1px;
     font-size: 12px;
+    line-height: 17px;
     background-color: transparent;
     border: 1px solid #000;
     border-radius: 3px;

package/src/components/dragPopup2/src/dragPopup.vue

@@ -217,7 +217,9 @@ export default {
         this.x = this.left + (wid-this.initWidth)/2
       }
     });
-    document.getElementById(this.id).classList.add('zIndex10000')
+    setTimeout(() => {
+      document.getElementById(this.id).classList.add('zIndex10000')
+    },0)
   },
   computed: {
     position() {

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

@@ -1367,7 +1367,7 @@ export default {
     },
     //修改模板类型
     async changeTemplateType() {
-      const oldFormatWriteNewFormat = (oldJson) => {
+      /*const oldFormatWriteNewFormat = (oldJson) => {
         let newJson = this.editor.getJSON()
         if (oldJson.content.length === 1 && !oldJson.content[0].content) {
           return
@@ -1418,7 +1418,7 @@ export default {
           newJson.content.splice(remainIndex + index + 1, 0, item)
         })
         this.editor.chain().setContent(newJson).run()
-      }
+      }*/
       const htmlFormat = butJson(this.editor, this.menusText)['switchingFormat'].menuKeys
       let oldJson = this.editor.getJSON()
       // 自由排版
@@ -1456,7 +1456,7 @@ export default {
           'textMenu', 'color', 'interposition']
         this.organizeButton()
         this.interpositionData = []
-        oldFormatWriteNewFormat(oldJson)
+        // oldFormatWriteNewFormat(oldJson)
       }
       // 公文版式
       if (this.templateType === 'officialDocumentFormat' && !this.readOnly) {
@@ -1468,7 +1468,7 @@ export default {
           'titleMenu', 'color', 'interposition']
         this.organizeButton()
         this.interpositionData = []
-        oldFormatWriteNewFormat(oldJson)
+        // oldFormatWriteNewFormat(oldJson)
       }
       // 新闻版式
       if (this.templateType === 'newsFormat' && !this.readOnly) {
@@ -1480,7 +1480,7 @@ export default {
           'titleMenu', 'color', 'interposition']
         this.organizeButton()
         this.interpositionData = []
-        oldFormatWriteNewFormat(oldJson)
+        // oldFormatWriteNewFormat(oldJson)
       }
       // 论文版式
       if (this.templateType === 'paperFormat' && !this.readOnly) {
@@ -1492,7 +1492,7 @@ export default {
           'titleMenu', 'color', 'interposition']
         this.organizeButton()
         this.interpositionData = []
-        oldFormatWriteNewFormat(oldJson)
+        // oldFormatWriteNewFormat(oldJson)
       }
     },
     // 修改边距
@@ -3008,29 +3008,42 @@ export default {
     },
 
     async butTap(data, key, childKey) {
+      if (!key.key)return
       // 切换版式
       if (data.key === 'switchingFormat') {
-        this.templateType = key.key
-        if (this.templateType === 'freeTypesetting') {
-
-          await this.changeTemplateType()
-        }
-        if(this.templateType === 'bookLayout'){
-
-          await this.changeTemplateType()
-        }
-        if (this.templateType === 'officialDocumentFormat') {
 
-          await this.changeTemplateType()
-        }
-        if (this.templateType === 'newsFormat') {
+        let text = this.editor.getText()
 
-          await this.changeTemplateType()
+        let changeTemplate  = async ()=>{
+          this.templateType = key.key
+          if (this.templateType === 'freeTypesetting') {
+            await this.changeTemplateType()
+          }
+          if (this.templateType === 'bookLayout'){
+            await this.changeTemplateType()
+          }
+          if (this.templateType === 'officialDocumentFormat') {
+            await this.changeTemplateType()
+          }
+          if (this.templateType === 'newsFormat') {
+            await this.changeTemplateType()
+          }
+          if (this.templateType === 'paperFormat') {
+            await this.changeTemplateType()
+          }
         }
-        if (this.templateType === 'paperFormat') {
 
-          await this.changeTemplateType()
+        if(!text){
+          await changeTemplate()
+          return
         }
+        await Message({type: 'text',
+          promptContent: '点击确定将切换版式并清空以编辑内容，如需保留内容请另行复制保存!!!'})
+            .then(async () => {
+              await changeTemplate()
+        }).catch((err) => {
+          console.log('取消', err)
+        })
       }
       // 快捷排版
       if (data.key === 'shortcut') {

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

@@ -136,7 +136,7 @@
     float: left;
     width: 50%;
 }
-.but{
+.sees-but{
     margin-left: 1px;
     font-size: 12px;
     background-color: transparent;
@@ -146,6 +146,7 @@
     cursor: pointer;
     min-width: 60px;
     height: 21px;
+    line-height: 17px;
     text-align-last: justify;
     word-break: break-all;
     text-justify: distribute;

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

@@ -10,7 +10,7 @@
                 v-html="item.title"></em><em v-if="scoreShow">({{ item.score }}分)</em>
                                <i class="subject-but" ref="subject">
                                  <!-- <b :style="{right: -item.right + 'px', top: item.top + 'px'}" ref="b"> -->
-                                       <button class="but" :disabled="it.disabled" v-for="(it) in item.customBut" :class="{'buts-actives theme-text': it.active&&it.butStart,'buts-disabled': it.disabled}" @click="customButTap(it,item)">{{ it.active? it.nameActive: it.name }}</button>
+                                       <button class="sees-but" :disabled="it.disabled" v-for="(it) in item.customBut" :class="{'buts-actives theme-text': it.active&&it.butStart,'buts-disabled': it.disabled}" @click="customButTap(it,item)">{{ it.active? it.nameActive: it.name }}</button>
                                    <!-- </b> -->
                                </i>
                            </span>

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

@@ -136,7 +136,7 @@
     float: left;
     width: 50%;
 }
-.but{
+.sees-but{
     margin-left: 5px;
     font-size: 12px;
     background-color: transparent;
@@ -146,6 +146,7 @@
     cursor: pointer;
     min-width: 60px;
     height: 21px;
+    line-height: 17px;
 }
 .buts-actives{
     color: #4B0C77 !important;

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

@@ -24,14 +24,14 @@
                 v-html="item.title"></em><em v-if="scoreShow">({{ item.score }}分)</em>
                                <i class="subject-but" ref="subject">
                                    <b :style="{right: -item.right + 'px', top: item.top + 'px'}" v-if="butShow" ref="b">
-                                     <button class="but" @click="modify(item)">修改</button>
-                                     <button class="but" @click="del(item)">删除</button>
+                                     <button class="sees-but" @click="modify(item)">修改</button>
+                                     <button class="sees-but" @click="del(item)">删除</button>
                                    </b>
                                    <b :style="{right: -item.right + 'px', top: item.top + 'px'}" v-if="replace" ref="b">
-                                       <button class="but" @click="replaceTap(item,index)">{{ replaceText }}</button>
+                                       <button class="sees-but" @click="replaceTap(item,index)">{{ replaceText }}</button>
                                    </b>
                                    <b :style="{right: -item.right + 'px', top: item.top + 'px'}" v-if="choice" ref="b">
-                                       <button class="but"
+                                       <button class="sees-but"
                                                @click="choiceTap(item,index)"
                                                :disabled="!item.choice"
                                                :style="{border: !item.choice?'1px solid #ccc': '1px solid #000'}">
@@ -42,20 +42,20 @@
                                    </b>
                                    <b :style="{right: -item.right + 'px', top: item.top + 'px'}" v-if="collapse"
                                       ref="b">
-                                       <button class="but" :class="{'buts-actives': item.open}"
+                                       <button class="sees-but" :class="{'buts-actives': item.open}"
                                                @click="openOption(index)">{{ item.open ? '收起选项' : '试题选项' }}</button>
-                                       <button class="but" :class="{'buts-actives': item.replace}"
+                                       <button class="sees-but" :class="{'buts-actives': item.replace}"
                                                @click="statistics(index)">{{ item.replace ? '收统计表' : '统计表' }}</button>
                                    </b>
                                    <b :style="{right: -item.right + 'px', top: item.top + 'px'}" v-if="reasoning"
                                       ref="b">
-                                       <button class="but" :class="{'buts-actives': item.reasoning}"
+                                       <button class="sees-but" :class="{'buts-actives': item.reasoning}"
                                                @click="openReasoning(index)">{{ item.reasoning ? reasoningBut[0].startName : reasoningBut[0].endName }}</button>
-                                       <button class="but" :class="{'buts-actives': item.review}"
+                                       <button class="sees-but" :class="{'buts-actives': item.review}"
                                                @click="review(index)">{{ item.review ? reasoningBut[1].startName : reasoningBut[1].endName }}</button>
                                    </b>
                                  <b :style="{right: -item.right + 'px', top: item.top + 'px'}" v-if="customBut.length > 0" ref="b">
-                                       <button class="but" v-for="(it,ind) in customBut" :class="{'buts-actives': it.active}" @click="customButTap(it,item)">{{ it.name }}</button>
+                                       <button class="sees-but" v-for="(it,ind) in customBut" :class="{'buts-actives': it.active}" @click="customButTap(it,item)">{{ it.name }}</button>
                                    </b>
                                </i>
                            </span>
@@ -104,7 +104,7 @@
         </div>
         <div class="table" v-if="item.replace&&collapse&&item.quesType !== '102_1'">
           <table border="0" cellspacing="0" cellpadding="0">
-            <tr>
+            <tr v-if="!teacherData.classifyName || teacherData.classifyName.value != 'aQuestion'">
               <td :colspan="5" class="tab-title">答题情况统计表</td>
             </tr>
             <tr>
@@ -148,6 +148,10 @@ export default {
     }
   },
   props: {
+    teacherData: {
+      type: Object,
+      default: () => ({})
+    },
     data: {
       type: Array,
       default: []

package/src/index.js

@@ -89,7 +89,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.35.536',
+    version: '1.35.538',
     install,
     Calendar,
     Message,