zydx-plus 1.35.522 → 1.35.523

package/package.json

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

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

@@ -282,6 +282,7 @@ export default {
         this.clientHeight = document.documentElement.clientHeight;
         this.x = this.clientWidth / 2 - this.footRightOffset / 2;
         this.y = this.clientHeight / 2 - this.footDownOffset / 2;
+        this.y=isNaN(this.y)?100:this.y
       }
       setTimeout(() => {
         interact(`#draggable${that.id}`).draggable({

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

@@ -291,6 +291,7 @@ export default {
         this.clientHeight = document.documentElement.clientHeight;
         this.x = this.clientWidth / 2 - this.footRightOffset / 2;
         this.y = this.clientHeight / 2 - this.footDownOffset / 2;
+        this.y=isNaN(this.y)?100:this.y
       }
       setTimeout(() => {
         interact(`#draggable${that.id}`).draggable({

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

@@ -387,13 +387,32 @@
     <!--  展示弹窗  -->
     <div v-for="(item,index) in interpositionData" :key="index">
       <zydx-drag-popup v-if="item.isShow" :drag-text-show="false" :enlargeShow="false" :minHeight="183"
-                       :minWidth="['importWorks', 'linkCourseware', 'importArticles', 'videoLink'].indexOf(item.type) === -1 ? 640 :905"
+                       :minWidth="['importWorks', 'linkCourseware', 'importArticles', 'videoLink','group-upload'].indexOf(item.type) === -1 ? 640 :905"
                        :minimize="false" :minimizeCir="false"
-                       :title="titleDragPopup[item.type]?titleDragPopup[item.type]:'参考文献'"
-                       :width="['importWorks', 'linkCourseware', 'importArticles', 'videoLink'].indexOf(item.type) === -1 ? 640 :905"
-                       height="auto"
+                       :title="titleDragPopup[item.type]?titleDragPopup[item.type]:`参考文献`"
+                       :width="['importWorks', 'linkCourseware', 'importArticles', 'videoLink','group-upload'].indexOf(item.type) === -1 ? 640 :905"
+                       auto-height
                        @close="closeDataShowPopup(item)">
         <template #content>
+          <div v-if="item.type === 'group-upload'"  style="padding: 5px 10px 10px 10px;height: 100%;">
+            <div class="p-popup-title-box">
+              <span class="p-popup-title-name">文章内容</span>
+              <div v-if="!readOnly" class="tip-btnBox" style="margin: 0">
+                <div class="tip-btn" style="margin-right: 0" @click="delAnnotatedLiterature(item.id,item.type)"
+                     v-html="'删除'"></div>
+              </div>
+            </div>
+            <div class="tip-box" style="min-width:600px;max-height: 900px;">
+              <div class="tip-title" v-html="`${item.fileName}`"></div>
+              <div class="tip-boxContent" style="height: 700px;">
+                <zydx-read :url="item.url" style="height: 100%"></zydx-read>
+              </div>
+            </div>
+            <div style="display: flex;flex-direction: row;justify-content: flex-end;margin-top: 10px;">
+              <div class="tip-btn" @click="item.isShow=false" v-html="`关闭`"></div>
+            </div>
+          </div>
+
           <div v-if="item.type === 'taggingMenu'" style="padding: 5px 10px 10px 10px">
             <div class="p-popup-title-box">
               <span class="p-popup-title-name">注释内容</span>
@@ -455,7 +474,7 @@
                      v-html="'删除'"></div>
               </div>
             </div>
-            <div class="tip-box" style="min-width:600px;">
+            <div class="tip-box" style="min-width:600px;max-height: 900px;">
               <div class="tip-title" v-html="`${item.exegesis}`"></div>
               <div class="tip-boxContent">
                 <zydx-read :url="item.url" style="height: 100%"></zydx-read>
@@ -611,7 +630,7 @@ import zydxColoring from '../../coloring'
 import Message from '../../../components/tipBox/index';
 import zydxTextarea from '../../textarea'
 import zydxRead from '../../read'
-import zydxDragPopup from '../../dragPopup'
+import zydxDragPopup from '../../dragPopup2'
 import zydxSelect from '../../select'
 import {exegesisId} from "./extend/exegesis-id";
 import {html2json, json2html} from '../../utils/html2json.js'
@@ -685,7 +704,8 @@ export default {
         importArticles: '链接文章',
         importWorks: '链接著作',
         videoLink: '链接视频',
-        linkCourseware: '链接课件'
+        linkCourseware: '链接课件',
+        'group-upload':'附件'
       },
       literature: ['periodical', 'dissertation', 'writings', 'newspaper', 'customize'],
       literatureName: {
@@ -2025,10 +2045,37 @@ export default {
     // 下载附件
     enlDownload() {
       this.$emit('enlDownload', this.encIndex)
+      const urlToBlob = (url) => {
+        return fetch(url).then(response => response.blob())
+            .then(blob => blob);
+      }
+// file { fileName: '1.pdf', url: 'http://192.168.155.31:8888/group1/M00/03/1B/wKibH2bxL0SAepw4AADv47rruEo751.pdf' }
+      const downloadOfBlob = (file) => {
+        urlToBlob(file.dataUrl).then((blob) => {
+          const href = window.URL.createObjectURL(blob)
+          const downloadElement = document.createElement("a")
+          downloadElement.href = href
+          downloadElement.target = "_blank"
+          downloadElement.download = file.dataName
+          document.body.appendChild(downloadElement)
+          downloadElement.click()
+          document.body.removeChild(downloadElement)
+          window.URL.revokeObjectURL(href)
+        }).catch(error => {
+          console.error('downloadOfBlob_error', error)
+        })
+      }
+      downloadOfBlob(this.encIndex)
     },
     // 查看附件
     enlSee() {
       this.$emit('enlSee', this.encIndex)
+      let id = this.encIndex.signId.split('u-').join('')
+      this.interpositionData.forEach(item => {
+        if (item.id === id) {
+          item.isShow = true
+        }
+      })
     },
     // 删除附件
     enlDel() {
@@ -2039,6 +2086,8 @@ export default {
         const val = json.content[i].attrs?.signId
         if (val === this.encIndex.signId) {
           json.content.splice(i, 1)
+          let id = val.split('u-').join('')
+          this.interpositionData=this.interpositionData.filter(item=>item.id!==id)
           this.editor?.commands.setContent(json)
           break
         }
@@ -2298,6 +2347,18 @@ export default {
             top: `${e.clientY - only.top - 40}px`,
             left: `${e.clientX - only.left - 60}px`
           }
+          this.encIndex = {
+            borderBottom : "",
+            cont: "false",
+            dataUrl: p[i].dataset.url,
+            dataName:e.target.innerText,
+            exegesisId: null,
+            lineHeightId: "indent mu",
+            margin: '',
+            signId: p[i].dataset.signid,
+            textAlign: null,
+            titleId: "indent mu"
+          }
         }
       }
 
@@ -2623,11 +2684,21 @@ export default {
               const t = await this.signIdData('enclosure')
               const r = await this.signIdData('reference')
               const html = butJson(this.editor, this.menusText)[v].html
-              if (r === -1) {
+              // if (r === -1) {
                 const last = this.editor.state.selection.$anchor.path[0].content.size
+                const id = new Date().getTime()
+                let dataInfo = {
+                  isShow: false,
+                  edit: false,
+                  id: `${id}`,
+                  type: v,
+                  exegesis: this.tipTitle,
+                  fileName: name,
+                  url: url
+                }
                 if (t === -1) this.editor.chain().focus().insertContentAt(to, html).run()
                 const num = this.upSort(this.editor, 'enclosure')
-                const html2 = `<p contenteditable="false" data-signId="u-${num.num}" data-url="${url}" class="indent mu"><span>${num.num}. ${name}</span></p>`
+                const html2 = `<p contenteditable="false" data-signId="u-${id}" 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++) {
@@ -2639,12 +2710,24 @@ export default {
                 this.editor.chain().setContent(<p></p>).run()
                 this.editor.chain().setContent(json).run()
                 this.isShowUpload = false
-                return
-              }
-              const num1 = this.upSort(this.editor, 'reference')
+                this.interpositionData.push(dataInfo)
+                this.documentClick()
+              //   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="indent mu"><span>${num.num}. ${name}</span></p>`
+              const id = new Date().getTime()
+              let dataInfo = {
+                isShow: false,
+                edit: false,
+                id: `${id}`,
+                type: v,
+                exegesis: this.tipTitle,
+                fileName: name,
+                url: url
+              }
+              const html2 = `<p contenteditable="false" data-signId="u-${id}" 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++) {
@@ -2656,6 +2739,8 @@ export default {
               this.editor.chain().setContent(<p></p>).run()
               this.editor.chain().setContent(json).run()
               this.isShowUpload = false
+              this.interpositionData.push(dataInfo)
+              this.documentClick()*/
             })
           }
           if (v === 'uploadImage') {
@@ -4693,6 +4778,10 @@ li {
   opacity: 0;
   position: relative;
 }
+.tip-boxContent::-webkit-scrollbar{
+  width: 0;
+  opacity: 0;
+}
 
 .tip-title {
   font-size: 16px;
@@ -4714,6 +4803,10 @@ li {
   max-height: 700px;
 }
 
+.tip-box>.tip-boxContent {
+  height: 700px;
+}
+
 .tip-title {
   margin-bottom: 20px;
   font-size: 18px;
@@ -5050,4 +5143,7 @@ li {
 * {
   box-sizing: border-box;
 }
+:deep(.drag-down2){
+  height: 20px;
+}
 </style>

package/src/components/sketchpad/src/sketchpad.vue

@@ -95,6 +95,10 @@ export default {
       type: Boolean,
       default: false
     },
+    isToolLocked: { // 菜单工具锁
+      type: Boolean,
+      default: true
+    },
   },
   mounted() {
     // 鼠标移入
@@ -149,7 +153,9 @@ export default {
     },
     handleMountedEditor(editor) {
       editorAPP = editor
+      console.log('editorAPP',editorAPP);
       editorAPP._cameraOptions.current.isLocked = this.cameraIsLocked
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
       if (this.top) {
         setTimeout(() => {
           document.documentElement.scrollTop = 0
@@ -167,8 +173,14 @@ export default {
     },
     // 清空
     clear() {
-      editorAPP.store.loadSnapshot(clearJson)
-      this.isFocused()
+      // editorAPP.store.loadSnapshot(clearJson)
+      let graphicIds = []
+      for(let key in editorAPP.store.query.atoms.current) {
+        if(key.split(':')[0]==='shape') {
+          graphicIds.push(key)
+        }
+      }
+      editorAPP.deleteShapes(graphicIds)
     },
     // 添加快照
     setSnapshot(v) {
@@ -185,23 +197,29 @@ export default {
       this.styleProps('draw', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('draw', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('draw')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     select() {
       editorAPP.setCurrentTool('select')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     hand() {
       editorAPP.setCurrentTool('hand')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     eraser() {
       editorAPP.setCurrentTool('eraser')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     arrow(v) {
       // 'none', 'semi', 'solid', 'pattern'
+      console.log('arrowarrowarrowarrowarrow');
       this.styleProps('arrow', 'color').defaultValue = v?.color ?? 'black'
       this.styleProps('arrow', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('arrow', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('arrow', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('arrow')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     text(v) {
       this.styleProps('text', 'color').defaultValue = v?.color ?? 'black'
@@ -209,6 +227,7 @@ export default {
       this.styleProps('text', 'font').defaultValue = v?.font ?? 'draw' //['draw', 'sans', 'serif', 'mono']
       // this.styleProps('text', 'align').defaultValue = v?.align ?? 'start'
       editorAPP.setCurrentTool('text')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     note(v) {
       let verticalAlign = ['middle-legacy', 'start-legacy', 'end-legacy']
@@ -222,6 +241,7 @@ export default {
       this.styleProps('note', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('note', 'font').defaultValue = v?.font ?? 'draw' //['draw', 'sans', 'serif', 'mono']
       editorAPP.setCurrentTool('note')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     line(v) {
       this.styleProps('arrow', 'color').defaultValue = v?.color ?? 'black'
@@ -229,6 +249,7 @@ export default {
       this.styleProps('arrow', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('arrow', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('line')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     rectangle(v) {
       this.styleProps('geo', 'geo').defaultValue = 'rectangle'
@@ -237,6 +258,7 @@ export default {
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('geo')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     ellipse(v) {
       this.styleProps('geo', 'geo').defaultValue = 'ellipse'
@@ -245,6 +267,7 @@ export default {
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('geo')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     triangle(v) {
       this.styleProps('geo', 'geo').defaultValue = 'triangle'
@@ -253,6 +276,7 @@ export default {
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('geo')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
 
     rhombus(v) {
@@ -262,6 +286,7 @@ export default {
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('geo')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     cloud(v) {
       this.styleProps('geo', 'geo').defaultValue = 'cloud'
@@ -270,6 +295,7 @@ export default {
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('geo')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     trapezoid(v) {
       this.styleProps('geo', 'geo').defaultValue = 'trapezoid'
@@ -278,6 +304,7 @@ export default {
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('geo')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     diamond(v) {
       this.styleProps('geo', 'geo').defaultValue = 'diamond'
@@ -286,6 +313,7 @@ export default {
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('geo')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     star(v) {
       this.styleProps('geo', 'geo').defaultValue = 'star'
@@ -294,6 +322,7 @@ export default {
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('geo')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
 
     xBox(v) {
@@ -303,6 +332,7 @@ export default {
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('geo')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     checkBox(v) {
       this.styleProps('geo', 'geo').defaultValue = 'check-box'
@@ -311,6 +341,7 @@ export default {
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('geo')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     oval(v) {
       this.styleProps('geo', 'geo').defaultValue = 'oval'
@@ -319,6 +350,7 @@ export default {
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('geo')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     arrowLeft(v) {
       this.styleProps('geo', 'geo').defaultValue = 'arrow-left'
@@ -327,6 +359,7 @@ export default {
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('geo')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     arrowRight(v) {
       this.styleProps('geo', 'geo').defaultValue = 'arrow-right'
@@ -335,6 +368,7 @@ export default {
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('geo')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     arrowUp(v) {
       this.styleProps('geo', 'geo').defaultValue = 'arrow-up'
@@ -343,6 +377,7 @@ export default {
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('geo')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     arrowDown(v) {
       this.styleProps('geo', 'geo').defaultValue = 'arrow-down'
@@ -351,6 +386,7 @@ export default {
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('geo')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     hexagon(v) {
       this.styleProps('geo', 'geo').defaultValue = 'hexagon'
@@ -359,6 +395,7 @@ export default {
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('geo')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     highlight(v) {
       this.styleProps('geo', 'color').defaultValue = v?.color ?? 'black'
@@ -366,6 +403,7 @@ export default {
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
       editorAPP.setCurrentTool('highlight')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     insertPicture(img) {
       const assetId = AssetRecordType.createId()
@@ -400,6 +438,7 @@ export default {
     },
     laser() {
       editorAPP.setCurrentTool('laser')
+      editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
     undo() {
       editorAPP.undo()

package/src/index.js

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