From 0f7d467c3164c5effc3f185bceb7afc94b7a93c5 Mon Sep 17 00:00:00 2001
From: Mike Ungers <mike.ungers@zf.com>
Date: Fri, 16 Apr 2021 08:48:23 +0200
Subject: [PATCH 1/2] potential bugfix when pasting previous copied data from
 excel

---
 src/controllers/handler.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/controllers/handler.js b/src/controllers/handler.js
index 61724a7..28c3215 100644
--- a/src/controllers/handler.js
+++ b/src/controllers/handler.js
@@ -5285,9 +5285,9 @@ export default function luckysheetHandler() {
             if (txtdata.indexOf("luckysheet_copy_action_table") > - 1 && Store.luckysheet_copy_save["copyRange"] != null && Store.luckysheet_copy_save["copyRange"].length > 0) {
                 //剪贴板内容解析
                 let cpDataArr = [];
-
-                let reg = new RegExp('<tr.*?>(.*?)</tr>', 'g');
-                let reg2 = new RegExp('<td.*?>(.*?)</td>', 'g');
+                
+                let reg = new RegExp('<tr.*?>(.*?)</tr>', 'gs');
+                let reg2 = new RegExp('<td.*?>(.*?)</td>', 'gs');
 
                 let regArr = txtdata.match(reg);
 
@@ -5298,7 +5298,7 @@ export default function luckysheetHandler() {
 
                     if (reg2Arr != null) {
                         for (let j = 0; j < reg2Arr.length; j++) {
-                            let cpValue = reg2Arr[j].replace(/<td.*?>/g, "").replace(/<\/td>/g, "");
+                            let cpValue = reg2Arr[j].replace(/<td.*?>/gs, "").replace(/<\/td>/gs, "");
                             cpRowArr.push(cpValue);
                         }
                     }

From 0dce8454f0827a36d4d2e36a36cd15b710eff784 Mon Sep 17 00:00:00 2001
From: Mike Ungers <mike.ungers@zf.com>
Date: Mon, 14 Feb 2022 13:25:02 +0100
Subject: [PATCH 2/2] fixed loss of multi line comment line breaks when
 moving/resizing comment field

---
 src/controllers/handler.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/controllers/handler.js b/src/controllers/handler.js
index c6887f6..d163bf7 100644
--- a/src/controllers/handler.js
+++ b/src/controllers/handler.js
@@ -3571,7 +3571,7 @@ export default function luckysheetHandler() {
 
             d[ps_r][ps_c].ps.left = luckysheetPostil.currentObj.position().left;
             d[ps_r][ps_c].ps.top = luckysheetPostil.currentObj.position().top;
-            d[ps_r][ps_c].ps.value = luckysheetPostil.currentObj.find(".formulaInputFocus").text();
+            d[ps_r][ps_c].ps.value = luckysheetPostil.currentObj.find(".formulaInputFocus").html().replaceAll('<div>', '\n').replaceAll(/<(.*)>.*?|<(.*) \/>/g, '').trim();
 
             rc.push(ps_r + "_" + ps_c);
 
@@ -3605,7 +3605,7 @@ export default function luckysheetHandler() {
             d[ps_r][ps_c].ps.top = luckysheetPostil.currentObj.position().top;
             d[ps_r][ps_c].ps.width = luckysheetPostil.currentObj.outerWidth();
             d[ps_r][ps_c].ps.height = luckysheetPostil.currentObj.outerHeight();
-            d[ps_r][ps_c].ps.value = luckysheetPostil.currentObj.find(".formulaInputFocus").text();
+            d[ps_r][ps_c].ps.value = luckysheetPostil.currentObj.find(".formulaInputFocus").html().replaceAll('<div>', '\n').replaceAll(/<(.*)>.*?|<(.*) \/>/g, '').trim();
 
             rc.push(ps_r + "_" + ps_c);