Merge branch 'dev-online-excel-market' into 'hotfix'

在线文档-市场-更换全屏方式以支持IE浏览器

See merge request spfm/spfm-market-front!213

public/static/views/onlineShareExcelMarket.html

@@ -117,6 +117,7 @@
     var toolBar = '';
     var type = '';
     var emptyExcel = false;
+    var fullScreenState = false;
     $(function () {
         userId = JSON.parse(window.top.sessionStorage.userInfo).loginNo
     })
@@ -338,7 +339,15 @@
                 window.parent['backToExcelList']('true');
             })
             $("#fullScreen").on("click", function () {
-                fullScreen();
+                if (fullScreenState){
+                    fullScreenState = false;
+                    $("#fullScreen").html('全屏显示');
+                } else {
+                    fullScreenState = true;
+                    $("#fullScreen").html('退出全屏');
+                }
+                window.parent['fullScreen']('true');
+                //fullScreen();
             })
             //退出全屏
             $("#exitFullScreen").on("click", function () {
@@ -346,6 +355,11 @@
             })
             //分享
             $('#share').off("click").click(function () {
+                if (fullScreenState){
+                    fullScreenState = false;
+                    $("#fullScreen").html('全屏显示');
+                    window.parent['fullScreen']('true');
+                }
                 //  当前工作表名
                 var excelId = $(window.parent.document).find("#excelId").attr("value");
                 var sheetName = luckysheet.getSheet().name;

src/pages/main/onlineExcelMarket/index.vue

@@ -90,8 +90,10 @@
                     </el-pagination>
                 </div>
                 <div class="container" id="container" v-else>
-                    <iframe id="excelIframe" height="100%" width="100%" src="/marketfront/static/views/onlineShareExcelMarket.html"
-                            frameborder="0"></iframe>
+                    <fullscreen :fullscreen.sync="excelFullScreen" class="container">
+                        <iframe id="excelIframe" height="100%" width="100%" src="/marketfront/static/views/onlineShareExcelMarket.html"
+                                frameborder="0"></iframe>
+                    </fullscreen>
                 </div>
             </div>
         </div>
@@ -259,6 +261,7 @@ export default {
             shareLoading : false,
             woNo: '',
             moveMenuList: [],
+            excelFullScreen: false,
         }
     },
     methods: {
@@ -733,6 +736,9 @@ export default {
                 ) || null
             );
         },
+        processFullScreen() {
+            this.excelFullScreen = !this.excelFullScreen;
+        }
     },
     mounted() {
         this.woNo = this.getUrlKey("id")//获取地址栏参数
@@ -750,6 +756,9 @@ export default {
         this.getTreeData();
     },
     created() {
+        window['fullScreen'] = (rp) => {
+            this.processFullScreen(rp);
+        }
         window['backToExcelList'] = (rp) => {
             this.closeExcel(rp);
         }