@fileverse-dev/fortune-react 1.1.99 → 1.2.0-patch-2

package/lib/components/SheetOverlay/RowHeader.js

@@ -76,7 +76,13 @@ var RowHeader = function RowHeader() {
     getRowIndexClicked = _f.getRowIndexClicked,
     isRowDoubleClicked = _f.isRowDoubleClicked;
   var onMouseDown = (0, _react.useCallback)(function (e) {
-    if (e.button !== 0) return;
+    if (e.button === 0 && e.target.tagName === "use" || e.button === 2) {
+      var nativeEvent_1 = e.nativeEvent;
+      setContext(function (draft) {
+        (0, _fortuneCore.handleRowHeaderMouseDown)(draft, refs.globalCache, nativeEvent_1, containerRef.current, refs.cellInput.current, refs.fxInput.current);
+      });
+    }
+    if (e.button !== 0 || context.isFlvReadOnly) return;
     var targetEl = e.target;
     if (targetEl.closest(".fortune-rows-change-size") || targetEl.closest(".fortune-rows-freeze-handle")) return;
     var headerEl = containerRef.current;
@@ -88,9 +94,9 @@ var RowHeader = function RowHeader() {
         draft.luckysheet_scroll_status = true;
       });
     } else {
-      var nativeEvent_1 = e.nativeEvent;
+      var nativeEvent_2 = e.nativeEvent;
       setContext(function (draft) {
-        (0, _fortuneCore.handleRowHeaderMouseDown)(draft, refs.globalCache, nativeEvent_1, containerRef.current, refs.cellInput.current, refs.fxInput.current);
+        (0, _fortuneCore.handleRowHeaderMouseDown)(draft, refs.globalCache, nativeEvent_2, containerRef.current, refs.cellInput.current, refs.fxInput.current);
       });
       return;
     }
@@ -156,6 +162,43 @@ var RowHeader = function RowHeader() {
     }
     setSelectedLocation(selects);
   }, [context.luckysheet_select_save, context.visibledatarow]);
+  var _g = (0, _react.useState)([]),
+    hiddenPointers = _g[0],
+    setHiddenPointers = _g[1];
+  (0, _react.useEffect)(function () {
+    var _a, _b;
+    if (sheetIndex == null) return;
+    var tempPointers = [];
+    var rowhidden = (_b = (_a = context.luckysheetfile[sheetIndex]) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.rowhidden;
+    if (rowhidden) {
+      Object.keys(rowhidden).forEach(function (key) {
+        var item = {
+          row: key,
+          top: context.visibledatarow[Number(key) - 1]
+        };
+        tempPointers.push(item);
+      });
+      setHiddenPointers(tempPointers);
+    } else {
+      setHiddenPointers([]);
+    }
+  }, [context.visibledatarow, sheetIndex]);
+  var showRow = function showRow(e, item) {
+    if (context.isFlvReadOnly) return;
+    e.stopPropagation();
+    setContext(function (ctx) {
+      var _a;
+      _fortuneCore.api.setSelection(ctx, [{
+        row: [Number(item.row) - 1, Number(item.row) + 1],
+        column: [0, (_a = context.visibledatacolumn) === null || _a === void 0 ? void 0 : _a.length]
+      }], {
+        id: context.currentSheetId
+      });
+    });
+    setContext(function (ctx) {
+      (0, _fortuneCore.showSelected)(ctx, "row");
+    });
+  };
   (0, _react.useEffect)(function () {
     containerRef.current.scrollTop = context.scrollTop;
   }, [context.scrollTop]);
@@ -170,7 +213,40 @@ var RowHeader = function RowHeader() {
     onMouseDown: onMouseDown,
     onMouseLeave: onMouseLeave,
     onContextMenu: onContextMenu
-  }, /*#__PURE__*/_react.default.createElement("div", {
+  }, hiddenPointers.map(function (item) {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: "flex flex-col gap-4 cursor-pointer align-center hide-btn-row hide-btn",
+      style: {
+        top: "".concat(item.top - 16, "px"),
+        zIndex: 100
+      },
+      onClick: function onClick(e) {
+        return showRow(e, item);
+      }
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: "rotate-row-icon"
+    }, /*#__PURE__*/_react.default.createElement("svg", {
+      xmlns: "http://www.w3.org/2000/svg",
+      width: "5",
+      height: "8",
+      viewBox: "0 0 5 8",
+      fill: "none"
+    }, /*#__PURE__*/_react.default.createElement("path", {
+      d: "M0.164574 4.20629L3.54376 7.58548C3.7275 7.76922 4.04167 7.63909 4.04167 7.37924L4.04167 0.620865C4.04167 0.361018 3.7275 0.230885 3.54376 0.414625L0.164575 3.79381C0.0506717 3.90772 0.0506715 4.09239 0.164574 4.20629Z",
+      fill: "#363B3F"
+    }))), /*#__PURE__*/_react.default.createElement("div", {
+      className: "rotate-90"
+    }, /*#__PURE__*/_react.default.createElement("svg", {
+      xmlns: "http://www.w3.org/2000/svg",
+      width: "5",
+      height: "8",
+      viewBox: "0 0 5 8",
+      fill: "none"
+    }, /*#__PURE__*/_react.default.createElement("path", {
+      d: "M0.164574 4.20629L3.54376 7.58548C3.7275 7.76922 4.04167 7.63909 4.04167 7.37924L4.04167 0.620865C4.04167 0.361018 3.7275 0.230885 3.54376 0.414625L0.164575 3.79381C0.0506717 3.90772 0.0506715 4.09239 0.164574 4.20629Z",
+      fill: "#363B3F"
+    }))));
+  }), /*#__PURE__*/_react.default.createElement("div", {
     className: "fortune-rows-freeze-handle",
     onMouseDown: onRowFreezeHandleMouseDown,
     style: {

package/lib/components/SheetOverlay/drag_and_drop/column-helpers.js

@@ -280,24 +280,26 @@ var useColumnDragAndDrop = exports.useColumnDragAndDrop = function useColumnDrag
               }
             });
           });
