Merge branch 'dev/v1.2.11_tsz' of jianyu/jy-docs into feature/v1.2.11

jydocs-pc/src/views/Content.vue

@@ -45,10 +45,11 @@
                   @rendered="rendered"
               />
             </div>
-            <div class="file-content file-word-docx" id="xlsxPage" v-if="fileTypeThis === 'xlsx'">
+            <div class="file-content file-word-docx" id="xlsxPage" v-if="fileTypeThis === 'xlsx' || fileTypeThis === 'xls'">
               <vue-office-excel
                   :src="fileSrc.excelSrc"
                   style="height: 100vh;"
+                  :options="excelOptions"
                   @rendered="rendered"
                   @error="errorHandler"
               />
@@ -240,7 +241,10 @@ export default {
         docSrc: '',
         excelSrc: ''
       },
-      fileTypeThis: '' // 当前文件类型
+      fileTypeThis: '', // 当前文件类型
+      excelOptions: {
+        xls: false
+      }
     }
   },
   created () {
@@ -498,8 +502,12 @@ export default {
               this.fileSrc.docSrc = res.data.data
               break
             case 'xlsx':
+              this.excelOptions.xls = false
               this.fileSrc.excelSrc = res.data.data
               break
+            case 'xls':
+              this.excelOptions.xls = true
+              this.fileSrc.excelSrc = res.data.data
             default:
               this.init()
               break