zydx-plus 1.33.353 → 1.33.354

package/package.json

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

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

@@ -4,8 +4,7 @@
       <div v-for="(item,index) in butData" class="editor-but">
         <div v-if="uploadTypeArr.indexOf(item.key)  !== -1" class="editor-but-name">
           <label>
-            <input :accept="acceptType[item.key]" style="display: none;" type="file"
-                   @change="upload($event,item.key)">
+            <input :accept="acceptType[item.key]" style="display: none;" type="file" @change="upload($event,item.key)">
             <span v-html="item.name"></span>
           </label>
         </div>
@@ -18,8 +17,7 @@
           <ul v-for="(item2,index2) in item.menuKeys" style="position: relative">
             <li v-if="uploadTypeArr.indexOf(item2.key)  !== -1">
               <label>
-                <input :accept="acceptType[item2.key]" style="display: none;" type="file"
-                       @change="upload($event,item2.key)">
+                <input :accept="acceptType[item2.key]" style="display: none;" type="file" @change="upload($event,item2.key)">
                 <span v-html="item2.name"></span>
               </label>
             </li>
@@ -32,8 +30,7 @@
               <li v-for="(childItem,childIndex) in item2.childMenuKeys" @click="butTap(item,item2,childItem)">
                 <!--                childItem.key === 'uploadImage'-->
                 <label v-if=" uploadTypeArr.indexOf(childItem.key)  !== -1 ">
-                  <input :accept="acceptType[childItem.key]" style="display: none;" type="file"
-                         @change="upload($event,childItem.key)">
+                  <input :accept="acceptType[childItem.key]" style="display: none;" type="file" @change="upload($event,childItem.key)">
                   <span v-html="item2.name"></span>
                 </label>
                 <span v-else v-html="childItem.name"></span>
@@ -304,7 +301,7 @@
 
     <!--  展示弹窗  -->
     <div v-for="(item,index) in interpositionData" :key="index">
-      <zydx-drag-popup v-if="item.isShow"
+      <zydx-drag-popup v-if="item.isShow" :minWidth="640" :minHeight="183"
                        :enlargeShow="false" :minimize="false" :minimizeCir="false"
                        :title="titleDragPopup[item.type]?titleDragPopup[item.type]:'参考文献'" height="auto"
                        width="auto" @close="closeDataShowPopup(item)">
@@ -370,7 +367,7 @@
                      v-html="'删除'"></div>
               </div>
             </div>
-            <div :style="{width: item.type === 'linkCourseware'?'1280px':'885px'}" class="tip-box">
+            <div style="min-width:600px;width: 600px" class="tip-box">
               <div class="tip-title" v-html="`${item.exegesis}`"></div>
               <div class="tip-boxContent">
                 <zydx-read :url="item.url" style="height: 100%"></zydx-read>
@@ -389,7 +386,7 @@
                      v-html="'删除'"></div>
               </div>
             </div>
-            <div :style="{width: item.type === 'linkCourseware'?'1280px':'885px'}" class="tip-box">
+            <div style="min-width:600px;width: 600px" class="tip-box">
               <div class="tip-title" v-html="`${item.exegesis}`"></div>
               <div class="tip-boxContent">
                 <zydx-read :url="item.url" style="height: 100%"></zydx-read>
@@ -408,7 +405,7 @@
                      v-html="'删除'"></div>
               </div>
             </div>
-            <div :style="{width: item.type === 'linkCourseware'?'1280px':'885px'}" class="tip-box">
+            <div style="min-width:600px;width: 600px" class="tip-box">
               <div class="tip-title" v-html="`${item.exegesis}`"></div>
               <div class="tip-boxContent">
                 <zydx-read :url="item.url" style="height: 100%"></zydx-read>
@@ -427,7 +424,7 @@
                      v-html="'删除'"></div>
               </div>
             </div>