-          var newDataVerification = {};
-          Object.keys(_sheet.dataVerification).forEach(function (item) {
-            var _a;
-            var itemData = (_a = _sheet.dataVerification) === null || _a === void 0 ? void 0 : _a[item];
-            var colRow = item.split("_");
-            if (colRow.length !== 2) return;
-            var presentcol = parseInt(colRow[1], 10);
-            var updatedCol = presentcol;
-            if (presentcol === sourceIndex_1) {
-              updatedCol = targetIndex;
-            } else if (presentcol > sourceIndex_1 && presentcol < targetIndex) {
-              updatedCol -= 1;
-            } else if (presentcol < sourceIndex_1 && presentcol >= targetIndex) {
-              updatedCol += 1;
-            }
-            newDataVerification["".concat(colRow[0], "_").concat(updatedCol)] = itemData;
-          });
-          _sheet.dataVerification = newDataVerification;
+          if (_sheet.dataVerification) {
+            var newDataVerification_1 = {};
+            Object.keys(_sheet.dataVerification).forEach(function (item) {
+              var _a;
+              var itemData = (_a = _sheet.dataVerification) === null || _a === void 0 ? void 0 : _a[item];
+              var colRow = item.split("_");
+              if (colRow.length !== 2) return;
+              var presentcol = parseInt(colRow[1], 10);
+              var updatedCol = presentcol;
+              if (presentcol === sourceIndex_1) {
+                updatedCol = targetIndex;
+              } else if (presentcol > sourceIndex_1 && presentcol < targetIndex) {
+                updatedCol -= 1;
+              } else if (presentcol < sourceIndex_1 && presentcol >= targetIndex) {
+                updatedCol += 1;
+              }
+              newDataVerification_1["".concat(colRow[0], "_").concat(updatedCol)] = itemData;
+            });
+            _sheet.dataVerification = newDataVerification_1;
+          }
           (_c = _sheet.calcChain) === null || _c === void 0 ? void 0 : _c.forEach(function (item) {
             if (item.c === sourceIndex_1) {
               item.c = targetIndex;

package/lib/components/SheetOverlay/drag_and_drop/row-helpers.js

@@ -260,24 +260,26 @@ var useRowDragAndDrop = exports.useRowDragAndDrop = function useRowDragAndDrop(c
               }
             });
           });
