From 009205eb754babd96d22f41edc6715219d2f6e68 Mon Sep 17 00:00:00 2001
From: cdswyda <cdswyda@gmail.com>
Date: Mon, 15 Nov 2021 10:34:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=86=BB=E7=BB=93=E9=A6=96=E8=A1=8C=E9=A6=96=E5=88=97=E7=9A=84?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/menuButton.js | 53 ++++++++++++++++++++++-------------
 src/locale/zh.js              |  2 +-
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js
index 43247d2..29b1cff 100644
--- a/src/controllers/menuButton.js
+++ b/src/controllers/menuButton.js
@@ -1666,28 +1666,43 @@ const menuButton = {
                         // luckysheetrefreshgrid();
                     }
                     else if(itemvalue == "freezenRC"){ //首行列冻结
-                        let scrollTop = $("#luckysheet-cell-main").scrollTop();
-                        let row_st = luckysheet_searcharray(Store.visibledatarow, scrollTop);
-                        if(row_st == -1){
-                            row_st = 0;
-                        }
-                        let top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columnHeaderHeight;
-                        let freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, scrollTop, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
-                        luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
-
-                        luckysheetFreezen.createFreezenHorizontal(freezenhorizontaldata, top);
+                        if (luckysheetFreezen.freezenRealFirstRowColumn) {
+                            let row_st = 0;
+                            let top = Store.visibledatarow[row_st] - 2 + Store.columnHeaderHeight;
+                            let freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, 0, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
+                            luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
+
+                            luckysheetFreezen.createFreezenHorizontal(freezenhorizontaldata, top);
+
+                            let col_st = 0;
+                            let left = Store.visibledatacolumn[col_st] - 2 + Store.rowHeaderWidth;
+                            let freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, 0, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
+                            luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left);
+
+                            luckysheetFreezen.createFreezenVertical(freezenverticaldata, left);
+                        } else {
+                            let scrollTop = $("#luckysheet-cell-main").scrollTop();
+                            let row_st = luckysheet_searcharray(Store.visibledatarow, scrollTop);
+                            if(row_st == -1){
+                                row_st = 0;
+                            }
+                            let top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columnHeaderHeight;
+                            let freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, scrollTop, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
+                            luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
 
-                        let scrollLeft = $("#luckysheet-cell-main").scrollLeft();
-                        let col_st = luckysheet_searcharray(Store.visibledatacolumn, scrollLeft);
-                        if(col_st == -1){
-                            col_st = 0;
-                        }
-                        let left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
-                        let freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
-                        luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left);
+                            luckysheetFreezen.createFreezenHorizontal(freezenhorizontaldata, top);
 
-                        luckysheetFreezen.createFreezenVertical(freezenverticaldata, left);
+                            let scrollLeft = $("#luckysheet-cell-main").scrollLeft();
+                            let col_st = luckysheet_searcharray(Store.visibledatacolumn, scrollLeft);
+                            if(col_st == -1){
+                                col_st = 0;
+                            }
+                            let left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
+                            let freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
+                            luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left);
 
+                            luckysheetFreezen.createFreezenVertical(freezenverticaldata, left);
+                        }
                         luckysheetFreezen.createAssistCanvas();
                         luckysheetrefreshgrid();
                     }
diff --git a/src/locale/zh.js b/src/locale/zh.js
index b79d401..00cc217 100644
--- a/src/locale/zh.js
+++ b/src/locale/zh.js
@@ -9486,7 +9486,7 @@ export default {
         default:"冻结第一行",
         freezenRow:"冻结第一行",
         freezenColumn:"冻结第A列",
-        freezenRC:"冻结行列",
+        freezenRC:"冻结第一行第A列",
         freezenRowRange:"冻结行到选区",
         freezenColumnRange:"冻结列到选区",
         freezenRCRange:"冻结行列到选区",