@leankylin-sheet/core 5.2.19 → 5.2.21

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import _, { isPlainObject, uniqBy, pick } from 'lodash';
+import _, { omit, isPlainObject, uniqBy, pick } from 'lodash';
 import numeral from 'numeral';
 import dayjs from 'dayjs';
 import { Parser, ERROR_REF } from '@leankylin-sheet/formula-parser';
@@ -42404,7 +42404,8 @@ function copy(ctx) {
     cpString += "<tr>";
     var _loop4 = function _loop4() {
       var _flowdata$r, _ref2, _data$m, _ref3, _data$v, _data$mc$rs, _data$mc, _data$mc$cs, _data$mc2;
-      var data = flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r = flowdata[r]) === null || _flowdata$r === void 0 ? void 0 : _flowdata$r[c];
+      var cellValue = flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r = flowdata[r]) === null || _flowdata$r === void 0 ? void 0 : _flowdata$r[c];
+      var data = omit(cellValue, ["tip"]);
       var value = (_ref2 = (_data$m = data === null || data === void 0 ? void 0 : data.m) !== null && _data$m !== void 0 ? _data$m : data === null || data === void 0 ? void 0 : data.v) !== null && _ref2 !== void 0 ? _ref2 : "";
       var realValue = (_ref3 = (_data$v = data === null || data === void 0 ? void 0 : data.v) !== null && _data$v !== void 0 ? _data$v : data === null || data === void 0 ? void 0 : data.m) !== null && _ref3 !== void 0 ? _ref3 : "";
       var f = (data === null || data === void 0 ? void 0 : data.f) || "";
