@leankylin-sheet/core 1.2.6 → 1.2.9

package/dist/index.esm.js

@@ -44595,6 +44595,9 @@ var make_ssf = function make_ssf(SSF) {
     return [l, ff];
   }
   function format(fmt, v, o) {
+    if (fmt === 'leanky_n') {
+      return numberThousands(v);
+    }
     if (o == null) o = {};
     var sfmt = "";
     switch (_typeof(fmt)) {
@@ -44764,6 +44767,24 @@ var make_ssf = function make_ssf(SSF) {
   SSF.format = format;
 };
 make_ssf(SSF);
+var intThousands = function intThousands(number) {
+  var groupSeparator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ',';
+  return String(number).replace(/\B(?=(\d{3})+(?!\d))/g, groupSeparator);
+};
+var numberThousands = function numberThousands(number) {
+  var groupSeparator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ',';
+  if (number === 0) return '0';
+  if (!number) return number;
+  if (String(number).includes('.')) {
+    var _String$split = String(number).split('.'),
+      _String$split2 = _slicedToArray(_String$split, 2),
+      init = _String$split2[0],
+      decimal = _String$split2[1];
+    return intThousands(init, groupSeparator) + '.' + decimal;
+  } else {
+    return intThousands(number, groupSeparator);
+  }
+};
 
 var base1904 = new Date(1900, 2, 1, 0, 0, 0);
 function datenum_local(v, date1904) {
@@ -52200,10 +52221,10 @@ function calcSelectionInfo(ctx, lang) {
     var data = getDataBySelectionNoCopy(ctx, selection[s]);
     for (var r = 0; r < data.length; r += 1) {
       for (var c = 0; c < data[0].length; c += 1) {
-        var _data$r$c, _data$r$c$ct, _data$r$c2;
+        var _data$r$c, _data$r$c$ct, _data$r$c$v, _data$r$c2, _data$r$c3;
         if (r >= data.length || c >= data[0].length) break;
         var ct = (_data$r$c = data[r][c]) === null || _data$r$c === void 0 ? void 0 : (_data$r$c$ct = _data$r$c.ct) === null || _data$r$c$ct === void 0 ? void 0 : _data$r$c$ct.t;
-        var value = (_data$r$c2 = data[r][c]) === null || _data$r$c2 === void 0 ? void 0 : _data$r$c2.m;
+        var value = ((_data$r$c$v = (_data$r$c2 = data[r][c]) === null || _data$r$c2 === void 0 ? void 0 : _data$r$c2.v) !== null && _data$r$c$v !== void 0 ? _data$r$c$v : (_data$r$c3 = data[r][c]) === null || _data$r$c3 === void 0 ? void 0 : _data$r$c3.m) || "0";
         if (ct === "n" || ct === "g" && parseFloat(value).toString() !== "NaN") {
           var valueNumber = parseFloat(value);
           count += 1;
@@ -65645,7 +65666,12 @@ var defaultSettings = {
   defaultRowHeight: 19,
   defaultFontSize: 10,
   toolbarItems: ["undo", "redo", "format-painter", "clear-format", "|", "currency-format", "percentage-format", "number-decrease", "number-increase", "format", "|", "font", "|", "font-size", "|", "bold", "italic", "strike-through", "underline", "|", "font-color", "background", "border", "merge-cell", "|", "horizontal-align", "vertical-align", "text-wrap", "text-rotation", "|", "freeze", "conditionFormat", "filter", "link", "image", "comment", "quick-formula", "dataVerification", "splitColumn", "locationCondition", "screenshot", "search"],
-  cellContextMenu: ["copy", "paste", "|", "insert-row", "insert-column", "delete-row", "delete-column", "delete-cell", "hide-row", "hide-column", "set-row-height", "set-column-width", "|", "clear", "sort", "orderAZ", "orderZA", "filter", "chart", "image", "link", "data", "cell-format"],
+  cellContextMenu: function cellContextMenu() {
+    return ["copy", "paste", "|", "insert-row", "insert-column", "delete-row", "delete-column", "delete-cell", "hide-row", "hide-column", "set-row-height", "set-column-width", "|", "clear", "sort", "orderAZ", "orderZA", "filter", "chart", "image", "link", "data", "cell-format"];
+  },
+  cellCustomContextMenu: function cellCustomContextMenu() {
+    return [];
+  },
   headerContextMenu: ["copy", "paste", "|", "insert-row", "insert-column", "delete-row", "delete-column", "delete-cell", "hide-row", "hide-column", "set-row-height", "set-column-width", "|", "clear", "sort", "orderAZ", "orderZA"],
   sheetTabContextMenu: ["delete", "copy", "rename", "color", "hide", "|", "move"],
   filterContextMenu: ["sort-by-asc", "sort-by-desc", "|", "filter-by-color", "|", "filter-by-value"],
@@ -66458,7 +66484,7 @@ function handleContextMenu(ctx, settings, e, workbookContainer, container, area)
   if (!flowdata) return;
   var workbookRect = workbookContainer.getBoundingClientRect();
   var cellContextMenu = settings.cellContextMenu;
-  if (_.isEmpty(cellContextMenu)) {
+  if (cellContextMenu && _.isEmpty(cellContextMenu())) {
     return;
   }
   var x = e.pageX - workbookRect.left;

package/dist/index.js

@@ -44605,6 +44605,9 @@ var make_ssf = function make_ssf(SSF) {
     return [l, ff];
   }
   function format(fmt, v, o) {
+    if (fmt === 'leanky_n') {
+      return numberThousands(v);
+    }
     if (o == null) o = {};
     var sfmt = "";
     switch (_typeof(fmt)) {
@@ -44774,6 +44777,24 @@ var make_ssf = function make_ssf(SSF) {
   SSF.format = format;
 };
 make_ssf(SSF);
+var intThousands = function intThousands(number) {
+  var groupSeparator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ',';
+  return String(number).replace(/\B(?=(\d{3})+(?!\d))/g, groupSeparator);
+};
+var numberThousands = function numberThousands(number) {
+  var groupSeparator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ',';
+  if (number === 0) return '0';
+  if (!number) return number;
+  if (String(number).includes('.')) {
+    var _String$split = String(number).split('.'),
+      _String$split2 = _slicedToArray(_String$split, 2),
+      init = _String$split2[0],
+      decimal = _String$split2[1];
+    return intThousands(init, groupSeparator) + '.' + decimal;
+  } else {
+    return intThousands(number, groupSeparator);
+  }
+};
 
 var base1904 = new Date(1900, 2, 1, 0, 0, 0);
 function datenum_local(v, date1904) {
@@ -52210,10 +52231,10 @@ function calcSelectionInfo(ctx, lang) {
     var data = getDataBySelectionNoCopy(ctx, selection[s]);
     for (var r = 0; r < data.length; r += 1) {
       for (var c = 0; c < data[0].length; c += 1) {
-        var _data$r$c, _data$r$c$ct, _data$r$c2;
+        var _data$r$c, _data$r$c$ct, _data$r$c$v, _data$r$c2, _data$r$c3;
         if (r >= data.length || c >= data[0].length) break;
         var ct = (_data$r$c = data[r][c]) === null || _data$r$c === void 0 ? void 0 : (_data$r$c$ct = _data$r$c.ct) === null || _data$r$c$ct === void 0 ? void 0 : _data$r$c$ct.t;
-        var value = (_data$r$c2 = data[r][c]) === null || _data$r$c2 === void 0 ? void 0 : _data$r$c2.m;
+        var value = ((_data$r$c$v = (_data$r$c2 = data[r][c]) === null || _data$r$c2 === void 0 ? void 0 : _data$r$c2.v) !== null && _data$r$c$v !== void 0 ? _data$r$c$v : (_data$r$c3 = data[r][c]) === null || _data$r$c3 === void 0 ? void 0 : _data$r$c3.m) || "0";
         if (ct === "n" || ct === "g" && parseFloat(value).toString() !== "NaN") {
           var valueNumber = parseFloat(value);
           count += 1;
@@ -65655,7 +65676,12 @@ var defaultSettings = {
   defaultRowHeight: 19,
   defaultFontSize: 10,
   toolbarItems: ["undo", "redo", "format-painter", "clear-format", "|", "currency-format", "percentage-format", "number-decrease", "number-increase", "format", "|", "font", "|", "font-size", "|", "bold", "italic", "strike-through", "underline", "|", "font-color", "background", "border", "merge-cell", "|", "horizontal-align", "vertical-align", "text-wrap", "text-rotation", "|", "freeze", "conditionFormat", "filter", "link", "image", "comment", "quick-formula", "dataVerification", "splitColumn", "locationCondition", "screenshot", "search"],
-  cellContextMenu: ["copy", "paste", "|", "insert-row", "insert-column", "delete-row", "delete-column", "delete-cell", "hide-row", "hide-column", "set-row-height", "set-column-width", "|", "clear", "sort", "orderAZ", "orderZA", "filter", "chart", "image", "link", "data", "cell-format"],
+  cellContextMenu: function cellContextMenu() {
+    return ["copy", "paste", "|", "insert-row", "insert-column", "delete-row", "delete-column", "delete-cell", "hide-row", "hide-column", "set-row-height", "set-column-width", "|", "clear", "sort", "orderAZ", "orderZA", "filter", "chart", "image", "link", "data", "cell-format"];
+  },
+  cellCustomContextMenu: function cellCustomContextMenu() {
+    return [];
+  },
   headerContextMenu: ["copy", "paste", "|", "insert-row", "insert-column", "delete-row", "delete-column", "delete-cell", "hide-row", "hide-column", "set-row-height", "set-column-width", "|", "clear", "sort", "orderAZ", "orderZA"],
   sheetTabContextMenu: ["delete", "copy", "rename", "color", "hide", "|", "move"],
   filterContextMenu: ["sort-by-asc", "sort-by-desc", "|", "filter-by-color", "|", "filter-by-value"],
@@ -66468,7 +66494,7 @@ function handleContextMenu(ctx, settings, e, workbookContainer, container, area)
   if (!flowdata) return;
   var workbookRect = workbookContainer.getBoundingClientRect();
   var cellContextMenu = settings.cellContextMenu;
-  if (___default['default'].isEmpty(cellContextMenu)) {
+  if (cellContextMenu && ___default['default'].isEmpty(cellContextMenu())) {
     return;
   }
   var x = e.pageX - workbookRect.left;

package/dist/settings.d.ts

@@ -82,8 +82,13 @@ export type Settings = {
     defaultRowHeight?: number;
     defaultFontSize?: number;
     toolbarItems?: string[];
-    cellContextMenu?: string[];
+    cellContextMenu?: () => string[];
     headerContextMenu?: string[];
+    cellCustomContextMenu: () => {
+        key: string;
+        element: any;
+        onClick: any;
+    }[];
     sheetTabContextMenu?: string[];
     filterContextMenu?: string[];
     generateSheetId?: () => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "1.2.6",
+  "version": "1.2.9",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
@@ -10,7 +10,7 @@
   "repository": "http://114.55.85.79:19999/leankylin-front/leankylin-sheet",
   "license": "MIT",
   "dependencies": {
-    "@leankylin-sheet/formula-parser": "^1.2.6",
+    "@leankylin-sheet/formula-parser": "^1.2.9",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",