From 1dda5c55371a8bbd0a0567f564a1e2459dbac19a Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Fri, 2 Aug 2024 22:49:43 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20dwg=E6=96=87=E4=BB=B6=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E5=8F=8B=E5=A5=BD=E6=80=A7=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ShowFile/ShowFile.vue     |  5 ++--
 src/components/preview/CADPreview.vue    | 33 ++++++++++++++++++------
 src/components/preview/IframePreview.vue |  6 ++---
 src/icons/svg/file-dwg.svg               |  1 +
 src/icons/svg/file-epub.svg              |  1 +
 src/utils/file-type.js                   |  4 +--
 6 files changed, 35 insertions(+), 15 deletions(-)
 create mode 100644 src/icons/svg/file-dwg.svg
 create mode 100644 src/icons/svg/file-epub.svg

diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index 2d70cec..fb583cf 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -633,7 +633,7 @@
 
     <message-dialog
       title="提示"
-      content="此文件不支持预览, 是否下载该文件?"
+      :content="notPreviewDialogMsg"
       :show.sync="notPreviewDialogVisible"
       button-size="mini"
       operatButtonText="取消"
@@ -1098,6 +1098,7 @@ export default {
       drawFlag: false,
       fileListScrollTop: 0,
       initFileListScrollTop: 0,
+      notPreviewDialogMsg: '', // 非预览文件提示信息
       notPreviewDialogVisible: false,
       openingFile: '',
       openCompressionVisible: false,
@@ -1227,6 +1228,7 @@ export default {
           break
         case 'loadFileFailed':
           this.notPreviewDialogVisible = true
+          this.notPreviewDialogMsg = msg.msg || '此文件不支持预览, 是否下载该文件?'
           break
         case 'clickMore':
           this.$refs.fileListTable.tableSelectData = msg.data
@@ -1477,7 +1479,6 @@ export default {
       }
     },
     onmessage(msg) {
-      console.log(msg.url, this.$route.path, msg, this.path)
       let fileDoc = msg.body
       const url = msg.url
       let index = this.fileList.findIndex(file => file.id === fileDoc.id)
diff --git a/src/components/preview/CADPreview.vue b/src/components/preview/CADPreview.vue
index b686167..6ab7bbf 100644
--- a/src/components/preview/CADPreview.vue
+++ b/src/components/preview/CADPreview.vue
@@ -2,11 +2,13 @@
   <div>
     <div class="top-bar">
       <div class="top-left"></div>
-      <div class="top-center">{{file.name}}</div>
+      <div class="top-center">{{ file.name }}</div>
       <div class="top-right">
         <div class="top-right-option">
-          <el-button title="切换背景色" size="medium" type="primary" @click="changeBackground" :icon="lightTheme?'el-icon-moon':'el-icon-sunny'"></el-button>
-          <el-button title="显示全部" size="medium" type="primary" @click="reset" icon="el-icon-c-scale-to-original"></el-button>
+          <el-button title="切换背景色" size="medium" type="primary" @click="changeBackground"
+                     :icon="lightTheme?'el-icon-moon':'el-icon-sunny'"></el-button>
+          <el-button title="显示全部" size="medium" type="primary" @click="reset"
+                     icon="el-icon-c-scale-to-original"></el-button>
         </div>
       </div>
     </div>
@@ -17,7 +19,7 @@
 </template>
 
 <script>
-import { createMxCad, MxCpp } from 'mxcad'
+import { createMxCad, loadMxCADassembly, MxCpp } from 'mxcad'
 import { MxFun } from 'mxdraw'
 
 export default {
@@ -57,10 +59,15 @@ export default {
       canvas: '#mxCadCanvas',
       locateFile: (fileName) => window.location.origin + '/resource/mxcad/wasm/2d-st/' + fileName,
       fontspath: window.location.origin + '/resource/mxcad/fonts/',
-      fileUrl: this.mxwebUrl,
-    }).then(() => {
+      fileUrl: '',
+      onOpenFileComplete: () => {
+        this.$emit('onReady')
+      },
+    }).then((mxcad) => {
+      this.fetchFile()
       MxFun.sendStringToExecute('Mx_Pan')
-      this.$emit('onReady')
+    }).catch((error) => {
+      console.error('加载 MxCAD assembly 时出错：', error)
     })
   },
   methods: {
@@ -71,6 +78,16 @@ export default {
       mxcad.updateDisplay()
       mxcad.setViewBackgroundColor(value, value, value)
     },
+    fetchFile() {
+      const mxcad = this.mxcad()
+      mxcad.openWebFile(this.mxwebUrl, (iRet) => {
+        if (iRet === 0) {
+          this.$emit('onReady')
+        } else {
+          this.$emit('loadFileFailed', '文件加载失败, 请稍后再试, 或者对该文件重建索引')
+        }
+      })
+    },
     reset() {
       const mxcad = this.mxcad()
       mxcad.regen()
@@ -79,7 +96,7 @@ export default {
     },
     mxcad() {
       return MxCpp.getCurrentMxCAD()
-    }
+    },
   },
 }
 </script>
