From 19560eba3fe36cce4ee65ba3e8ac80ab7ec8d620 Mon Sep 17 00:00:00 2001
From: wpxp123456 <2677556700@qq.com>
Date: Tue, 22 Dec 2020 11:06:33 +0800
Subject: [PATCH] fix(bug): bug

bug

fix #367, fix #370
---
 src/controllers/postil.js      | 29 ++++++++++++++++++++++++-----
 src/controllers/sheetmanage.js |  1 +
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/controllers/postil.js b/src/controllers/postil.js
index 6c260dc28..2dcb0c95b 100644
--- a/src/controllers/postil.js
+++ b/src/controllers/postil.js
@@ -229,7 +229,7 @@ const luckysheetPostil = {
 
         let html =  '<div id="luckysheet-postil-overshow">' +
                         '<canvas class="arrowCanvas" width="'+ size[2] +'" height="'+ size[3] +'" style="position:absolute;left:'+ size[0] +'px;top:'+ size[1] +'px;z-index:100;pointer-events:none;"></canvas>' +
-                        '<div style="width:'+ (width - 12) +'px;min-height:'+ (height - 12) +'px;color:#000;padding:5px;border:1px solid #000;background-color:rgb(255,255,225);position:absolute;left:'+ fromX +'px;top:'+ fromY +'px;z-index:100;">'+ value +'</div>' +
+                        '<div style="width:'+ (width - 12) +'px;min-height:'+ (height - 12) +'px;color:#000;padding:5px;border:1px solid #000;background-color:rgb(255,255,225);position:absolute;left:'+ fromX +'px;top:'+ fromY +'px;z-index:100;">'+ _this.htmlEscape(value) +'</div>' +
                     '</div>';
 
         $(html).appendTo($("#luckysheet-cell-main"));
@@ -392,7 +392,7 @@ const luckysheetPostil = {
                                 '</div>' +
                                 '<div style="width:100%;height:100%;overflow:hidden;">' + 
                                     '<div class="formulaInputFocus" style="width:'+ (width - 12) +'px;height:'+ (height - 12) +'px;line-height:20px;box-sizing:border-box;text-align: center;;word-break:break-all;" spellcheck="false" contenteditable="true">' +
-                                        value +
+                                        _this.htmlEscape(value) +
                                     '</div>' +
                                 '</div>' +
                             '</div>' +
@@ -564,7 +564,7 @@ const luckysheetPostil = {
                                 '</div>' +
                                 '<div style="width:100%;height:100%;overflow:hidden;">' + 
                                     '<div class="formulaInputFocus" style="width:'+ (width - 12) +'px;height:'+ (height - 12) +'px;line-height:20px;box-sizing:border-box;text-align: center;;word-break:break-all;" spellcheck="false" contenteditable="true">' +
-                                        value +
+                                        _this.htmlEscape(value) +
                                     '</div>' +
                                 '</div>' +
                             '</div>' +
@@ -686,7 +686,7 @@ const luckysheetPostil = {
                                 '</div>' +
                                 '<div style="width:100%;height:100%;overflow:hidden;">' + 
                                     '<div class="formulaInputFocus" style="width:'+ (width - 12) +'px;height:'+ (height - 12) +'px;line-height:20px;box-sizing:border-box;text-align: center;;word-break:break-all;" spellcheck="false" contenteditable="true">' +
-                                        value +
+                                        _this.htmlEscape(value) +
                                     '</div>' +
                                 '</div>' +
                             '</div>' +
@@ -810,7 +810,7 @@ const luckysheetPostil = {
                                             '</div>' +
                                             '<div style="width:100%;height:100%;overflow:hidden;">' + 
                                                 '<div class="formulaInputFocus" style="width:'+ (width - 12) +'px;height:'+ (height - 12) +'px;line-height:20px;box-sizing:border-box;text-align: center;;word-break:break-all;" spellcheck="false" contenteditable="true">' +
-                                                    value +
+                                                    _this.htmlEscape(value) +
                                                 '</div>' +
                                             '</div>' +
                                         '</div>' +
@@ -924,6 +924,25 @@ const luckysheetPostil = {
                 $("#" + id).hide();
             }
         });
+    },
+    htmlEscape: function(text){
+        return text.replace(/[<>"&]/g, function(match, pos, originalText){
+            console.log(match, pos, originalText)
+            switch(match){
+                case '<': {
+                    return '&lt';
+                }
+                case '>': {
+                    return '&gt';
+                }
+                case '&': {
+                    return '&amp';
+                }
+                case '\"': {
+                    return '&quot;';
+                }
+            }
+        })
     }
 }
 
diff --git a/src/controllers/sheetmanage.js b/src/controllers/sheetmanage.js
index ec4536c41..2f571ed81 100644
--- a/src/controllers/sheetmanage.js
+++ b/src/controllers/sheetmanage.js
@@ -942,6 +942,7 @@ const sheetmanage = {
     storeSheetParam: function() {
         let index = this.getSheetIndex(Store.currentSheetIndex);
         let file = Store.luckysheetfile[index];
+        file["config"] = Store.config;
         file["visibledatarow"] = Store.visibledatarow;
         file["visibledatacolumn"] = Store.visibledatacolumn;
         file["ch_width"] = Store.ch_width;