-            <div :style="{width: item.type === 'linkCourseware'?'1280px':'885px'}" class="tip-box">
+            <div style="min-width:600px;width: 600px" class="tip-box">
               <div class="tip-title" v-html="`${item.exegesis}`"></div>
               <div class="tip-boxContent">
                 <iframe v-if="item.type === 'linkCourseware'" :src="item.url" frameborder="no" height="590"
@@ -449,7 +446,7 @@
                      v-html="'删除'"></div>
               </div>
             </div>
-            <div class="tip-box" style="width: auto">
+            <div class="tip-box" style="min-width:600px;width: 600px">
               <div class="tip-boxContent">
                 {{ item.text }}
               </div>
@@ -462,6 +459,29 @@
       </zydx-drag-popup>
     </div>
 
+
+    <!--    链接注释-->
+    <zydx-drag-popup v-if="isShowUpload" :dragStatus="false" :width="400"
+                     :enlargeShow="false" :minimize="false" :height="200"
+                     :minimizeCir="false" :title="'上传附件'" @close="isShowUpload=false">
+      <template #content>
+        <div class="upload-box">
+          <div class="check-upload">
+            <label>
+              <input type="checkbox" v-model="checkboxObj.value" :checked="checkboxObj.checked" @change="checkboxTao(checkboxObj)"/>
+              <span>{{ checkboxObj.label }}</span>
+            </label>
+          </div>
+          <div >
+            <label  style="border:1px solid #000;border-radius: 3px;padding:2px 5px;">
+              <input :accept="acceptType['group-upload']" style="display: none;" type="file" @change="upload($event,'group-upload')">
+              <span v-html="'上传附件'"></span>
+            </label>
+          </div>
+        </div>
+      </template>
+    </zydx-drag-popup>
+
   </div>
 </template>
 
@@ -500,6 +520,7 @@ import viewSvg from "./view-svg.vue";
 import Recorder from 'js-audio-recorder'
 import zydxColoring from '../../coloring'
 import Message from '../../../components/tipBox/index';
+import Upload from '../../../components/upload' //上传文件
 import zydxTextarea from '../../textarea'
 import zydxRead from '../../read'
 import zydxDragPopup from '../../dragPopup'
