@leankylin-sheet/core 4.0.8 → 4.0.10

package/dist/context.d.ts

@@ -19,6 +19,7 @@ export type CellOptions = {
     render: any;
 }[];
 export type Context = {
+    headerBgColor?: string;
     dragRangeSelect?: {
         top: number;
         left: number;

package/dist/index.esm.js

@@ -42570,6 +42570,7 @@ function calcSelectionInfo(ctx, lang) {
 
 function defaultContext(refs) {
   return {
+    headerBgColor: "#fff",
     cellOptions: [],
     luckysheetfile: [],
     defaultcolumnNum: 60,
@@ -44322,7 +44323,6 @@ function scrollToFrozenRowCol(ctx, freeze) {
   if (freezenverticaldata != null && column != null) {
     var freezen_colindex = freezenverticaldata[1];
     var offset = _.sortedIndex(freezenverticaldata[3], ctx.scrollLeft);
-    var top = freezenverticaldata[4];
     freezen_colindex += offset;
     if (column >= ctx.visibledatacolumn.length) {
       column = ctx.visibledatacolumn.length - 1;
@@ -44330,16 +44330,10 @@ function scrollToFrozenRowCol(ctx, freeze) {
     if (freezen_colindex >= ctx.visibledatacolumn.length) {
       freezen_colindex = ctx.visibledatacolumn.length - 1;
     }
-    var column_px = ctx.visibledatacolumn[column];
-    var freezen_px = ctx.visibledatacolumn[freezen_colindex];
-    if (column_px <= freezen_px + top) {
-      ctx.scrollLeft = 0;
-    }
   }
   if (freezenhorizontaldata != null && row != null) {
     var freezen_rowindex = freezenhorizontaldata[1];
     var _offset = _.sortedIndex(freezenhorizontaldata[3], ctx.scrollTop);
-    var left = freezenhorizontaldata[4];
     freezen_rowindex += _offset;
     if (row >= ctx.visibledatarow.length) {
       row = ctx.visibledatarow.length - 1;
@@ -44347,11 +44341,6 @@ function scrollToFrozenRowCol(ctx, freeze) {
     if (freezen_rowindex >= ctx.visibledatarow.length) {
       freezen_rowindex = ctx.visibledatarow.length - 1;
     }
-    var row_px = ctx.visibledatarow[row];
-    var _freezen_px = ctx.visibledatarow[freezen_rowindex];
-    if (row_px <= _freezen_px + left) {
-      ctx.scrollTop = 0;
-    }
   }
 }
 function getFrozenHandleTop(ctx) {
@@ -51977,7 +51966,7 @@ var Canvas = /*#__PURE__*/function () {
           continue;
         }
         if (((_this$sheetCtx$config = this.sheetCtx.config) === null || _this$sheetCtx$config === void 0 ? void 0 : (_this$sheetCtx$config2 = _this$sheetCtx$config.rowhidden) === null || _this$sheetCtx$config2 === void 0 ? void 0 : _this$sheetCtx$config2[r]) == null) {
-          renderCtx.fillStyle = "#F8F9FA";
+          renderCtx.fillStyle = this.sheetCtx.headerBgColor || "#fff";
           renderCtx.fillRect(0, start_r + offsetTop + firstOffset, this.sheetCtx.rowHeaderWidth - 1, end_r - start_r + 1 + lastOffset - firstOffset);
           renderCtx.fillStyle = "#000000";
           renderCtx.save();
@@ -52070,7 +52059,7 @@ var Canvas = /*#__PURE__*/function () {
           continue;
         }
         if (((_this$sheetCtx$config5 = this.sheetCtx.config) === null || _this$sheetCtx$config5 === void 0 ? void 0 : (_this$sheetCtx$config6 = _this$sheetCtx$config5.colhidden) === null || _this$sheetCtx$config6 === void 0 ? void 0 : _this$sheetCtx$config6[c]) == null) {
-          renderCtx.fillStyle = "#F8F9FA";
+          renderCtx.fillStyle = this.sheetCtx.headerBgColor || "#fff";
           renderCtx.fillRect(start_c + offsetLeft - 1, 0, end_c - start_c, this.sheetCtx.columnHeaderHeight - 1);
           renderCtx.fillStyle = "#000000";
           renderCtx.save();
@@ -56049,6 +56038,7 @@ var index = /*#__PURE__*/Object.freeze({
 });
 
 var defaultSettings = {
+  headerBgColor: "#fff",
   toolbarRightRender: undefined,
   onClickContentEditable: undefined,
   renderCustomColor: undefined,
@@ -56459,7 +56449,7 @@ function fixPositionOnFrozenCells(freeze, x, y, mouseX, mouseY) {
   };
 }
 function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxInput, canvas) {
-  var _globalCache$freezen, _ctx$hooks$beforeCell, _ctx$hooks, _flowdata$row_index;
+  var _globalCache$freezen, _ctx$hooks$beforeCell, _ctx$hooks, _flowdata$row_index, _flowdata$row_index2, _flowdata$row_index2$;
   ctx.contextMenu = {};
   ctx.filterContextMenu = undefined;
   var flowdata = getFlowdata(ctx);
@@ -56629,7 +56619,6 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
           }
           cellInput.innerHTML = vText;
           cancelFunctionrangeSelected(ctx);
-          createRangeHightlight(ctx, vText);
         }
         ctx.formulaCache.rangestart = false;
         ctx.formulaCache.rangedrag_column_start = false;
@@ -56675,9 +56664,6 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
       ctx.formulaCache.rangedrag_column_start = false;
       ctx.formulaCache.rangedrag_row_start = false;
       ctx.formulaCache.selectingRangeIndex = ctx.formulaCache.rangechangeindex;
-      if (ctx.formulaCache.rangechangeindex > ctx.formulaRangeHighlight.length) {
-        createRangeHightlight(ctx, cellInput.innerHTML, ctx.formulaCache.rangechangeindex);
-      }
       createFormulaRangeSelect(ctx, {
         rangeIndex: ctx.formulaCache.rangechangeindex || 0,
         left: left,
@@ -56795,10 +56781,12 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
     }
   }
   ctx.luckysheet_select_save = normalizeSelection(ctx, ctx.luckysheet_select_save);
+  var f = ((_flowdata$row_index2 = flowdata[row_index]) === null || _flowdata$row_index2 === void 0 ? void 0 : (_flowdata$row_index2$ = _flowdata$row_index2[col_index]) === null || _flowdata$row_index2$ === void 0 ? void 0 : _flowdata$row_index2$.f) || "";
+  createRangeHightlight(ctx, functionHTMLGenerate(f));
   if (ctx.hooks.afterCellMouseDown) {
     setTimeout(function () {
-      var _ctx$hooks$afterCellM, _ctx$hooks2, _flowdata$row_index2;
-      (_ctx$hooks$afterCellM = (_ctx$hooks2 = ctx.hooks).afterCellMouseDown) === null || _ctx$hooks$afterCellM === void 0 ? void 0 : _ctx$hooks$afterCellM.call(_ctx$hooks2, (_flowdata$row_index2 = flowdata[row_index]) === null || _flowdata$row_index2 === void 0 ? void 0 : _flowdata$row_index2[col_index], {
+      var _ctx$hooks$afterCellM, _ctx$hooks2, _flowdata$row_index3;
+      (_ctx$hooks$afterCellM = (_ctx$hooks2 = ctx.hooks).afterCellMouseDown) === null || _ctx$hooks$afterCellM === void 0 ? void 0 : _ctx$hooks$afterCellM.call(_ctx$hooks2, (_flowdata$row_index3 = flowdata[row_index]) === null || _flowdata$row_index3 === void 0 ? void 0 : _flowdata$row_index3[col_index], {
         row: row_index,
         column: col_index,
         startRow: row_pre,
@@ -56810,7 +56798,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
   }
 }
 function handleCellDrop(ctx, globalCache, e, container) {
-  var _globalCache$freezen2, _flowdata$row_index3;
+  var _globalCache$freezen2, _flowdata$row_index4;
   var afterCellDrop = ctx.hooks.afterCellDrop;
   if (!afterCellDrop) {
     return;
@@ -56837,7 +56825,7 @@ function handleCellDrop(ctx, globalCache, e, container) {
   var col_location = colLocation(x, ctx.visibledatacolumn);
   var col_pre = col_location[0];
   var col_index = col_location[2];
-  var currentCellValue = JSON.parse(JSON.stringify((_flowdata$row_index3 = flowdata[row_index]) === null || _flowdata$row_index3 === void 0 ? void 0 : _flowdata$row_index3[col_index]));
+  var currentCellValue = JSON.parse(JSON.stringify((_flowdata$row_index4 = flowdata[row_index]) === null || _flowdata$row_index4 === void 0 ? void 0 : _flowdata$row_index4[col_index]));
   var box = document.querySelector(".leankylin-cell-area");
   if (box) {
     var _currentCellValue$cu;
@@ -56873,7 +56861,7 @@ function handleCellDrop(ctx, globalCache, e, container) {
   });
 }
 function handleCellAreaDragOver(ctx, globalCache, e, container) {
-  var _globalCache$freezen3, _flowdata$row_index4;
+  var _globalCache$freezen3, _flowdata$row_index5;
   var canDrop = ctx.hooks.afterCellDrop;
   if (!canDrop) {
     return;
@@ -56902,7 +56890,7 @@ function handleCellAreaDragOver(ctx, globalCache, e, container) {
   var col_pre = col_location[0];
   var col_end = col_location[1];
   var col_index = col_location[2];
-  var currentCellValue = JSON.parse(JSON.stringify((_flowdata$row_index4 = flowdata[row_index]) === null || _flowdata$row_index4 === void 0 ? void 0 : _flowdata$row_index4[col_index]));
+  var currentCellValue = JSON.parse(JSON.stringify((_flowdata$row_index5 = flowdata[row_index]) === null || _flowdata$row_index5 === void 0 ? void 0 : _flowdata$row_index5[col_index]));
   var box = document.querySelector(".leankylin-cell-area");
   if (box) {
     var _currentCellValue$cu2;
@@ -56933,7 +56921,7 @@ function handleCellAreaDragOver(ctx, globalCache, e, container) {
   };
 }
 function handleCellAreaMouseMove(ctx, globalCache, e, container) {
-  var _globalCache$freezen4, _flowdata$row_index5;
+  var _globalCache$freezen4, _flowdata$row_index6;
   var afterCellMouseMove = ctx.hooks.afterCellMouseMove;
   if (!afterCellMouseMove) {
     return;
@@ -56958,7 +56946,7 @@ function handleCellAreaMouseMove(ctx, globalCache, e, container) {
   var col_location = colLocation(x, ctx.visibledatacolumn);
   var col_pre = col_location[0];
   var col_index = col_location[2];
-  var currentCellValue = JSON.parse(JSON.stringify((_flowdata$row_index5 = flowdata[row_index]) === null || _flowdata$row_index5 === void 0 ? void 0 : _flowdata$row_index5[col_index]));
+  var currentCellValue = JSON.parse(JSON.stringify((_flowdata$row_index6 = flowdata[row_index]) === null || _flowdata$row_index6 === void 0 ? void 0 : _flowdata$row_index6[col_index]));
   var box = document.querySelector(".leankylin-cell-area");
   if (box) {
     var _currentCellValue$cu3;

package/dist/index.js

@@ -42580,6 +42580,7 @@ function calcSelectionInfo(ctx, lang) {
 
 function defaultContext(refs) {
   return {
+    headerBgColor: "#fff",
     cellOptions: [],
     luckysheetfile: [],
     defaultcolumnNum: 60,
@@ -44332,7 +44333,6 @@ function scrollToFrozenRowCol(ctx, freeze) {
   if (freezenverticaldata != null && column != null) {
     var freezen_colindex = freezenverticaldata[1];
     var offset = ___default['default'].sortedIndex(freezenverticaldata[3], ctx.scrollLeft);
-    var top = freezenverticaldata[4];
     freezen_colindex += offset;
     if (column >= ctx.visibledatacolumn.length) {
       column = ctx.visibledatacolumn.length - 1;
@@ -44340,16 +44340,10 @@ function scrollToFrozenRowCol(ctx, freeze) {
     if (freezen_colindex >= ctx.visibledatacolumn.length) {
       freezen_colindex = ctx.visibledatacolumn.length - 1;
     }
-    var column_px = ctx.visibledatacolumn[column];
-    var freezen_px = ctx.visibledatacolumn[freezen_colindex];
-    if (column_px <= freezen_px + top) {
-      ctx.scrollLeft = 0;
-    }
   }
   if (freezenhorizontaldata != null && row != null) {
     var freezen_rowindex = freezenhorizontaldata[1];
     var _offset = ___default['default'].sortedIndex(freezenhorizontaldata[3], ctx.scrollTop);
-    var left = freezenhorizontaldata[4];
     freezen_rowindex += _offset;
     if (row >= ctx.visibledatarow.length) {
       row = ctx.visibledatarow.length - 1;
@@ -44357,11 +44351,6 @@ function scrollToFrozenRowCol(ctx, freeze) {
     if (freezen_rowindex >= ctx.visibledatarow.length) {
       freezen_rowindex = ctx.visibledatarow.length - 1;
     }
-    var row_px = ctx.visibledatarow[row];
-    var _freezen_px = ctx.visibledatarow[freezen_rowindex];
-    if (row_px <= _freezen_px + left) {
-      ctx.scrollTop = 0;
-    }
   }
 }
 function getFrozenHandleTop(ctx) {
@@ -51987,7 +51976,7 @@ var Canvas = /*#__PURE__*/function () {
           continue;
         }
         if (((_this$sheetCtx$config = this.sheetCtx.config) === null || _this$sheetCtx$config === void 0 ? void 0 : (_this$sheetCtx$config2 = _this$sheetCtx$config.rowhidden) === null || _this$sheetCtx$config2 === void 0 ? void 0 : _this$sheetCtx$config2[r]) == null) {
-          renderCtx.fillStyle = "#F8F9FA";
+          renderCtx.fillStyle = this.sheetCtx.headerBgColor || "#fff";
           renderCtx.fillRect(0, start_r + offsetTop + firstOffset, this.sheetCtx.rowHeaderWidth - 1, end_r - start_r + 1 + lastOffset - firstOffset);
           renderCtx.fillStyle = "#000000";
           renderCtx.save();
@@ -52080,7 +52069,7 @@ var Canvas = /*#__PURE__*/function () {
           continue;
         }
         if (((_this$sheetCtx$config5 = this.sheetCtx.config) === null || _this$sheetCtx$config5 === void 0 ? void 0 : (_this$sheetCtx$config6 = _this$sheetCtx$config5.colhidden) === null || _this$sheetCtx$config6 === void 0 ? void 0 : _this$sheetCtx$config6[c]) == null) {
-          renderCtx.fillStyle = "#F8F9FA";
+          renderCtx.fillStyle = this.sheetCtx.headerBgColor || "#fff";
           renderCtx.fillRect(start_c + offsetLeft - 1, 0, end_c - start_c, this.sheetCtx.columnHeaderHeight - 1);
           renderCtx.fillStyle = "#000000";
           renderCtx.save();
@@ -56059,6 +56048,7 @@ var index = /*#__PURE__*/Object.freeze({
 });
 
 var defaultSettings = {
+  headerBgColor: "#fff",
   toolbarRightRender: undefined,
   onClickContentEditable: undefined,
   renderCustomColor: undefined,
@@ -56469,7 +56459,7 @@ function fixPositionOnFrozenCells(freeze, x, y, mouseX, mouseY) {
   };
 }
 function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxInput, canvas) {
-  var _globalCache$freezen, _ctx$hooks$beforeCell, _ctx$hooks, _flowdata$row_index;
+  var _globalCache$freezen, _ctx$hooks$beforeCell, _ctx$hooks, _flowdata$row_index, _flowdata$row_index2, _flowdata$row_index2$;
   ctx.contextMenu = {};
   ctx.filterContextMenu = undefined;
   var flowdata = getFlowdata(ctx);
@@ -56639,7 +56629,6 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
           }
           cellInput.innerHTML = vText;
           cancelFunctionrangeSelected(ctx);
-          createRangeHightlight(ctx, vText);
         }
         ctx.formulaCache.rangestart = false;
         ctx.formulaCache.rangedrag_column_start = false;
@@ -56685,9 +56674,6 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
       ctx.formulaCache.rangedrag_column_start = false;
       ctx.formulaCache.rangedrag_row_start = false;
       ctx.formulaCache.selectingRangeIndex = ctx.formulaCache.rangechangeindex;
-      if (ctx.formulaCache.rangechangeindex > ctx.formulaRangeHighlight.length) {
-        createRangeHightlight(ctx, cellInput.innerHTML, ctx.formulaCache.rangechangeindex);
-      }
       createFormulaRangeSelect(ctx, {
         rangeIndex: ctx.formulaCache.rangechangeindex || 0,
         left: left,
@@ -56805,10 +56791,12 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
     }
   }
   ctx.luckysheet_select_save = normalizeSelection(ctx, ctx.luckysheet_select_save);
+  var f = ((_flowdata$row_index2 = flowdata[row_index]) === null || _flowdata$row_index2 === void 0 ? void 0 : (_flowdata$row_index2$ = _flowdata$row_index2[col_index]) === null || _flowdata$row_index2$ === void 0 ? void 0 : _flowdata$row_index2$.f) || "";
+  createRangeHightlight(ctx, functionHTMLGenerate(f));
   if (ctx.hooks.afterCellMouseDown) {
     setTimeout(function () {
-      var _ctx$hooks$afterCellM, _ctx$hooks2, _flowdata$row_index2;
-      (_ctx$hooks$afterCellM = (_ctx$hooks2 = ctx.hooks).afterCellMouseDown) === null || _ctx$hooks$afterCellM === void 0 ? void 0 : _ctx$hooks$afterCellM.call(_ctx$hooks2, (_flowdata$row_index2 = flowdata[row_index]) === null || _flowdata$row_index2 === void 0 ? void 0 : _flowdata$row_index2[col_index], {
+      var _ctx$hooks$afterCellM, _ctx$hooks2, _flowdata$row_index3;
+      (_ctx$hooks$afterCellM = (_ctx$hooks2 = ctx.hooks).afterCellMouseDown) === null || _ctx$hooks$afterCellM === void 0 ? void 0 : _ctx$hooks$afterCellM.call(_ctx$hooks2, (_flowdata$row_index3 = flowdata[row_index]) === null || _flowdata$row_index3 === void 0 ? void 0 : _flowdata$row_index3[col_index], {
         row: row_index,
         column: col_index,
         startRow: row_pre,
@@ -56820,7 +56808,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
   }
 }
 function handleCellDrop(ctx, globalCache, e, container) {
-  var _globalCache$freezen2, _flowdata$row_index3;
+  var _globalCache$freezen2, _flowdata$row_index4;
   var afterCellDrop = ctx.hooks.afterCellDrop;
   if (!afterCellDrop) {
     return;
@@ -56847,7 +56835,7 @@ function handleCellDrop(ctx, globalCache, e, container) {
   var col_location = colLocation(x, ctx.visibledatacolumn);
   var col_pre = col_location[0];
   var col_index = col_location[2];
-  var currentCellValue = JSON.parse(JSON.stringify((_flowdata$row_index3 = flowdata[row_index]) === null || _flowdata$row_index3 === void 0 ? void 0 : _flowdata$row_index3[col_index]));
+  var currentCellValue = JSON.parse(JSON.stringify((_flowdata$row_index4 = flowdata[row_index]) === null || _flowdata$row_index4 === void 0 ? void 0 : _flowdata$row_index4[col_index]));
   var box = document.querySelector(".leankylin-cell-area");
   if (box) {
     var _currentCellValue$cu;
@@ -56883,7 +56871,7 @@ function handleCellDrop(ctx, globalCache, e, container) {
   });
 }
 function handleCellAreaDragOver(ctx, globalCache, e, container) {
-  var _globalCache$freezen3, _flowdata$row_index4;
+  var _globalCache$freezen3, _flowdata$row_index5;
   var canDrop = ctx.hooks.afterCellDrop;
   if (!canDrop) {
     return;
@@ -56912,7 +56900,7 @@ function handleCellAreaDragOver(ctx, globalCache, e, container) {
   var col_pre = col_location[0];
   var col_end = col_location[1];
   var col_index = col_location[2];
-  var currentCellValue = JSON.parse(JSON.stringify((_flowdata$row_index4 = flowdata[row_index]) === null || _flowdata$row_index4 === void 0 ? void 0 : _flowdata$row_index4[col_index]));
+  var currentCellValue = JSON.parse(JSON.stringify((_flowdata$row_index5 = flowdata[row_index]) === null || _flowdata$row_index5 === void 0 ? void 0 : _flowdata$row_index5[col_index]));
   var box = document.querySelector(".leankylin-cell-area");
   if (box) {
     var _currentCellValue$cu2;
@@ -56943,7 +56931,7 @@ function handleCellAreaDragOver(ctx, globalCache, e, container) {
   };
 }
 function handleCellAreaMouseMove(ctx, globalCache, e, container) {
-  var _globalCache$freezen4, _flowdata$row_index5;
+  var _globalCache$freezen4, _flowdata$row_index6;
   var afterCellMouseMove = ctx.hooks.afterCellMouseMove;
   if (!afterCellMouseMove) {
     return;
@@ -56968,7 +56956,7 @@ function handleCellAreaMouseMove(ctx, globalCache, e, container) {
   var col_location = colLocation(x, ctx.visibledatacolumn);
   var col_pre = col_location[0];
   var col_index = col_location[2];
-  var currentCellValue = JSON.parse(JSON.stringify((_flowdata$row_index5 = flowdata[row_index]) === null || _flowdata$row_index5 === void 0 ? void 0 : _flowdata$row_index5[col_index]));
+  var currentCellValue = JSON.parse(JSON.stringify((_flowdata$row_index6 = flowdata[row_index]) === null || _flowdata$row_index6 === void 0 ? void 0 : _flowdata$row_index6[col_index]));
   var box = document.querySelector(".leankylin-cell-area");
   if (box) {
     var _currentCellValue$cu3;

package/dist/settings.d.ts

@@ -79,6 +79,7 @@ export type Hooks = {
     afterUpdateSheetName?: (id: string, oldName: string, newName: string) => void;
 };
 export type Settings = {
+    headerBgColor?: string;
     toolbarRightRender?: any;
     onClickContentEditable?: any;
     renderCustomColor?: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "4.0.8",
+  "version": "4.0.10",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
@@ -13,7 +13,7 @@
     "build": "father-build"
   },
   "dependencies": {
-    "@leankylin-sheet/formula-parser": "4.0.8",
+    "@leankylin-sheet/formula-parser": "4.0.10",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",