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:"冻结行列到选区",