zydx-plus 1.33.352 → 1.33.353

package/package.json

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

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

@@ -338,7 +338,8 @@ let buttonNames = {
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             lowLevel: {
-                                default: "setTask",
+                                default: "viewResources",
+                                viewResources: '查看资源',
                                 setTask: '布置任务',
                                 teacherAnswer: '教师答疑',
                                 // duplicate: '违纪查重',

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

@@ -45,7 +45,7 @@ export function butJson(editor, data) {
                     name: '作   者',
                     key: 'authorMenu',
                     menuKeys: [],
-                    html: `<p class="author" data-signId="author" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: KaiT;">${menusData(data, 'authorMenu').text}：</span></p>`
+                    html: `<p class="author" data-signId="author" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: FangSong;">${menusData(data, 'authorMenu').text}：</span></p>`
                 },
                 // {
                 //     name: '抬&nbsp;&nbsp;&nbsp;头',
@@ -67,7 +67,7 @@ export function butJson(editor, data) {
                     name: '标&nbsp;&nbsp;&nbsp;题',
                     key: 'paragraphTitle',
                     menuKeys: [],
-                    html: `<p data-signId="paragraph" class="indent"><span style="color: rgb(0, 0, 0);font-size: 16px;font-weight: 700;">标题名称</span></p>`
+                    html: `<p data-signId="title" class="indent"><span style="color: rgb(0, 0, 0);font-size: 16px;font-weight: 700;">标题名称</span></p>`
                 }, {
                     name: '正&nbsp;&nbsp;&nbsp;文',
                     key: 'paragraphBody',
@@ -77,7 +77,7 @@ export function butJson(editor, data) {
                     name: '信息源',
                     key: 'sourcesInfo',
                     menuKeys: [],
-                    html: `<p style="text-align: right;"><span style="color: rgb(0, 0, 0);font-size: 14px;">———— </span><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: SimSun;">信息源文本</span></p>`
+                    html: `<p style="text-align: right;" data-signId="sourcesInfo"><span style="color: rgb(0, 0, 0);font-size: 14px;">———— </span><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: SimSun;">信息源文本</span></p>`
                 }, {
                     name: '落&nbsp;&nbsp;&nbsp;款',
                     key: 'paragraphMenu',

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

@@ -67,17 +67,18 @@
       <!--        </div>-->
       <!--      </div>-->
     </div>
-    <div class="editor-content" :class="{'editor-content-show': !editableShow}">
+    <div :class="{'editor-content-show': !editableShow}" class="editor-content">
       <div class="editing">
-        <div class="editing-header" v-if="signMenuShow">
+        <div v-if="signMenuShow" class="editing-header">
           <img :src="menusData('signMenu')?.ico" alt=""/>
           <span>{{ menusData('signMenu')?.text }}</span>
         </div>
-        <editor-content @paste.native.capture.prevent="preventPaste" class="editing-cont" :editor="editor"></editor-content>
+        <editor-content :editor="editor" class="editing-cont"
+                        @paste.native.capture.prevent="preventPaste"></editor-content>
         <div class="menu">
-          <button class="but" @click="enlSee" v-if="readOnly">查看</button>
-          <button class="but" @click="enlDownload" v-if="readOnly">下载</button>
-          <button class="but" @click="enlDel" v-if="!readOnly">删除</button>
+          <button v-if="readOnly" class="but" @click="enlSee">查看</button>
+          <button v-if="readOnly" class="but" @click="enlDownload">下载</button>
+          <button v-if="!readOnly" class="but" @click="enlDel">删除</button>
         </div>
       </div>
     </div>
@@ -434,7 +435,7 @@
               </div>
             </div>
             <div style="display: flex;flex-direction: row;justify-content: flex-end;margin-top: 10px;">
-              <div class="tip-btn" @click="isShowFile=false" v-html="`关闭`"></div>
+              <div class="tip-btn" @click="item.isShow=false" v-html="`关闭`"></div>
             </div>
           </div>
 
@@ -986,15 +987,18 @@ export default {
               let typeArr = ['superscript', 'underline', 'link']
               if (typeArr.indexOf(marks && marks.length && marks[marks.length - 1].type) !== -1) {
                 if (!item.content[j + 1] || item.content[j + 1].text.indexOf(' ') !== 0) {
+                  let historica = []
                   for (let k = 0; k < _this.interpositionData.length; k++) {
                     if (_this.interpositionData[k].id.toString() === item.content[j].text) {
-                      let historica = _this.interpositionData.splice(k, 1)
+                      historica = _this.interpositionData.splice(k, 1)
                       _this.historicalData.push(historica[0])
                     }
-                    console.log('onUpdate', _this.historicalData)
                   }
                   item.content.splice(j, 1)
                   editor.chain().setContent(json).run()
+                  if (_this.literature.indexOf(historica[0].type) !== -1) {
+                    _this.delReferenceMenu(historica[0])
+                  }
                   break
                 }
               }
@@ -1092,10 +1096,11 @@ export default {
           for (let j = 0; j < item.content.length; j++) {
             if (item.content[j].marks && item.content[j].marks.length) {
               let typeArr = ['taggingMenu', 'nounExplain', 'importArticles', 'importWorks', 'videoLink', 'linkCourseware', 'periodical', 'dissertation', 'writings', 'newspaper', 'customize']
+              let historica = []
               if (typeArr.indexOf(type) !== -1) {
                 for (let k = 0; k < this.interpositionData.length; k++) {
                   if (this.interpositionData[k].id === id) {
-                    let historica = this.interpositionData.splice(k, 1)
+                    historica = this.interpositionData.splice(k, 1)
                     this.historicalData.push(historica[0])
                   }
                 }
@@ -1107,6 +1112,9 @@ export default {
                   }
                   item.content.splice(j, 1)
                   this.editor.chain().setContent(json).run()
+                  if (this.literature.indexOf(historica[0].type) !== -1) {
+                    this.delReferenceMenu(historica[0])
+                  }
                   break
                 }
               }
@@ -1123,6 +1131,9 @@ export default {
                 }
                 item.content.splice(j, 1)
                 this.editor.chain().setContent(json).run()
+                if (this.literature.indexOf(historica[0].type) !== -1) {
+                  this.delReferenceMenu(historica[0])
+                }
               }
             }
           }
@@ -1131,7 +1142,6 @@ export default {
     },
     //修改注释 文献
     editAnnotatedLiterature(bubbleData) {
-      console.log('bubbleData', bubbleData)
       // 添加标注
       if (bubbleData.type === 'nounExplain') {
         // this.isShowExegesis = true
@@ -1526,6 +1536,8 @@ export default {
     // 删除附件
     enlDel() {
       const json = this.editor.getJSON()
+      let delTitle = true
+      let index = 0
       for (let i = 0; i < json.content.length; i++) {
         const val = json.content[i].attrs?.signId
         if (val === this.encIndex.signId) {
@@ -1534,6 +1546,20 @@ export default {
           break
         }
       }
+      for (let j = 0; j < json.content.length; j++) {
+        const signId = json.content[j].attrs?.signId
+        if (signId === 'enclosure') {
+          index = j
+        }
+        if (signId && signId.includes('u-')) {
+          delTitle = false
+          break
+        }
+      }
+      if (delTitle) {
+        json.content.splice(index, 1)
+        this.editor?.commands.setContent(json)
+      }
     },
     signMenu(next) { // 签名菜单
       this.signMenuShow = !this.signMenuShow
@@ -1716,23 +1742,23 @@ export default {
             let linkTypeArr = ['linkWorks', 'linkArticle', 'linkImage']
             // this.bubbleData = this.interpositionData.filter(item => item.id === text)[0]
             this.interpositionData.forEach(item => {
-              if(item.id === text){
-                if (linkTypeArr.indexOf(item.type) !== -1){
+              if (item.id === text) {
+                if (linkTypeArr.indexOf(item.type) !== -1) {
                   window.open(item.url, '_blank');
                   return
                 }
-                item.isShow=true
+                item.isShow = true
               }
             })
             if (href) {
               // this.bubbleData = this.interpositionData.filter(item => item.id === href)[0]
               this.interpositionData.forEach(item => {
-                if(item.id === href){
-                  if (linkTypeArr.indexOf(item.type) !== -1){
+                if (item.id === href) {
+                  if (linkTypeArr.indexOf(item.type) !== -1) {
                     window.open(item.url, '_blank');
                     return
                   }
-                  item.isShow=true
+                  item.isShow = true
                 }
               })
             }
@@ -1964,21 +1990,31 @@ export default {
           }
           if (v === 'group-upload') {
             up.customInsert(res, file, async (name, url) => {
-              const b = await this.signIdData('paragraph')
+              // const b = await this.signIdData('paragraph')
               const t = await this.signIdData('enclosure')
+              const r = await this.signIdData('reference')
               const html = butJson(this.editor, this.menusText)[v].html
-              if (b === -1) {
+              if(r===-1){
                 const last = this.editor.state.selection.$anchor.path[0].content.size
                 if (t === -1) this.editor.chain().focus().insertContentAt(last, html).run()
                 const num = this.upSort(this.editor, 'enclosure')
                 const html2 = `<p contenteditable="false" data-signId="u-${num.num}" data-url="${url}" class="mu"><span>${num.num}. ${name}</span></p>`
                 this.editor.chain().focus().insertContentAt(num.len, html2).run()
-              } else {
-                if (t === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('paragraph', b - 1), html).run()
-                const num = this.upSort(this.editor, 'enclosure')
-                const html2 = `<p contenteditable="false" data-signId="u-${num.num}" data-url="${url}" class="mu"><span>${num.num}. ${name}</span></p>`
-                this.editor.chain().focus().insertContentAt(num.len, html2).run()
+                return
               }
+              const num1 = this.upSort(this.editor, 'reference')
+              if (t === -1) this.editor.chain().focus().insertContentAt(num1.len-7, html).run()
+              const num = this.upSort(this.editor, 'enclosure')
+              const html2 = `<p contenteditable="false" data-signId="u-${num.num}" data-url="${url}" class="mu"><span>${num.num}. ${name}</span></p>`
+              this.editor.chain().focus().insertContentAt(num.len, html2).run()
+
+              // if (b === -1) {
+              // } else {
+              //   if (t === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('paragraph', b - 1), html).run()
+              //   const num = this.upSort(this.editor, 'enclosure')
+              //   const html2 = `<p contenteditable="false" data-signId="u-${num.num}" data-url="${url}" class="mu"><span>${num.num}. ${name}</span></p>`
+              //   this.editor.chain().focus().insertContentAt(num.len, html2).run()
+              // }
             })
           }
           if (v === 'uploadImage') {
@@ -2257,36 +2293,85 @@ export default {
           const html = menusHtml.filter(item => item.key == key.key)[0].html
           // const html = butJson(this.editor, this.menusText)[data.key].html
           const b = await this.signIdData('red') // 判断是否有红头文件
-          const r = await this.signIdData('subject')
+          const r = await this.signIdData('subject')// 判断是否有题目
           if (b === -1) {
             if (r === -1) this.editor.chain().focus().insertContentAt(0, html).run()
           } else {
             if (r === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('red'), html).run()
           }
         }
+        // 作者
+        if (key.key === 'authorMenu') {
+          const html = menusHtml.filter(item => item.key == key.key)[0].html
+          const b = await this.signIdData('subject') // 判断是否有题目
+          const r = await this.signIdData('author')// 判断是否有作者
+          const a = await this.signIdData('red') // 判断是否有红头文件
+          if (b === -1) {
+            if (a === -1) {
+              if (r === -1) this.editor.chain().focus().insertContentAt(0, html).run()
+              return
+            }
+            if (r === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('red'), html).run()
+            return
+          }
+          if (r === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('subject'), html).run()
+        }
         // 摘要
         if (key.key === 'abstractMenu') {
           const html = menusHtml.filter(item => item.key == key.key)[0].html
-          const r = await this.signIdData('abstract')
-          if (r === -1) this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+          const a = await this.signIdData('red') // 判断是否有红头文件
+          const b = await this.signIdData('subject') // 判断是否有题目
+          const r = await this.signIdData('author')// 判断是否有作者
+          const n = await this.signIdData('abstract')// 判断是否有摘要
+          if (r === -1) {
+            if (b === -1) {
+              if (a === -1) {
+                if (n === -1) this.editor.chain().focus().insertContentAt(0, html).run()
+                return
+              }
+              if (n === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('red'), html).run()
+              return
+            }
+            if (n === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('subject'), html).run()
+            return
+          }
+          if (n === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('author'), html).run()
         }
         // 关键词
         if (key.key === 'keywordMenu') {
           const html = menusHtml.filter(item => item.key == key.key)[0].html
-          const r = await this.signIdData('keyword')
-          if (r === -1) this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+          const a = await this.signIdData('red') // 判断是否有红头文件
+          const b = await this.signIdData('subject') // 判断是否有题目
+          const r = await this.signIdData('author')// 判断是否有作者
+          const n = await this.signIdData('abstract')// 判断是否有摘要
+          const k = await this.signIdData('keyword')// 判断是否有关键词
+          if (n === -1) {
+            if (r === -1) {
+              if (b === -1) {
+                if (a === -1) {
+                  if (k === -1) this.editor.chain().focus().insertContentAt(0, html).run()
+                  return
+                }
+                if (k === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('red'), html).run()
+                return
+              }
+              if (k === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('subject'), html).run()
+              return
+            }
+            if (k === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('author'), html).run()
+            return
+          }
+          if (k === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('abstract'), html).run()
         }
         // 标题
         if (key.key === 'paragraphTitle') {
           const html = menusHtml.filter(item => item.key == key.key)[0].html
-          let form = this.selection()
-          this.editor.chain().focus().insertContentAt(form, html).run()
+          this.editor.chain().focus().insertContentAt(this.selection(), html).run()
         }
         // 正文
         if (key.key === 'paragraphBody') {
           const html = menusHtml.filter(item => item.key == key.key)[0].html
-          let form = this.selection()
-          this.editor.chain().focus().insertContentAt(form, html).run()
+          this.editor.chain().focus().insertContentAt(this.selection(), html).run()
         }
         // 信息源
         if (key.key === 'sourcesInfo') {
@@ -2298,47 +2383,65 @@ export default {
         if (key.key === 'paragraphMenu') {
           const html = menusHtml.filter(item => item.key == key.key)[0].html
           const last = this.editor.state.selection.$anchor.path[0].content.size
-          const b = await this.signIdData('ack')
-          const r = await this.signIdData('paragraph')
+          const r = await this.signIdData('paragraph')//落款
+          const b = await this.signIdData('ack')//致谢
+          const n = await this.signIdData('enclosure')//附件
+          const a = await this.signIdData('reference')//参考文献
           if (b === -1) {
-            if (r === -1) this.editor.chain().focus().insertContentAt(last, html).run()
-          } else {
-            const num = this.upSort(this.editor, 'ack')
-            if (r === -1) this.editor.chain().focus().insertContentAt(num.len - 3, html).run()
+            if(n===-1){
+              if(a===-1){
+                if (r === -1) this.editor.chain().focus().insertContentAt(last, html).run()
+                return
+              }
+              const num = this.selectionPath('reference')
+              if (r === -1) this.editor.chain().focus().insertContentAt(num - 7, html).run()
+              return
+            }
+            const num = this.selectionPath('enclosure')
+            if (r === -1) this.editor.chain().focus().insertContentAt(num - 7, html).run()
+            return
           }
+          const num = this.upSort(this.editor, 'ack')
+          if (r === -1) this.editor.chain().focus().insertContentAt(num.len - 3, html).run()
         }
         // 致谢
         if (key.key === 'ackMenu') {
           const html = menusHtml.filter(item => item.key == key.key)[0].html
           const last = this.editor.state.selection.$anchor.path[0].content.size
           const r = await this.signIdData('ack')
-          if (r === -1) {
-            this.editor.chain().focus().insertContentAt(last, html[0]).run()
-            this.editor.chain().focus().insertContentAt(last + 3, html[1]).run()
+          const b = await this.signIdData('enclosure')//附件
+          const a = await this.signIdData('reference')//参考文献
+          if(b===-1){
+            if(a===-1){
+              if (r === -1) {
+                this.editor.chain().focus().insertContentAt(last, html[0]).run()
+                this.editor.chain().focus().insertContentAt(last + 3, html[1]).run()
+              }
+              return
+            }
+            const num = this.upSort(this.editor, 'reference')
+            if (r === -1) {
+              this.editor.chain().focus().insertContentAt(num.len - 7, html[0]).run()
+              this.editor.chain().focus().insertContentAt(num.len-3, html[1]).run()
+            }
+            return
           }
-        }
-        // 作者
-        if (key.key === 'authorMenu') {
-          const html = menusHtml.filter(item => item.key == key.key)[0].html
-          const b = await this.signIdData('subject') // 判断是否有题目
-          const r = await this.signIdData('author')
-          if (b === -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()
+          const num = this.selectionPath('enclosure')
+          if (r === -1) {
+            this.editor.chain().focus().insertContentAt(num-7, html[0]).run()
+            const ackNum = this.selectionPath('ack')
+            this.editor.chain().focus().insertContentAt(ackNum, html[1]).run()
           }
+
+          // if(a===-1){
+          //   if (r === -1) {
+          //     this.editor.chain().focus().insertContentAt(last, html[0]).run()
+          //     this.editor.chain().focus().insertContentAt(last + 3, html[1]).run()
+          //   }
+          // }else {
+          //   // if (r === -1) this.editor.chain().focus().insertContentAt(num.len - 3, html).run()
+          // }
         }
-        // 作者
-        // if (key.key === 'authorMenu') {
-        //   const html = menusHtml.filter(item => item.key == key.key)[0].html
-        //   const b = await this.signIdData('subject') // 判断是否有题目
-        //   const r = await this.signIdData('author')
-        //   if (b === -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 (data.key === 'textMenu' && key === 0 || data.key === 'titleMenu' && key === 0) return
@@ -2582,6 +2685,7 @@ export default {
               }
               const html = `<sup>[${res[0]}]</sup> `
               this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+              this.addReferenceMenu(dataInfo)
               this.documentClick()
             }).catch((err) => {
               console.log('取消', err)
@@ -2647,6 +2751,7 @@ export default {
               }
               const html = `<sup>[${res[0]}]</sup><span> </span>`
               this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+              this.addReferenceMenu(dataInfo)
               this.documentClick()
             }).catch((err) => {
               console.log('取消', err)
@@ -2712,6 +2817,7 @@ export default {
               }
               const html = `<sup>[${res[0]}]</sup><span> </span>`
               this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+              this.addReferenceMenu(dataInfo)
               this.documentClick()
             }).catch((err) => {
               console.log('取消', err)
@@ -2773,6 +2879,7 @@ export default {
               }
               const html = `<sup>[${res[0]}]</sup><span> </span>`
               this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+              this.addReferenceMenu(dataInfo)
               this.documentClick()
             }).catch((err) => {
               console.log('取消', err)
@@ -2811,6 +2918,7 @@ export default {
               }
               const html = `<sup>[${res[0]}]</sup><span> </span>`
               this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+              this.addReferenceMenu(dataInfo)
               this.documentClick()
             }).catch((err) => {
               console.log('取消', err)
@@ -3103,7 +3211,47 @@ export default {
       } else {
         return false;
       }
-    }
+    },
+
+    async addReferenceMenu(data) {
+      const t = await this.signIdData('reference')
+      const html = `<p contenteditable="false" data-signId="reference" style="text-align: center;margin-bottom: 30px;"><span style="font-weight: 700;font-size: 16px;">参考文献：</span></p>`
+      const html2 = `<p contenteditable="false" data-signId="r-${data.number}"><span style="font-family: FangSong;font-size: 12px;line-height25px">${data.text}</span></p>`
+      const last = this.editor.state.selection.$anchor.path[0].content.size
+      if (t === -1) this.editor.chain().focus().insertContentAt(last, html).run()
+      let last1 = this.editor.state.selection.$anchor.path[0].content.size
+      // const num = this.selectionPath('reference')
+      // console.log(num)
+      this.editor.chain().focus().insertContentAt(last1, html2).run()
+    },
+
+    delReferenceMenu(data) {
+      const json = this.editor.getJSON()
+      let delTitle = true
+      let index = 0
+      for (let i = 0; i < json.content.length; i++) {
+        const val = json.content[i].attrs?.signId
+        if (val === `r-${data.number}`) {
+          json.content.splice(i, 1)
+          this.editor?.commands.setContent(json)
+          break
+        }
+      }
+      for (let j = 0; j < json.content.length; j++) {
+        const signId = json.content[j].attrs?.signId
+        if (signId === 'reference') {
+          index = j
+        }
+        if (signId && signId.includes('r-')) {
+          delTitle = false
+          break
+        }
+      }
+      if (delTitle) {
+        json.content.splice(index, 1)
+        this.editor?.commands.setContent(json)
+      }
+    },
   }
 }
 </script>
@@ -3557,8 +3705,7 @@ li {
 
 
 .menu-one {
-//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; z-index: 10 !important;
+//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; z-index: 10 !important;
 }
 
 .menu-one-text {

package/src/index.js

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