Browse Source

fix: 修复点击冻结首行首列的滚动问题

master
cdswyda 4 years ago
parent
commit
009205eb75
  1. 17
      src/controllers/menuButton.js
  2. 2
      src/locale/zh.js

17
src/controllers/menuButton.js

@ -1666,6 +1666,21 @@ const menuButton = {
// luckysheetrefreshgrid(); // luckysheetrefreshgrid();
} }
else if(itemvalue == "freezenRC"){ //首行列冻结 else if(itemvalue == "freezenRC"){ //首行列冻结
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 scrollTop = $("#luckysheet-cell-main").scrollTop();
let row_st = luckysheet_searcharray(Store.visibledatarow, scrollTop); let row_st = luckysheet_searcharray(Store.visibledatarow, scrollTop);
if(row_st == -1){ if(row_st == -1){
@ -1687,7 +1702,7 @@ const menuButton = {
luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left); luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left);
luckysheetFreezen.createFreezenVertical(freezenverticaldata, left); luckysheetFreezen.createFreezenVertical(freezenverticaldata, left);
}
luckysheetFreezen.createAssistCanvas(); luckysheetFreezen.createAssistCanvas();
luckysheetrefreshgrid(); luckysheetrefreshgrid();
} }

2
src/locale/zh.js

@ -9486,7 +9486,7 @@ export default {
default:"冻结第一行", default:"冻结第一行",
freezenRow:"冻结第一行", freezenRow:"冻结第一行",
freezenColumn:"冻结第A列", freezenColumn:"冻结第A列",
freezenRC:"冻结行列", freezenRC:"冻结第一第A列",
freezenRowRange:"冻结行到选区", freezenRowRange:"冻结行到选区",
freezenColumnRange:"冻结列到选区", freezenColumnRange:"冻结列到选区",
freezenRCRange:"冻结行列到选区", freezenRCRange:"冻结行列到选区",

Loading…
Cancel
Save