@leankylin-sheet/core 5.1.12 → 5.1.14

package/dist/index.esm.js

@@ -42405,13 +42405,14 @@ function copy(ctx) {
       var f = (data === null || data === void 0 ? void 0 : data.f) || "";
       var rowspan = (_data$mc$rs = data === null || data === void 0 ? void 0 : (_data$mc = data.mc) === null || _data$mc === void 0 ? void 0 : _data$mc.rs) !== null && _data$mc$rs !== void 0 ? _data$mc$rs : 1;
       var colspan = (_data$mc$cs = data === null || data === void 0 ? void 0 : (_data$mc2 = data.mc) === null || _data$mc2 === void 0 ? void 0 : _data$mc2.cs) !== null && _data$mc$cs !== void 0 ? _data$mc$cs : 1;
+      var allV = JSON.stringify(data);
       if (!(data === null || data === void 0 ? void 0 : data.mc) || (data === null || data === void 0 ? void 0 : data.mc) && (data === null || data === void 0 ? void 0 : data.mc.r) === r && data.mc.c === c) {
         var _Object$keys;
         var style = cellAttrToDomStyle(data, borderInfo["".concat(r, "_").concat(c)]);
         var styleStr = (_Object$keys = Object.keys(style)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.map(function (item) {
           return "".concat(item, ":").concat(style[item], ";");
         }).join("");
-        cpString += "<td x:num='".concat(realValue, "' f='").concat(f, "' style='").concat(styleStr, "' rowspan=").concat(rowspan, " colspan=").concat(colspan, ">").concat(value, "</td>");
+        cpString += "<td _v='".concat(allV, "' x:num='").concat(realValue, "' f='").concat(f, "' style='").concat(styleStr, "' rowspan=").concat(rowspan, " colspan=").concat(colspan, ">").concat(value, "</td>");
       }
     };
     for (var c = columns[0]; c <= columns[1]; c += 1) {
@@ -42474,7 +42475,41 @@ function copy2(ctx) {
     clipboard.writeHtml(cpdata);
   }
 }
-function deleteSelectedCellText(ctx) {
+function deepClear(ctx) {
+  var allowEdit = isAllowEdit(ctx);
+  if (allowEdit === false) {
+    return "allowEdit";
+  }
+  var selection = ctx.luckysheet_select_save;
+  if (selection && !_.isEmpty(selection)) {
+    var d = getFlowdata(ctx);
+    var hyperlinkMap = ctx.luckysheetfile[getSheetIndex(ctx, ctx.currentSheetId)].hyperlink;
+    for (var s = 0; s < selection.length; s += 1) {
+      var r1 = selection[s].row[0];
+      var r2 = selection[s].row[1];
+      var c1 = selection[s].column[0];
+      var c2 = selection[s].column[1];
+      for (var r = r1; r <= r2; r += 1) {
+        for (var c = c1; c <= c2; c += 1) {
+          var _d$r2;
+          var cell = d === null || d === void 0 ? void 0 : (_d$r2 = d[r]) === null || _d$r2 === void 0 ? void 0 : _d$r2[c];
+          d[r][c] = null;
+          if ((cell === null || cell === void 0 ? void 0 : cell.f) != null) {
+            delFunctionGroup(ctx, r, c, ctx.currentSheetId);
+          }
+          if (hyperlinkMap && hyperlinkMap["".concat(r, "_").concat(c)]) {
+            delete hyperlinkMap["".concat(r, "_").concat(c)];
+          }
+        }
+      }
+    }
+  }
+  return "success";
+}
+function deleteSelectedCellText(ctx, deep) {
+  if (deep) {
+    return deepClear(ctx);
+  }
   var allowEdit = isAllowEdit(ctx);
   if (allowEdit === false) {
     return "allowEdit";
@@ -60072,21 +60107,19 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
     for (var cIndex = 0; cIndex < cells.length; cIndex += 1) {
       var _colIndex = startCol + offsetColIndex;
       var cell = cells[cIndex];
-      if (index === 1) {
-        console.log("cell", cell);
-      }
       if (cell === null) {
         offsetColIndex++;
         continue;
       }
       var m = cell === null || cell === void 0 ? void 0 : cell.textContent;
+      var allV = JSON.parse(cell.getAttribute("_v") || "{}");
       var v = cell.getAttribute("x:num");
       var f = cell.getAttribute("f");
       if (copyRich) {
         var style = iframe.contentWindow.getComputedStyle(cell);
         var rowspan = Number(cell.getAttribute("rowspan")) || 1;
         var colspan = Number(cell.getAttribute("colspan")) || 1;
-        var mainCell = _objectSpread2({
+        var mainCell = _objectSpread2(_objectSpread2({}, allV || {}), {}, {
           v: v || m,
           m: m || v,
           f: f || undefined

package/dist/index.js

@@ -42415,13 +42415,14 @@ function copy(ctx) {
       var f = (data === null || data === void 0 ? void 0 : data.f) || "";
       var rowspan = (_data$mc$rs = data === null || data === void 0 ? void 0 : (_data$mc = data.mc) === null || _data$mc === void 0 ? void 0 : _data$mc.rs) !== null && _data$mc$rs !== void 0 ? _data$mc$rs : 1;
       var colspan = (_data$mc$cs = data === null || data === void 0 ? void 0 : (_data$mc2 = data.mc) === null || _data$mc2 === void 0 ? void 0 : _data$mc2.cs) !== null && _data$mc$cs !== void 0 ? _data$mc$cs : 1;
+      var allV = JSON.stringify(data);
       if (!(data === null || data === void 0 ? void 0 : data.mc) || (data === null || data === void 0 ? void 0 : data.mc) && (data === null || data === void 0 ? void 0 : data.mc.r) === r && data.mc.c === c) {
         var _Object$keys;
         var style = cellAttrToDomStyle(data, borderInfo["".concat(r, "_").concat(c)]);
         var styleStr = (_Object$keys = Object.keys(style)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.map(function (item) {
           return "".concat(item, ":").concat(style[item], ";");
         }).join("");
-        cpString += "<td x:num='".concat(realValue, "' f='").concat(f, "' style='").concat(styleStr, "' rowspan=").concat(rowspan, " colspan=").concat(colspan, ">").concat(value, "</td>");
+        cpString += "<td _v='".concat(allV, "' x:num='").concat(realValue, "' f='").concat(f, "' style='").concat(styleStr, "' rowspan=").concat(rowspan, " colspan=").concat(colspan, ">").concat(value, "</td>");
       }
     };
     for (var c = columns[0]; c <= columns[1]; c += 1) {
@@ -42484,7 +42485,41 @@ function copy2(ctx) {
     clipboard.writeHtml(cpdata);
   }
 }
-function deleteSelectedCellText(ctx) {
+function deepClear(ctx) {
+  var allowEdit = isAllowEdit(ctx);
+  if (allowEdit === false) {
+    return "allowEdit";
+  }
+  var selection = ctx.luckysheet_select_save;
+  if (selection && !___default['default'].isEmpty(selection)) {
+    var d = getFlowdata(ctx);
+    var hyperlinkMap = ctx.luckysheetfile[getSheetIndex(ctx, ctx.currentSheetId)].hyperlink;
+    for (var s = 0; s < selection.length; s += 1) {
+      var r1 = selection[s].row[0];
+      var r2 = selection[s].row[1];
+      var c1 = selection[s].column[0];
+      var c2 = selection[s].column[1];
+      for (var r = r1; r <= r2; r += 1) {
+        for (var c = c1; c <= c2; c += 1) {
+          var _d$r2;
+          var cell = d === null || d === void 0 ? void 0 : (_d$r2 = d[r]) === null || _d$r2 === void 0 ? void 0 : _d$r2[c];
+          d[r][c] = null;
+          if ((cell === null || cell === void 0 ? void 0 : cell.f) != null) {
+            delFunctionGroup(ctx, r, c, ctx.currentSheetId);
+          }
+          if (hyperlinkMap && hyperlinkMap["".concat(r, "_").concat(c)]) {
+            delete hyperlinkMap["".concat(r, "_").concat(c)];
+          }
+        }
+      }
+    }
+  }
+  return "success";
+}
+function deleteSelectedCellText(ctx, deep) {
+  if (deep) {
+    return deepClear(ctx);
+  }
   var allowEdit = isAllowEdit(ctx);
   if (allowEdit === false) {
     return "allowEdit";
@@ -60082,21 +60117,19 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
     for (var cIndex = 0; cIndex < cells.length; cIndex += 1) {
       var _colIndex = startCol + offsetColIndex;
       var cell = cells[cIndex];
-      if (index === 1) {
-        console.log("cell", cell);
-      }
       if (cell === null) {
         offsetColIndex++;
         continue;
       }
       var m = cell === null || cell === void 0 ? void 0 : cell.textContent;
+      var allV = JSON.parse(cell.getAttribute("_v") || "{}");
       var v = cell.getAttribute("x:num");
       var f = cell.getAttribute("f");
       if (copyRich) {
         var style = iframe.contentWindow.getComputedStyle(cell);
         var rowspan = Number(cell.getAttribute("rowspan")) || 1;
         var colspan = Number(cell.getAttribute("colspan")) || 1;
-        var mainCell = _objectSpread2({
+        var mainCell = _objectSpread2(_objectSpread2({}, allV || {}), {}, {
           v: v || m,
           m: m || v,
           f: f || undefined

package/dist/modules/selection.d.ts

@@ -24,7 +24,7 @@ export declare function moveHighlightRange(ctx: Context, postion: "down" | "righ
 export declare function rangeValueToHtml(ctx: Context, sheetId: string, ranges?: Range): string | null;
 export declare function copy(ctx: Context): void;
 export declare function copy2(ctx: Context): void;
-export declare function deleteSelectedCellText(ctx: Context): string;
+export declare function deleteSelectedCellText(ctx: Context, deep?: boolean): string;
 export declare function selectIsOverlap(ctx: Context, range?: any): boolean;
 export declare function selectAll(ctx: Context): void;
 export declare function fixRowStyleOverflowInFreeze(ctx: Context, r1: number, r2: number, freeze: Freezen | undefined): {

package/package.json

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