zydx-plus 1.32.303 → 1.32.305

package/package.json

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

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

@@ -2565,7 +2565,7 @@ let buttonNames = {
                                 default: "btnIndex1",
                                 btnIndex1: '演示阅读',
                                 btnIndex2: '互动操作',
-                                btnIndex3: '深度拓展'
+                                btnIndex3: '拓展资源'
                             },
                             otherLevel: {
                                 default: "btnIndex1",

package/src/components/flip/src/flip.vue

@@ -127,9 +127,9 @@
 </template>
 
 <script>
-import * as PdfJs from 'pdfjs-dist/legacy/build/pdf.js' // 注意导入的写法d
+import * as PdfJs from 'pdfjs-dist/legacy/build/pdf.js'
+import Mess from '../../tipBox/index'
 PdfJs.GlobalWorkerOptions.workerSrc = require('pdfjs-dist/build/pdf.worker.entry')
-const jsdelivr = '/zydx/static/cmaps/'
 
 let pdfs = null
 
@@ -977,13 +977,19 @@ export default {
       that.loading = true
       const loadingTask = PdfJs.getDocument({
         url: that.source,
-        cMapUrl: jsdelivr,
+        cMapUrl: "/zydx/static/cmaps/",
         cMapPacked: true
       })
       loadingTask.promise.then((pdf) => {
         pdfs = pdf
         that.pdfPages = pdf.numPages // 获取pdf文件的总页数
         that.readPdf(pdf)
+      }).catch(() => {
+        that.loading = false
+        Mess({
+          promptContent: '文件加载错误',
+          cancelShow: false
+        })
       })
     },
     readPdf() {

package/src/components/menuTree/src/ZydxMenuTreeInfo.vue

@@ -121,7 +121,7 @@ export default {
       }
       // 如果显示复选。 怎不显示高亮
       if (!this.menuConfig.isCheckBox) {
-          if (this.selectItem.catalogId === this.menuInfo.catalogId) {
+          if (this.selectItem && (this.selectItem.catalogId === this.menuInfo.catalogId)) {
               ar.push("active");
           }
       }

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%;" @rendered="renderedHandler" />
-      <vue-office-excel v-if="fileType === 'xlsx' && xlsx" :src="url" style="height: 100%;" @rendered="renderedHandler" />
+      <vue-office-docx v-if="fileType === 'docx'" :src="url" style="height: 100%;" @rendered="renderedHandler"  @error="errorHandler" />
+      <vue-office-excel v-if="fileType === 'xlsx' && xlsx" :src="url" style="height: 100%;" @rendered="renderedHandler"  @error="errorHandler" />
       <div class="view-pdf" v-if="fileType === 'pdf'">
           <div class="pageContainer" v-for="(item,index) in idArr">
               <canvas :id="item"></canvas>
@@ -33,6 +33,9 @@ import VueOfficeExcel from '@vue-office/excel'
 import '@vue-office/docx/lib/index.css'
 //引入相关样式
 import '@vue-office/excel/lib/index.css'
+
+import Mess from '../../tipBox/index'
+
 export default {
     name: "zydx-read",
     components: {VueOfficeDocx,VueOfficeExcel},
@@ -108,6 +111,13 @@ export default {
       }
     },
     methods: {
+      errorHandler() {
+        Mess({
+          promptContent: '文件加载错误',
+          cancelShow: false
+        })
+        this.loading = false
+      },
         repeatInit() {
             if (this.repeat) return // 防止重复加载
             this.repeat = true
@@ -142,6 +152,12 @@ export default {
                 that.pdfPages = pdf.numPages // 获取pdf文件的总页数
                 that.page = pdf.numPages
                 that.getPDF(pdf,that.page)
+            }).catch(() => {
+              that.loading = false
+              Mess({
+                promptContent: '文件加载错误',
+                cancelShow: false
+              })
             })
         },
         getPDF(pdf,page) {

package/src/index.js

@@ -81,7 +81,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.32.303',
+    version: '1.32.305',
     install,
     Calendar,
     Message,