From 4a5d2abfc91e7613f86fdb4edb153ed7290c8a96 Mon Sep 17 00:00:00 2001
From: cdswyda <cdswyda@gmail.com>
Date: Tue, 2 Nov 2021 10:12:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(postil):=20=E4=BF=AE=E5=A4=8D=E6=8F=92?=
 =?UTF-8?q?=E5=85=A5=E8=A1=8C=E5=88=97=E7=9A=84=E6=97=B6=E5=80=99=E6=89=B9?=
 =?UTF-8?q?=E6=B3=A8=E8=A2=AB=E5=A4=8D=E5=88=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/global/extend.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/global/extend.js b/src/global/extend.js
index 0d9e09e..ad8f182 100644
--- a/src/global/extend.js
+++ b/src/global/extend.js
@@ -640,6 +640,7 @@ function luckysheetextendtable(type, index, value, direction, sheetIndex) {
         for(let c = 0; c < d[0].length; c++){
             let cell = curRow[c],
             templateCell = cell ?  {...cell, v: '', m: ''} : Store.defaultCell;
+            delete templateCell.ps;
             row.push(templateCell);
         }
         var cellBorderConfig = [];
@@ -813,6 +814,7 @@ function luckysheetextendtable(type, index, value, direction, sheetIndex) {
         for(let r = 0; r < d.length; r++){
             let cell = curd[r][index],
             templateCell = cell ?  {...cell, v: '', m: ''} : Store.defaultCell;
+            delete templateCell.ps;
             col.push(templateCell);
         }
         var cellBorderConfig = [];

From af4d16690ddfaa8053777f02d83f5cc5e7bfe330 Mon Sep 17 00:00:00 2001
From: cdswyda <cdswyda@gmail.com>
Date: Tue, 2 Nov 2021 10:21:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix(postil):=20=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=89=B9=E6=B3=A8=E9=BC=A0=E6=A0=87=E6=82=AC=E6=B5=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=97=B6=EF=BC=8C=E5=A4=A7=E5=B0=8F=E5=92=8C=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=8A=B6=E6=80=81=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/controllers/postil.js b/src/controllers/postil.js
index 5f75177..c643a13 100644
--- a/src/controllers/postil.js
+++ b/src/controllers/postil.js
@@ -222,8 +222,8 @@ const luckysheetPostil = {
             fromY = 2;
         }
 
-        let width = _this.defaultWidth * Store.zoomRatio
-        let height = _this.defaultHeight * Store.zoomRatio
+        let width = postil["width"] == null ? _this.defaultWidth * Store.zoomRatio : postil["width"] * Store.zoomRatio;
+        let height = postil["height"] == null ? _this.defaultHeight * Store.zoomRatio : postil["height"] * Store.zoomRatio;
 
         let size = _this.getArrowCanvasSize(fromX, fromY, toX, toY);
 

From a0c93c0b6f9f31741f1028d215c355fc7ff9a2c3 Mon Sep 17 00:00:00 2001
From: cdswyda <cdswyda@gmail.com>
Date: Tue, 2 Nov 2021 10:40:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(postil):=20=E4=BF=AE=E5=A4=8D=20comment?=
 =?UTF-8?q?UpdateBefore=20=E9=92=A9=E5=AD=90=E4=B8=AD=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复 return false 的情况下，编辑批注无法消失的bug
---
 src/controllers/postil.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/controllers/postil.js b/src/controllers/postil.js
index c643a13..b5d2ccd 100644
--- a/src/controllers/postil.js
+++ b/src/controllers/postil.js
@@ -872,6 +872,9 @@ const luckysheetPostil = {
             let value = $("#" + id).find(".formulaInputFocus").html().replaceAll('<div>', '\n').replaceAll(/<(.*)>.*?|<(.*) \/>/g, '').trim();
             // Hook function
             if(!method.createHookFunction('commentUpdateBefore',r,c,value)){
+                if (!Store.flowdata[r][c].ps.isshow) {
+                    $("#" + id).remove();
+                }
                 return;
             }