-          var newDataVerification = {};
-          Object.keys(_sheet.dataVerification).forEach(function (item) {
-            var _a;
-            var itemData = (_a = _sheet.dataVerification) === null || _a === void 0 ? void 0 : _a[item];
-            var colRow = item.split("_");
-            if (colRow.length !== 2) return;
-            var presentRow = parseInt(colRow[0], 10);
-            var updatedRow = presentRow;
-            if (presentRow === sourceIndex_1) {
-              updatedRow = targetIndex;
-            } else if (presentRow > sourceIndex_1 && presentRow < targetIndex) {
-              updatedRow -= 1;
-            } else if (presentRow < sourceIndex_1 && presentRow >= targetIndex) {
-              updatedRow += 1;
-            }
-            newDataVerification["".concat(updatedRow, "_").concat(colRow[1])] = itemData;
-          });
-          _sheet.dataVerification = newDataVerification;
+          if (_sheet.dataVerification) {
+            var newDataVerification_1 = {};
+            Object.keys(_sheet.dataVerification).forEach(function (item) {
+              var _a;
+              var itemData = (_a = _sheet.dataVerification) === null || _a === void 0 ? void 0 : _a[item];
+              var colRow = item.split("_");
+              if (colRow.length !== 2) return;
+              var presentRow = parseInt(colRow[0], 10);
+              var updatedRow = presentRow;
+              if (presentRow === sourceIndex_1) {
+                updatedRow = targetIndex;
+              } else if (presentRow > sourceIndex_1 && presentRow < targetIndex) {
+                updatedRow -= 1;
+              } else if (presentRow < sourceIndex_1 && presentRow >= targetIndex) {
+                updatedRow += 1;
+              }
+              newDataVerification_1["".concat(updatedRow, "_").concat(colRow[1])] = itemData;
+            });
+            _sheet.dataVerification = newDataVerification_1;
+          }
           (_a = _sheet.calcChain) === null || _a === void 0 ? void 0 : _a.forEach(function (item) {
             if (item.r === sourceIndex_1) {
               item.r = targetIndex;

package/lib/components/SheetOverlay/helper.js

@@ -108,12 +108,12 @@ function countCommasBeforeCursor(editableDiv) {
   var textBeforeCursor = preCaretRange.toString();
   var inQuotes = false;
   var count = 0;
-  for (var i = 0; i < textBeforeCursor.length; i++) {
+  for (var i = 0; i < textBeforeCursor.length; i += 1) {
     var char = textBeforeCursor[i];
     if (char === '"') {
       inQuotes = !inQuotes;
-    } else if (char === ',' && !inQuotes) {
-      count++;
+    } else if (char === "," && !inQuotes) {
+      count += 1;
     }
   }
   return count;

package/lib/components/SheetOverlay/index.css

@@ -1010,4 +1010,27 @@
   background: #555;
   /* darker on hover */
   /* scrollbar */
-}
+}
+
+.hide-btn {
+  padding-top: 1px;
+  position: absolute;
+  right: 5;
+  top: 5px;
+  z-index: 200;
+  width: 9px;
+}
+
+.hide-btn:hover {
+  border: 1px solid #0188fb;
+}
+
+.rotate-row-icon {
+  transform: rotate(-90deg);
+}
+
+.hide-btn-row {
+  position: absolute;
+   left: 4px;
+  z-index: 200;
+}

package/lib/components/Toolbar/index.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.getLucideIcon = exports.default = exports.CurrencySelector = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _fortuneCore = require("@fileverse-dev/fortune-core");
-var _api = require("@fileverse-dev/fortune-core/lib/api");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _ui = require("@fileverse/ui");
 var _dataVerificationPortal = _interopRequireDefault(require("./dataVerificationPortal"));
@@ -594,9 +593,35 @@ var Toolbar = function Toolbar(_a) {
       }
     }
   }, [itemLocations, setMoreItems, settings.toolbarItems.length, sheetWidth, isDesktop]);
+  (0, _react.useEffect)(function () {
+    setContext(function (ctx) {
+      ctx.dataVerification.dataRegulation.value1 = "value1";
+    });
+  }, []);
   var _o = (0, _react.useState)(false),
     showDataValidation = _o[0],
     setShowDataValidation = _o[1];
