@fileverse-dev/fortune-core 1.2.99 → 1.3.0-paint

package/es/modules/selection.js

@@ -180,6 +180,8 @@ export function selectTitlesRange(map) {
   return rangeArr;
 }
 export function pasteHandlerOfPaintModel(ctx, copyRange) {
+  var _a;
+  console.log("pasteHandlerOfPaintModel", ctx, copyRange);
   var cfg = ctx.config;
   if (cfg.merge == null) {
     cfg.merge = {};
@@ -369,36 +371,40 @@ export function pasteHandlerOfPaintModel(ctx, copyRange) {
   }
   var currFile = ctx.luckysheetfile[getSheetIndex(ctx, ctx.currentSheetId)];
   currFile.config = cfg;
-  currFile.dataVerification = dataVerification;
-  var cdformat = null;
+  if (dataVerification != null) {
+    currFile.dataVerification = dataVerification;
+  }
   var copyIndex = getSheetIndex(ctx, copySheetIndex);
-  if (!copyIndex) return;
-  var ruleArr = _.cloneDeep(ctx.luckysheetfile[copyIndex].luckysheet_conditionformat_save);
-  if (!_.isNil(ruleArr) && ruleArr.length > 0) {
-    var currentIndex = getSheetIndex(ctx, ctx.currentSheetId);
-    cdformat = _.cloneDeep(ctx.luckysheetfile[currentIndex].luckysheet_conditionformat_save);
-    for (var i = 0; i < ruleArr.length; i += 1) {
-      var cdformat_cellrange = ruleArr[i].cellrange;
-      var emptyRange = [];
-      for (var j = 0; j < cdformat_cellrange.length; j += 1) {
-        var range = CFSplitRange(cdformat_cellrange[j], {
-          row: [c_r1, c_r2],
-          column: [c_c1, c_c2]
-        }, {
-          row: [minh, maxh],
-          column: [minc, maxc]
-        }, "operatePart");
-        if (range.length > 0) {
-          emptyRange = emptyRange.concat(range);
+  if (copyIndex != null) {
+    var ruleArr = _.cloneDeep(ctx.luckysheetfile[copyIndex].luckysheet_conditionformat_save);
+    if (!_.isNil(ruleArr) && ruleArr.length > 0) {
+      var currentIndex = getSheetIndex(ctx, ctx.currentSheetId);
+      var existingCf = ctx.luckysheetfile[currentIndex].luckysheet_conditionformat_save;
+      var cdformat = (_a = _.cloneDeep(existingCf)) !== null && _a !== void 0 ? _a : [];
+      for (var i = 0; i < ruleArr.length; i += 1) {
+        var cdformat_cellrange = ruleArr[i].cellrange;
+        var emptyRange = [];
+        for (var j = 0; j < cdformat_cellrange.length; j += 1) {
+          var range = CFSplitRange(cdformat_cellrange[j], {
+            row: [c_r1, c_r2],
+            column: [c_c1, c_c2]
+          }, {
+            row: [minh, maxh],
+            column: [minc, maxc]
+          }, "operatePart");
+          if (range.length > 0) {
+            emptyRange = emptyRange.concat(range);
+          }
+        }
+        if (emptyRange.length > 0) {
+          ruleArr[i].cellrange = [{
+            row: [minh, maxh],
+            column: [minc, maxc]
+          }];
+          cdformat.push(ruleArr[i]);
         }
       }
-      if (emptyRange.length > 0) {
-        ruleArr[i].cellrange = [{
-          row: [minh, maxh],
-          column: [minc, maxc]
-        }];
-        cdformat.push(ruleArr[i]);
-      }
+      currFile.luckysheet_conditionformat_save = cdformat;
     }
   }
 }

package/es/modules/toolbar.js

@@ -727,6 +727,7 @@ export function handleVerticalAlign(ctx, cellInput, value) {
   setAttr(ctx, cellInput, "vt", value);
 }
 export function handleFormatPainter(ctx) {
+  console.log("handleFormatPainter", ctx);
   var allowEdit = isAllowEdit(ctx);
   if (!allowEdit) return;
   if (ctx.luckysheet_select_save == null || ctx.luckysheet_select_save.length === 0) {

package/lib/modules/selection.js

@@ -215,6 +215,8 @@ function selectTitlesRange(map) {
   return rangeArr;
 }
 function pasteHandlerOfPaintModel(ctx, copyRange) {
+  var _a;
+  console.log("pasteHandlerOfPaintModel", ctx, copyRange);
   var cfg = ctx.config;
   if (cfg.merge == null) {
     cfg.merge = {};
@@ -404,36 +406,40 @@ function pasteHandlerOfPaintModel(ctx, copyRange) {
   }
   var currFile = ctx.luckysheetfile[(0, _utils.getSheetIndex)(ctx, ctx.currentSheetId)];
   currFile.config = cfg;
-  currFile.dataVerification = dataVerification;
-  var cdformat = null;
+  if (dataVerification != null) {
+    currFile.dataVerification = dataVerification;
+  }
   var copyIndex = (0, _utils.getSheetIndex)(ctx, copySheetIndex);
-  if (!copyIndex) return;
-  var ruleArr = _lodash.default.cloneDeep(ctx.luckysheetfile[copyIndex].luckysheet_conditionformat_save);
-  if (!_lodash.default.isNil(ruleArr) && ruleArr.length > 0) {
-    var currentIndex = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
-    cdformat = _lodash.default.cloneDeep(ctx.luckysheetfile[currentIndex].luckysheet_conditionformat_save);
-    for (var i = 0; i < ruleArr.length; i += 1) {
-      var cdformat_cellrange = ruleArr[i].cellrange;
-      var emptyRange = [];
-      for (var j = 0; j < cdformat_cellrange.length; j += 1) {
-        var range = (0, _ConditionFormat.CFSplitRange)(cdformat_cellrange[j], {
-          row: [c_r1, c_r2],
-          column: [c_c1, c_c2]
-        }, {
-          row: [minh, maxh],
-          column: [minc, maxc]
-        }, "operatePart");
-        if (range.length > 0) {
-          emptyRange = emptyRange.concat(range);
+  if (copyIndex != null) {
+    var ruleArr = _lodash.default.cloneDeep(ctx.luckysheetfile[copyIndex].luckysheet_conditionformat_save);
+    if (!_lodash.default.isNil(ruleArr) && ruleArr.length > 0) {
+      var currentIndex = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
+      var existingCf = ctx.luckysheetfile[currentIndex].luckysheet_conditionformat_save;
+      var cdformat = (_a = _lodash.default.cloneDeep(existingCf)) !== null && _a !== void 0 ? _a : [];
+      for (var i = 0; i < ruleArr.length; i += 1) {
+        var cdformat_cellrange = ruleArr[i].cellrange;
+        var emptyRange = [];
+        for (var j = 0; j < cdformat_cellrange.length; j += 1) {
+          var range = (0, _ConditionFormat.CFSplitRange)(cdformat_cellrange[j], {
+            row: [c_r1, c_r2],
+            column: [c_c1, c_c2]
+          }, {
+            row: [minh, maxh],
+            column: [minc, maxc]
+          }, "operatePart");
+          if (range.length > 0) {
+            emptyRange = emptyRange.concat(range);
+          }
+        }
+        if (emptyRange.length > 0) {
+          ruleArr[i].cellrange = [{
+            row: [minh, maxh],
+            column: [minc, maxc]
+          }];
+          cdformat.push(ruleArr[i]);
         }
       }
-      if (emptyRange.length > 0) {
-        ruleArr[i].cellrange = [{
-          row: [minh, maxh],
-          column: [minc, maxc]
-        }];
-        cdformat.push(ruleArr[i]);
-      }
+      currFile.luckysheet_conditionformat_save = cdformat;
     }
   }
 }

package/lib/modules/toolbar.js

@@ -760,6 +760,7 @@ function handleVerticalAlign(ctx, cellInput, value) {
   setAttr(ctx, cellInput, "vt", value);
 }
 function handleFormatPainter(ctx) {
+  console.log("handleFormatPainter", ctx);
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (!allowEdit) return;
   if (ctx.luckysheet_select_save == null || ctx.luckysheet_select_save.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.2.99",
+  "version": "1.3.0-paint",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",