zydx-plus 1.35.525 → 1.35.526

package/package.json

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

package/src/components/data_table/src/data_table.vue

@@ -297,7 +297,8 @@ export default defineComponent({
       matrix,
     } = this;
     return (
-      <div class="table_wrapper" style={[getHeight, getWidth]}>
+      // <div class="table_wrapper" style={[getHeight, getWidth]}>
+      <div class="table_wrapper" style={[getWidth]}>
         {draggable ? (
           <div class="table_root" aria-label="draggbale-table">
             <VueDraggableNext tag={"table"} border="0" cellpadding="0" cellspacing="0" animation={"200"} onEnd={onDragEnd}>
@@ -343,6 +344,7 @@ export default defineComponent({
   opacity: 1;
   overflow: scroll;
   border-top: 1px solid #cccccc;
+  border-left: 1px solid #cccccc;
 }
 
 .table_wrapper::-webkit-scrollbar {
@@ -354,7 +356,6 @@ export default defineComponent({
   table-layout: fixed;
   display: table;
   max-width: 100%;
-  border-left: 1px solid #cccccc;
   margin: 0 auto;
   border-spacing: 0;
 }

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

@@ -404,8 +404,10 @@
             </div>
             <div class="tip-box" style="min-width:600px;max-height: 900px;">
               <div class="tip-title" v-html="`${item.fileName}`"></div>
-              <div class="tip-boxContent" style="height: 700px;">
-                <zydx-read :url="item.url" style="height: 100%"></zydx-read>
+              <div class="tip-boxContent" :style="{height: item.isPPT?'590px':'700px'}">
+                <iframe v-if="item.isPPT" :src="item.url" frameborder="no" height="590"
+                        scrolling="no" width="100%"></iframe>
+                <zydx-read v-else :url="item.url" style="height: 100%"></zydx-read>
               </div>
             </div>
             <div style="display: flex;flex-direction: row;justify-content: flex-end;margin-top: 10px;">
@@ -2614,33 +2616,57 @@ export default {
               const r = await this.signIdData('reference')
               const html = butJson(this.editor, this.menusText)[v].html
               // if (r === -1) {
-                const last = this.editor.state.selection.$anchor.path[0].content.size
-                const id = new Date().getTime()
-                let dataInfo = {
+              const last = this.editor.state.selection.$anchor.path[0].content.size
+              const id = new Date().getTime()
+              if (t === -1) this.editor.chain().focus().insertContentAt(to, html).run()
+              const num = this.upSort(this.editor, 'enclosure')
+              const html2 = `<p contenteditable="false" data-signId="u-${id}" data-url="${url}" class="indent mu"><span>${num.num}. ${name}</span></p>`
+              this.editor.chain().focus().insertContentAt(num.len, html2).run()
+              const json = this.editor.getJSON()
+              for (let i = 0; i < json.content.length; i++) {
+                const item = json.content[i]
+                if (item.attrs.signId === 'enclosure' && item.content[0].text === '附件列表：') {
+                  item.attrs.titleId = this.checkbox ? 'indent' : null
+                }
+              }
+              this.editor.chain().setContent(<p></p>).run()
+              this.editor.chain().setContent(json).run()
+              this.isShowUpload = false
+              const ext = file.name.split('.').pop().toLowerCase();
+              let pptArr = ['pptx', 'ppt', 'pptm', 'potx', 'potm', 'pot', 'ppsx', 'ppsm', 'ppam', 'ppa', 'odp']
+              let dataInfo = {}
+              if (pptArr.includes(ext)) {
+                let officeInfo = this.getOffice
+                let annex = res.data.annex
+                officeInfo.meta.wordPath = annex.showPath
+                officeInfo.meta.filePath = annex.filePath
+                officeInfo.meta.fileName = annex.fileName
+                officeInfo.meta.useType = 'view'
+                officeInfo.meta.height = '590'
+                let officeRes = await this.getOfficePath(officeInfo)
+                dataInfo = {
                   isShow: false,
                   edit: false,
                   id: `${id}`,
                   type: v,
                   exegesis: this.tipTitle,
                   fileName: name,
-                  url: url
+                  isPPT:true,
+                  url: officeRes.data
                 }
-                if (t === -1) this.editor.chain().focus().insertContentAt(to, html).run()
-                const num = this.upSort(this.editor, 'enclosure')
-                const html2 = `<p contenteditable="false" data-signId="u-${id}" data-url="${url}" class="indent mu"><span>${num.num}. ${name}</span></p>`
-                this.editor.chain().focus().insertContentAt(num.len, html2).run()
-                const json = this.editor.getJSON()
-                for (let i = 0; i < json.content.length; i++) {
-                  const item = json.content[i]
-                  if (item.attrs.signId === 'enclosure' && item.content[0].text === '附件列表：') {
-                    item.attrs.titleId = this.checkbox ? 'indent' : null
-                  }
+              } else {
+                dataInfo = {
+                  isShow: false,
+                  edit: false,
+                  id: `${id}`,
+                  type: v,
+                  exegesis: this.tipTitle,
+                  fileName: name,
+                  url: url
                 }
-                this.editor.chain().setContent(<p></p>).run()
-                this.editor.chain().setContent(json).run()
-                this.isShowUpload = false
-                this.interpositionData.push(dataInfo)
-                this.documentClick()
+              }
+              this.interpositionData.push(dataInfo)
+              this.documentClick()
               //   return
               // }
               /*const num1 = this.upSort(this.editor, 'reference')

package/src/index.js

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