|
@@ -276,7 +276,7 @@ const getColSign = (celldata, days) => {
|
|
// 定义44927代表的日期基准
|
|
// 定义44927代表的日期基准
|
|
let baseDate = new Date(1900, 0, 1); // 1900年1月1日
|
|
let baseDate = new Date(1900, 0, 1); // 1900年1月1日
|
|
let resultDate = new Date(baseDate);
|
|
let resultDate = new Date(baseDate);
|
|
- resultDate.setDate(baseDate.getDate() + days);
|
|
|
|
|
|
+ resultDate.setDate(baseDate.getDate() + Number(days));
|
|
const curMonth = resultDate.getMonth() + 1;
|
|
const curMonth = resultDate.getMonth() + 1;
|
|
const curYear = resultDate.getFullYear();
|
|
const curYear = resultDate.getFullYear();
|
|
let colNum = 0;
|
|
let colNum = 0;
|
|
@@ -450,8 +450,16 @@ function initSheet(sheet, authority, permissions) {
|
|
};
|
|
};
|
|
}
|
|
}
|
|
|
|
|
|
- sheet.config.colhidden = colhidden;
|
|
|
|
- sheet.config.rowhidden = rowhidden;
|
|
|
|
|
|
+ if (sheet.config.colhidden) {
|
|
|
|
+ sheet.config.colhidden = { ...colhidden, ...sheet.config.colhidden };
|
|
|
|
+ } else {
|
|
|
|
+ sheet.config.colhidden = colhidden;
|
|
|
|
+ }
|
|
|
|
+ if (sheet.config.rowhidden) {
|
|
|
|
+ sheet.config.rowhidden = { ...rowhidden, ...sheet.config.rowhidden };
|
|
|
|
+ } else {
|
|
|
|
+ sheet.config.rowhidden = rowhidden;
|
|
|
|
+ }
|
|
|
|
|
|
// 公式计算
|
|
// 公式计算
|
|
let calcChain = [];
|
|
let calcChain = [];
|