@leankylin-sheet/core 5.2.20 → 5.2.22

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';
@@ -31637,7 +31637,7 @@ function locale(ctx) {
 }
 
 function moveToEnd(obj) {
-  if (document.createRange) {
+  if (document.createRange && obj) {
     if (obj.innerHTML !== obj.innerText || obj.innerHTML === "") {
       obj.focus();
       var range = window.getSelection();
@@ -36595,8 +36595,9 @@ function setCaretPosition(ctx, textDom, children, pos) {
     sel === null || sel === void 0 ? void 0 : sel.addRange(range);
     el.focus();
   } catch (err) {
+    var _ctx$formulaCache, _ctx$formulaCache$ran;
     console.error(err);
-    moveToEnd(ctx.formulaCache.rangeResizeTo[0]);
+    moveToEnd((_ctx$formulaCache = ctx.formulaCache) === null || _ctx$formulaCache === void 0 ? void 0 : (_ctx$formulaCache$ran = _ctx$formulaCache.rangeResizeTo) === null || _ctx$formulaCache$ran === void 0 ? void 0 : _ctx$formulaCache$ran[0]);
   }
 }
 function functionRange(ctx, obj, v, vp) {
@@ -37310,6 +37311,10 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
     $editor = fxInput;
     $copyTo = cellInput;
   }
+  if (ctx.active_f) {
+    $editor = fxInput;
+    $copyTo = cellInput;
+  }
   var range = "";
   var rf = selected.row[0];
   var cf = selected.column[0];
@@ -37326,6 +37331,7 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
     var span = $editor.querySelector("span[rangeindex='".concat(ctx.formulaCache.rangechangeindex, "']"));
     if (span) {
       span.innerHTML = range;
+      console.log(333312);
       setCaretPosition(ctx, span, 0, range.length);
     }
   } else if (ctx.active_f) {
@@ -37339,7 +37345,7 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
     }
     ctx.formulaCache.rangechangeindex = functionHTMLIndex;
     var _span = $editor.querySelector("span[rangeindex='".concat(ctx.formulaCache.rangechangeindex, "']"));
-    setCaretPosition(ctx, _span, 0, range.length);
+    setCaretPosition(ctx, _span || $editor, 0, range.length);
     functionHTMLIndex += 1;
   } else {
     var _function_str = "<span class=\"leankylin-formula-functionrange-cell\" rangeindex=\"".concat(functionHTMLIndex, "\" dir=\"auto\" style=\"color:").concat(getHLColor(functionHTMLIndex), ";\">").concat(range, "</span>");
@@ -42404,7 +42410,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) || "";
@@ -51237,6 +51244,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 = [];
@@ -51249,9 +51260,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) {

package/dist/index.js

@@ -31647,7 +31647,7 @@ function locale(ctx) {
 }
 
 function moveToEnd(obj) {
-  if (document.createRange) {
+  if (document.createRange && obj) {
     if (obj.innerHTML !== obj.innerText || obj.innerHTML === "") {
       obj.focus();
       var range = window.getSelection();
@@ -36605,8 +36605,9 @@ function setCaretPosition(ctx, textDom, children, pos) {
     sel === null || sel === void 0 ? void 0 : sel.addRange(range);
     el.focus();
   } catch (err) {
+    var _ctx$formulaCache, _ctx$formulaCache$ran;
     console.error(err);
-    moveToEnd(ctx.formulaCache.rangeResizeTo[0]);
+    moveToEnd((_ctx$formulaCache = ctx.formulaCache) === null || _ctx$formulaCache === void 0 ? void 0 : (_ctx$formulaCache$ran = _ctx$formulaCache.rangeResizeTo) === null || _ctx$formulaCache$ran === void 0 ? void 0 : _ctx$formulaCache$ran[0]);
   }
 }
 function functionRange(ctx, obj, v, vp) {
@@ -37320,6 +37321,10 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
     $editor = fxInput;
     $copyTo = cellInput;
   }
+  if (ctx.active_f) {
+    $editor = fxInput;
+    $copyTo = cellInput;
+  }
   var range = "";
   var rf = selected.row[0];
   var cf = selected.column[0];
@@ -37336,6 +37341,7 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
     var span = $editor.querySelector("span[rangeindex='".concat(ctx.formulaCache.rangechangeindex, "']"));
     if (span) {
       span.innerHTML = range;
+      console.log(333312);
       setCaretPosition(ctx, span, 0, range.length);
     }
   } else if (ctx.active_f) {
@@ -37349,7 +37355,7 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
     }
     ctx.formulaCache.rangechangeindex = functionHTMLIndex;
     var _span = $editor.querySelector("span[rangeindex='".concat(ctx.formulaCache.rangechangeindex, "']"));
-    setCaretPosition(ctx, _span, 0, range.length);
+    setCaretPosition(ctx, _span || $editor, 0, range.length);
     functionHTMLIndex += 1;
   } else {
     var _function_str = "<span class=\"leankylin-formula-functionrange-cell\" rangeindex=\"".concat(functionHTMLIndex, "\" dir=\"auto\" style=\"color:").concat(getHLColor(functionHTMLIndex), ";\">").concat(range, "</span>");
@@ -42414,7 +42420,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) || "";
@@ -51247,6 +51254,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 = [];
@@ -51259,9 +51270,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) {

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.20",
+  "version": "5.2.22",
   "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.20",
+    "@leankylin-sheet/formula-parser": "5.2.22",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",