zydx-plus 1.35.487 → 1.35.488

package/package.json

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

package/src/components/biz_header/src/button_name.js

@@ -2946,7 +2946,7 @@ let buttonNames = {
                               default: "demand",
                               demand: '学习要求',
                               actionAnalysis: '学习评析',
-                            //   qualityAnalysis: '素养评析'
+                              qualityAnalysis: '素养评析' // 2025.4.9 加回来bug6776
                           }
                       }
                   }

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

@@ -43,7 +43,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" class="title ${randomId()} indent"><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: 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="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 +57,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" class="title ${randomId()} indent"><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: 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="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>
@@ -73,7 +73,7 @@ export function butJson(editor, data) {
                   <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="text" class="indent"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>
-                  <p data-signid="title-1" class="title ${randomId()} indent"><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: 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="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>
@@ -190,7 +190,7 @@ export function butJson(editor, data) {
                 {name: '一级标题', key: 'title-1'},
                 {name: '二级标题', key: 'title-2'},
                 {name: '三级标题', key: 'title-3'},
-                {name: '四级标题', key: 'title-4'},
+                // {name: '四级标题', key: 'title-4'},
                 {name: '正文文本', key: 'text'},
             ],
             html: {}
@@ -210,13 +210,13 @@ export function butJson(editor, data) {
             name: '一级标题',
             key: 'firstLevelHeading',
             menuKeys: [],
-            html: `<p data-signid="title-1" class="title ${randomId()} indent"><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: 16px; font-family: SimHei; color:#333333">一、请在此处输入一级标题</span></strong></p>`
         },
         secondaryHeading: {
             name: '二级标题',
             key: 'secondaryHeading',
             menuKeys: [],
-            html: `<p data-signid="title-2" class="title ${randomId()} indent"><strong><span style="font-size: 16px; font-family: SimHei; color:#333333">（一）请在此处输入二级标题</span></strong></p>`
+            html: `<p data-signid="title-2" class="title ${randomId()} indent"><span style="font-size: 16px; font-family: SimHei; color:#333333">（一）请在此处输入二级标题</span></p>`
         },
         paragraphBody: {
             name: '正文文本',
@@ -266,7 +266,7 @@ export function butJson(editor, data) {
                 {name: '黑体', key: 'SimHei'},
             ],
             html: {
-                blackCenter4: `<p data-signId="title-1" class="title ${randomId()}" style="text-align: center;"><span style="font-weight: 700;color: rgb(0, 0, 0);font-size: 16px;font-family: SimHei">${menusData(data, 'titleMenu').text}</span></p>`,
+                blackCenter4: `<p data-signId="title-1" style="text-align: center" class="title ${randomId()}" style="text-align: center;"><span style="font-weight: 700;color: rgb(0, 0, 0);font-size: 16px;font-family: SimHei">${menusData(data, 'titleMenu').text}</span></p>`,
                 blackLeft4: `<p data-signId="title-2" class="title ${randomId()}" style="text-align: left;"><span style="font-weight: 700;color: rgb(0, 0, 0);font-size: 16px;font-family: SimHei">${menusData(data, 'titleMenu').text}</span></p>`,
                 blackCenter5: `<p data-signId="title-3" class="title ${randomId()}" style="text-align: center;"><span style="font-weight: 700;color: rgb(0, 0, 0);font-size: 16px;font-family: SimHei">${menusData(data, 'titleMenu').text}</span></p>`,
                 blackLeft5: `<p data-signId="title-4" class="title ${randomId()}" style="text-align: left;"><span style="font-weight: 700;color: rgb(0, 0, 0);font-size: 16px;font-family: SimHei">${menusData(data, 'titleMenu').text}</span></p>`,

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

@@ -640,7 +640,7 @@ export default {
     zydxDragPopup,
     zydxSelect,
     zydxChat,
-    delSvg, editSvg, viewSvg,Paint
+    delSvg, editSvg, viewSvg, Paint
   },
   beforeUnmount() {
     this.editor.destroy()
@@ -759,7 +759,7 @@ export default {
       audioData: [],
       time: {},
       hex: '',
-      toolbar:  [
+      toolbar: [
         'switchingFormat', 'signMenu', 'pageMargin', 'paragraph',
         'outlineMenu', 'alignmentMode', 'titleMenu',
         'textMenu', 'color', 'interposition'],
@@ -816,7 +816,7 @@ export default {
           name: '公文版式',
           key: 'officialDocumentFormat',
           menuKeys: [],
-          html:  `<p style="text-align: center"><span style="font-size: 48px; 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: rgb(0, 0, 0);line-height: 1;">请在此处输入标题</span></strong></p>
@@ -833,7 +833,7 @@ export default {
           name: '新闻版式',
           key: 'newsFormat',
           menuKeys: [],
-          html:  `<p data-signid="subject" style="text-align: center;"><strong><span style="font-size: 24px; font-family: SimHei; color: rgb(0, 0, 0);">请在此处输入标题</span></strong></p>
+          html: `<p data-signid="subject" style="text-align: center;"><strong><span style="font-size: 24px; font-family: SimHei; color: rgb(0, 0, 0);">请在此处输入标题</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 class="indent"><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">请在此处输入正文文本</span></p>
                   <p data-signid="title-1" class="title indent"><strong><span style="font-size: 14px; font-family: SimHei; color: rgb(0, 0, 0)">一、请在此处输入一级标题</span></strong></p>
@@ -847,7 +847,7 @@ export default {
           name: '论文版式',
           key: 'paperFormat',
           menuKeys: [],
-          html:  `<p data-signid="subject" style="text-align: center;"><strong><span style="font-size: 24px; font-family: SimHei; color: rgb(0, 0, 0);">请在此处输入题目</span></strong></p>
+          html: `<p data-signid="subject" style="text-align: center;"><strong><span style="font-size: 24px; font-family: SimHei; color: rgb(0, 0, 0);">请在此处输入题目</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: rgb(0, 0, 0)">摘要:</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: rgb(0, 0, 0)">关键词:</span></strong> <span style="font-size: 14px; font-family: FangSong; color: rgb(0, 0, 0)"> 请在此处输入关键字...</span></p>
@@ -926,7 +926,7 @@ export default {
           customInsert(res, insertFn) {
             setTimeout(() => {
               insertFn('http://192.168.5.213:8888' + res.data)
-            },100)
+            }, 100)
           },
           onSuccess(file, res) {
             console.log('图片上传成功', file, res)
@@ -1014,7 +1014,7 @@ export default {
     html: {
       handler: function (e, oldVal) {
         this.init = false
-        if (e&&e.sign?.tag === 'sign') {
+        if (e && e.sign?.tag === 'sign') {
           this.signMenuShow = true
           // e.shift()
         }
@@ -1033,6 +1033,8 @@ export default {
         }
         setTimeout(() => {
           this.init = true
+          this.templateType = this.htmlJson.templateType
+          this.changeTemplateType()
         }, 500)
       },
       deep: true
@@ -1047,7 +1049,7 @@ export default {
             if (this.page) {
               this.editableShow = !e
               setTimeout(() => {
-                if(e){
+                if (e) {
                   this.readOnlyPage() // 只读分页
                 }
               }, 300)
@@ -1138,7 +1140,7 @@ export default {
         BubbleMenu.configure({  // 气泡菜单
           pluginKey: 'bubbleMenu',
           element: document.querySelector('.menu'),
-          tippyOptions:{
+          tippyOptions: {
             placement: 'right',
           },
           shouldShow: ({editor, view, state, oldState, from, to}) => {
@@ -1154,7 +1156,7 @@ export default {
         BubbleMenu.configure({
           pluginKey: 'bubbleMenuOne',
           element: document.querySelector('.menu-one'),
-          tippyOptions:{
+          tippyOptions: {
             placement: 'right',
           },
           shouldShow: ({editor, view, state, oldState, from, to}) => {
@@ -1238,6 +1240,7 @@ export default {
         this.limits = true
       },
       onUpdate: ({editor}) => {
+        editor.commands.focus()
         const json = editor.getJSON()
         for (let i = 0; i < json.content.length; i++) {
           const item = json.content[i]
@@ -1264,24 +1267,24 @@ export default {
               }
             }
           } else {
-            if(/r-/.test(item.attrs.signId) || /a-/.test(item.attrs.signId)){
-              json.content.splice(i,1)
+            if (/r-/.test(item.attrs.signId) || /a-/.test(item.attrs.signId)) {
+              json.content.splice(i, 1)
               editor.chain().setContent(json).run()
             }
           }
-          let r = json.content.filter(item=>item.attrs.signId&&/r-/.test(item.attrs.signId)).length
-          let a = json.content.filter(item=>item.attrs.signId&&/a-/.test(item.attrs.signId)).length
-          for (let i = 0; i < json.content.length; i++){
+          let r = json.content.filter(item => item.attrs.signId && /r-/.test(item.attrs.signId)).length
+          let a = json.content.filter(item => item.attrs.signId && /a-/.test(item.attrs.signId)).length
+          for (let i = 0; i < json.content.length; i++) {
             const item = json.content[i]
-            if (r===0){
-              if(item.attrs.signId==='reference' || item.attrs.signId==='reference-1' || item.attrs.signId==='annotationSplitLine'){
-                json.content.splice(i,1)
+            if (r === 0) {
+              if (item.attrs.signId === 'reference' || item.attrs.signId === 'reference-1' || item.attrs.signId === 'annotationSplitLine') {
+                json.content.splice(i, 1)
                 editor.chain().setContent(json).run()
               }
             }
-            if (a===0){
-              if(item.attrs.signId==='annotation' || item.attrs.signId==='annotation-1' || item.attrs.signId==='referenceSplitLine'){
-                json.content.splice(i,1)
+            if (a === 0) {
+              if (item.attrs.signId === 'annotation' || item.attrs.signId === 'annotation-1' || item.attrs.signId === 'referenceSplitLine') {
+                json.content.splice(i, 1)
                 editor.chain().setContent(json).run()
               }
             }
@@ -1357,12 +1360,14 @@ export default {
       this.x = event.clientX - this.left;
       this.y = event.clientY - this.top;
     })
+    this.templateType = this.htmlJson.templateType
+    this.changeTemplateType()
     // document.addEventListener('click', () => {
     //   // if(this.limits) return
     //   // this.close()
     // })
   },
-  emits: ['confirm', 'enclosure', 'enlDownload', 'enlSee', 'changeOutlineMenu'],
+  emits: ['confirm', 'enclosure', 'enlDownload', 'enlSee', 'changeOutlineMenu', 'getConfirm'],
   methods: {
     showAi() {
       this.isShowAi = !this.isShowAi
@@ -1404,51 +1409,51 @@ export default {
     },
     //修改模板类型
     async changeTemplateType() {
-      const  oldFormatWriteNewFormat = (oldJson)=>{
+      const oldFormatWriteNewFormat = (oldJson) => {
         let newJson = this.editor.getJSON()
-        if(oldJson.content.length===1&&!oldJson.content[0].content){
+        if (oldJson.content.length === 1 && !oldJson.content[0].content) {
           return
         }
         let oldContent = []
-        let signIdArrObj={
-          officialDocumentFormat: ['text','paragraph','date','subject'],
-          newsFormat: ['text','paragraph','date','subject','author'],
-          paperFormat: ['text','paragraph','date','subject','author']
+        let signIdArrObj = {
+          officialDocumentFormat: ['text', 'paragraph', 'date', 'subject'],
+          newsFormat: ['text', 'paragraph', 'date', 'subject', 'author'],
+          paperFormat: ['text', 'paragraph', 'date', 'subject', 'author']
         }
-        let signIdArr=signIdArrObj[this.templateType]
+        let signIdArr = signIdArrObj[this.templateType]
         let newSignIdIndex = -1
         let remainIndex = 0
-        for (let i = 0; i <oldJson.content.length ; i++) {
+        for (let i = 0; i < oldJson.content.length; i++) {
           let item = oldJson.content[i]
-          if(signIdArr.indexOf(item.attrs.signId)!==-1||(!!item.attrs.signId&&item.attrs.signId.indexOf('title')!==-1)){
+          if (signIdArr.indexOf(item.attrs.signId) !== -1 || (!!item.attrs.signId && item.attrs.signId.indexOf('title') !== -1)) {
             item.reserve = true
             for (let j = 0; j < newJson.content.length; j++) {
               let newItem = newJson.content[j]
-              if(newItem.attrs.signId&&item.attrs.signId&&item.attrs.signId===newItem.attrs.signId&&newSignIdIndex<j){
-                newJson.content[j]=JSON.parse(JSON.stringify(item))
+              if (newItem.attrs.signId && item.attrs.signId && item.attrs.signId === newItem.attrs.signId && newSignIdIndex < j) {
+                newJson.content[j] = JSON.parse(JSON.stringify(item))
                 delete newJson.content[j].reserve
                 item.reserve = false
-                if(newJson.content[j].attrs.signId==='subject'&&this.templateType === 'officialDocumentFormat'){
-                  newJson.content[j].attrs.margin= '80px 0 60px'
-                }else {
-                  newJson.content[j].attrs.margin= null
+                if (newJson.content[j].attrs.signId === 'subject' && this.templateType === 'officialDocumentFormat') {
+                  newJson.content[j].attrs.margin = '80px 0 60px'
+                } else {
+                  newJson.content[j].attrs.margin = null
                 }
-                newSignIdIndex=j
+                newSignIdIndex = j
                 break
-              }else {
-                let arr = ['paragraph','date']
-                if(newSignIdIndex>=0&&arr.indexOf(newJson.content[newSignIdIndex].attrs.signId)===-1){
+              } else {
+                let arr = ['paragraph', 'date']
+                if (newSignIdIndex >= 0 && arr.indexOf(newJson.content[newSignIdIndex].attrs.signId) === -1) {
                   // 内容有意义但无法替换如新样板，位置起点留存
-                  remainIndex=newSignIdIndex
+                  remainIndex = newSignIdIndex
                 }
               }
             }
           }
         }
-        oldContent = oldJson.content.filter(item=>item.reserve)
-        oldContent.forEach((item,index)=>{
+        oldContent = oldJson.content.filter(item => item.reserve)
+        oldContent.forEach((item, index) => {
           delete item.reserve
-          newJson.content.splice(remainIndex+index+1,0,item)
+          newJson.content.splice(remainIndex + index + 1, 0, item)
         })
         this.editor.chain().setContent(newJson).run()
       }
@@ -1464,27 +1469,27 @@ export default {
           'textMenu', 'color', 'interposition']
         this.organizeButton()
         this.interpositionData = []
-        if(oldJson.content.length===1&&!oldJson.content[0].content){
+        if (oldJson.content.length === 1 && !oldJson.content[0].content) {
           return
         }
         let oldContent = []
-        let signIdArr=['text','paragraph','date','subject','author']
-        oldJson.content.forEach((item)=>{
-          if(signIdArr.indexOf(item.attrs.signId)!==-1||(!!item.attrs.signId&&item.attrs.signId.indexOf('title')!==-1)){
-            if(item.attrs.signId==='subject'){
-              item.attrs.margin= null
+        let signIdArr = ['text', 'paragraph', 'date', 'subject', 'author']
+        oldJson.content.forEach((item) => {
+          if (signIdArr.indexOf(item.attrs.signId) !== -1 || (!!item.attrs.signId && item.attrs.signId.indexOf('title') !== -1)) {
+            if (item.attrs.signId === 'subject') {
+              item.attrs.margin = null
             }
             oldContent.push(item)
           }
         })
-        this.editor.chain().setContent({type:'doc',content:oldContent}).run()
+        this.editor.chain().setContent({type: 'doc', content: oldContent}).run()
       }
       // 公文版式
       if (this.templateType === 'officialDocumentFormat') {
         const html = htmlFormat.filter(item => item.key === this.templateType)[0].html
         this.editor.chain().setContent(html).run()
         this.toolbar = [
-          'switchingFormat', 'signMenu', 'pageMargin','redMenu', 'firstLevelHeading',
+          'switchingFormat', 'signMenu', 'pageMargin', 'redMenu', 'firstLevelHeading',
           'secondaryHeading', 'paragraphBody', 'paragraphMenu', 'alignmentMode',
           'titleMenu', 'color', 'interposition']
         this.organizeButton()
@@ -2166,7 +2171,7 @@ export default {
           let mtop = parseInt(getComputedStyle(data[i]).marginTop)
           let Bottom = parseInt(getComputedStyle(data[i]).paddingBottom)
           let mBottom = parseInt(getComputedStyle(data[i]).marginBottom)
-          let text = data[i].offsetHeight+Bottom+top+mtop+mBottom
+          let text = data[i].offsetHeight + Bottom + top + mtop + mBottom
           if ((pHeight + text) > max) {
             const {start, end, size} = this.rows(data[i], max - pHeight)
             let child = data[i].childNodes[0]
@@ -2410,8 +2415,9 @@ export default {
       let editorJson = this.editor.getJSON()
       let sign = {node: 'element', tag: 'sign', child: []}
       let popupsData = {type: 'interpositionData', data: [...this.interpositionData]}
+      let templateType = this.templateType
       let data = {
-        directoryJson, editorHtml, editorJson, popupsData
+        directoryJson, editorHtml, editorJson, popupsData, templateType
       }
       if (this.signMenuShow) {
         data.sign = sign
@@ -2434,8 +2440,9 @@ export default {
       let editorJson = this.editor.getJSON()
       let sign = {node: 'element', tag: 'sign', child: []}
       let popupsData = {type: 'interpositionData', data: [...this.interpositionData]}
+      let templateType = this.templateType
       let data = {
-        directoryJson, editorHtml, editorJson, popupsData
+        directoryJson, editorHtml, editorJson, popupsData, templateType
       }
       if (this.signMenuShow) {
         data.sign = sign
@@ -2455,6 +2462,21 @@ export default {
       // })
       return data
     },
+    changeOutlineMenu() {
+      let directoryJson = html2json(this.editor.getHTML()).child
+      let editorHtml = this.editor.getHTML()
+      let editorJson = this.editor.getJSON()
+      let sign = {node: 'element', tag: 'sign', child: []}
+      let popupsData = {type: 'interpositionData', data: [...this.interpositionData]}
+      let templateType = this.templateType
+      let data = {
+        directoryJson, editorHtml, editorJson, popupsData, templateType
+      }
+      if (this.signMenuShow) {
+        data.sign = sign
+      }
+      return data
+    },
     // 上传进度
     progressFunction(e) {
       if (e.lengthComputable) {
@@ -3072,7 +3094,6 @@ export default {
           // }
         }*/
       }
-
       // 标志
       if (data.key === 'signMenu') this.signMenuShow = !this.signMenuShow
       // 红头文件
@@ -3089,13 +3110,13 @@ export default {
       if (data.key === 'firstLevelHeading') {
         const html = butJson(this.editor, this.menusText)[data.key].html
         this.editor.chain().focus().insertContentAt(this.selection(), html).run()
-        this.$emit('changeOutlineMenu')
+        this.$emit('changeOutlineMenu', this.changeOutlineMenu())
       }
       // 二级标题
       if (data.key === 'secondaryHeading') {
         const html = butJson(this.editor, this.menusText)[data.key].html
         this.editor.chain().focus().insertContentAt(this.selection(), html).run()
-        this.$emit('changeOutlineMenu')
+        this.$emit('changeOutlineMenu', this.changeOutlineMenu())
       }
       // 正文
       if (data.key === 'paragraphBody') {
@@ -3198,16 +3219,31 @@ export default {
       // 大纲级别
       if (data.key === 'outlineMenu') {
         if (key.key === 'text') {
+          this.editor.commands.setNode('paragraph', {class: 'indent'})
           this.editor.commands.setTitleId(key.key)
           this.editor.commands.unsetSignId()
-          this.editor.chain().focus().unsetBold().setFontSize('14px').setColor('#000000').setTextAlign('left').run()
+          this.editor.chain().unsetBold().setFontSize('14px').setColor('#000000').setTextAlign('left').focus().run()
         } else {
           const t = key.key.split('-')[0]
-          this.editor.commands.setSignId(key.key)
-          this.editor.commands.setTitleId(`${t} ${this.randomId()}`)
-          this.editor.chain().focus().setBold().setFontSize('16px').setColor('#333333').setTextAlign('left').run()
+          const level = key.key.split('-')[1]
+          let size = '16px'
+          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()
+          } else if (level === '2') {
+            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()
+          } else {
+            size = '14px'
+            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.$emit('changeOutlineMenu')
+        this.$emit('changeOutlineMenu', this.changeOutlineMenu())
       }
       // 对齐方式
       if (data.key === 'alignmentMode') {
@@ -4041,9 +4077,12 @@ export default {
         if (this.readOnly) {
           let bodys = document.querySelector(`.z-editor`)
           bodys.scrollTop = element.offsetTop
-          return
+        } else {
+          let bodys = document.querySelector(`.editor-content`)
+          bodys.scrollTop = element.offsetTop + 70
         }
-        element.scrollIntoView({behavior: 'smooth'});
+
+        // element.scrollIntoView({behavior: 'smooth'});
       }
     }
   }
@@ -4130,8 +4169,8 @@ export default {
 
 :deep(.title) {
   /*padding: 10px 0 2px 0;*/
-  font-weight: 900;
-  color:#333333!important;
+  /*font-weight: 900;*/
+  color: #333333 !important;
 }
 
 .read-only-a {

package/src/components/treeList/src/treeList.vue

@@ -1,86 +1,84 @@
 <template>
-    <div class="list-tree">
-        <div class="list-cont" v-if="list.length > 0">
-            <div :class="{'list-li':true, 'theme-text': active === index, pos: multiple}"
-                 :style="{'border-bottom': (link)? '1px solid #ccc': '0'}"
-                 v-for="(item,index) in listCopy" :key="index" @click="listTap(item,index)">
-                <input v-if="multiple" :checked="item.box" @change="checkboxChange($event,index)" class="box-list" type="checkbox" name="boxList" />
-                <div class="list-title">
-                    <span :style="{'font-size': 'fontSize' in column[0]?column[0].fontSize + 'px':'16px', 'font-weight': column[0].fontWeight, 'color': (active === index)? activeColor : '#333333'}" v-html="(index + 1) + '.' + (angleBrackets ? '《' : '') + item[column[0].label] + (angleBrackets ? '》' : '')"></span>
-                    <button v-if="delShow" @click="del(item)" v-html="delText"></button>
-                </div>
-                <div class="list-cont" v-if="open">
-                    <div class="list-li-cont" :style="{'color': (active === index)? activeColor : '#000000'}">
-                        <p v-for="(it,ind) in column.slice(1, column.length)" :key="ind">{{ it.name }}：{{ item[it.label] }}</p>
-                    </div>
-                </div>
-                <div class="list-cont" v-else>
-                    <div class="list-li-cont" :style="{'color': (active === index)? activeColor : '#000000'}" v-if="active === index">
-                        <p v-for="(it,ind) in column.slice(1, column.length)" :key="ind">{{ it.name }}：{{ item[it.label] }}</p>
-                    </div>
-                </div>
+  <div class="list-tree">
+    <div class="list-cont" v-if="list.length > 0">
+      <div :class="{'list-li':true, 'theme-text': active === index, pos: multiple}"
+           :style="{'border-bottom': (link)? '1px solid #ccc': '0'}"
+           v-for="(item,index) in listCopy" :key="index" @click="listTap(item,index)">
+        <input v-if="multiple" :checked="item.box" @change="checkboxChange($event,index)" class="box-list" type="checkbox" name="boxList" />
+        <div class="list-title">
+          <span :style="{'font-size': 'fontSize' in column[0]?column[0].fontSize + 'px':'16px', 'font-weight': column[0].fontWeight, 'color': (active === index)? activeColor : '#333333'}" v-html="(index + 1) + '.' + (angleBrackets ? '《' : '') + item[column[0].label] + (angleBrackets ? '》' : '')"></span>
+          <button v-if="delShow" @click="del(item)" v-html="delText"></button>
+        </div>
+        <div class="list-cont">
+          <div class="list-li-cont" :style="{'color': (active === index)? activeColor : '#000000'}" v-if="open ? true : active === index">
+            <div v-for="(it,ind) in column.slice(1, column.length)" :key="ind" class="textWrap">
+              <div class="lable">{{ it.name }}</div>
+              <div class="text">：{{ item[it.label] }}</div>
             </div>
+          </div>
         </div>
-        <div v-else class="wu">暂无数据</div>
+      </div>
     </div>
+    <div v-else class="wu">暂无数据</div>
+  </div>
 </template>
 
 <script>
-export default {
+  export default {
     name: "zydx-tree-list",
     data() {
-        return {
-            active: this.actives,
-            listCopy: []
-        }
+      return {
+        active: this.actives,
+        listCopy: []
+      }
     },
     props: {
-        list: { // 数据列表
-            type: Array,
-            default: () => []
-        },
-        column: { // 数据列表
-            type: Array,
-            default: () => []
-        },
-        delShow: { //是否显示取消按钮
-            type: Boolean,
-            default: false
-        },
-        angleBrackets: {
-            type: Boolean,
-            default: false
-        },
-        open: {
-            type: Boolean,
-            default: false
-        },
-        link: {
-            type: Boolean,
-            default: false
-        },
-        activeColor: {
-            type: String,
-            default: '#e20808'
-        },
-        actives: {
-            type: Number,
-            default: 0
-        },
-        delText: {
-            type: String,
-            default: '删除'
-        },
+      list: { // 数据列表
+        type: Array,
+        default: () => []
+      },
+      column: { // 数据列表
+        type: Array,
+        default: () => []
+      },
+      delShow: { //是否显示取消按钮
+        type: Boolean,
+        default: false
+      },
+      angleBrackets: {
+        type: Boolean,
+        default: false
+      },
+      open: {
+        type: Boolean,
+        default: false
+      },
+      link: {
+        type: Boolean,
+        default: false
+      },
+      activeColor: {
+        type: String,
+        default: '#e20808'
+      },
+      actives: {
+        type: Number,
+        default: 0
+      },
+      delText: {
+        type: String,
+        default: '删除'
+      },
       multiple: {
         type: Boolean,
         default: false
       }
     },
     watch: {
-        actives(val) {
-            if (val === -1) return
-            this.active = val
-        },
+      actives(val) {
+        if (val === -1) return
+        this.active = val
+      },
       list: {
         handler(val) {
           let list = JSON.parse(JSON.stringify(val))
@@ -106,41 +104,41 @@ export default {
         const data = this.listCopy.filter(x => x.box)
         this.$emit('multipleData', data)
       },
-        del(data) {
-            this.$emit('del', data)
-        },
-        listTap(data, index) {
-            this.active = index
-            this.$emit('confirm', {...data, activeIndex: index})
-        },
+      del(data) {
+        this.$emit('del', data)
+      },
+      listTap(data, index) {
+        this.active = index
+        this.$emit('confirm', {...data, activeIndex: index})
+      },
     }
-}
+  }
 </script>
 
 <style scoped>
-.pos{
-  position: relative;
-  padding-left: 20px;
-}
-.box-list{
-  position: absolute;
-  top: 9px;
-  left: 0;
-  z-index: 1;
-}
-.wu {
+  .pos{
+    position: relative;
+    padding-left: 20px;
+  }
+  .box-list{
+    position: absolute;
+    top: 9px;
+    left: 0;
+    z-index: 1;
+  }
+  .wu {
     text-align: center;
     font-size: 18px;
     padding: 40px 0;
-}
+  }
 
-.list-title {
+  .list-title {
     display: flex;
     justify-content: center;
     line-height: 30px;
-}
+  }
 
-.list-title > span {
+  .list-title > span {
     flex: 1;
     overflow: hidden;
     white-space: nowrap;
@@ -148,9 +146,9 @@ export default {
     height: 30px;
     font-size: 14px;
     font-weight: 600;
-}
+  }
 
-.list-title > button {
+  .list-title > button {
     margin-left: 5px;
     margin-top: 4px;
     font-size: 12px;
@@ -161,31 +159,47 @@ export default {
     cursor: pointer;
     height: 22px;
     min-width: 60px;
-}
+  }
 
-.list-tree {
+  .list-tree {
     padding: 0 10px;
     cursor: pointer;
-}
-/*.list-li{*/
-    /*padding-bottom: 10px;*/
-/*}*/
-.list-li > span {
+  }
+  /*.list-li{
+      /*padding-bottom: 10px;*/
+  /*}*/
+  .list-li > span {
     font-size: 16px;
     line-height: 30px;
-}
+  }
 
-.list-li-cont {
+  .list-li-cont {
     font-size: 14px;
     padding-left: 18px;
-}
+  }
 
-.list-li-cont > p {
+  .list-li-cont > .textWrap {
     height: 25px;
     line-height: 25px;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
     font-size: 14px;
-}
+    display: flex;
+    justify-content: left;
+    align-items: center;
+  }
+  .lable{
+    line-height: 25px;
+    width: 57px;
+    text-align: justify;
+    text-align-last: justify;
+  }
+  .text {
+    width: calc(100% - 57px);
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    line-height: 25px;
+  }
 </style>

package/src/index.js

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