+  var dataVerificationClick = function dataVerificationClick() {
+    var _a;
+    var selection = _fortuneCore.api.getSelection(context);
+    if (!selection) {
+      setContext(function (ctx) {
+        _fortuneCore.api.setSelection(ctx, [{
+          row: [0, 0],
+          column: [0, 0]
+        }], {
+          id: context.currentSheetId
+        });
+      });
+    }
+    (_a = document.getElementById("data-verification-button")) === null || _a === void 0 ? void 0 : _a.click();
+    setTimeout(function () {
+      setShowDataValidation(true);
+    }, 100);
+  };
+  (0, _react.useEffect)(function () {
+    window.dataVerificationClick = dataVerificationClick;
+  }, []);
   var getToolbarItem = (0, _react.useCallback)(function (name, i) {
     var _a, _b, _c, _d, _e, _f, _g;
     var tooltip = toolbar[name];
@@ -979,24 +1004,7 @@ var Toolbar = function Toolbar(_a) {
         iconId: name,
         tooltip: tooltip,
         key: name,
-        onClick: function onClick() {
-          var _a;
-          var selection = (0, _api.getSelection)(context);
-          if (!selection) {
-            setContext(function (ctx) {
-              (0, _api.setSelection)(ctx, [{
-                row: [0, 0],
-                column: [0, 0]
-              }], {
-                id: context.currentSheetId
-              });
-            });
-          }
-          (_a = document.getElementById("data-verification-button")) === null || _a === void 0 ? void 0 : _a.click();
-          setTimeout(function () {
-            setShowDataValidation(true);
-          }, 100);
-        }
+        onClick: dataVerificationClick
       }));
     }
     if (name === "locationCondition") {

package/lib/components/Workbook/index.d.ts

@@ -57,7 +57,7 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
     getHtmlByRange: (range: import("@fileverse-dev/fortune-core").Range, options?: api.CommonOptions) => string | null;
     setSelection: (range: import("@fileverse-dev/fortune-core").Range, options?: api.CommonOptions) => void;
     setCellValuesByRange: (data: any[][], range: import("@fileverse-dev/fortune-core").SingleRange, options?: api.CommonOptions) => void;
-    setCellFormatByRange: (attr: "error" | "rt" | "f" | "m" | "v" | "mc" | "ct" | "qp" | "spl" | "bg" | "lo" | "baseValue" | "baseCurrency" | "baseCurrencyPrice" | "isDataBlockFormula" | "ps" | "hl" | keyof import("@fileverse-dev/fortune-core").CellStyle, value: any, range: import("@fileverse-dev/fortune-core").SingleRange | import("@fileverse-dev/fortune-core").Range, options?: api.CommonOptions) => void;
+    setCellFormatByRange: (attr: "error" | "rt" | "f" | "m" | "v" | "mc" | "ct" | "qp" | "spl" | "bg" | "lo" | "baseValue" | "baseCurrency" | "baseCurrencyPrice" | "isDataBlockFormula" | "ps" | "hl" | keyof import("@fileverse-dev/fortune-core").CellStyle, value: any, range: import("@fileverse-dev/fortune-core").Range | import("@fileverse-dev/fortune-core").SingleRange, options?: api.CommonOptions) => void;
     mergeCells: (ranges: import("@fileverse-dev/fortune-core").Range, type: string, options?: api.CommonOptions) => void;
     cancelMerge: (ranges: import("@fileverse-dev/fortune-core").Range, options?: api.CommonOptions) => void;
     getAllSheets: () => SheetType[];

package/lib/components/Workbook/index.js

@@ -656,6 +656,11 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
         }
       });
     }
+    setContextWithProduce(function (ctx) {
+      if (ctx.luckysheet_selection_range) {
+        ctx.luckysheet_selection_range = [];
+      }
+    });
   }, [context, setContextWithProduce]);
   var onMoreToolbarItemsClose = (0, _react.useCallback)(function () {
     setMoreToolbarItems(null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.1.99",
+  "version": "1.2.0-patch-2",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "module": "es/index.js",
@@ -16,7 +16,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@fileverse-dev/fortune-core": "1.1.99",
+    "@fileverse-dev/fortune-core": "1.2.0-patch-2",
     "@fileverse/ui": "^4.1.7-patch-21",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",