diff --git a/src/components/preview/IframePreview.vue b/src/components/preview/IframePreview.vue
index 25453bf..6e10358 100644
--- a/src/components/preview/IframePreview.vue
+++ b/src/components/preview/IframePreview.vue
@@ -16,7 +16,7 @@
             <svg-icon class="preview-close" icon-class="close"/>
           </div>
           <div class="wrapper">
-            <CADPreview v-if="fileType === 'cad'" :file="file" :shareId="shareId" :file-url="fileUrl" @onReady="onReady"></CADPreview>
+            <CADPreview v-if="fileType === 'cad'" :file="file" :shareId="shareId" :file-url="fileUrl" @onReady="onReady" @loadFileFailed="loadFileFailed"></CADPreview>
             <pdf-preview v-else-if="fileType === 'pdf'" :file="file" :shareId="shareId" :file-url="fileUrl" @onReady="onReady"></pdf-preview>
             <drawio v-else-if="fileType === 'drawio'" v-show="fileReday" :file="file" :shareId="shareId" :read-only="readOnly" @onEdit="onEdit" @onReady="onReady" @onClose="close"></drawio>
             <my-mind-editor v-else-if="fileType === 'mind'" :file="file" :shareId="shareId" :read-only="readOnly" @onEdit="onEdit" @onReady="onReady" @onClose="close"></my-mind-editor>
