From efb593b7d72ca635a8c9b1ed09fdff254a2fdf16 Mon Sep 17 00:00:00 2001
From: cdswyda <cdswyda@gmail.com>
Date: Thu, 11 Nov 2021 16:59:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=97=B6=20=E7=82=B9=E5=87=BB=E5=86=BB?=
 =?UTF-8?q?=E7=BB=93=E9=A6=96=E5=88=97=20=E5=AE=9E=E9=99=85=E5=86=BB?=
 =?UTF-8?q?=E7=BB=93=E7=9A=84=E6=98=AF=E5=BD=93=E5=89=8D=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E5=88=97=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/menuButton.js | 35 ++++++++++++++++++-----------------
 src/global/api.js             | 16 +++++++++-------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js
index ed6e839..43247d2 100644
--- a/src/controllers/menuButton.js
+++ b/src/controllers/menuButton.js
@@ -37,7 +37,7 @@ import { replaceHtml, getObjType, rgbTohex, mouseclickposition, luckysheetfontfo
 import {openProtectionModal,checkProtectionFormatCells,checkProtectionNotEnable} from './protection';
 import Store from '../store';
 import locale from '../locale/locale';
-import {checkTheStatusOfTheSelectedCells, frozenFirstRow} from '../global/api';
+import { checkTheStatusOfTheSelectedCells, frozenFirstRow, frozenFirstColumn } from '../global/api';
 
 const menuButton = {
     "menu": '<div class="luckysheet-cols-menu luckysheet-rightgclick-menu luckysheet-menuButton ${subclass} luckysheet-mousedown-cancel" id="luckysheet-icon-${id}-menuButton">${item}</div>',
@@ -1645,24 +1645,25 @@ const menuButton = {
                         // luckysheetrefreshgrid();
                     }
                     else if(itemvalue == "freezenColumn"){ //首列冻结
-                        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);
+                        frozenFirstColumn();
+                        // 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);
 
-                        if (luckysheetFreezen.freezenhorizontaldata != null) {
-                            luckysheetFreezen.cancelFreezenHorizontal();
-                            luckysheetFreezen.createAssistCanvas();
-                            luckysheetrefreshgrid();
-                        }
+                        // if (luckysheetFreezen.freezenhorizontaldata != null) {
+                        //     luckysheetFreezen.cancelFreezenHorizontal();
+                        //     luckysheetFreezen.createAssistCanvas();
+                        //     luckysheetrefreshgrid();
+                        // }
 
-                        luckysheetFreezen.createFreezenVertical(freezenverticaldata, left);
-                        luckysheetFreezen.createAssistCanvas();
-                        luckysheetrefreshgrid();
+                        // luckysheetFreezen.createFreezenVertical(freezenverticaldata, left);
+                        // luckysheetFreezen.createAssistCanvas();
+                        // luckysheetrefreshgrid();
                     }
                     else if(itemvalue == "freezenRC"){ //首行列冻结
                         let scrollTop = $("#luckysheet-cell-main").scrollTop();
diff --git a/src/global/api.js b/src/global/api.js
index cad3e06..77e7c16 100644
--- a/src/global/api.js
+++ b/src/global/api.js
@@ -651,18 +651,20 @@ export function frozenFirstColumn(order) {
 
     // 冻结为当前sheet页
     if (!order || order == getSheetIndex(Store.currentSheetIndex)) {
-        let scrollLeft = $("#luckysheet-cell-main").scrollLeft();
+        // let scrollLeft = $("#luckysheet-cell-main").scrollLeft();
 
-        let col_st = luckysheet_searcharray(Store.visibledatacolumn, scrollLeft);
-        if(col_st == -1){
-            col_st = 0;
-        }
+        // let col_st = luckysheet_searcharray(Store.visibledatacolumn, scrollLeft);
+        // if(col_st == -1){
+        //     col_st = 0;
+        // }
+        let col_st = 0;
 
-        let left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
+        // let left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
+        let left = Store.visibledatacolumn[col_st] - 2 + Store.rowHeaderWidth;
         let freezenverticaldata = [
             Store.visibledatacolumn[col_st],
             col_st + 1,
-            scrollLeft,
+            0,
             luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1),
             left
         ];