zydx-plus 1.33.347 → 1.33.349

package/package.json

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

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

@@ -11,7 +11,7 @@
         <slot name="icon"></slot>
         <i class="disconnect" v-if="disconnectShow" @click.stop="disconnect"></i>
         <i class="enlarge" v-if="enlargeShow" @click.stop="enlarge"></i>
-        <i @click.stop="close"></i>
+        <i v-if="closeShow" @click.stop="close"></i>
       </div>
     </div>
     <div :class="{'drag-cont': dragStatus || dragTextShow,'drag-conts': !dragStatus || !dragTextShow}"
@@ -86,7 +86,7 @@ export default {
     },
     dragTextShow: {
       type: Boolean,
-      default: false
+      default: true
     },
     minimize: {
       type: Boolean,
@@ -104,6 +104,10 @@ export default {
       type: Number,
       default: 200
     },
+    closeShow: {
+      type: Boolean,
+      default: true
+    }
   },
   beforeUnmount() {
     this.clean()
@@ -298,6 +302,8 @@ export default {
 
 .down-text-cont {
   display: inline-block;
+  position: relative;
+  z-index: 10000;
 }
 
 .down-text-cont img {
@@ -312,8 +318,8 @@ export default {
   line-height: 30px;
   font-size: 14px;
   color: #999;
-  padding: 0 10px;
   text-align: center;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
 }
 
 .drag-down {

package/src/components/editor/src/butJson.js

@@ -45,12 +45,12 @@ export function butJson(editor, data) {
                     name: '摘 要',
                     key: 'abstractMenu',
                     menuKeys: [],
-                    html: `<p class="abstract" data-signId="abstract"><span style="color: rgb(0, 0, 0);font-size: 14px;font-weight: 700;font-family: SimSun;">摘要：</span><span style="color: rgb(0, 0, 0);font-size: 12px;font-family: KaiTi">摘要内容...</span></p>`
+                    html: `<p class="abstract" data-signId="abstract"><span style="color: rgb(0, 0, 0);font-size: 14px;font-weight: 700;font-family: SimSun;">摘要:</span> <span style="color: rgb(0, 0, 0);font-size: 12px;font-family: KaiTi"> 摘要内容...</span></p>`
                 }, {
                     name: '关键词',
                     key: 'keywordMenu',
                     menuKeys: [],
-                    html: `<p class="keyword" data-signId="keyword"><span style="color: rgb(0, 0, 0);font-size: 14px;font-weight: 700;font-family: SimSun;">关键词：</span><span style="color: rgb(0, 0, 0);font-size: 12px;font-family: KaiTi">关键词内容...</span></p>`
+                    html: `<p class="keyword" data-signId="keyword"><span contenteditable="false" style="color: rgb(0, 0, 0);font-size: 14px;font-weight: 700;font-family: SimSun;">关键词:</span> <span style="color: rgb(0, 0, 0);font-size: 12px;font-family: KaiTi"> 关键词内容...</span></p>`
                 }, {
                     name: '落 款',
                     key: 'paragraphMenu',

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

@@ -349,7 +349,8 @@ export default {
         'shortcut', 'pageMargin', 'paragraph',
         'outlineMenu', 'alignmentMode', 'titleMenu',
         'textMenu', 'color', 'interposition'],
-      bubbleData: {}
+      bubbleData: {},
+      htmlJson: []
     }
   },
   props: {
@@ -378,10 +379,9 @@ export default {
       default: () => {
         return {
           meta: {
-            bizId: 'b5063ffdac7047f6ba27d198ffb5b847',
           },
           headers: {
-            Authorization:localStorage.getItem("remember") === "1"? localStorage.getItem('sessionId'): sessionStorage.getItem('sessionId')
+            Authorization: localStorage.getItem("remember") === "1" ? localStorage.getItem('sessionId') : sessionStorage.getItem('sessionId')
           },
           server: '/zydx/lessonResource/editOfficeFile',
         }
@@ -393,7 +393,7 @@ export default {
         return {
           server: '/zydx/lessonResource/upload/img',
           headers: {
-            Authorization: localStorage.getItem("remember") === "1"? localStorage.getItem('sessionId'): sessionStorage.getItem('sessionId')
+            Authorization: localStorage.getItem("remember") === "1" ? localStorage.getItem('sessionId') : sessionStorage.getItem('sessionId')
           },
           customInsert(res, insertFn) {
             insertFn('http://192.168.5.213:8888' + res.data)
@@ -407,15 +407,14 @@ export default {
     uploadAttachment: {
       type: Object,
       default: () => {
-        return  {
+        return {
           server: '/zydx/fileanex/uploadfile',
           fieldName: 'file',
           maxFileSize: 100 * 1024 * 1024,
           meta: {
-            bizId: 'b5063ffdac7047f6ba27d198ffb5b847',
           },
           headers: {
-            Authorization:  localStorage.getItem("remember") === "1"? localStorage.getItem('sessionId'): sessionStorage.getItem('sessionId')
+            Authorization: localStorage.getItem("remember") === "1" ? localStorage.getItem('sessionId') : sessionStorage.getItem('sessionId')
           },
           // 在上传之前
           onBeforeUpload(file) {
@@ -535,8 +534,10 @@ export default {
   },
   mounted() {
     const _this = this
-    if (_this.html[_this.html.length - 1]?.type === 'interpositionData') {
-      this.interpositionData = _this.html[_this.html.length - 1].data
+    _this.htmlJson = _this.html ? JSON.parse(JSON.stringify(_this.html)) : []
+    if (_this.htmlJson[_this.htmlJson.length - 1]?.type === 'interpositionData') {
+      this.interpositionData = _this.htmlJson[_this.htmlJson.length - 1].data
+      _this.htmlJson.splice(_this.htmlJson.length - 1, 1)
     }
     let dataHtml = json2html({node: "root", child: (_this.html === undefined || _this.html === null) ? [] : _this.html})
     if (dataHtml[0]?.tag === 'sign') {
@@ -598,8 +599,14 @@ export default {
           shouldShow: ({editor, view, state, oldState, from, to}) => {
             let encIndex = state.selection.$from.nodeBefore?.marks
             if (encIndex && encIndex.length) {
-              let name = encIndex[encIndex.length - 1].type.name
-              return name === "superscript" || name === "underline"
+              let name = ''
+              let nameArr = ["superscript", "underline"]
+              encIndex.forEach(item => {
+                if (nameArr.indexOf(item.type.name) !== -1) {
+                  name = item.type.name
+                }
+              })
+              return nameArr.indexOf(name) !== -1
             } else {
               return false
             }
@@ -1292,7 +1299,7 @@ export default {
       const data = document.querySelectorAll('.editing-cont')[0].childNodes[0].childNodes
       this.wit = document.getElementsByClassName('editor-content')[0].offsetWidth + 20
       if (this.wit > 900) this.wit = 900
-      let max = this.wit * 1.6 - 246
+      let max = this.wit * 1.6 - 46
       let pHeight = 0
       let html = ''
       for (let i = 0; i < data.length; i++) {
@@ -1380,7 +1387,7 @@ export default {
           let styleKey = 'left'
           let positionNum = `-${bubbleMenu.width / 2}px`
           let menusStyle = {
-            'max-width':`${width-20}px`,
+            'max-width': `${width - 20}px`,
             position: 'absolute',
             'text-indent': bubbleMenu.width === width ? '2em' : '0em',
             top: this.readOnly ? `${e.clientY - only.top + 10}px` : `${30}px`,
@@ -1401,7 +1408,7 @@ export default {
             if (only.left + (only.width / 2) < e.clientX) {
               styleKey = 'right'
               if ((e.clientX + (bubbleMenu.width / 2)) > (only.left + only.width - marginRight - 10)) {
-                let difference = Math.floor((e.clientX + (bubbleMenu.width / 2)) - (only.left + only.width- marginRight - 10))
+                let difference = Math.floor((e.clientX + (bubbleMenu.width / 2)) - (only.left + only.width - marginRight - 10))
                 positionNum = `-${(bubbleMenu.width / 2) - difference - 10}px`
               }
             } else {
@@ -1511,6 +1518,10 @@ export default {
           child: []
         })
       }
+      data.push({
+        type:'interpositionData',
+        data:this.interpositionData
+      })
       return data
     },
     // 上传进度
@@ -1551,7 +1562,7 @@ export default {
       this.uploadFile(file, up).then(res => {
         if (res.code === '200') {
           const {from, to} = this.editor.state.selection
-          this.tipTitle = this.editor.getText().substring(from - 1, to - 1)
+          this.tipTitle = window.getSelection().toString()
           let typeArr = ['importArticles', 'importWorks', 'interposition', 'videoLink', 'linkCourseware']
           if (typeArr.indexOf(v) !== -1) {
             up.customInsert(res, file, async (name, url) => {
@@ -1580,10 +1591,7 @@ export default {
                   url: officeRes.data
                 }
               }
-              this.editor.chain()
-                  .setLink({href: `${dataInfo.id}`})
-                  .setUnderline().insertContentAt(to, ` `)
-                  .setTextSelection({from: to, to: to + 1})
+              this.editor.chain().setLink({href: `${dataInfo.id}`}).setUnderline().insertContentAt(to, ` `).setTextSelection({from: to, to: to + 1})
                   .unsetUnderline().unsetLink().focus('end').run()
               this.interpositionData.push(dataInfo)
               this.documentClick()
@@ -2025,7 +2033,7 @@ export default {
       }
       // 插入
       if (data.key === 'interposition') {
-        const menusHtml = butJson(this.editor, this.menusText)[data.key].menuKeys
+        // const menusHtml = butJson(this.editor, this.menusText)[data.key].menuKeys
         // 添加图片
         if (key.key === 'group-image') {
           if (childKey.key === 'insertImage') {
@@ -2037,8 +2045,8 @@ export default {
         }
         // 添加标注
         if (key.key === 'taggingMenu') {
-          const {from, to} = this.editor.state.selection
-          this.tipTitle = this.editor.getText().substring(from - 1, to - 1)
+          // const {from, to} = this.editor.state.selection
+          this.tipTitle = window.getSelection().toString()// this.editor.getText().substring(from - 1, to - 1)
           if (this.tipTitle.length === 0) {
             await Message({type: 'text', promptContent: '请选中需要注释的文字'})
             return
@@ -2408,10 +2416,7 @@ export default {
           }
         })
       } else {
-        this.editor.chain().setLink({href: `${dataInfo.id}`}).setUnderline().insertContentAt(to, ` `).setTextSelection({
-          from: to,
-          to: to + 1
-        }).unsetUnderline().unsetLink().focus('end').run()
+        this.editor.chain().setLink({href: `${dataInfo.id}`}).setUnderline().insertContentAt(to, ` `).setTextSelection({ from: to, to: to + 1 }).unsetUnderline().unsetLink().focus('end').run()
         this.interpositionData.push(dataInfo)
       }
       this.isShowExegesis = false
@@ -2613,7 +2618,6 @@ export default {
 </script>
 
 <style scoped>
-@import "../../tipBox/src/zydxStyle.css";
 
 :deep(.ProseMirror-separator) {
   display: none !important;
@@ -2647,6 +2651,9 @@ export default {
 .read-only {
   position: relative;
   margin: 0 auto;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
 }
 
 .read-only-page {
@@ -2922,12 +2929,14 @@ li {
   min-height: 700px;
   margin: 0 auto;
   position: relative;
+  display: flex;
+  align-items: center;
 }
 
 .editing-cont {
   padding: 8% 0;
   box-sizing: border-box;
-  max-width: 770px;
+  width: 100%;
   min-height: 700px;
   margin: 0 15%;
 }
@@ -3048,13 +3057,11 @@ li {
 }
 
 .menu-one {
-  //max-width: 557px;
-  min-width: 300px;
+//max-width: 557px; min-width: 300px;
   width: max-content;
   padding: 10px;
   border-radius: 7px;
-//margin:0 100px; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.58); background: #FFFFFF; display: flex; flex-direction: column;
-  justify-content: space-between;
+//margin:0 100px; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.58); background: #FFFFFF; display: flex; flex-direction: column; justify-content: space-between;
   z-index: 10 !important;
 }
 
@@ -3090,6 +3097,15 @@ li {
   color: #CCCCCC;
 }
 
+@keyframes linkDown {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+
 .tip-box {
   width: 744px;
   padding: 20px;
@@ -3111,7 +3127,6 @@ li {
 
 :deep(.text) {
   font-size: 14px;
-  padding: 0 10px;
   font-family: FangSong;
 }
 
@@ -3122,4 +3137,52 @@ li {
 .tip-boxContent {
   overflow-y: auto;
 }
+
+.tip-title {
+  margin-bottom: 20px;
+  font-size: 18px;
+  font-weight: 700;
+  flex-shrink: 0;
+  display: flex;
+  align-items: flex-end;
+  justify-content: center;
+  flex-wrap: wrap;
+  overflow: hidden;
+}
+
+.tip-boxContent {
+  max-height: 600px;
+}
+
+.tip-btnBox {
+  margin-top: 20px;
+  flex-shrink: 0;
+  display: flex;
+  justify-content: center;
+  align-items: flex-start;
+  font-size: 12px;
+}
+
+.tip-btnBox > div {
+  width: 60px;
+  line-height: 20px;
+  margin-right: 10px;
+  border-radius: 3px;
+  border: 1px solid #000000;
+  cursor: pointer;
+  text-align: center;
+}
+
+.tip-popupWindowSearch {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.2);
+  z-index: 20000;
+  display: flex;
+  align-items: center;
+}
+
 </style>

package/src/index.js

@@ -83,7 +83,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.33.347',
+    version: '1.33.349',
     install,
     Calendar,
     Message,