zydx-plus 1.35.522 → 1.35.524

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.35.522",
+  "version": "1.35.524",
   "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/butJson.js

@@ -28,7 +28,7 @@ export function butJson(editor, data) {
             key: 'switchingFormat',
             menuKeys: [
                 {
-                    name: '自由排版',
+                    name: '自由版式',
                     key: 'freeTypesetting',
                     menuKeys: [],
                     html: ''
@@ -37,22 +37,22 @@ export function butJson(editor, data) {
                     name: '图书版式',
                     key: 'bookLayout',
                     menuKeys: [],
-                    html: `<p data-signid="subject" style="text-align: center;"><strong><span style="font-size: 24px; font-family: SimHei; color:#000;line-height: 1;">请在此处输入一级标题</span></strong></p>
+                    html: `<p data-signid="title-1" class="title bookLayout1" style="text-align: center;"><strong><span style="font-size: 24px; font-family: SimHei; color:#000;line-height: 1;">请在此处输入一级标题</span></strong></p>
                   <p data-signid="text" class="text"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>
-                  <p data-signid="title-1" style="text-align: center;" class="title ${randomId()}"><strong><span style="font-size: 20px; font-family: SimHei; color:#000">一、请在此处输入一级标题</span></strong></p>
+                  <p data-signid="title-2" style="text-align: center;" class="title ${randomId()} bookLayout2"><strong><span style="font-size: 20px; font-family: SimHei; color:#000">一、请在此处输入一级标题</span></strong></p>
                   <p data-signid="text" class="text"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>
-                  <p data-signid="title-2" class="title ${randomId()} indent"><strong><span style="font-size: 16px; font-family: SimHei; color:#000">（一）请在此处输入二级标题</span></strong></p>
+                  <p data-signid="title-3" class="title ${randomId()}"><strong><span style="font-size: 16px; font-family: SimHei; color:#000">（一）请在此处输入二级标题</span></strong></p>
                   <p data-signid="text" class="text"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>`
                 },
                 {
                     name: '公文版式',
                     key: 'officialDocumentFormat',
                     menuKeys: [],
-                    html:  `<p style="text-align: center"><span style="font-size: 36px; color: rgb(225, 60, 57)">请在此输入红头名称</span></p>
+                    html:  `<p style="text-align: center"><span style="font-size: 48px; color: rgb(225, 60, 57)">请在此输入红头名称</span></p>
                   <p data-signid="red" style="text-align: center"><span style="font-size: 16px; color: rgb(0, 0, 0)">请在此输入文件号xxx[xxx]xxxx号</span></p>
                   <p contenteditable="false" class="solid"></p>
                   <p data-signid="subject" style="text-align: center;margin: 80px 0 60px"><strong><span style="font-size: 24px; font-family: SimHei; color:#333333;line-height: 1;">请在此处输入标题</span></strong></p>
-                  <p data-signid="lookUp"><strong><span style="font-size: 16px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入抬头:</span></strong></p>
+                  <p data-signid="lookUp"><strong><span style="font-size: 18px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入抬头:</span></strong></p>
                   <p data-signid="text" class="indent"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>
                   <p data-signid="title-1" style="text-align: center;" class="title ${randomId()}"><strong><span style="font-size: 18px; font-family: SimHei; color:#333333">一、请在此处输入一级标题</span></strong></p>
                   <p data-signid="text" class="indent"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>
@@ -135,7 +135,7 @@ export function butJson(editor, data) {
                     name: '抬&nbsp;&nbsp;&nbsp;头',
                     key: 'lookUp',
                     menuKeys: [],
-                    html: `<p data-signId="lookUp"><span style="color: rgb(0, 0, 0);font-size: 16px; font-family:SimHei;font-weight: 700;">请在此处输入抬头:</span><span> </span></p>`
+                    html: `<p data-signId="lookUp"><span style="color: rgb(0, 0, 0);font-size: 18px; font-family:SimHei;font-weight: 700;">请在此处输入抬头:</span><span> </span></p>`
                 },
                 {
                     name: '摘&nbsp;&nbsp;&nbsp;要',
@@ -231,7 +231,7 @@ export function butJson(editor, data) {
             name: '红&nbsp;&nbsp;&nbsp;头',
             key: 'redMenu',
             menuKeys: [],
-            html: `<p style="text-align: center"><span style="font-size: 36px; color: rgb(225, 60, 57)">请在此输入红头名称</span></p><p data-signid="red" style="text-align: center"><span style="font-size: 16px; color: rgb(0, 0, 0)">请在此输入文件号xxx[xxx]xxxx号</span></p>`
+            html: `<p style="text-align: center"><span style="font-size: 48px; color: rgb(225, 60, 57)">请在此输入红头名称</span></p><p data-signid="red" style="text-align: center"><span style="font-size: 16px; color: rgb(0, 0, 0)">请在此输入文件号xxx[xxx]xxxx号</span></p>`
         },
         firstLevelHeading: {
             name: '一级标题',

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: {
@@ -820,7 +840,7 @@ export default {
                   <p data-signid="red" style="text-align: center"><span style="font-size: 16px; color: rgb(0, 0, 0)">请在此输入文件号xxx[xxx]xxxx号</span></p>
                   <p contenteditable="false" class="solid"></p>
                   <p data-signid="subject" style="text-align: center;margin: 80px 0 60px"><strong><span style="font-size: 24px; font-family: SimHei; color: rgb(0, 0, 0);line-height: 1;">请在此处输入标题</span></strong></p>
-                  <p data-signid="lookUp"><strong><span style="font-size: 16px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入抬头:</span></strong></p>
+                  <p data-signid="lookUp"><strong><span style="font-size: 18px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入抬头:</span></strong></p>
                   <p class="indent"><span style="font-size: 16px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>
                   <p data-signid="title-1" class="title indent"><strong><span style="font-size: 16px; font-family: SimHei; color: rgb(0, 0, 0)">一、请在此处输入一级标题</span></strong></p>
                   <p class="indent"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>
@@ -1524,8 +1544,8 @@ export default {
         const html = htmlFormat.filter(item => item.key === this.templateType)[0].html
         this.editor.chain().setContent(html).run()
         this.toolbar = [
-          'switchingFormat', 'signMenu', 'pageMargin', 'firstLevelHeading',
-          'secondaryHeading', 'paragraphBody', 'paragraphMenu', 'alignmentMode',
+          'switchingFormat', 'signMenu', 'pageMargin', 'outlineMenu',
+          'paragraphMenu', 'alignmentMode',
           'titleMenu', 'color', 'interposition']
         this.organizeButton()
         this.interpositionData = []
@@ -1536,8 +1556,8 @@ export default {
         const html = htmlFormat.filter(item => item.key === this.templateType)[0].html
         this.editor.chain().setContent(html).run()
         this.toolbar = [
-          'switchingFormat', 'signMenu', 'pageMargin', 'firstLevelHeading',
-          'secondaryHeading', 'paragraphBody', 'ackMenu', 'paragraphMenu', 'alignmentMode',
+          'switchingFormat', 'signMenu', 'pageMargin', 'outlineMenu',
+          'ackMenu', 'paragraphMenu', 'alignmentMode',
           'titleMenu', 'color', 'interposition']
         this.organizeButton()
         this.interpositionData = []
@@ -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') {
@@ -2862,13 +2947,35 @@ export default {
       this.toolbar.forEach(item => {
         let obj = butJson(this.editor, this.menusText)[item.key === undefined ? item : item.key]
         if (obj) {
-          if (this.templateType === 'bookLayout' && obj.key === 'outlineMenu') {
-            obj.menuKeys = [
-              {name: '一级标题', key: 'title-1'},
-              {name: '二级标题', key: 'title-2'},
-              {name: '三级标题', key: 'title-3'},
-              // {name: '四级标题', key: 'title-4'},
-              {name: '正文文本', key: 'text'},]
+          if (obj.key === 'outlineMenu') {
+            if(this.templateType === 'bookLayout'||this.templateType === 'freeTypesetting'){
+              obj.menuKeys = [
+                {name: '一级标题', key: 'title-1'},
+                {name: '二级标题', key: 'title-2'},
+                {name: '三级标题', key: 'title-3'},
+                // {name: '四级标题', key: 'title-4'},
+                {name: '正文文本', key: 'text'},]
+            }
+            if(this.templateType === 'newsFormat'||this.templateType === 'paperFormat'){
+              obj.menuKeys = [
+                {
+                  name: '文章标题',
+                  key: 'subjectMenu',
+                  menuKeys: [],
+                  html: `<p data-signid="subject" style="text-align: center;"><strong><span style="font-size: 24px; font-family: SimHei; color: #333333;">请在此处输入标题</span></strong></p>`
+                },
+                {
+                  name: '作者',
+                  key: 'authorMenu',
+                  menuKeys: [],
+                  html: `<p data-signid="author" class="author" style="text-align: center;padding-bottom: 30px;"><span style="font-size: 14px; font-family: FangSong; color: rgb(0, 0, 0);">请在此处输入作者/来源</span></p>`
+                },
+                {name: '一级标题', key: 'title-1'},
+                {name: '二级标题', key: 'title-2'},
+                // {name: '三级标题', key: 'title-3'},
+                // {name: '四级标题', key: 'title-4'},
+                {name: '正文文本', key: 'text'},]
+            }
             this.butData.push(obj)
             return
           }
@@ -3266,6 +3373,28 @@ export default {
       // 大纲级别
       if (data.key === 'outlineMenu') {
         const menusHtml = butJson(this.editor, this.menusText)[data.key].menuKeys
+        if (this.templateType === 'newsFormat'||this.templateType === 'paperFormat'){
+          const level = key.key.split('-')[1]
+          // 一级标题
+          if (level === '1') {
+            const html = butJson(this.editor, this.menusText)['firstLevelHeading'].html
+            this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+            this.$emit('changeOutlineMenu', this.changeOutlineMenu())
+          }
+          // 二级标题
+          if (level === '2') {
+            const html = butJson(this.editor, this.menusText)['secondaryHeading'].html
+            this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+            this.$emit('changeOutlineMenu', this.changeOutlineMenu())
+          }
+          // 正文
+          if (key.key === 'text') {
+            const html = butJson(this.editor, this.menusText)['paragraphBody'].html
+            this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+          }
+          return
+        }
+
         // 题目
         if (key.key === 'subjectMenu') {
           const html = menusHtml.filter(item => item.key == key.key)[0].html
@@ -3296,6 +3425,27 @@ export default {
           if (r === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('subject'), html).run()
           return
         }
+        let sizeObj1 = {
+          freeTypesetting:{size:'18px',color:'#000000',margin:'0 0 20px 0',textAlign:'left',bold:true},
+          bookLayout:{size:'24px',color:'#333333',margin:'0 0 40px 0',textAlign:'center',bold:true},
+          paperFormat:{size:'20px',color:'#000000',margin:'0px',textAlign:'left',bold:true},
+          officialDocumentFormat:{size:'18px',color:'#000000',margin:'0px',textAlign:'left',bold:true},
+          newsFormat:{size:'18px',color:'#000000',margin:'0px',textAlign:'left',bold:true},
+        }
+        let sizeObj2 = {
+          freeTypesetting:{size:'16px',color:'#000000',margin:'0px',textAlign:'left',bold:true},
+          bookLayout:{size:'20px',color:'#000000',margin:'0 0 20px 0',textAlign:'center',bold:true},
+          paperFormat:{size:'18px',color:'#000000',margin:'0px',textAlign:'left',bold:true},
+          officialDocumentFormat:{size:'16px',color:'#000000',margin:'0px',textAlign:'left',bold:true},
+          newsFormat:{size:'16px',color:'#000000',margin:'0px',textAlign:'left',bold:true},
+        }
+        let sizeObj3 = {
+          freeTypesetting:{size:'14px',color:'#000000',margin:'0px',textAlign:'left',bold:true},
+          bookLayout:{size:'16px',color:'#000000',margin:'0px',textAlign:'left',bold:true},
+          paperFormat:{size:'16px',color:'#000000',margin:'0px',textAlign:'left',bold:true},
+          officialDocumentFormat:{size:'14px',color:'#000000',margin:'0px',textAlign:'left',bold:true},
+          newsFormat:{size:'14px',color:'#000000',margin:'0px',textAlign:'left',bold:true},
+        }
         if (key.key === 'text') {
           this.editor.commands.setNode('paragraph', {class: 'indent'})
           this.editor.commands.setTitleId(key.key)
@@ -3304,31 +3454,37 @@ export default {
         } else {
           const t = key.key.split('-')[0]
           const level = key.key.split('-')[1]
-          let size = this.templateType === 'bookLayout' ? '24px' : '18px'
-          let color = this.templateType === 'bookLayout' ? '#000000' : '#333333'
           if (level === '1') {
-            this.editor.commands.setNode('paragraph', {class: ''})
+            let obj1 = sizeObj1[this.templateType]
+            // this.editor.commands.setNode('paragraph', {class:{}})
             this.editor.commands.setTitleId(`${t} ${this.randomId()}`)
             this.editor.commands.setSignId(key.key)
-            this.editor.chain().setBold().setFontSize(size).setColor(color).setTextAlign('center').focus().run()
+            if(this.templateType==='bookLayout'){
+              this.editor.commands.setTitleId(`${t} ${this.randomId()} bookLayout1`)
+              this.editor.chain().setBold().setFontSize(obj1.size).setColor(obj1.color).setTextAlign(obj1.textAlign).focus().run()
+              return
+            }
+            if (obj1.margin==='0px'){
+              this.editor.chain().setBold().setFontSize(obj1.size).setColor(obj1.color).setTextAlign(obj1.textAlign).focus().run()
+              return
+            }
+            this.editor.chain().setBold().setFontSize(obj1.size).setColor(obj1.color).setTextAlign(obj1.textAlign).setMargin(obj1.margin).focus().run()
           } else if (level === '2') {
-            size = this.templateType === 'bookLayout' ? '20px' : '16px'
-            color = this.templateType === 'bookLayout' ? '#000000' : '#333333'
-            let align = this.templateType === 'bookLayout' ? 'center' : 'left'
+            this.editor.commands.setNode('paragraph', {class: ''})
+            let obj2 = sizeObj2[this.templateType]
             this.editor.commands.setSignId(key.key)
             if (this.templateType === 'bookLayout') {
-              this.editor.commands.setNode('paragraph', {class: ''})
-              this.editor.commands.setTitleId(`${t} ${this.randomId()}`)
+              this.editor.commands.setTitleId(`${t} ${this.randomId()} bookLayout2`)
             } else {
-              this.editor.commands.setTitleId(`${t} ${this.randomId()} indent`)
+              this.editor.commands.setTitleId(`${t} ${this.randomId()}`)
             }
-            this.editor.chain().setBold().setFontSize(size).setColor(color).setTextAlign(align).focus().run()
+            this.editor.chain().setBold().setFontSize(obj2.size).setColor(obj2.color).setTextAlign(obj2.textAlign).focus().run()
           } else {
-            size = this.templateType === 'bookLayout' ? '16px' : '14px'
-            color = this.templateType === 'bookLayout' ? '#000000' : '#333333'
+            this.editor.commands.setNode('paragraph', {class: ''})
+            let obj3 = sizeObj3[this.templateType]
             this.editor.commands.setSignId(key.key)
-            this.editor.commands.setTitleId(`${t} ${this.randomId()} indent`)
-            this.editor.chain().setBold().setFontSize(size).setColor(color).setTextAlign('left').focus().run()
+            this.editor.commands.setTitleId(`${t} ${this.randomId()}`)
+            this.editor.chain().setBold().setFontSize(obj3.size).setColor(obj3.color).setTextAlign(obj3.textAlign).focus().run()
           }
         }
         this.$emit('changeOutlineMenu', this.changeOutlineMenu())
@@ -4244,7 +4400,7 @@ export default {
 }
 
 :deep(p[data-signid="subject"]) {
-  padding-bottom: 5px;
+  padding-bottom: 2px;
 }
 
 :deep(.author) {
@@ -4474,6 +4630,7 @@ li {
   margin: 10px;
   max-height: 900px;
   overflow: auto;
+  border: 1px solid #ccc;
 }
 
 .editor-content::-webkit-scrollbar {
@@ -4506,7 +4663,7 @@ li {
   position: relative;
   display: flex;
   align-items: center;
-  border: 1px solid #CCCCCC;
+  /*border: 1px solid #CCCCCC;*/
 }
 
 .editing-cont {
@@ -4693,6 +4850,10 @@ li {
   opacity: 0;
   position: relative;
 }
+.tip-boxContent::-webkit-scrollbar{
+  width: 0;
+  opacity: 0;
+}
 
 .tip-title {
   font-size: 16px;
@@ -4714,6 +4875,10 @@ li {
   max-height: 700px;
 }
 
+.tip-box>.tip-boxContent {
+  height: 700px;
+}
+
 .tip-title {
   margin-bottom: 20px;
   font-size: 18px;
@@ -5050,4 +5215,13 @@ li {
 * {
   box-sizing: border-box;
 }
+:deep(.drag-down2){
+  height: 20px;
+}
+:deep(.bookLayout1){
+  margin-bottom: 40px;
+}
+:deep(.bookLayout2){
+  margin-bottom: 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/components/tipBox/src/main.vue

@@ -88,12 +88,18 @@
                 <div class="cal" v-if="item.type === 'calender'">
                   <input type="text" :placeholder="item.placeholder" @focus="focus" :maxlength="item.maxlength"
                          v-model="item.value" :disabled="item.disabled"/>
-                  <Calendar v-if="tip" style="top: 35px;" @confirm="confirm($event,item)"></Calendar>
+                  <div class="empty" @click="emptyCal($event,item)">
+                    <svg t="1747276919145" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4844" width="15" height="15"><path d="M511.333 127.333c51.868 0 102.15 10.144 149.451 30.15 45.719 19.337 86.792 47.034 122.078 82.321 35.287 35.286 62.983 76.359 82.321 122.078 20.006 47.3 30.15 97.583 30.15 149.451s-10.144 102.15-30.15 149.451c-19.337 45.719-47.034 86.792-82.321 122.078-35.286 35.287-76.359 62.983-122.078 82.321-47.3 20.006-97.583 30.15-149.451 30.15s-102.15-10.144-149.451-30.15c-45.719-19.337-86.792-47.034-122.078-82.321-35.287-35.286-62.983-76.359-82.321-122.078-20.006-47.3-30.15-97.583-30.15-149.451s10.144-102.15 30.15-149.451c19.337-45.719 47.034-86.792 82.321-122.078 35.286-35.287 76.359-62.983 122.078-82.321 47.301-20.006 97.583-30.15 149.451-30.15m0-64c-247.424 0-448 200.576-448 448s200.576 448 448 448 448-200.576 448-448-200.576-448-448-448z" fill="#999999" p-id="4845"></path><path d="M557.254 512l147.373-147.373c12.497-12.497 12.497-32.758 0-45.255-12.496-12.497-32.758-12.497-45.254 0L512 466.746 364.627 319.373c-12.497-12.497-32.758-12.497-45.255 0s-12.497 32.758 0 45.255L466.746 512 319.373 659.373c-12.497 12.496-12.497 32.758 0 45.254C325.621 710.876 333.811 714 342 714s16.379-3.124 22.627-9.373L512 557.254l147.373 147.373C665.621 710.876 673.811 714 682 714s16.379-3.124 22.627-9.373c12.497-12.496 12.497-32.758 0-45.254L557.254 512z" fill="#999999" p-id="4846"></path></svg>
+                  </div>
+                  <Calendar v-if="tip" style="top: 35px;" @cancel="cancelCal" @confirm="confirm($event,item)"></Calendar>
                 </div>
                 <div class="cal" v-if="item.type === 'calenderYear'">
                   <input type="text" :placeholder="item.placeholder" @focus="focusYear" :maxlength="item.maxlength"
                          v-model="item.value" :disabled="item.disabled"/>
-                  <Year v-if="tipYear" style="top: 35px;" @confirm="confirmYear($event,item)"></Year>
+                  <div class="empty" @click="emptyYear($event,item)">
+                    <svg t="1747276919145" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4844" width="15" height="15"><path d="M511.333 127.333c51.868 0 102.15 10.144 149.451 30.15 45.719 19.337 86.792 47.034 122.078 82.321 35.287 35.286 62.983 76.359 82.321 122.078 20.006 47.3 30.15 97.583 30.15 149.451s-10.144 102.15-30.15 149.451c-19.337 45.719-47.034 86.792-82.321 122.078-35.286 35.287-76.359 62.983-122.078 82.321-47.3 20.006-97.583 30.15-149.451 30.15s-102.15-10.144-149.451-30.15c-45.719-19.337-86.792-47.034-122.078-82.321-35.287-35.286-62.983-76.359-82.321-122.078-20.006-47.3-30.15-97.583-30.15-149.451s10.144-102.15 30.15-149.451c19.337-45.719 47.034-86.792 82.321-122.078 35.286-35.287 76.359-62.983 122.078-82.321 47.301-20.006 97.583-30.15 149.451-30.15m0-64c-247.424 0-448 200.576-448 448s200.576 448 448 448 448-200.576 448-448-200.576-448-448-448z" fill="#999999" p-id="4845"></path><path d="M557.254 512l147.373-147.373c12.497-12.497 12.497-32.758 0-45.255-12.496-12.497-32.758-12.497-45.254 0L512 466.746 364.627 319.373c-12.497-12.497-32.758-12.497-45.255 0s-12.497 32.758 0 45.255L466.746 512 319.373 659.373c-12.497 12.496-12.497 32.758 0 45.254C325.621 710.876 333.811 714 342 714s16.379-3.124 22.627-9.373L512 557.254l147.373 147.373C665.621 710.876 673.811 714 682 714s16.379-3.124 22.627-9.373c12.497-12.496 12.497-32.758 0-45.254L557.254 512z" fill="#999999" p-id="4846"></path></svg>
+                  </div>
+                  <Year v-if="tipYear" style="top: 35px;" @cancel="cancelYear" @confirm="confirmYear($event,item)"></Year>
                 </div>
                 <div v-if="item.type === 'text'" class="text" v-html="item.value"></div>
                 <div v-if="item.type === 'code'" class="ph-code">
@@ -335,18 +341,44 @@ export default {
       data.value = e
       this.tipYear = false
     },
+    cancelYear() {
+      this.tipYear = false
+    },
     focus() {
       this.tip = true
     },
     confirm(e, data) {
       data.value = e.start
       this.tip = false
-    }
+    },
+    emptyCal(e,data) {
+      data.value = ''
+      this.tip = true
+      this.tip = false
+    },
+    emptyYear(e,data) {
+      data.value = ''
+      this.tip = true
+      this.tip = false
+    },
+    cancelCal() {
+      this.tip = false
+    },
   }
 }
 </script>
 
 <style scoped>
+.cal{
+  position: relative;
+}
+.empty{
+  position: absolute;
+  top: 8px;
+  right: 5px;
+  z-index: 1;
+  cursor: pointer;
+}
 :deep(.text) {
   padding:0 10px;
 }

package/src/index.js

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