zydx-plus 1.35.472 → 1.35.474

package/package.json

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

package/src/components/biz_header/src/bizHeader.vue

@@ -22,14 +22,14 @@
                         <template v-if="buttonInfo instanceof Object" v-for="(childButtonInfo, childButtonIndex) in buttonInfo">
                             <!-- 在课上渲染的 -->
                             <button class="defaultButton"
-                                    :class="childButtonIndex === getSelectBtnIndex && selectItem.level === item.level? 'active theme-text' : ''"
+                                    :class="{'active theme-text' : (childButtonIndex === getSelectBtnIndex && selectItem.level === item.level) && (headerType === 2 && isHasDemandContent && childButtonIndex === 'demand' || headerType === 2  && childButtonIndex !== 'demand' || headerType !== 2), 'defaultDisableButton': headerType === 2 && !isHasDemandContent && childButtonIndex === 'demand' }"
                                     v-if="item.level === 0 && buttonIndex === 'headLevel' && childButtonIndex !== 'default'"
                                     @click="clickRightBtn(item, childButtonIndex, childButtonInfo)"
                                     v-html="childButtonInfo"
                             />
                             <!-- 单独在最低节点设置的按钮 -->
                             <button :ref="childButtonIndex + item.catalogId" class="defaultButton"
-                                    :class="childButtonIndex === getSelectBtnIndex && selectItem.level === item.level? 'active theme-text' : ''"
+                                    :class="{'active theme-text' : childButtonIndex === getSelectBtnIndex && selectItem.level === item.level && (isHasResContent && childButtonIndex === 'viewResource' || childButtonIndex !== 'viewResource'), 'defaultDisableButton': !isHasResContent && childButtonIndex === 'viewResource'}"
                                     v-if="item.level !== 0 && (!item.children || item.children.length === 0) && buttonIndex === 'lowLevel'  && childButtonIndex !== 'default' && (tabType === 2 && childButtonIndex !=='analysis' || tabType === 0)"
                                     @click="clickRightBtn(item, childButtonIndex, childButtonInfo)"
                                     v-html="childButtonInfo"
