@leankylin-sheet/core 3.1.37 → 3.1.38

package/dist/index.esm.js

@@ -36857,7 +36857,9 @@ function handleFormulaInput(ctx, $copyTo, $editor, kcode, preText) {
   var value1txt = preText !== null && preText !== void 0 ? preText : $editor.innerText;
   var value = $editor.innerText;
   value = escapeScriptTag(value);
-  if (value.length > 0 && value.substring(0, 1) === "=" && (kcode !== 229 || value.length === 1)) {
+  var hasF = value.length > 0 && value.substring(0, 1) === "=" && (kcode !== 229 || value.length === 1);
+  var lastHasF = _.startsWith(value1txt, "=") && !_.startsWith(value, "=");
+  if (hasF) {
     if (!refreshRangeSelect) rangeIndexes = getRangeIndexes($editor);
     value = functionHTMLGenerate(value);
     if (!refreshRangeSelect && functionHTMLIndex < rangeIndexes.length) refreshRangeSelect = true;
@@ -36882,19 +36884,10 @@ function handleFormulaInput(ctx, $copyTo, $editor, kcode, preText) {
     $editor.innerHTML = value;
     if ($copyTo) $copyTo.innerHTML = value;
     functionRange(ctx, $editor, value, value1);
-    if (refreshRangeSelect) {
-      cancelFunctionrangeSelected(ctx);
-      if (kcode !== 46) {
-        createRangeHightlight(ctx, value);
-      }
-      ctx.formulaCache.rangestart = false;
-      ctx.formulaCache.rangedrag_column_start = false;
-      ctx.formulaCache.rangedrag_row_start = false;
-      rangeHightlightselected(ctx, $editor);
-    }
-  } else if (_.startsWith(value1txt, "=") && !_.startsWith(value, "=")) {
+  } else if (lastHasF) {
     if ($copyTo) $copyTo.innerHTML = value;
     $editor.innerHTML = escapeHTMLTag(value);
+    ctx.formulaCache.functionRangeIndex = [0, 1];
   } else if (!_.startsWith(value1txt, "=")) {
     if (!$copyTo) return;
     if ($copyTo.id === "luckysheet-rich-text-editor") {
@@ -36905,6 +36898,18 @@ function handleFormulaInput(ctx, $copyTo, $editor, kcode, preText) {
       $copyTo.innerHTML = escapeHTMLTag(value);
     }
   }
+  if (hasF || lastHasF) {
+    if (refreshRangeSelect) {
+      cancelFunctionrangeSelected(ctx);
+      if (kcode !== 46) {
+        createRangeHightlight(ctx, value);
+      }
+      ctx.formulaCache.rangestart = false;
+      ctx.formulaCache.rangedrag_column_start = false;
+      ctx.formulaCache.rangedrag_row_start = false;
+      rangeHightlightselected(ctx, $editor);
+    }
+  }
 }
 function isfreezonFuc(txt) {
   var row = txt.replace(/[^0-9]/g, "");
@@ -56046,6 +56051,7 @@ var index = /*#__PURE__*/Object.freeze({
 var defaultSettings = {
   renderFormulaHint: undefined,
   renderFormulaSearch: undefined,
+  renderEditorSelector: undefined,
   copyRich: false,
   renderCalcInfo: undefined,
   renderFreezeCol: undefined,

package/dist/index.js

@@ -36867,7 +36867,9 @@ function handleFormulaInput(ctx, $copyTo, $editor, kcode, preText) {
   var value1txt = preText !== null && preText !== void 0 ? preText : $editor.innerText;
   var value = $editor.innerText;
   value = escapeScriptTag(value);
-  if (value.length > 0 && value.substring(0, 1) === "=" && (kcode !== 229 || value.length === 1)) {
+  var hasF = value.length > 0 && value.substring(0, 1) === "=" && (kcode !== 229 || value.length === 1);
+  var lastHasF = ___default['default'].startsWith(value1txt, "=") && !___default['default'].startsWith(value, "=");
+  if (hasF) {
     if (!refreshRangeSelect) rangeIndexes = getRangeIndexes($editor);
     value = functionHTMLGenerate(value);
     if (!refreshRangeSelect && functionHTMLIndex < rangeIndexes.length) refreshRangeSelect = true;
@@ -36892,19 +36894,10 @@ function handleFormulaInput(ctx, $copyTo, $editor, kcode, preText) {
     $editor.innerHTML = value;
     if ($copyTo) $copyTo.innerHTML = value;
     functionRange(ctx, $editor, value, value1);
-    if (refreshRangeSelect) {
-      cancelFunctionrangeSelected(ctx);
-      if (kcode !== 46) {
-        createRangeHightlight(ctx, value);
-      }
-      ctx.formulaCache.rangestart = false;
-      ctx.formulaCache.rangedrag_column_start = false;
-      ctx.formulaCache.rangedrag_row_start = false;
-      rangeHightlightselected(ctx, $editor);
-    }
-  } else if (___default['default'].startsWith(value1txt, "=") && !___default['default'].startsWith(value, "=")) {
+  } else if (lastHasF) {
     if ($copyTo) $copyTo.innerHTML = value;
     $editor.innerHTML = escapeHTMLTag(value);
+    ctx.formulaCache.functionRangeIndex = [0, 1];
   } else if (!___default['default'].startsWith(value1txt, "=")) {
     if (!$copyTo) return;
     if ($copyTo.id === "luckysheet-rich-text-editor") {
@@ -36915,6 +36908,18 @@ function handleFormulaInput(ctx, $copyTo, $editor, kcode, preText) {
       $copyTo.innerHTML = escapeHTMLTag(value);
     }
   }
+  if (hasF || lastHasF) {
+    if (refreshRangeSelect) {
+      cancelFunctionrangeSelected(ctx);
+      if (kcode !== 46) {
+        createRangeHightlight(ctx, value);
+      }
+      ctx.formulaCache.rangestart = false;
+      ctx.formulaCache.rangedrag_column_start = false;
+      ctx.formulaCache.rangedrag_row_start = false;
+      rangeHightlightselected(ctx, $editor);
+    }
+  }
 }
 function isfreezonFuc(txt) {
   var row = txt.replace(/[^0-9]/g, "");
@@ -56056,6 +56061,7 @@ var index = /*#__PURE__*/Object.freeze({
 var defaultSettings = {
   renderFormulaHint: undefined,
   renderFormulaSearch: undefined,
+  renderEditorSelector: undefined,
   copyRich: false,
   renderCalcInfo: undefined,
   renderFreezeCol: undefined,

package/dist/settings.d.ts

@@ -80,6 +80,7 @@ export type Hooks = {
 export type Settings = {
     renderFormulaHint?: any;
     renderFormulaSearch?: any;
+    renderEditorSelector?: any;
     copyRich?: boolean;
     renderCalcInfo?: any;
     renderFreezeCol?: any;

package/package.json

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