@@ -46605,10 +46606,11 @@ function calculateSheetFromula(ctx, id, isrefresh) {
 function updateFunctionGroup(ctx) {
   var luckysheetfile = ctx.luckysheetfile;
   for (var index = 0; index < luckysheetfile.length; index++) {
+    var _ctx$luckysheetfile$i, _ctx$luckysheetfile$i2, _ctx$luckysheetfile$i3;
     var file = luckysheetfile[index];
     var calcChain = [];
-    if (!ctx.luckysheetfile[index].data) return;
-    for (var r = 0; r < ctx.luckysheetfile[index].data.length; r += 1) {
+    var rows = (_ctx$luckysheetfile$i = (_ctx$luckysheetfile$i2 = ctx.luckysheetfile[index]) === null || _ctx$luckysheetfile$i2 === void 0 ? void 0 : (_ctx$luckysheetfile$i3 = _ctx$luckysheetfile$i2.data) === null || _ctx$luckysheetfile$i3 === void 0 ? void 0 : _ctx$luckysheetfile$i3.length) !== null && _ctx$luckysheetfile$i !== void 0 ? _ctx$luckysheetfile$i : 0;
+    for (var r = 0; r < rows; r += 1) {
       for (var c = 0; c < ctx.luckysheetfile[index].data[r].length; c += 1) {
         var cell = ctx.luckysheetfile[index].data[r][c];
         if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
@@ -46617,7 +46619,8 @@ function updateFunctionGroup(ctx) {
         var cc = {
           r: r,
           c: c,
-          id: file.id
+          id: file.id,
+          f: cell === null || cell === void 0 ? void 0 : cell.f
         };
         calcChain.push(cc);
       }
@@ -51235,6 +51238,10 @@ function getCopyData(d, r1, r2, c1, c2, direction) {
     b1 = c1;
     b2 = c2;
   }
+  var getCellData = function getCellData(r, c) {
+    var _d$r;
+    return omit(d === null || d === void 0 ? void 0 : (_d$r = d[r]) === null || _d$r === void 0 ? void 0 : _d$r[c], ["tip"]);
+  };
   for (var a = a1; a <= a2; a += 1) {
     var obj = {};
     var arrData = [];
@@ -51247,9 +51254,9 @@ function getCopyData(d, r1, r2, c1, c2, direction) {
       var _data11;
       var data = void 0;
       if (direction === "down" || direction === "up") {
-        data = d[b][a];
+        data = getCellData(b, a);
       } else if (direction === "right" || direction === "left") {
-        data = d[a][b];
+        data = getCellData(a, b);
       }
       var str = void 0;
       if (((_data11 = data) === null || _data11 === void 0 ? void 0 : _data11.v) != null && data.f == null) {
@@ -56441,6 +56448,7 @@ var defaultSettings = {
   copyRich: false,
   renderCalcInfo: undefined,
   renderCellOptions: undefined,
+  renderCellTip: undefined,
   renderFreezeCol: undefined,
   renderFreezeRow: undefined,
   renderFilter: undefined,

package/dist/index.js

@@ -42414,7 +42414,8 @@ function copy(ctx) {
     cpString += "<tr>";
     var _loop4 = function _loop4() {
       var _flowdata$r, _ref2, _data$m, _ref3, _data$v, _data$mc$rs, _data$mc, _data$mc$cs, _data$mc2;
-      var data = flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r = flowdata[r]) === null || _flowdata$r === void 0 ? void 0 : _flowdata$r[c];
+      var cellValue = flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r = flowdata[r]) === null || _flowdata$r === void 0 ? void 0 : _flowdata$r[c];
+      var data = _.omit(cellValue, ["tip"]);
       var value = (_ref2 = (_data$m = data === null || data === void 0 ? void 0 : data.m) !== null && _data$m !== void 0 ? _data$m : data === null || data === void 0 ? void 0 : data.v) !== null && _ref2 !== void 0 ? _ref2 : "";
       var realValue = (_ref3 = (_data$v = data === null || data === void 0 ? void 0 : data.v) !== null && _data$v !== void 0 ? _data$v : data === null || data === void 0 ? void 0 : data.m) !== null && _ref3 !== void 0 ? _ref3 : "";
       var f = (data === null || data === void 0 ? void 0 : data.f) || "";
@@ -46615,10 +46616,11 @@ function calculateSheetFromula(ctx, id, isrefresh) {
 function updateFunctionGroup(ctx) {
   var luckysheetfile = ctx.luckysheetfile;
   for (var index = 0; index < luckysheetfile.length; index++) {
+    var _ctx$luckysheetfile$i, _ctx$luckysheetfile$i2, _ctx$luckysheetfile$i3;
     var file = luckysheetfile[index];
     var calcChain = [];
-    if (!ctx.luckysheetfile[index].data) return;
-    for (var r = 0; r < ctx.luckysheetfile[index].data.length; r += 1) {
+    var rows = (_ctx$luckysheetfile$i = (_ctx$luckysheetfile$i2 = ctx.luckysheetfile[index]) === null || _ctx$luckysheetfile$i2 === void 0 ? void 0 : (_ctx$luckysheetfile$i3 = _ctx$luckysheetfile$i2.data) === null || _ctx$luckysheetfile$i3 === void 0 ? void 0 : _ctx$luckysheetfile$i3.length) !== null && _ctx$luckysheetfile$i !== void 0 ? _ctx$luckysheetfile$i : 0;
+    for (var r = 0; r < rows; r += 1) {
       for (var c = 0; c < ctx.luckysheetfile[index].data[r].length; c += 1) {
         var cell = ctx.luckysheetfile[index].data[r][c];
         if (!(cell === null || cell === void 0 ? void 0 : cell.f)) {
@@ -46627,7 +46629,8 @@ function updateFunctionGroup(ctx) {
         var cc = {
           r: r,
           c: c,
-          id: file.id
+          id: file.id,
+          f: cell === null || cell === void 0 ? void 0 : cell.f
         };
         calcChain.push(cc);
       }
@@ -51245,6 +51248,10 @@ function getCopyData(d, r1, r2, c1, c2, direction) {
     b1 = c1;
     b2 = c2;
   }
+  var getCellData = function getCellData(r, c) {
+    var _d$r;
+    return _.omit(d === null || d === void 0 ? void 0 : (_d$r = d[r]) === null || _d$r === void 0 ? void 0 : _d$r[c], ["tip"]);
+  };
   for (var a = a1; a <= a2; a += 1) {
     var obj = {};
     var arrData = [];
@@ -51257,9 +51264,9 @@ function getCopyData(d, r1, r2, c1, c2, direction) {
       var _data11;
       var data = void 0;
       if (direction === "down" || direction === "up") {
-        data = d[b][a];
+        data = getCellData(b, a);
       } else if (direction === "right" || direction === "left") {
-        data = d[a][b];
+        data = getCellData(a, b);
       }
       var str = void 0;
       if (((_data11 = data) === null || _data11 === void 0 ? void 0 : _data11.v) != null && data.f == null) {
@@ -56451,6 +56458,7 @@ var defaultSettings = {
   copyRich: false,
   renderCalcInfo: undefined,
   renderCellOptions: undefined,
+  renderCellTip: undefined,
   renderFreezeCol: undefined,
   renderFreezeRow: undefined,
   renderFilter: undefined,

package/dist/settings.d.ts

@@ -98,6 +98,7 @@ export type Settings = {
     renderEditorSelector?: any;
     copyRich?: boolean;
     renderCellOptions?: any;
+    renderCellTip?: any;
     renderCalcInfo?: any;
     renderFreezeCol?: any;
     renderFreezeRow?: any;

package/dist/types.d.ts

@@ -53,6 +53,7 @@ export type Cell = {
         value: string;
         isShow: boolean;
     };
+    tip?: any;
     hl?: {
         r: number;
         c: number;

package/package.json

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