@@ -102,6 +102,14 @@ export default {
         headerType: {
             type: Number,
             required: true
+        },
+        isHasDemandContent: { // 学生端要求是否有内容
+            type: Boolean,
+            default: true
+        },
+        isHasResContent: { // 教师端-演示阅读、教学互动-模块最低节点资源列表是否有内容
+            type: Boolean,
+            default: true
         }
     },
     data() {
@@ -243,7 +251,24 @@ export default {
         margin: 1px;
         box-sizing: border-box;
     }
-
+    .defaultDisableButton {
+        width: auto;
+        min-width: 60px;
+        height: 20px;
+        font-size: 12px;
+        line-height: 20px;
+        color: #717171;
+        border: #717171 1px solid;
+        border-radius: 3px;
+        text-align: center;
+        cursor: pointer;
+        background-color: #fff;
+        user-select: none;
+        margin: 1px;
+        box-sizing: border-box;
+        pointer-events: none;
+        /*禁止点击*/
+    }
     .active{
         /* color: rgba(0, 255, 0, 1) !important; */
     }

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

@@ -43,9 +43,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: 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="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 indent"><strong><span style="font-size: 16px; font-family: SimHei; color: rgb(0, 0, 0)">一、请在此处输入一级标题</span></strong></p>
+                  <p data-signid="title-1" class="title ${randomId()} indent"><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-2" class="title indent"><strong><span style="font-size: 16px; font-family: SimHei; color: rgb(0, 0, 0)">（一）请在此处输入二级标题</span></strong></p>
+                  <p data-signid="title-2" class="title ${randomId()} indent"><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="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>`
@@ -57,9 +57,9 @@ export function butJson(editor, data) {
                     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="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 indent"><strong><span style="font-size: 16px; font-family: SimHei; color: rgb(0, 0, 0)">一、请在此处输入一级标题</span></strong></p>
+                  <p data-signid="title-1" class="title ${randomId()} indent"><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-2" class="title indent"><strong><span style="font-size: 16px; font-family: SimHei; color: rgb(0, 0, 0)">（一）请在此处输入二级标题</span></strong></p>
+                  <p data-signid="title-2" class="title ${randomId()} indent"><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="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>`
@@ -73,9 +73,9 @@ export function butJson(editor, data) {
                   <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>
                   <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 indent"><strong><span style="font-size: 16px; font-family: SimHei; color: rgb(0, 0, 0)">一、请在此处输入一级标题</span></strong></p>
+                  <p data-signid="title-1" class="title ${randomId()} indent"><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-2" class="title indent"><strong><span style="font-size: 16px; font-family: SimH ei; color: rgb(0, 0, 0)">（一）请在此处输入二级标题</span></strong></p>
+                  <p data-signid="title-2" class="title ${randomId()} indent"><strong><span style="font-size: 16px; font-family: SimH ei; 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="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: rgb(0, 0, 0);">注释</span></strong></p>
@@ -210,13 +210,13 @@ export function butJson(editor, data) {
             name: '一级标题',
             key: 'firstLevelHeading',
             menuKeys: [],
-            html: `<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>`
+            html: `<p data-signid="title-1" class="title ${randomId()} indent"><strong><span style="font-size: 16px; font-family: SimHei; color: rgb(0, 0, 0)">一、请在此处输入一级标题</span></strong></p>`
         },
         secondaryHeading: {
             name: '二级标题',
             key: 'secondaryHeading',
             menuKeys: [],
-            html: `<p data-signid="title-2" class="title indent"><strong><span style="font-size: 16px; font-family: SimHei; color: rgb(0, 0, 0)">（一）请在此处输入二级标题</span></strong></p>`
+            html: `<p data-signid="title-2" class="title ${randomId()} indent"><strong><span style="font-size: 16px; font-family: SimHei; color: rgb(0, 0, 0)">（一）请在此处输入二级标题</span></strong></p>`
         },
         paragraphBody: {
             name: '正文文本',
@@ -470,4 +470,4 @@ function getTime() {
     let month = date.getMonth() + 1
     let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
     return year + '年' + month + '月' + day + '日'
-}
+}

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

@@ -924,10 +924,9 @@ export default {
             Authorization: localStorage.getItem("remember") === "1" ? localStorage.getItem('sessionId') : sessionStorage.getItem('sessionId')
           },
           customInsert(res, insertFn) {
-              setTimeout(() => {
-                  console.log('uploadImage100');
-                  insertFn('http://192.168.5.213:8888' + res.data)
-              },100)
+            setTimeout(() => {
+              insertFn('http://192.168.5.213:8888' + res.data)
+            },100)
           },
           onSuccess(file, res) {
             console.log('图片上传成功', file, res)
@@ -1139,6 +1138,9 @@ export default {
         BubbleMenu.configure({  // 气泡菜单
           pluginKey: 'bubbleMenu',
           element: document.querySelector('.menu'),
+          tippyOptions:{
+            placement: 'right',
+          },
           shouldShow: ({editor, view, state, oldState, from, to}) => {
             _this.encIndex = state.selection.$from.parent.attrs
             if (_this.encIndex && _this.encIndex.titleId) {
@@ -1152,6 +1154,9 @@ export default {
         BubbleMenu.configure({
           pluginKey: 'bubbleMenuOne',
           element: document.querySelector('.menu-one'),
+          tippyOptions:{
+            placement: 'right',
+          },
           shouldShow: ({editor, view, state, oldState, from, to}) => {
             let encIndex = state.selection.$from.nodeBefore?.marks
             if (encIndex && encIndex.length) {
@@ -1357,7 +1362,7 @@ export default {
     //   // this.close()
     // })
   },
-  emits: ['confirm', 'enclosure', 'enlDownload', 'enlSee'],
+  emits: ['confirm', 'enclosure', 'enlDownload', 'enlSee', 'changeOutlineMenu'],
   methods: {
     showAi() {
       this.isShowAi = !this.isShowAi
@@ -2125,8 +2130,11 @@ export default {
         this.htmlArr = []
         const data = this.$refs['editing-cont'].$el.childNodes[0]?.childNodes//document.querySelectorAll('.editing-cont')[0]?.childNodes[0]?.childNodes
         this.wit = this.$refs['read-only'].offsetWidth//document.getElementsByClassName('read-only')[0]?.offsetWidth + 20
-        if (this.wit > 900) this.wit = 900
-        let max = this.wit * 1.6 - 46
+        if (this.wit > 900) {
+          this.$refs['read-only'].style.width = '900px'
+          this.wit = 900
+        }
+        let max = this.wit * 1.6 - 186
         let pHeight = 0
         let html = ''
         for (let i = 0; i < data.length; i++) {
@@ -2154,7 +2162,11 @@ export default {
           //   pHeight = 0
           //   html = ''
           // }
-          let text = data[i].offsetHeight
+          let top = parseInt(getComputedStyle(data[i]).paddingTop)
+          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
           if ((pHeight + text) > max) {
             const {start, end, size} = this.rows(data[i], max - pHeight)
             let child = data[i].childNodes[0]
@@ -2565,16 +2577,15 @@ export default {
           }
           if (v === 'uploadImage') {
             up.customInsert(res, (data) => {
-                setTimeout(() => {
-                    console.log('uploadImage100');
-                    const cla = this.randomId()
-                    const html = `<p class="imgCont ${cla}"><img src="${data}" alt="" /></p>`
-                    this.editor.chain().focus().insertContentAt(this.selection(), html).run()
-                    if (this.selection() <= 6 && this.selection() > 2) this.selectionClass2(cla)
-                    if (this.selectionClass(cla)) {
-                        this.editor.chain().focus().insertContentAt(this.selection(), '<p></p>').run()
-                    }
-                },100)
+              setTimeout(() => {
+                const cla = this.randomId()
+                const html = `<p class="imgCont ${cla}"><img src="${data}" alt="" /></p>`
+                this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+                if (this.selection() <= 6 && this.selection() > 2) this.selectionClass2(cla)
+                if (this.selectionClass(cla)) {
+                  this.editor.chain().focus().insertContentAt(this.selection(), '<p></p>').run()
+                }
+              }, 100)
             })
           }
           up.onSuccess(file, res) // 上传成功回调
@@ -2826,19 +2837,19 @@ export default {
       // 切换版式
       if (data.key === 'switchingFormat') {
         this.templateType = key.key
-        if(this.templateType  === 'freeTypesetting'){
+        if (this.templateType === 'freeTypesetting') {
 
           await this.changeTemplateType()
         }
-        if(this.templateType  === 'officialDocumentFormat'){
+        if (this.templateType === 'officialDocumentFormat') {
 
           await this.changeTemplateType()
         }
-        if(this.templateType  === 'newsFormat'){
+        if (this.templateType === 'newsFormat') {
 
           await this.changeTemplateType()
         }
-        if(this.templateType  === 'paperFormat'){
+        if (this.templateType === 'paperFormat') {
 
           await this.changeTemplateType()
         }
@@ -3067,7 +3078,6 @@ export default {
       // 红头文件
       if (data.key === 'redMenu') {
         const html = butJson(this.editor, this.menusText)[data.key].html
-        // console.log('menusHtml',menusHtml)
         // const html = menusHtml.filter(item => item.key == key.key)[0].html
         const r = await this.signIdData('red')
         if (r === -1) {
@@ -3079,11 +3089,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')
       }
       // 二级标题
       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')
       }
       // 正文
       if (data.key === 'paragraphBody') {
@@ -3188,13 +3200,14 @@ export default {
         if (key.key === 'text') {
           this.editor.commands.setTitleId(key.key)
           this.editor.commands.unsetSignId()
-          this.editor.chain().focus().unsetBold().setTextAlign('left').run()
+          this.editor.chain().focus().unsetBold().setFontSize('14px').setTextAlign('left').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().setTextAlign('left').run()
+          this.editor.chain().focus().setBold().setFontSize('16px').setTextAlign('left').run()
         }
+        this.$emit('changeOutlineMenu')
       }
       // 对齐方式
       if (data.key === 'alignmentMode') {
@@ -3932,9 +3945,9 @@ export default {
       const json = this.editor.getJSON()
       let jsonData = json.content.filter(item => !(/a-/.test(item.attrs.signId)))
       this.editor?.commands.setContent(jsonData)
-      this.interpositionData.forEach((item)=>{
-        if(item.type!=='taggingMenu') return
-        index+=1
+      this.interpositionData.forEach((item) => {
+        if (item.type !== 'taggingMenu') return
+        index += 1
         const t = this.signIdData('annotation')
         const b = this.signIdData('annotationSplitLine') // 判断是否有分页线
         const html = `<p contenteditable="false" data-signId="annotation" style="text-align: center;margin-bottom: 30px;"><span style="font-weight: 700;font-size: 16px;">注释：</span></p>`
@@ -3968,7 +3981,7 @@ export default {
       }
     },
     // 删除举例说明
-    delGiveExample(){
+    delGiveExample() {
       const json = this.editor.getJSON()
       let jsonData = json.content.filter(item => !(/r-l/.test(item.attrs.signId)) && !(/a-/.test(item.attrs.signId)))
       this.editor?.commands.setContent(jsonData)
@@ -4021,6 +4034,17 @@ export default {
       }
       //赋值，这样实现的效果就是用户按下非数字不会有任何反应
       element.target.value = val;
+    },
+    goAnchors(item) {
+      const element = document.querySelector(`.${item.anchors}`)
+      if (element) {
+        if (this.readOnly) {
+          let bodys = document.querySelector(`.z-editor`)
+          bodys.scrollTop = element.offsetTop
+          return
+        }
+        element.scrollIntoView({behavior: 'smooth'});
+      }
     }
   }
 }
@@ -4087,7 +4111,7 @@ export default {
 }
 
 :deep(.read-only-p p) {
-  line-height: 24px;
+  line-height: 1.5;
   text-align: justify;
   white-space: pre-wrap;
 }
@@ -4241,6 +4265,9 @@ li {
   border: 1px solid rgba(204, 204, 204, 1);
   position: relative;
   width: 100%;
+  max-height: 900px;
+  overflow-y: auto;
+  scrollbar-width: none;
 }
 
 .editor-header {
@@ -4360,7 +4387,6 @@ li {
   background-color: #fff;
   padding: 5px;
   border-radius: 5px;
-  box-shadow: 0 0 10px rgba(0, 0, 0, .2);
 }
 
 .menus {
@@ -4573,10 +4599,12 @@ li {
   align-items: flex-start;
   font-size: 12px;
 }
+
 :deep(p:has(>img)) {
   line-height: 0 !important;
   text-indent: 0 !important;
 }
+
 .tip-btnBox > div {
   width: 60px;
   height: 20px;
@@ -4879,4 +4907,12 @@ li {
   border: 1px solid #000;
   border-radius: 50%;
 }
+
+:deep(.drag-pop-shadow) {
+  top: 200px
+}
+
+* {
+  box-sizing: border-box;
+}
 </style>

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

@@ -1023,6 +1023,7 @@ export default {
 .ed-head {
   display: flex;
   justify-content: center;
+  flex-wrap: wrap;
 }
 
 .ed-head-but {
@@ -1045,6 +1046,7 @@ export default {
   float: right;
 }
 .ed-title {
+  min-width: 120px;
   flex: 1;
   text-align: left;
   font-size: 16px;

package/src/components/menuTree/src/ZydxMenuTree.vue

@@ -3,11 +3,11 @@
     <slot></slot>
     <div v-for="(item, index) in targetTree" :key="index">
       <zydx-menu-tree-info
-        :menuConfig="menuConfig"
-        :nodeLevel="nodeLevel"
-        :menu-info="item"
-        :selectItem="selectItem"
-        @clickItem="clickItem"
+          :menuConfig="menuConfig"
+          :nodeLevel="nodeLevel"
+          :menu-info="item"
+          :selectItem="selectItem"
+          @clickItem="clickItem"
       ></zydx-menu-tree-info>
     </div>
   </div>
@@ -15,6 +15,7 @@
 
 <script>
 import zydxMenuTreeInfo from "./ZydxMenuTreeInfo";
+
 export default {
   name: "zydx-menu-tree",
   components: {
@@ -23,17 +24,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: {
@@ -53,22 +54,23 @@ export default {
       required: true,
     },
   },
-  data () {
-      return {
-          pcatalogIds: ''
-      }
+  data() {
+    return {
+      pcatalogIds: ''
+    }
   },
   computed: {
     targetTree: function () {
       let that = this;
       let targetTree = [];
       let minLevel = "";
+      let pId = ''
       that.treeData.map(function (item) {
         if (that.menuConfig.isShowUpDown) {
           // 如果设置收起展开， 添加控制变量
-            Reflect.set(item, "isShowUpDown", false);
+          Reflect.set(item, "isShowUpDown", false);
         } else {
-            Reflect.set(item, "isShowUpDown", true);
+          Reflect.set(item, "isShowUpDown", true);
         }
         if (minLevel === "") {
           minLevel = item.level;
@@ -80,7 +82,10 @@ export default {
       });
       this.treeData.map(function (item) {
         if (item.level === minLevel) {
+          pId = item.catalogId;
           targetTree.push(item);
+        } else {
+          item.pid = pId
         }
       });
       targetTree.map(function (item) {
@@ -100,7 +105,7 @@ export default {
       let that = this;
       let newArr = [];
       arr.map(function (item) {
-        if (item.pcatalogId === obj.catalogId) {
+        if (item.pid === obj.catalogId) {
           newArr.push(item);
         }
       });
@@ -133,17 +138,17 @@ export default {
     },
     // 获取当前节点的父级id
     getPcatalogIds: function (pcatalogId) {
-        let that = this
-        if (pcatalogId === '-1') {
-            that.pcatalogIds += ','
-        } else {
-            this.treeData.some(function (item) {
-                if (item.catalogId === pcatalogId) {
-                    that.pcatalogIds += ',' + item.catalogId
-                    that.getPcatalogIds(item.pcatalogId)
-                }
-            })
-        }
+      let that = this
+      if (pcatalogId === '-1') {
+        that.pcatalogIds += ','
+      } else {
+        this.treeData.some(function (item) {
+          if (item.catalogId === pcatalogId) {
+            that.pcatalogIds += ',' + item.catalogId
+            that.getPcatalogIds(item.pcatalogId)
+          }
+        })
+      }
     },
   },
 };

package/src/components/mind/src/mind.vue

@@ -321,6 +321,10 @@ export default {
         },
         fullDel() {
             this.fullShow = true
+            this.mindMap.view.setTransformData({
+              state : {scale: 1, x: 0, y: 0, sx: 0, sy: 0},
+              transform : {a:1,b:0,c:0,d:1,e:0,f:0,originX:0,originY:0,rotate:0,scaleX:1,scaleY:1,shear:0,translateX:0,translateY:0}
+            })
             this.cancelFullscreen()
         },
         // 全屏

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

@@ -2,20 +2,20 @@
     <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', 'color': (active === index)? activeColor : '#333'}"
+                 :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': column[0].fontSize + 'px', 'font-weight': column[0].fontWeight}" v-html="(index + 1) + '.' + (angleBrackets ? '《' : '') + item[column[0].label] + (angleBrackets ? '》' : '')"></span>
+                    <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">
+                    <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" v-if="active === index">
+                    <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>

package/src/index.js

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