@@ -157,9 +157,9 @@ export default {
     /**
      * 加载失败
      */
-    loadFileFailed() {
+    loadFileFailed(msg) {
       this.close()
-      this.$store.dispatch('updateMessage', { event: 'loadFileFailed'})
+      this.$store.dispatch('updateMessage', { event: 'loadFileFailed', msg: msg})
       this.readyShow = true
     },
     /**
diff --git a/src/icons/svg/file-dwg.svg b/src/icons/svg/file-dwg.svg
new file mode 100644
index 0000000..e932d14
--- /dev/null
+++ b/src/icons/svg/file-dwg.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1722606327045" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6625" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M923.136 267.605333v701.952H193.024v-909.653333h521.216z" fill="#7CCDFF" p-id="6626"></path><path d="M912.896 253.952l2.56 671.914667c0 15.530667-12.458667 27.989333-27.989333 27.989333H237.909333c-15.530667 0-27.989333-12.458667-27.989333-27.989333V96.938667c0-15.530667 12.458667-27.989333 27.989333-27.989334l493.397334-1.024-38.912-39.936H239.274667c-36.352 0-65.706667 29.354667-65.706667 65.706667v835.584c0 36.352 29.354667 65.706667 65.706667 65.706667h646.826666c36.352 0 65.706667-29.354667 65.706667-65.706667V293.888l-38.912-39.936z" fill="#4191FB" p-id="6627"></path><path d="M692.394667 222.72c0 39.424 31.914667 71.338667 71.338666 71.338667h188.245334L692.394667 27.989333v194.730667z" fill="#C7E2FF" p-id="6628"></path><path d="M557.568 482.304H158.72c-50.346667 0-91.136-40.789333-91.136-91.136v-60.245333c0-50.346667 40.789333-91.136 91.136-91.136h398.848c50.346667 0 91.136 40.789333 91.136 91.136v60.245333c0 50.346667-40.789333 91.136-91.136 91.136z" fill="#4191FB" p-id="6629"></path><path d="M155.818667 287.573333h53.589333c10.581333 0 19.114667 1.877333 25.6 5.802667 6.485333 3.754667 11.946667 9.386667 16.042667 16.384 4.266667 7.168 7.338667 15.530667 9.216 24.917333 1.877333 9.557333 2.901333 19.626667 2.901333 30.208 0 16.725333-1.365333 29.525333-4.266667 38.741334s-6.826667 16.896-11.776 23.04c-5.12 6.144-10.410667 10.24-16.213333 12.458666-7.850667 2.901333-15.018667 4.266667-21.504 4.266667H155.818667v-155.818667z m36.010666 35.328V407.893333h8.874667c7.509333 0 12.970667-1.194667 16.042667-3.413333 3.242667-2.218667 5.632-6.144 7.509333-11.605333 1.877333-5.632 2.730667-14.506667 2.730667-26.965334 0-16.554667-2.048-27.818667-5.973334-33.962666-4.096-6.144-10.752-9.216-20.138666-9.216l-9.045334 0.170666zM272.896 287.573333H307.2l12.288 87.210667 18.090667-87.210667h34.133333l18.090667 87.04 12.288-87.04h34.133333l-25.770667 155.818667h-35.328l-20.48-98.133333-20.48 98.133333h-35.328l-25.941333-155.818667zM503.978667 386.901333v-32.426666H559.786667v66.389333c-10.752 9.728-20.138667 16.384-28.330667 19.797333-8.192 3.584-17.92 5.290667-29.184 5.290667-13.824 0-25.088-3.072-33.962667-9.386667-8.704-6.314667-15.530667-15.701333-20.309333-28.16s-7.168-26.794667-7.168-42.837333c0-17.066667 2.56-31.744 7.850667-44.373333s12.970667-22.186667 23.04-28.672c7.850667-4.949333 18.602667-7.509333 31.914666-7.509334 12.970667 0 22.528 1.536 29.013334 4.608 6.314667 3.072 11.776 8.021333 15.872 14.506667 4.266667 6.485333 7.338667 14.848 9.557333 24.917333l-34.816 8.362667c-1.365333-5.802667-3.925333-10.410667-7.338667-13.482667-3.413333-3.072-7.850667-4.608-13.141333-4.608-7.850667 0-14.165333 3.584-18.944 10.922667-4.778667 7.338667-6.997333 18.944-6.997333 34.816 0 16.896 2.389333 28.842667 7.168 36.181333 4.778667 7.168 11.434667 10.752 19.797333 10.752 4.096 0 7.850667-0.853333 11.605333-2.389333 3.584-1.536 7.850667-4.266667 12.629334-8.021333v-14.677334h-24.064z" fill="#FFFFFF" p-id="6630"></path><path d="M610.474667 620.885333c0.512 7.509333 0 15.018667-4.266667 20.138667-11.264 13.312-6.826667 25.088 0.170667 38.4 16.725333 31.744 32.768 63.829333 47.957333 96.256 6.485333 13.653333 13.141333 12.629333 21.504 3.072 12.288-13.824 24.234667-28.16 32.085333-45.056 3.584-7.509333 9.045333-15.530667 18.261334-9.898667 9.557333 5.802667 1.365333 12.970667-1.706667 19.114667-10.922667 21.845333-25.6 40.96-44.202667 56.490667-10.581333 8.704-11.605333 17.066667-5.290666 28.842666 10.069333 18.432 18.944 37.546667 27.818666 56.490667 3.242667 6.656 7.168 14.848-2.048 19.456-9.386667 4.778667-15.018667-1.877333-18.944-9.557333-9.386667-18.773333-19.114667-37.376-27.818666-56.661334-4.266667-9.557333-8.192-13.312-19.456-8.533333-48.981333 20.48-98.304 22.357333-147.456 0.682667-10.069333-4.437333-15.701333-2.901333-20.309334 7.338666-8.704 19.114667-18.432 37.717333-27.989333 56.490667-3.413333 6.826667-8.021333 14.506667-16.725333 10.752-10.069333-4.266667-6.826667-13.312-3.242667-20.650667 8.192-17.237333 16.042667-34.816 25.770667-51.370666 8.704-14.848 8.021333-25.258667-6.144-36.352-17.066667-13.482667-30.208-30.72-39.765334-50.688-3.754667-8.021333-9.386667-16.725333 1.706667-22.357334 10.752-5.461333 15.530667 4.096 19.797333 11.605334 9.386667 16.725333 19.456 32.768 34.133334 45.909333 8.362667 7.338667 12.970667 6.826667 17.749333-3.413333 17.408-36.864 35.498667-73.557333 53.418667-110.08 3.242667-6.656 3.413333-11.776-0.853334-18.773334-15.701333-25.429333-10.410667-49.834667 13.994667-65.536 7.850667-5.12 11.434667-10.581333 11.093333-19.285333-0.170667-4.949333 0-9.898667 0.512-14.848 1.024-7.850667 3.584-15.189333 13.141334-14.848 9.386667 0.341333 12.970667 7.509333 12.288 15.530667-1.536 17.578667 3.584 30.208 19.626666 39.594666 11.605333 6.314667 15.701333 18.944 15.189334 31.744z m-46.592 201.898667c21.674667-1.877333 43.690667-4.949333 64.682666-12.970667 8.874667-3.413333 13.141333-7.68 7.850667-18.090666-18.602667-37.034667-36.522667-74.24-54.784-111.445334-3.413333-7.168-7.850667-11.946667-16.896-11.946666s-13.141333 5.12-16.725333 12.117333c-18.090667 37.205333-36.181333 74.410667-54.613334 111.445333-4.437333 9.045333-1.877333 13.482667 6.826667 16.896 20.48 8.192 41.472 12.629333 63.658667 13.994667z m22.357333-203.093333c-1.024-11.605333-7.509333-20.309333-21.504-21.162667-11.946667-0.682667-24.576 11.434667-23.893333 23.381333 0.853333 13.312 8.021333 21.674667 22.186666 22.357334 13.312 0.682667 23.210667-8.874667 23.210667-24.576z" fill="#4191FB" p-id="6631"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/file-epub.svg b/src/icons/svg/file-epub.svg
new file mode 100644
index 0000000..3be4ca2
--- /dev/null
+++ b/src/icons/svg/file-epub.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1722606319523" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6475" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M874.834646 185.448819v774.047244a24.17285 24.17285 0 0 1-24.188977 24.188976H173.354331a24.180913 24.180913 0 0 1-24.188977-24.188976V64.503937a24.188976 24.188976 0 0 1 24.188977-24.188976h556.346456l145.133859 145.133858z" fill="#5892B6" p-id="6476"></path><path d="M874.834646 185.448819H753.889764a24.188976 24.188976 0 0 1-24.188977-24.188976V40.314961l145.133859 145.133858z" opacity=".2" p-id="6477"></path><path d="M433.966362 919.181102h-39.782803v-69.06759h39.782803v11.997732h-25.132346v15.166488h23.382677v11.997733h-23.382677v17.811149h25.132346v12.094488z m29.107402-36.565669h4.813606c4.49915 0 7.86948-0.886929 10.110992-2.644661 2.233449-1.798047 3.354205-4.394331 3.354205-7.796914 0-3.434835-0.94337-5.966614-2.838173-7.603401-1.854488-1.64485-4.789417-2.459213-8.788662-2.459213h-6.660031v20.504189z m33.058267-10.965669c0 7.434079-2.322142 13.118488-6.982551 17.061291-4.63622 3.93474-11.231748 5.90211-19.802708 5.90211h-6.281071V919.181102h-14.642394v-69.06759h22.060347c8.385512 0 14.73915 1.80611 19.085102 5.426394 4.378205 3.596094 6.571339 8.966047 6.571338 16.109858z m69.261103-21.536252v44.693165c0 5.095811-1.144945 9.570772-3.442898 13.416819-2.265701 3.837984-5.563465 6.780976-9.877165 8.828976-4.313701 2.048-9.417575 3.072-15.303559 3.072-8.885417 0-15.779276-2.265701-20.697701-6.805165-4.910362-4.563654-7.369575-10.796346-7.369575-18.706142v-44.499653h14.594016v42.282331c0 5.321575 1.080441 9.224063 3.225197 11.715527 2.136693 2.483402 5.676346 3.733165 10.627023 3.733165 4.781354 0 8.248441-1.249764 10.393197-3.733165 2.177008-2.523717 3.257449-6.458457 3.257449-11.812283v-42.185575h14.594016z m16.916157 0h21.495937c9.796535 0 16.900031 1.394898 21.310489 4.200819 4.434646 2.773669 6.660031 7.200252 6.660031 13.279748 0 4.120189-0.975622 7.506646-2.926866 10.151307a11.513953 11.513953 0 0 1-7.700158 4.773291v0.475717c4.378205 0.975622 7.522772 2.797858 9.449827 5.474771 1.951244 2.676913 2.926866 6.240756 2.926866 10.683465 0 6.297197-2.281827 11.207559-6.853543 14.73915-4.531402 3.523528-10.707654 5.289323-18.520693 5.289322H582.309291v-69.06759z m14.650457 27.349669h8.498394c3.966992 0 6.837417-0.612787 8.603212-1.838362 1.789984-1.233638 2.693039-3.265512 2.69304-6.095622 0-2.644661-0.975622-4.539465-2.934929-5.668284-1.918992-1.169134-4.974866-1.749669-9.159559-1.749669h-7.700158v15.351937z m0 11.626835v17.996598h9.53852c4.031496 0 7.014803-0.774047 8.933795-2.314079 1.918992-1.548094 2.878488-3.902488 2.878488-7.08737 0-5.732787-4.096-8.59515-12.279937-8.595149h-9.070866zM503.937008 677.291339V395.086614s-72.566929-48.377953-193.511811-56.440945v266.07874s137.070866 8.062992 193.511811 72.56693zM713.574803 604.724409V338.645669c-120.944882 8.062992-193.511811 56.440945-193.511811 56.440945v282.204725c56.440945-64.503937 193.511811-72.566929 193.511811-72.56693z" fill="#FFFFFF" p-id="6478"></path><path d="M729.700787 378.96063v258.015748s-120.944882 0-217.700787 66.922835C415.244094 636.976378 294.299213 636.976378 294.299213 636.976378V378.96063h-24.188977v282.204724s104.818898-16.125984 241.889764 48.377953c137.070866-64.503937 241.889764-48.377953 241.889764-48.377953V378.96063h-24.188977z" fill="#FFFFFF" p-id="6479"></path></svg>
\ No newline at end of file
diff --git a/src/utils/file-type.js b/src/utils/file-type.js
index 4c5fe3a..5581588 100644
--- a/src/utils/file-type.js
+++ b/src/utils/file-type.js
@@ -92,8 +92,8 @@ iconClass.set('plist','file-plist')
 iconClass.set('iso','file-iso')
 iconClass.set('glb','file-glb')
 iconClass.set('gltf','file-glb')
-iconClass.set('epub','epub')
-iconClass.set('dwg','dwg')
+iconClass.set('epub','file-epub')
+iconClass.set('dwg','file-dwg')
 
 export function findIconClass(file){
   if(!file){