zydx-plus 1.35.528 → 1.35.530

package/package.json

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

package/src/components/calendar/src/Calendar.css

@@ -255,6 +255,9 @@ li{list-style-type:none;}
 .cle-but-right{
 	flex: 2;
 }
+.cle-but-right-cont{
+	display: flex;
+}
 .cle-time{
 	display: inline-block;
 	position: relative;

package/src/components/calendar/src/Calendar.vue

@@ -60,7 +60,7 @@
                <div class="cle-frame"></div>
                <div class="cle-time-y">
                  <ul @scroll="scrollHour($event)">
-                   <li v-for="(item,index) in 30"></li>
+                   <li v-for="(item,index) in 30*4"></li>
                  </ul>
                  <div class="cle-time-li" :style="{transform: 'translateY('+ transHour +'px)'}">
                    <p v-for="(item,index) in 30" :class="{'cle-time-act': index === -(transHour/26)+3}">{{ (index > 2 && index < 27)? ((index - 3) < 10)? '0'+(index - 3): (index - 3) : '' }}</p>
@@ -68,7 +68,7 @@
                </div>
                <div class="cle-time-y">
                  <ul @scroll="scrollMinute($event)">
-                   <li v-for="(item,index) in 66"></li>
+                   <li v-for="(item,index) in 66*4"></li>
                  </ul>
                  <div class="cle-time-li" :style="{transform: 'translateY('+ transMinute +'px)'}">
                    <p v-for="(item,index) in 66" :class="{'cle-time-act': index === -(transMinute/26)+3}">{{ (index > 2 && index < 63)? ((index - 3) < 10)? '0'+(index - 3): (index - 3) : '' }}</p>
@@ -78,8 +78,10 @@
            </div>
         </div>
         <div class="cle-but-right">
-          <button class="cle-but" @click="cancel">取消</button>
-          <button class="cle-but" @click="confirm">确认</button>
+          <div class="cle-but-right-cont">
+            <button class="cle-but" @click="cancel">取消</button>
+            <button class="cle-but" @click="confirm">确认</button>
+          </div>
         </div>
       </div>
     </div>
@@ -248,15 +250,17 @@ export default {
             this.cleFocusShow = true
         },
         scrollMinute(e) {
-            let top = e.target.scrollTop
+            let top = e.target.scrollTop/3.8
             let index = Math.floor(top/26)
+            if(index > 59 || index < 0) return
             this.transMinute = -(index * 26)
             this.minute = (index < 10)? '0'+ index: index
             this.cleDate = `${this.hour}:${this.minute}`
         },
         scrollHour(e) {
-            let top = e.target.scrollTop
+            let top = e.target.scrollTop/3.8
             let index = Math.floor(top/26)
+            if(index > 23 || index < 0) return
             this.transHour = -(index * 26)
             this.hour = (index < 10)? '0'+ index: index
             this.cleDate = `${this.hour}:${this.minute}`

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

@@ -12,7 +12,8 @@
       </div>
     </div>
     <div :class="{'drag-cont2': fixedStart,'drag-conts': true}">
-      <div class="drag-cont-slot">
+      <div class="drag-cont-slot" :class="{'zIndexSlot': footIsMove}">
+        <div class="zIndexSlot" v-if="footIsMove || draggableMove"></div>
         <slot name="content"></slot>
       </div>
       <div v-show="!fixedStart&&!autoHeight">
@@ -55,7 +56,8 @@ export default {
       transAll: false,
       fixedStart: false,
       initWidth: 1280,
-      draggableState: null
+      draggableState: null,
+      draggableMove: false
     }
   },
   props: {
@@ -194,6 +196,10 @@ export default {
         this.y = this.top - scrollTop
       }
     }
+    document.addEventListener('fullscreenchange', this.handleFullScreenChange);
+    document.addEventListener('mozfullscreenchange', this.handleFullScreenChange); // Firefox
+    document.addEventListener('webkitfullscreenchange', this.handleFullScreenChange); // Chrome, Safari and Opera
+    document.addEventListener('msfullscreenchange', this.handleFullScreenChange); // IE/Edge
     // 监听窗口变化
     window.addEventListener('resize', () => {
       const wid = document.getElementById('app').offsetWidth
@@ -218,6 +224,24 @@ export default {
   },
   emits: ['dragStatus', 'close', 'enlarge','updateDrag','minimize','dragMouseup'],
   methods: {
+    handleFullScreenChange() {
+      if (!document.fullscreenElement) {
+        let clientWidth = window.innerWidth
+        this.x = clientWidth / 2 - this.width / 2;
+        this.y = (window.innerHeight / 2 - this.height / 2) - 80;
+        this.footDownOffset = this.height;
+        this.footRightOffset = this.width;
+        this.draggableState.draggable({enabled: true})
+        this.state = false
+        this.$emit('updateDrag', {
+          width: this.footRightOffset,
+          height: this.footDownOffset - ((this.dragTextShow)?60:30),
+          left: this.x,
+          top: this.y
+        })
+        this.$emit('enlarge', this.state)
+      }
+    },
     // 全屏
     fullScreen() {
       this.draggableState.draggable({enabled: false})
@@ -293,6 +317,7 @@ export default {
           enabled: true,
           listeners: {
             start (event) {
+              that.draggableMove = true
               that.dragTap()
             },
             move (event) {
@@ -312,6 +337,9 @@ export default {
               if (that.y > that.clientHeight - that.footDownOffset + that.footDownOffset / 2) {
                 that.y = that.clientHeight - that.footDownOffset + that.footDownOffset / 2
               }
+            },
+            end (event) {
+              that.draggableMove = false
             }
           }
         })
@@ -391,13 +419,13 @@ export default {
     minimizeTap() {
       this.isMove = false
       this.footIsMove = false
-      this.exitFullscreen()
+      if(this.state) this.exitFullscreen()
       this.$emit('minimize');
     },
     close() {
       this.isMove = false
       this.footIsMove = false
-      this.exitFullscreen()
+      if(this.state) this.exitFullscreen()
       this.$emit('close');
     },
     selectedDrag(){
@@ -582,4 +610,13 @@ export default {
 .zIndex10000{
   z-index: 10000;
 }
+.zIndexSlot{
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+  bottom: 0;
+  z-index: 5;
+  background-color: rgba(255,255,255,0);
+}
 </style>

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

@@ -14,6 +14,7 @@
       </div>
       <div :class="{'drag-cont2': fixedStart,'drag-conts': true}">
         <div class="drag-cont-slot">
+          <div class="zIndexSlot" v-if="footIsMove || draggableMove"></div>
           <slot name="content"></slot>
         </div>
         <div v-show="!fixedStart&&!autoHeight">
@@ -56,7 +57,8 @@ export default {
       transAll: false,
       fixedStart: false,
       initWidth: 1280,
-      draggableState: null
+      draggableState: null,
+      draggableMove: false
     }
   },
   props: {
@@ -197,6 +199,11 @@ export default {
         this.y = this.top - scrollTop
       }
     }
+    document.addEventListener('fullscreenchange', this.handleFullScreenChange);
+    document.addEventListener('mozfullscreenchange', this.handleFullScreenChange); // Firefox
+    document.addEventListener('webkitfullscreenchange', this.handleFullScreenChange); // Chrome, Safari and Opera
+    document.addEventListener('msfullscreenchange', this.handleFullScreenChange); // IE/Edge
+
     // 监听窗口变化
     window.addEventListener('resize', () => {
       const wid = document.getElementById('app').offsetWidth
@@ -226,6 +233,24 @@ export default {
   },
   emits: ['dragStatus', 'close', 'enlarge','updateDrag','minimize','dragMouseup'],
   methods: {
+     handleFullScreenChange() {
+       if (!document.fullscreenElement) {
+         let clientWidth = window.innerWidth
+         this.x = clientWidth / 2 - this.width / 2;
+         this.y = (window.innerHeight / 2 - this.height / 2) - 80;
+         this.footDownOffset = this.height;
+         this.footRightOffset = this.width;
+         this.draggableState.draggable({enabled: true})
+         this.state = false
+         this.$emit('updateDrag', {
+           width: this.footRightOffset,
+           height: this.footDownOffset - ((this.dragTextShow)?60:30),
+           left: this.x,
+           top: this.y
+         })
+         this.$emit('enlarge', this.state)
+       }
+    },
     // 全屏
     fullScreen() {
       this.draggableState.draggable({enabled: false})
@@ -301,7 +326,12 @@ export default {
         this.draggableState.draggable({
           enabled: true,
           listeners: {
+            start (event) {
+              that.draggableMove = true
+              that.dragTap()
+            },
             move (event) {
+              console.log('移动')
               // 获取滚动距离
               const scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
               that.y = event.rect.top - scrollTop
@@ -318,6 +348,9 @@ export default {
               if (that.y > that.clientHeight - that.footDownOffset + that.footDownOffset / 2) {
                 that.y = that.clientHeight - that.footDownOffset + that.footDownOffset / 2
               }
+            },
+            end (event) {
+              that.draggableMove = false
             }
           }
         })
@@ -397,13 +430,13 @@ export default {
     minimizeTap() {
       this.isMove = false
       this.footIsMove = false
-      this.exitFullscreen()
+      if(this.state) this.exitFullscreen()
       this.$emit('minimize');
     },
     close() {
       this.isMove = false
       this.footIsMove = false
-      this.exitFullscreen()
+      if(this.state) this.exitFullscreen()
       this.$emit('close');
     },
     selectedDrag(){
@@ -588,4 +621,13 @@ export default {
 .zIndex10000{
   z-index: 10000;
 }
+.zIndexSlot{
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+  bottom: 0;
+  z-index: 5;
+  background-color: rgba(255,255,255,0);
+}
 </style>

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

@@ -54,9 +54,9 @@ 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: 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="title-1" 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="title-2" class="title ${randomId()}"><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>
                   <p data-signid="paragraph" style="margin: 30px 0px 0px; text-align: right"><strong><span style="font-size: 14px; color: rgb(0, 0, 0)">请在此处输入落款</span></strong></p>
                   <p data-signid="date" style="text-align: right"><strong><span style="font-size: 14px; color: rgb(0, 0, 0)">请在此处输入日期</span></strong></p>`
@@ -66,11 +66,11 @@ export function butJson(editor, data) {
                     key: 'newsFormat',
                     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="author" class="author" style="text-align: center;padding-bottom: 30px;"><span style="font-size: 12px; 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: 18px; font-family: SimHei; color: #333333">一、请在此处输入一级标题</span></strong></p>
+                  <p data-signid="title-1" 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="title-2" class="title ${randomId()}"><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>
                   <p data-signid="paragraph" style="margin: 30px 0px 0px; text-align: right"><strong><span style="font-size: 14px; color: rgb(0, 0, 0)">请在此处输入落款</span></strong></p>
                   <p data-signid="date" style="text-align: right"><strong><span style="font-size: 14px; color: rgb(0, 0, 0)">请在此处输入日期</span></strong></p>`
@@ -80,13 +80,13 @@ export function butJson(editor, data) {
                     key: 'paperFormat',
                     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="author" class="author" style="text-align: center;padding-bottom: 30px;"><span style="font-size: 12px; 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: 18px; font-family: SimHei; color: #333333">一、请在此处输入一级标题</span></strong></p>
+                  <p data-signid="title-1" class="title ${randomId()}"><strong><span style="font-size: 20px; 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="title-2" 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="splitLine" contenteditable="false" class="paging-line">分  页  线（保存文档时线下内容另起一页）</p>
                   <p data-signid="annotation" contenteditable="false" style="text-align: center;"><strong><span style="font-size: 24px; font-family: SimHei; color: #333333;">注释</span></strong></p>
@@ -210,7 +210,7 @@ export function butJson(editor, data) {
                     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>`
+                    html: `<p data-signid="author" class="author" style="text-align: center;padding-bottom: 30px;"><span style="font-size: 12px; font-family: FangSong; color: rgb(0, 0, 0);">请在此处输入作者/来源</span></p>`
                 },
                 {name: '一级标题', key: 'title-1'},
                 {name: '二级标题', key: 'title-2'},
@@ -237,13 +237,19 @@ 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: 18px; font-family: SimHei; color:#333333">一、请在此处输入一级标题</span></strong></p>`
+            html: `<p data-signid="title-1" class="title ${randomId()}"><strong><span style="font-size: 18px; font-family: SimHei; color:#333333">一、请在此处输入一级标题</span></strong></p>`
         },
         secondaryHeading: {
             name: '二级标题',
             key: 'secondaryHeading',
             menuKeys: [],
-            html: `<p data-signid="title-2" class="title ${randomId()} indent"><span style="font-size: 16px; font-family: SimHei; color:#333333">（一）请在此处输入二级标题</span></p>`
+            html: `<p data-signid="title-2" class="title ${randomId()}"><span style="font-size: 16px; font-family: SimHei; color:#333333">（二）请在此处输入二级标题</span></p>`
+        },
+        level3Heading: {
+            name: '三级标题',
+            key: 'level3Heading',
+            menuKeys: [],
+            html: `<p data-signid="title-3" class="title ${randomId()}"><span style="font-size: 16px; font-family: SimHei; color:#333333">（三）请在此处输入三级标题</span></p>`
         },
         paragraphBody: {
             name: '正文文本',
@@ -326,7 +332,7 @@ export function butJson(editor, data) {
             name: '作者',
             key: 'authorMenu',
             menuKeys: [],
-            html: `<p class="author" data-signId="author" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 16px;font-family: KaiT;">${menusData(data, 'authorMenu').text}</span></p>`
+            html: `<p class="author" data-signId="author" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 12px;font-family: KaiT;">${menusData(data, 'authorMenu').text}</span></p>`
         },
         numberMenu: {
             name: '参考编号',

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

@@ -1197,7 +1197,6 @@ 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++) {
@@ -1251,6 +1250,7 @@ export default {
             _this.interpositionData = []
           }
         }
+        _this.$emit('changeOutlineMenu', _this.changeOutlineMenu())
       },
       onTransaction: () => {
         const index = _this.editor.state.selection.$anchor.path[1]
@@ -2911,7 +2911,7 @@ export default {
                 // {name: '四级标题', key: 'title-4'},
                 {name: '正文文本', key: 'text'},]
             }
-            if(this.templateType === 'newsFormat'||this.templateType === 'paperFormat'){
+            if(this.templateType === 'newsFormat'){
               obj.menuKeys = [
                 {
                   name: '文章标题',
@@ -2923,13 +2923,32 @@ export default {
                   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>`
+                  html: `<p data-signid="author" class="author" style="text-align: center;padding-bottom: 30px;"><span style="font-size: 12px; 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'},]
+            }else if(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: 12px; 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
@@ -3328,28 +3347,7 @@ 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)return
         // 题目
         if (key.key === 'subjectMenu') {
           const html = menusHtml.filter(item => item.key == key.key)[0].html
@@ -3401,6 +3399,56 @@ export default {
           officialDocumentFormat:{size:'14px',color:'#000000',margin:'0px',textAlign:'left',bold:true},
           newsFormat:{size:'14px',color:'#000000',margin:'0px',textAlign:'left',bold:true},
         }
+
+        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
+            if(this.templateType === 'paperFormat'){
+              const obj1 = sizeObj1[this.templateType]
+              let from = this.selection()
+              this.editor.chain().focus().insertContentAt(from, html).run()
+              this.editor.chain().setTextSelection({ from: from, to: from+14 }).setFontSize(obj1.size).setTextSelection(from+14).run()
+            }else {
+              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
+            if(this.templateType === 'paperFormat'){
+              const obj2 = sizeObj2[this.templateType]
+              let from = this.selection()
+              this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+              this.editor.chain().setTextSelection({ from: from, to: from+15 }).setFontSize(obj2.size).setTextSelection(from+15).run()
+            }else {
+              this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+            }
+            this.$emit('changeOutlineMenu', this.changeOutlineMenu())
+          }
+          // 三级标题
+          if (level === '3') {
+            const html = butJson(this.editor, this.menusText)['level3Heading'].html
+            if(this.templateType === 'paperFormat'){
+              const obj3 = sizeObj3[this.templateType]
+              let from = this.selection()
+              this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+              this.editor.chain().setTextSelection({ from: from, to: from+15 }).setFontSize(obj3.size).setTextSelection(from+15).run()
+            }else {
+              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 === 'text') {
           this.tipTitle = window.getSelection().toString()
           if (this.tipTitle.length === 0) {

package/src/components/menuTree/src/ZydxMenuTreeInfo.vue

@@ -14,18 +14,16 @@ selectItem 传入当前选择的节点，是一个对象
 <template>
   <div>
     <div
-      class="lineHeight30"
-      :class="menuInfo.level === 0 ? '' : 'marginLeft14'"
+        :class="menuInfo.level === 0 ? '' : 'marginLeft14'"
+        class="lineHeight30"
     >
       <div
-        :class=" menuConfig.isShowLine ? 'dashed' : 'no_dashed'"
+          :class=" menuConfig.isShowLine ? 'dashed' : 'no_dashed'"
       >
-        <div
-          class="widthB100 ellipse cursor "
-          :class="menuTitleStyle"
-          @click.stop="clickItem(menuInfo)"
-          :title="menuInfo.title"
-        >
+        <div :class="menuTitleStyle"
+             :title="menuInfo.title"
+             class="widthB100 ellipse cursor "
+             @click.stop="clickItem(menuInfo)">
           <template v-if="menuConfig.isCheckBox">
             <checkBox v-model="menuConfig.checkBoxValue" :value="menuInfo.catalogId"></checkBox>
           </template>
@@ -33,21 +31,23 @@ selectItem 传入当前选择的节点，是一个对象
         </div>
         <div v-show="menuConfig.isShowUpDown && menuInfo.children">
           <template v-if="menuConfig.isShowBtn">
-            <button class="z-button" @click="clickFont(menuInfo)">{{menuInfo.isShowUpDown ? '收&ensp;&ensp;起': '展&ensp;&ensp;开'}}</button>
+            <button class="z-button" @click="clickFont(menuInfo)">
+              {{ menuInfo.isShowUpDown ? '收&ensp;&ensp;起' : '展&ensp;&ensp;开' }}
+            </button>
           </template>
           <template v-else>
-            <span class="iconfont" v-html="defaultFont" @click="clickFont(menuInfo)"></span>
+            <span class="iconfont" @click="clickFont(menuInfo)" v-html="defaultFont"></span>
           </template>
         </div>
       </div>
       <div v-show="menuInfo.isShowUpDown">
         <div v-for="(item, index) in menuInfo.children" :key="index">
           <zydx-menu-tree-info
-            :menuConfig="menuConfig"
-            :selectItem="selectItem"
-            :menu-info="item"
-            :nodeLevel="nodeLevel"
-            @clickItem="clickItem"
+              :menu-info="item"
+              :menuConfig="menuConfig"
+              :nodeLevel="nodeLevel"
+              :selectItem="selectItem"
+              @clickItem="clickItem"
           >
           </zydx-menu-tree-info>
         </div>
@@ -68,17 +68,17 @@ export default {
   props: {
     // 目录配置
     menuConfig: {
-        type: Object,
-        default: function () {
-            return {
-                isShowUpDown: false,    // 是否显示收起展开
-                isShowLine: false,    // 是否显示下划线
-                isShowBtn: false,    // 显示按钮或者图标
-                isCheckBox: false,    // 是否显示复选框
-                isUnifyFontSize: false,    // 字体是否需要统一字号，
-                checkBoxValue: [],    // 复选款选中的值
-            };
-        }
+      type: Object,
+      default: function () {
+        return {
+          isShowUpDown: false,    // 是否显示收起展开
+          isShowLine: false,    // 是否显示下划线
+          isShowBtn: false,    // 显示按钮或者图标
+          isCheckBox: false,    // 是否显示复选框
+          isUnifyFontSize: false,    // 字体是否需要统一字号，
+          checkBoxValue: [],    // 复选款选中的值
+        };
+      }
     },
     // 显示可操作节点
     nodeLevel: {
@@ -109,21 +109,24 @@ export default {
       let ar = [];
       ar.push("level" + this.menuInfo.level);
       if (!this.menuConfig.isUnifyFontSize) {
-          if (parseInt(this.menuInfo.level) == 0) {
-              ar.push("text_center");
-          }
-          if (parseInt(this.menuInfo.level) == 0 || parseInt(this.menuInfo.level) == 1) {
-              ar.push("font_border");
-          }
+        if (parseInt(this.menuInfo.level) == 0) {
+          ar.push("text_center");
+        }
+        if (parseInt(this.menuInfo.level) == 0 || parseInt(this.menuInfo.level) == 1) {
+          ar.push("font_border");
+        }
+      }
+      if (this.menuInfo.hasData !== undefined && !this.menuInfo.hasData) {
+        ar.push("disable");
       }
       if (parseInt(this.menuInfo.level) > parseInt(this.nodeLevel)) {
         ar.push("disable");
       }
       // 如果显示复选。 怎不显示高亮
       if (!this.menuConfig.isCheckBox) {
-          if (this.selectItem && (this.selectItem.catalogId === this.menuInfo.catalogId)) {
-              ar.push("active");
-          }
+        if (this.selectItem && (this.selectItem.catalogId === this.menuInfo.catalogId)) {
+          ar.push("active");
+        }
       }
       return ar;
     }
@@ -144,6 +147,7 @@ export default {
   font-family: "iconfont";
   src: url("./iconfont.ttf?t=1660878683989") format("truetype");
 }
+
 .iconfont {
   font-family: "iconfont" !important;
   font-size: 16px;
@@ -152,51 +156,64 @@ export default {
   -moz-osx-font-smoothing: grayscale;
   cursor: pointer;
 }
+
 .cursor {
   cursor: pointer;
 }
+
 .disable {
   color: #7c7c7c;
   pointer-events: none;
   cursor: default;
 }
+
 .border_bottom {
   border-bottom: 1px #cccccc dashed;
 }
+
 .active {
   color: #4B0C77;
 }
+
 .ellipse {
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
 }
+
 .marginLeft14 {
   margin-left: 14px;
 }
+
 .widthB100 {
   width: 100%;
 }
+
 .dashed {
   display: flex;
   flex-direction: row;
   border-bottom: 1px #CCCCCC dashed;
 }
+
 .no_dashed {
   display: flex;
   flex-direction: row;
   border-bottom: 1px #FFFFFF dashed;
 }
+
 .lineHeight30 {
-   line-height: 30px;
+  line-height: 30px;
 }
-  .text_center {
-    font-size: 16px;
-    text-align: center;
-  }
-  .font_border {
-    font-weight: bolder;
-  }
+
+.text_center {
+  font-size: 16px;
+  text-align: center;
+}
+
+.font_border {
+  font-weight: bolder;
+}
+
 .z-button {
   margin: 1px;
   width: auto;
@@ -219,9 +236,11 @@ export default {
   font-weight: normal;
   box-sizing: border-box;
 }
+
 .level0 {
   font-weight: bold;
 }
+
 .level1 {
   font-weight: bold;
 }

package/src/components/variableBox/index.vue

@@ -24,6 +24,22 @@ export default {
       type: Boolean,
       default: true
     },
+    leftInitWidth:{
+      type: Number,
+      default: 310
+    },
+    leftMinWidth:{
+      type: Number,
+      default: 0
+    },
+    rightMinWidth:{
+      type: Number,
+      default: 0
+    },
+    isPercent: {
+      type: Boolean,
+      default: false
+    },
   },
   watch: {
     isShowsRight: {
@@ -59,29 +75,35 @@ export default {
   mounted() {
   },
   methods: {
-    handleResize(leftMinWidth = 310, rightMinWidth = 310) {
+    handleResize() {
       // 获取Dom节点
       const boxDom = this.$refs.boxRef,
           leftDom = this.$refs.leftRef,
           resizeDom = this.$refs.resizeRef,
           rightDom = this.$refs.rightRef;
       if (resizeDom) {
-        leftDom.style.width = '50%'
-        rightDom.style.width = '50%'
+        const maxWidth = boxDom.clientWidth - resizeDom.offsetWidth; // 左右两边区域的总宽度 = 外层容器宽度 - 中间区域拖拉框的宽度
+        leftDom.style.width = `${this.isPercent?
+            this.leftInitWidth<=0||this.leftInitWidth>=100 ? 30 : this.leftInitWidth
+            : this.leftInitWidth}${this.isPercent? '%' : 'px'}`
+        rightDom.style.width = `${this.isPercent?
+            this.leftInitWidth<=0||this.leftInitWidth>=100 ? 70 : 100-this.leftInitWidth
+            : maxWidth-this.leftInitWidth}${this.isPercent? '%' : 'px'}`
+        /*leftDom.style.width = '50%'
+        rightDom.style.width = '50%'*/
         resizeDom.onmousedown = e => {
           const startX = e.clientX; // 记录坐标起始位置
           leftDom.left = leftDom.offsetWidth; // 左边元素起始宽度
           document.onmousemove = e => {
             const endX = e.clientX; // 鼠标拖动的终止位置
             let moveLen = leftDom.left + (endX - startX); // 移动的距离 =  endX - startX，左边区域最后的宽度 = resizeDom.left + 移动的距离
-            const maxWidth = boxDom.clientWidth - resizeDom.offsetWidth; // 左右两边区域的总宽度 = 外层容器宽度 - 中间区域拖拉框的宽度
             // 限制左边区域的最小宽度为 leftMinWidth
-            if (moveLen < leftMinWidth) {
-              moveLen = leftMinWidth;
+            if (moveLen < this.leftMinWidth) {
+              moveLen = this.leftMinWidth;
             }
             // 右边区域最小宽度为 rightMinWidth
-            if (moveLen > maxWidth - rightMinWidth) {
-              moveLen = maxWidth - rightMinWidth;
+            if (moveLen > maxWidth - this.rightMinWidth) {
+              moveLen = maxWidth - this.rightMinWidth;
             }
             leftDom.style.width = (moveLen / maxWidth) * 100 + "%"; // 设置左边区域的宽度，通过换算为百分比的形式，实现窗体放大缩小自适应
             rightDom.style.width = ((maxWidth - moveLen) / maxWidth) * 100 + "%"; // 右边区域 = 总大小 - 左边宽度 - 拖动条宽度

package/src/index.js

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