@@ -528,6 +549,8 @@ export default {
   },
   data() {
     return {
+      checkboxObj:{value: '1', label: '是否开启缩进', checked: false},
+      checkbox:false,
       titleDragPopup: {
         nounExplain: '链接名词',
         taggingMenu: '注释',
@@ -549,6 +572,7 @@ export default {
       tipTitle: '',
       taggingText: '',
       isShowPopup: false,
+      isShowUpload: false,
       isShowExegesis: false,
       isShowFile: false,
       exegesisType: 'add',
@@ -562,7 +586,7 @@ export default {
         uploadImage: 'image/*',
       },
       uploadTypeArr: [
-        'group-upload',
+        // 'group-upload',
         'importArticles',
         'importWorks',
         'videoLink',
@@ -893,7 +917,8 @@ export default {
           shouldShow: ({editor, view, state, oldState, from, to}) => {
             _this.encIndex = state.selection.$from.parent.attrs
             if (_this.encIndex && _this.encIndex.titleId) {
-              return state.selection.$from.parent.attrs.titleId === 'mu'
+              let titleIdArr = state.selection.$from.parent.attrs.titleId.split(' ')
+              return state.selection.$from.parent.attrs.titleId === 'mu' || titleIdArr.indexOf('mu')!==-1
             } else {
               return false
             }
@@ -1082,6 +1107,9 @@ export default {
   },
   emits: ['confirm', 'enclosure', 'enlDownload', 'enlSee'],
   methods: {
+    checkboxTao(checkboxObj){
+      this.checkbox = checkboxObj.value
+    },
     closeDataShowPopup(item) {
       item.isShow = false
       item.edit = false
@@ -1998,23 +2026,35 @@ export default {
                 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>`
+                const html2 = `<p contenteditable="false" data-signId="u-${num.num}" data-url="${url}" class="indent mu"><span>${num.num}. ${name}</span></p>`
                 this.editor.chain().focus().insertContentAt(num.len, html2).run()
+                const json =  this.editor.getJSON()
+                for (let i = 0; i < json.content.length; i++) {
+                  const item = json.content[i]
+                  if( item.attrs.signId === 'enclosure'&&item.content[0].text==='附件列表：'){
+                    item.attrs.titleId = this.checkbox? 'indent' : null
+                  }
+                }
+                this.editor.chain().setContent(<p></p>).run()
+                this.editor.chain().setContent(json).run()
+                this.isShowUpload = false
                 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>`
+              const html2 = `<p contenteditable="false" data-signId="u-${num.num}" data-url="${url}" class="indent 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()
-              // }
+              const json =  this.editor.getJSON()
+              for (let i = 0; i < json.content.length; i++) {
+                const item = json.content[i]
+                if( item.attrs.signId === 'enclosure'&&item.content[0].text==='附件列表：'){
+                  item.attrs.titleId = this.checkbox? 'indent' : null
+                }
+              }
+              this.editor.chain().setContent(<p></p>).run()
+              this.editor.chain().setContent(json).run()
+              this.isShowUpload = false
             })
           }
           if (v === 'uploadImage') {
@@ -2475,13 +2515,15 @@ export default {
         //     this.editor.commands.unsetTitleId()
         //     return
         //   }
-        //   this.editor.commands.setTitleId(key.key)
+        //   this.editor.commands.setTitleId('indent')
         // }
         // if (key.key === 'LineSpace') {
+        // }
         this.showDragPopup = true
         const index = this.editor.state.selection.$anchor.path[1]
         const json = this.editor.getJSON()
         const margin = json.content[index].attrs.margin
+        console.log('attrs',json.content[index].attrs)
         const lineHeight = json.content[index].attrs.lineHeightId
         if (!margin === false) {
           const marginArr = margin.split(' ').map(item => item.replace('px', ''))
@@ -2495,7 +2537,6 @@ export default {
           const index = lineHeight.split('-')[1]
           this.paragraph.distance = child[index - 1]
         }
-        // }
       }
       // 字体
       if (data.key === 'titleMenu') {
@@ -2565,6 +2606,9 @@ export default {
       }
       // 插入
       if (data.key === 'interposition') {
+        if(key.key === 'group-upload'){
+          this.isShowUpload = true
+        }
         // 添加图片
         if (key.key === 'group-image') {
           if (childKey.key === 'insertImage') {
@@ -2937,10 +2981,17 @@ export default {
     },
     // 段落设置
     paragraphSetting() {
+      const selectionIndex = this.editor.state.selection.$anchor.path[1]
+      const json = this.editor.getJSON()
+      const titleId = json.content[selectionIndex].attrs.titleId
       this.editor.commands.setMargin(`${this.paragraph.top}px ${this.paragraph.right}px ${this.paragraph.bottom}px ${this.paragraph.left}px`)
       let child = ['1', '1.25', '1.5', '2', '2.5', '3']
       let index = this.paragraph?.distance ? child.indexOf(this.paragraph?.distance) + 1 : 2
       this.editor.commands.setLineHeightId(`ling-${index}`)
+      if(!titleId===false){
+        this.editor.commands.unsetTitleId()
+        this.editor.commands.setTitleId(titleId)
+      }
       this.showDragPopup = false
     },
     taggingMenuSubmit() {
@@ -3319,7 +3370,7 @@ export default {
 }
 
 :deep(p[data-signid="subject"]) {
-  padding-bottom: 20px;
+  padding-bottom: 15px;
 }
 
 :deep(.author) {
@@ -3964,4 +4015,23 @@ li {
   flex-direction: row;
   justify-content: flex-end;
 }
+
+.check-upload label{
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  line-height: 1;
+}
+
+.check-upload span{
+  padding-left: 10px;
+}
+
+.upload-box{
+  padding: 50px 40px;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
 </style>

package/src/index.js

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