zydx-plus 1.32.200 → 1.32.202

package/package.json

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

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

@@ -4,7 +4,7 @@
            <span @mousedown.stop="mousedown"
                  @mousemove.stop="mousemove"
                  @mouseup.stop="mouseup"
-                 @mouseleave.stop="mousemove" :style="{'text-align': title === ''? 'center':'left'}">{{ title === ''? '按住可拖动弹窗': title }}</span>
+                 @mouseleave.stop="mousemove" :style="{'text-align': title === ''? 'center':'left'}">{{ title }}</span>
            <div class="drag-i">
                <i class="disconnect" v-if="disconnectShow" @click.stop="disconnect"></i>
                <i class="enlarge" v-if="enlargeShow" @click.stop="enlarge"></i>
@@ -79,7 +79,7 @@ export default {
         },
         dragTextShow: {
             type: Boolean,
-            default: true
+            default: false
         },
     },
     watch: {

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

@@ -723,17 +723,13 @@ export default {
             // 文献
             if (data.key === 'literatureMenu') {
                 const html = butJson(this.editor, this.menusText)[data.key].html
-                const t = await this.signIdData('subject') // 判断是否有题目
-                const b = await this.signIdData('author') // 判断是否有作者
+                const b = await this.signIdData('paragraph')
+                const last = this.editor.state.selection.$anchor.path[0].content.size
                 const r = await this.signIdData('literature')
                 if (b === -1) {
-                    if (t === -1) {
-                        if (r === -1) this.editor.chain().focus().insertContentAt(this.selection(), html).run()
-                    } else {
-                        if (r === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('subject'), html).run()
-                    }
+                    if (r === -1) this.editor.chain().focus().insertContentAt(last, html).run()
                 } else {
-                    if (r === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('author'), html).run()
+                    if (r === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('paragraph',b - 1), html).run()
                 }
             }
             // 添加标注
@@ -1035,6 +1031,20 @@ li {
 .editor-content {
     margin: 10px;
     border: 1px solid rgba(204, 204, 204, 1);
+    max-height: 900px;
+    overflow: auto;
+}
+.editor-content::-webkit-scrollbar {
+    display: none;
+}
+/** 火狐浏览器 **/
+.editor-content {
+    scrollbar-width: none;
+}
+/** IE 与微软浏览器 **/
+.editor-content {
+    -ms-overflow-style: none;
+    overflow: -moz-scrollbars-none;
 }
 .editor-content-show{
     position: fixed;
@@ -1045,7 +1055,7 @@ li {
 
 .editing {
     width: 794px;
-    min-height: 1123px;
+    min-height: 700px;
     margin: 0 auto;
     position: relative;
 }
@@ -1054,7 +1064,7 @@ li {
     padding: 100px;
     box-sizing: border-box;
     width: 794px;
-    min-height: 1123px;
+    min-height: 700px;
 }
 .loading-back{
     position: absolute;

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

@@ -558,7 +558,9 @@ export default {
       padding: 2px 5px;
       cursor: pointer;
       min-width: 60px;
-      height: 21px;
+      height: 20px;
+      display: inline-block;
+      line-height: 16px;
   }
   .but-f{
       float: left;

package/src/index.js

@@ -77,7 +77,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.32.200',
+    version: '1.32.202',
     install,
     Calendar,
     Message,