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

Merge pull request #875 from cdswyda/fix/freezen-rc 

fix(freezen): 修复PR#843中修改遗漏处理冻结到选区的问题
master
mengshukeji 4 years ago
committed by GitHub
parent
25a3c80e33 3421f678db
commit
bbff981bc3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 13 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. 45
      src/controllers/menuButton.js

45
src/controllers/menuButton.js
View File

@ -1762,9 +1762,14 @@ const menuButton = {
if(row_st == -1){ if(row_st == -1){
row_st = 0; row_st = 0;
} }
let top,freezenhorizontaldata;
let top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columnHeaderHeight; if (luckysheetFreezen.freezenRealFirstRowColumn) {
let freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, scrollTop, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top]; top = Store.visibledatarow[row_st] - 2 + Store.columnHeaderHeight;
freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, 0, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
} else {
top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columnHeaderHeight;
freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, scrollTop, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
}
luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null); luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
if (luckysheetFreezen.freezenverticaldata != null) { if (luckysheetFreezen.freezenverticaldata != null) {
@ -1806,9 +1811,14 @@ const menuButton = {
if(col_st == -1){ if(col_st == -1){
col_st = 0; col_st = 0;
} }
let left,freezenverticaldata;
let left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth; if (luckysheetFreezen.freezenRealFirstRowColumn) {
let freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left]; left = Store.visibledatacolumn[col_st] - 2 + Store.rowHeaderWidth;
freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, 0, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
} else {
left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
}
luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left); luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left);
if (luckysheetFreezen.freezenhorizontaldata != null) { if (luckysheetFreezen.freezenhorizontaldata != null) {
@ -1853,10 +1863,16 @@ const menuButton = {
if(row_st == -1){ if(row_st == -1){
row_st = 0; row_st = 0;
} }
let top,freezenhorizontaldata;
let top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columnHeaderHeight; if (luckysheetFreezen.freezenRealFirstRowColumn) {
let freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, scrollTop, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top]; top = Store.visibledatarow[row_st] - 2 + Store.columnHeaderHeight;
freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, 0, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null); luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
} else {
top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columnHeaderHeight;
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); luckysheetFreezen.createFreezenHorizontal(freezenhorizontaldata, top);
@ -1872,9 +1888,14 @@ const menuButton = {
if(col_st == -1){ if(col_st == -1){
col_st = 0; col_st = 0;
} }
let left,freezenverticaldata;
let left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth; if (luckysheetFreezen.freezenRealFirstRowColumn) {
let freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left]; left = Store.visibledatacolumn[col_st] - 2 + Store.rowHeaderWidth;
freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, 0, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
} else {
left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
}
luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left); luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left);
luckysheetFreezen.createFreezenVertical(freezenverticaldata, left); luckysheetFreezen.createFreezenVertical(freezenverticaldata, left);

Write Preview
Loading…
Cancel
Save