@leankylin-sheet/core 4.0.57 → 4.0.59

package/README.md

@@ -1,19 +1,19 @@
-# @leankylin-sheet/core
-
-LeankylinSheet is a drop-in javascript spreadsheet library that provides rich features like Excel and Google Sheets
-
-See our repo [leankylin-sheet](http://114.55.85.79:19999/leankylin-front/leankylin-sheet) for more information.
-
-## Install
-
-Using npm:
-
-```bash
-$ npm install --save  @leankylin-sheet/core
-```
-
-or using yarn:
-
-```bash
-$ yarn add @leankylin-sheet/core
-```
+# @leankylin-sheet/core
+
+LeankylinSheet is a drop-in javascript spreadsheet library that provides rich features like Excel and Google Sheets
+
+See our repo [leankylin-sheet](http://114.55.85.79:19999/leankylin-front/leankylin-sheet) for more information.
+
+## Install
+
+Using npm:
+
+```bash
+$ npm install --save  @leankylin-sheet/core
+```
+
+or using yarn:
+
+```bash
+$ yarn add @leankylin-sheet/core
+```

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import _, { isPlainObject, pick } from 'lodash';
+import _, { isPlainObject, uniqBy, pick } from 'lodash';
 import numeral from 'numeral';
 import dayjs from 'dayjs';
 import { Parser, ERROR_REF } from '@leankylin-sheet/formula-parser';
@@ -33798,13 +33798,13 @@ var make_ssf = function make_ssf(SSF) {
     return general_fmt_num_base;
   }();
   SSF._general_num = general_fmt_num;
-  /*
-        "General" rules:
-        - text is passed through ("@")
-        - booleans are rendered as TRUE/FALSE
-        - "up to 11 characters" displayed for numbers
-        - Default date format (code 14) used for Dates
-        TODO: technically the display depends on the width of the cell
+  /*
+        "General" rules:
+        - text is passed through ("@")
+        - booleans are rendered as TRUE/FALSE
+        - "up to 11 characters" displayed for numbers
+        - Default date format (code 14) used for Dates
+        TODO: technically the display depends on the width of the cell
     */
   function general_fmt(v, opts) {
     switch (_typeof(v)) {
@@ -46540,6 +46540,12 @@ function copySheet(ctx, sheetId, hooks) {
 }
 function calculateSheetFromula(ctx, id) {
   var index$1 = getSheetIndex(ctx, id);
+  var luckysheetfile = ctx.luckysheetfile;
+  var file = luckysheetfile[index$1];
+  var calcChain = file.calcChain;
+  if (_.isNil(calcChain)) {
+    calcChain = [];
+  }
   if (!ctx.luckysheetfile[index$1].data) return;
   for (var r = 0; r < ctx.luckysheetfile[index$1].data.length; r += 1) {
     for (var c = 0; c < ctx.luckysheetfile[index$1].data[r].length; c += 1) {
@@ -46547,13 +46553,25 @@ function calculateSheetFromula(ctx, id) {
       if (!((_ctx$luckysheetfile$i = ctx.luckysheetfile[index$1].data[r][c]) === null || _ctx$luckysheetfile$i === void 0 ? void 0 : _ctx$luckysheetfile$i.f)) {
         continue;
       }
-      var result = execfunction(ctx, (_ctx$luckysheetfile$i2 = ctx.luckysheetfile[index$1].data[r][c]) === null || _ctx$luckysheetfile$i2 === void 0 ? void 0 : _ctx$luckysheetfile$i2.f, r, c, id);
+      var result = execfunction(ctx, (_ctx$luckysheetfile$i2 = ctx.luckysheetfile[index$1].data[r][c]) === null || _ctx$luckysheetfile$i2 === void 0 ? void 0 : _ctx$luckysheetfile$i2.f, r, c, id, undefined, true);
       setCellValue$1(ctx, r, c, result[1], null, {
         id: id
       });
-      insertUpdateFunctionGroup(ctx, r, c, id);
+      if (_.isNil(id)) {
+        id = ctx.currentSheetId;
+      }
+      var cc = {
+        r: r,
+        c: c,
+        id: id
+      };
+      calcChain.push(cc);
     }
   }
+  file.calcChain = uniqBy(calcChain, function (item) {
+    return item.r + item.c + item.id;
+  });
+  ctx.luckysheetfile = luckysheetfile;
 }
 
 function storeSheetParam(ctx) {
@@ -56222,6 +56240,7 @@ var index = /*#__PURE__*/Object.freeze({
 });
 
 var defaultSettings = {
+  renderSubToolbar: undefined,
   headerBgColor: "#fff",
   toolbarRightRender: undefined,
   onClickContentEditable: undefined,

package/dist/index.js

@@ -33808,13 +33808,13 @@ var make_ssf = function make_ssf(SSF) {
     return general_fmt_num_base;
   }();
   SSF._general_num = general_fmt_num;
-  /*
-        "General" rules:
-        - text is passed through ("@")
-        - booleans are rendered as TRUE/FALSE
-        - "up to 11 characters" displayed for numbers
-        - Default date format (code 14) used for Dates
-        TODO: technically the display depends on the width of the cell
+  /*
+        "General" rules:
+        - text is passed through ("@")
+        - booleans are rendered as TRUE/FALSE
+        - "up to 11 characters" displayed for numbers
+        - Default date format (code 14) used for Dates
+        TODO: technically the display depends on the width of the cell
     */
   function general_fmt(v, opts) {
     switch (_typeof(v)) {
@@ -46550,6 +46550,12 @@ function copySheet(ctx, sheetId, hooks) {
 }
 function calculateSheetFromula(ctx, id) {
   var index$1 = getSheetIndex(ctx, id);
+  var luckysheetfile = ctx.luckysheetfile;
+  var file = luckysheetfile[index$1];
+  var calcChain = file.calcChain;
+  if (___default['default'].isNil(calcChain)) {
+    calcChain = [];
+  }
   if (!ctx.luckysheetfile[index$1].data) return;
   for (var r = 0; r < ctx.luckysheetfile[index$1].data.length; r += 1) {
     for (var c = 0; c < ctx.luckysheetfile[index$1].data[r].length; c += 1) {
@@ -46557,13 +46563,25 @@ function calculateSheetFromula(ctx, id) {
       if (!((_ctx$luckysheetfile$i = ctx.luckysheetfile[index$1].data[r][c]) === null || _ctx$luckysheetfile$i === void 0 ? void 0 : _ctx$luckysheetfile$i.f)) {
         continue;
       }
-      var result = execfunction(ctx, (_ctx$luckysheetfile$i2 = ctx.luckysheetfile[index$1].data[r][c]) === null || _ctx$luckysheetfile$i2 === void 0 ? void 0 : _ctx$luckysheetfile$i2.f, r, c, id);
+      var result = execfunction(ctx, (_ctx$luckysheetfile$i2 = ctx.luckysheetfile[index$1].data[r][c]) === null || _ctx$luckysheetfile$i2 === void 0 ? void 0 : _ctx$luckysheetfile$i2.f, r, c, id, undefined, true);
       setCellValue$1(ctx, r, c, result[1], null, {
         id: id
       });
-      insertUpdateFunctionGroup(ctx, r, c, id);
+      if (___default['default'].isNil(id)) {
+        id = ctx.currentSheetId;
+      }
+      var cc = {
+        r: r,
+        c: c,
+        id: id
+      };
+      calcChain.push(cc);
     }
   }
+  file.calcChain = _.uniqBy(calcChain, function (item) {
+    return item.r + item.c + item.id;
+  });
+  ctx.luckysheetfile = luckysheetfile;
 }
 
 function storeSheetParam(ctx) {
@@ -56232,6 +56250,7 @@ var index = /*#__PURE__*/Object.freeze({
 });
 
 var defaultSettings = {
+  renderSubToolbar: undefined,
   headerBgColor: "#fff",
   toolbarRightRender: undefined,
   onClickContentEditable: undefined,

package/dist/settings.d.ts

@@ -89,6 +89,7 @@ export type Hooks = {
 export type Settings = {
     headerBgColor?: string;
     toolbarRightRender?: any;
+    renderSubToolbar?: any;
     onClickContentEditable?: any;
     renderCustomColor?: any;
     renderFormulaHint?: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "4.0.57",
+  "version": "4.0.59",
   "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.57",
+    "@leankylin-sheet/formula-parser": "4.0.59",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",