zydx-plus 1.19.92 → 1.19.93

package/package.json

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

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

@@ -24,7 +24,7 @@
                 <p v-if="editorShow">附件列表：</p>
                 <div class="enclosure-list" v-for="(item,index) in uploadAttData">
                     <div class="enclosure-item">
-                        <span>{{ index + 1 }}. {{ (item.name)? item.name : item.fileName }}</span>
+                        <span>{{ index + 1 }}. {{ (item.name)? item.name : item.annexName }}</span>
                     </div>
                     <div class="enclosure-item en-but">
                         <div style="display: inline-block; height: 21px;">
@@ -73,6 +73,7 @@
     </div>
 </template>
 <script>
+
 import { html2json, json2html } from 'html2json'
 import { Editor, EditorContent } from '@tiptap/vue-3'
 import StarterKit from '@tiptap/starter-kit'
@@ -191,8 +192,16 @@ export default {
         del(index) {
             if(this.uploadAttData[index].name === undefined) {
                 this.uploadAttData[index].active = false
-                this.$emit('del', this.uploadAttData[index], () => {
-                    this.uploadAttData.splice(index, 1)
+                this.$emit('del', this.uploadAttData[index], (e) => {
+                    if(e === undefined) {
+                        this.uploadAttData.splice(index, 1)
+                    }else {
+                        if(e) {
+                            this.uploadAttData.splice(index, 1)
+                        }else {
+                            this.uploadAttData[index].active = true
+                        }
+                    }
                 })
             }else {
                 this.uploadAttData.splice(index, 1)

package/src/components/read/src/read.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="read">
-      <vue-office-docx v-if="fileType === 'docx'" :src="url" style="height: 100%;" />
-      <vue-office-excel v-if="fileType === 'xlsx' || fileType === 'xls'" :src="url" style="height: 100%;" />
+      <vue-office-docx v-if="fileType === 'docx'" :src="url" style="height: 100%;" @rendered="renderedHandler" />
+      <vue-office-excel v-if="fileType === 'xlsx'" :src="url" style="height: 100%;" @rendered="renderedHandler" />
       <div class="view-pdf" v-if="fileType === 'pdf'" id="canvas-wrap"></div>
       <div class="mp4" v-if="fileType === 'mp4'">
           <video :src="url" controls></video>
@@ -9,6 +9,11 @@
       <div class="mp3" v-if="fileType === 'mp3'">
           <audio :src="url" controls></audio>
       </div>
+      <div v-if="loading" class="loading-back">
+          <div class="loading-cont">
+              <div class="loading">Loading</div>
+          </div>
+      </div>
   </div>
 </template>
 
@@ -32,7 +37,9 @@ export default {
             PdfJs: null,
             svgArr: [],
             container: null,
-            pdfPages: 0
+            pdfPages: 0,
+            loading: true,
+            repeat: false,
         }
     },
     props: {
@@ -44,17 +51,28 @@ export default {
     watch: {
         url: {
             handler: function (val, oldVal) {
-                this.fileType = val.split('.').pop()
-                if(this.fileType === 'pdf') this.init()
+                this.repeatInit()
             },
             immediate: true
         }
     },
     mounted() {
-        this.fileType = this.url.split('.').pop()
-        if(this.fileType === 'pdf') this.init()
+        this.repeatInit()
     },
     methods: {
+        repeatInit() {
+            if(this.repeat) return // 防止重复加载
+            this.repeat = true
+            this.loading = true
+            this.fileType = this.url.split('.').pop()
+            if(this.fileType === 'pdf') this.init()
+            setTimeout(() => {
+                this.repeat = false
+            },1000)
+        },
+        renderedHandler() {
+            this.loading = false
+        },
         init() {
             let that = this
             const loadingTask = PdfJs.getDocument(this.url)
@@ -106,6 +124,7 @@ export default {
                 document.getElementById('canvas-wrap').appendChild(container)
                 container.appendChild(x.data)
             })
+            this.renderedHandler()
         },
     }
 }
@@ -130,6 +149,7 @@ export default {
 .read{
     width: 100%;
     height: 100%;
+    position: relative;
 }
 :deep(.vue-office-docx)::-webkit-scrollbar {
     width: 0
@@ -137,4 +157,50 @@ export default {
 :deep(.docx-wrapper) {
     background-color: #fff;
 }
+.loading-back{
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 100;
+    display: flex;
+    align-items: center;
+}
+.loading-cont{
+    display: inline-block;
+    margin: 0 auto;
+}
+.loading {
+    display: inline-block;
+    font-size: 28px;
+    font-family: Arial, Helvetica, sans-serif;
+    font-weight: bold;
+    color: #fff;
+    text-shadow: 0 0 2px #ff3d00, 0 0 1px #ff3d00, 0 0 1px #ff3d00;
+    letter-spacing: 2px;
+    position: relative;
+}
+
+.loading::after {
+    content: "Loading";
+    position: absolute;
+    left: 0;
+    top: 0;
+    color: #ff3d00;
+    width: 0%;
+    height: 100%;
+    overflow: hidden;
+    animation: loading-animation 6s linear infinite;
+}
+
+@keyframes loading-animation {
+    0% {
+        width: 0%;
+    }
+
+    100% {
+        width: 100%;
+    }
+}
 </style>

package/src/index.js

@@ -57,7 +57,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.19.92',
+    version: '1.19.93',
     install,
     Calendar,
     Message,