zydx-plus 1.35.523 → 1.35.524

package/package.json

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

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

@@ -840,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>
@@ -1544,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 = []
@@ -1556,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 = []
@@ -2947,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
           }
@@ -3351,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
@@ -3381,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)
@@ -3389,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())
@@ -4329,7 +4400,7 @@ export default {
 }
 
 :deep(p[data-signid="subject"]) {
-  padding-bottom: 5px;
+  padding-bottom: 2px;
 }
 
 :deep(.author) {
@@ -4559,6 +4630,7 @@ li {
   margin: 10px;
   max-height: 900px;
   overflow: auto;
+  border: 1px solid #ccc;
 }
 
 .editor-content::-webkit-scrollbar {
@@ -4591,7 +4663,7 @@ li {
   position: relative;
   display: flex;
   align-items: center;
-  border: 1px solid #CCCCCC;
+  /*border: 1px solid #CCCCCC;*/
 }
 
 .editing-cont {
@@ -5146,4 +5218,10 @@ li {
 :deep(.drag-down2){
   height: 20px;
 }
+:deep(.bookLayout1){
+  margin-bottom: 40px;
+}
+:deep(.bookLayout2){
+  margin-bottom: 20px;
+}
 </style>

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.523',
+    version: '1.35.524',
     install,
     Calendar,
     Message,