elink-star
/
luckysheet
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #1089 from luncheon/freeze-range-upper-left 

fix: #409: `freeze range` fixes the upper left corner of the range
master
mengshukeji 3 years ago
committed by GitHub
parent
f6751f53b8 a54c7a8a17
commit
42ab04f05b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      src/controllers/menuButton.js

32
src/controllers/menuButton.js
View File

@ -1777,14 +1777,8 @@ const menuButton = {
let last = Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1]; let last = Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1];
let row_focus = last["row_focus"] == null ? last["row"][0] : last["row_focus"]; let row_focus = last["row_focus"] == null ? last["row"][0] : last["row_focus"];
row_st = Math.max(row_st - 1, row_focus - 1, 0);
if(row_focus > row_st){
row_st = row_focus;
}
if(row_st == -1){
row_st = 0;
}
let top,freezenhorizontaldata; let top,freezenhorizontaldata;
if (luckysheetFreezen.freezenRealFirstRowColumn) { if (luckysheetFreezen.freezenRealFirstRowColumn) {
top = Store.visibledatarow[row_st] - 2 + Store.columnHeaderHeight; top = Store.visibledatarow[row_st] - 2 + Store.columnHeaderHeight;
@ -1826,14 +1820,8 @@ const menuButton = {
let last = Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1]; let last = Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1];
let column_focus = last["column_focus"] == null ? last["column"][0] : last["column_focus"]; let column_focus = last["column_focus"] == null ? last["column"][0] : last["column_focus"];
col_st = Math.max(col_st - 1, column_focus - 1, 0);
if(column_focus > col_st){
col_st = column_focus;
}
if(col_st == -1){
col_st = 0;
}
let left,freezenverticaldata; let left,freezenverticaldata;
if (luckysheetFreezen.freezenRealFirstRowColumn) { if (luckysheetFreezen.freezenRealFirstRowColumn) {
left = Store.visibledatacolumn[col_st] - 2 + Store.rowHeaderWidth; left = Store.visibledatacolumn[col_st] - 2 + Store.rowHeaderWidth;
@ -1878,14 +1866,8 @@ const menuButton = {
let last = Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1]; let last = Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1];
let row_focus = last["row_focus"] == null ? last["row"][0] : last["row_focus"]; let row_focus = last["row_focus"] == null ? last["row"][0] : last["row_focus"];
row_st = Math.max(row_st - 1, row_focus - 1, 0);
if(row_focus > row_st){
row_st = row_focus;
}
if(row_st == -1){
row_st = 0;
}
let top,freezenhorizontaldata; let top,freezenhorizontaldata;
if (luckysheetFreezen.freezenRealFirstRowColumn) { if (luckysheetFreezen.freezenRealFirstRowColumn) {
top = Store.visibledatarow[row_st] - 2 + Store.columnHeaderHeight; top = Store.visibledatarow[row_st] - 2 + Store.columnHeaderHeight;
@ -1903,14 +1885,8 @@ const menuButton = {
let col_st = luckysheet_searcharray(Store.visibledatacolumn, scrollLeft); let col_st = luckysheet_searcharray(Store.visibledatacolumn, scrollLeft);
let column_focus = last["column_focus"] == null ? last["column"][0] : last["column_focus"]; let column_focus = last["column_focus"] == null ? last["column"][0] : last["column_focus"];
col_st = Math.max(col_st - 1, column_focus - 1, 0);
if(column_focus > col_st){
col_st = column_focus;
}
if(col_st == -1){
col_st = 0;
}
let left,freezenverticaldata; let left,freezenverticaldata;
if (luckysheetFreezen.freezenRealFirstRowColumn) { if (luckysheetFreezen.freezenRealFirstRowColumn) {
left = Store.visibledatacolumn[col_st] - 2 + Store.rowHeaderWidth; left = Store.visibledatacolumn[col_st] - 2 + Store.rowHeaderWidth;

Write Preview
Loading…
Cancel
Save