zydx-plus 1.35.493 → 1.35.494

package/package.json

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

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

@@ -33,6 +33,17 @@ export function butJson(editor, data) {
                     menuKeys: [],
                     html: ''
                 },
+                {
+                    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>
+                  <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="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="text" class="text"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>`
+                },
                 {
                     name: '公文版式',
                     key: 'officialDocumentFormat',
@@ -43,7 +54,7 @@ export function butJson(editor, data) {
                   <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="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: 16px; font-family: SimHei; color:#333333">一、请在此处输入一级标题</span></strong></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>
                   <p data-signid="title-2" class="title ${randomId()} indent"><strong><span style="font-size: 16px; 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>
@@ -57,7 +68,7 @@ export function butJson(editor, data) {
                     html:  `<p data-signid="subject" style="text-align: center;"><strong><span style="font-size: 24px; font-family: SimHei; color: #333333;">请在此处输入标题</span></strong></p>
                   <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>
                   <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: 16px; font-family: SimHei; color: #333333">一、请在此处输入一级标题</span></strong></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>
                   <p data-signid="title-2" class="title ${randomId()} indent"><strong><span style="font-size: 16px; 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>
@@ -70,10 +81,10 @@ export function butJson(editor, data) {
                     menuKeys: [],
                     html:  `<p data-signid="subject" style="text-align: center;"><strong><span style="font-size: 24px; font-family: SimHei; color: #333333;">请在此处输入题目</span></strong></p>
                   <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>
-                  <p data-signid="abstract" class="abstract"><strong><span style="font-size: 14px; font-family: SimSun; color: #333333;">摘要:</span></strong> <span style="font-size: 14px; font-family: FangSong; color: rgb(0, 0, 0)">请在此处输入摘要文本...</span></p>
-                  <p data-signid="keyword" class="keyword"><strong><span contenteditable="false" style="font-size: 14px; font-family: SimSun; color: #333333">关键词:</span></strong> <span style="font-size: 14px; font-family: FangSong; color: rgb(0, 0, 0)"> 请在此处输入关键字...</span></p>
+                  <p data-signid="abstract" class="abstract"><strong><span style="font-size: 14px; font-family: FangSong; color: #333333;">摘要:</span></strong> <span style="font-size: 14px; font-family: FangSong; color: rgb(0, 0, 0)">请在此处输入摘要文本...</span></p>
+                  <p data-signid="keyword" class="keyword"><strong><span contenteditable="false" style="font-size: 14px; font-family: FangSong; color: #333333">关键词:</span></strong> <span style="font-size: 14px; font-family: FangSong; color: rgb(0, 0, 0)"> 请在此处输入关键字...</span></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: 16px; font-family: SimHei; color: #333333">一、请在此处输入一级标题</span></strong></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>
                   <p data-signid="title-2" class="title ${randomId()} indent"><strong><span style="font-size: 16px; font-family: SimH ei; 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>
@@ -130,12 +141,12 @@ export function butJson(editor, data) {
                     name: '摘&nbsp;&nbsp;&nbsp;要',
                     key: 'abstractMenu',
                     menuKeys: [],
-                    html: `<p class="abstract" data-signId="abstract"><span style="color:#333333;font-size: 14px;font-weight: 700;font-family: SimSun;">摘要:</span> <span style="color: rgb(0, 0, 0);font-size: 14px;font-family: FangSong"> 摘要内容...</span></p>`
+                    html: `<p class="abstract" data-signId="abstract"><span style="color:#333333;font-size: 14px;font-weight: 700;font-family: FangSong;">摘要:</span> <span style="color: rgb(0, 0, 0);font-size: 14px;font-family: FangSong"> 摘要内容...</span></p>`
                 }, {
                     name: '关键词',
                     key: 'keywordMenu',
                     menuKeys: [],
-                    html: `<p class="keyword" data-signId="keyword"><span contenteditable="false" style="color:#333333;font-size: 14px;font-weight: 700;font-family: SimSun;">关键词:</span> <span style="color: rgb(0, 0, 0);font-size: 14px;font-family: FangSong"> 关键词内容...</span></p>`
+                    html: `<p class="keyword" data-signId="keyword"><span contenteditable="false" style="color:#333333;font-size: 14px;font-weight: 700;font-family: FangSong;">关键词:</span> <span style="color: rgb(0, 0, 0);font-size: 14px;font-family: FangSong"> 关键词内容...</span></p>`
                 }, {
                     name: '标&nbsp;&nbsp;&nbsp;题',
                     key: 'paragraphTitle',
@@ -189,6 +200,18 @@ export function butJson(editor, data) {
             name: '大纲级别',
             key: 'outlineMenu',
             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'},
@@ -214,7 +237,7 @@ export function butJson(editor, data) {
             name: '一级标题',
             key: 'firstLevelHeading',
             menuKeys: [],
-            html: `<p data-signid="title-1" style="text-align: center" class="title ${randomId()}"><strong><span style="font-size: 16px; font-family: SimHei; color:#333333">一、请在此处输入一级标题</span></strong></p>`
+            html: `<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>`
         },
         secondaryHeading: {
             name: '二级标题',

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

@@ -1,5 +1,5 @@
 <template>
-  <div ref="only" class="z-editor">
+  <div ref="only" class="z-editor" :style="!readOnly?'border: 1px solid rgba(204, 204, 204, 1);':''">
     <div v-show="!readOnly" class="editor-header">
       <div v-for="(item,index) in butData" :key="index" class="editor-but">
         <div v-if="uploadTypeArr.indexOf(item.key)  !== -1" class="editor-but-name">
@@ -1030,17 +1030,17 @@ export default {
         this.editor?.commands.setContent(dataHtml)
         if (this.readOnly) {
           if (this.page) this.editableShow = true
-          // setTimeout(() => {
-          if (this.page) {
-            this.editableShow = false
-            this.readOnlyPage()
-          }
-          // }, 300)
+          setTimeout(() => {
+            if (this.page) {
+              this.editableShow = false
+              this.readOnlyPage()
+            }
+          }, 300)
         }
         setTimeout(() => {
           this.init = true
           this.templateType = this.htmlJson.templateType
-          this.changeTemplateType()
+          // this.changeTemplateType()
         }, 500)
       },
       deep: true,
@@ -1248,6 +1248,7 @@ export default {
         this.limits = true
       },
       onUpdate: ({editor}) => {
+        _this.$emit('changeOutlineMenu', _this.changeOutlineMenu())
         editor.commands.focus()
         const json = editor.getJSON()
         for (let i = 0; i < json.content.length; i++) {
@@ -1369,7 +1370,7 @@ export default {
       this.y = event.clientY - this.top;
     })
     this.templateType = this.htmlJson.templateType
-    this.changeTemplateType()
+    // this.changeTemplateType()
     // document.addEventListener('click', () => {
     //   // if(this.limits) return
     //   // this.close()
@@ -1424,7 +1425,8 @@ export default {
         }
         let oldContent = []
         let signIdArrObj = {
-          officialDocumentFormat: ['red','text', 'paragraph', 'date', 'subject'],
+          bookLayout:['text', 'paragraph', 'date', 'subject'],
+          officialDocumentFormat: ['red', 'text', 'paragraph', 'date', 'subject'],
           newsFormat: ['text', 'paragraph', 'date', 'subject', 'author'],
           paperFormat: ['text', 'paragraph', 'date', 'subject', 'author']
         }
@@ -1495,6 +1497,18 @@ export default {
         })
         this.editor.chain().setContent({type: 'doc', content: oldContent}).run()
       }
+      // 图书版式
+      if (this.templateType === 'bookLayout' && !this.readOnly) {
+        const html = htmlFormat.filter(item => item.key === this.templateType)[0].html
+        this.editor.chain().setContent(html).run()
+        this.toolbar = [
+          'switchingFormat', 'signMenu', 'pageMargin', 'paragraph',
+          'outlineMenu', 'alignmentMode', 'titleMenu',
+          'textMenu', 'color', 'interposition']
+        this.organizeButton()
+        this.interpositionData = []
+        oldFormatWriteNewFormat(oldJson)
+      }
       // 公文版式
       if (this.templateType === 'officialDocumentFormat' && !this.readOnly) {
         const html = htmlFormat.filter(item => item.key === this.templateType)[0].html
@@ -2575,7 +2589,7 @@ export default {
               const html = butJson(this.editor, this.menusText)[v].html
               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()
+                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>`
                 this.editor.chain().focus().insertContentAt(num.len, html2).run()
@@ -2812,6 +2826,16 @@ 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'},]
+            this.butData.push(obj)
+            return
+          }
           if (item.key === undefined) {
             this.butData.push(obj)
           } else {
@@ -2874,6 +2898,10 @@ export default {
 
           await this.changeTemplateType()
         }
+        if(this.templateType === 'bookLayout'){
+
+          await this.changeTemplateType()
+        }
         if (this.templateType === 'officialDocumentFormat') {
 
           await this.changeTemplateType()
@@ -2901,34 +2929,6 @@ export default {
             this.editor.commands.setHorizontalRule() // 添加分割线
           }
         }
-        // 题目
-        if (key.key === 'subjectMenu') {
-          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')// 判断是否有题目
-          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
@@ -3229,6 +3229,37 @@ export default {
       }
       // 大纲级别
       if (data.key === 'outlineMenu') {
+        const menusHtml = butJson(this.editor, this.menusText)[data.key].menuKeys
+        // 题目
+        if (key.key === 'subjectMenu') {
+          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')// 判断是否有题目
+          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()
+          }
+          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')// 判断是否有作者
+          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()
+          return
+        }
         if (key.key === 'text') {
           this.editor.commands.setNode('paragraph', {class: 'indent'})
           this.editor.commands.setTitleId(key.key)
@@ -3237,21 +3268,31 @@ export default {
         } else {
           const t = key.key.split('-')[0]
           const level = key.key.split('-')[1]
-          let size = '16px'
+          let size = this.templateType === 'bookLayout' ? '24px' : '18px'
+          let color = this.templateType === 'bookLayout' ? '#000000' : '#333333'
           if (level === '1') {
             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('#333333').setTextAlign('center').focus().run()
+            this.editor.chain().setBold().setFontSize(size).setColor(color).setTextAlign('center').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.setSignId(key.key)
-            this.editor.commands.setTitleId(`${t} ${this.randomId()} indent`)
-            this.editor.chain().unsetBold().setFontSize(size).setColor('#333333').setTextAlign('left').focus().run()
+            if (this.templateType === 'bookLayout') {
+              this.editor.commands.setNode('paragraph', {class: ''})
+              this.editor.commands.setTitleId(`${t} ${this.randomId()}`)
+            } else {
+              this.editor.commands.setTitleId(`${t} ${this.randomId()} indent`)
+            }
+            this.editor.chain().setBold().setFontSize(size).setColor(color).setTextAlign(align).focus().run()
           } else {
-            size = '14px'
+            size = this.templateType === 'bookLayout' ? '16px' : '14px'
+            color = this.templateType === 'bookLayout' ? '#000000' : '#333333'
             this.editor.commands.setSignId(key.key)
             this.editor.commands.setTitleId(`${t} ${this.randomId()} indent`)
-            this.editor.chain().setBold().setFontSize(size).setColor('#333333').setTextAlign('left').focus().run()
+            this.editor.chain().setBold().setFontSize(size).setColor(color).setTextAlign('left').focus().run()
           }
         }
         this.$emit('changeOutlineMenu', this.changeOutlineMenu())
@@ -4314,7 +4355,6 @@ li {
 }
 
 .z-editor {
-  border: 1px solid rgba(204, 204, 204, 1);
   position: relative;
   width: 100%;
   max-height: 900px;

package/src/index.js

@@ -87,7 +87,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.35.493',
+    version: '1.35.494',
     install,
     Calendar,
     Message,