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

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

@@ -45,12 +45,10 @@
 .fortune-row-header-selected {
   position: absolute;
   z-index: 10;
-  border-right: 1px solid #0188fb;
   right: 0;
   width: 100%;
   margin-top: 2px;
   display: none;
-  background-color: rgba(76, 76, 76, 0.1);
 }
 
 .fortune-col-header-wrap {
@@ -94,12 +92,10 @@
   cursor: default;
   position: absolute;
   z-index: 10;
-  border-bottom: 1px solid #0188fb;
   bottom: 0;
   height: 100%;
   margin-left: 0px;
   display: none;
-  background-color: rgba(76, 76, 76, 0.1);
 }
 
 .fortune-left-top {
@@ -137,7 +133,7 @@
   z-index: 14;
   /*border:1px solid #fff;*/
   margin: 0px 0 0 0px;
-  background: rgba(0, 80, 208, 0.15);
+  /* background: rgba(0, 80, 208, 0.15); */
   display: none;
 }
 
@@ -199,7 +195,7 @@
   z-index: 15;
   border: 2.5px solid #efc703;
   margin: -1px 0 0 -1px;
-  background: rgba(1, 136, 251, 0.15);
+  background: rgba(239, 199, 5, 0.02);
   display: none;
   box-sizing: content-box;
 }
@@ -1010,4 +1006,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/Combo.js

@@ -58,7 +58,10 @@ var Combo = function Combo(_a) {
     height: 16
   })) : (/*#__PURE__*/_react.default.createElement("span", {
     className: "fortune-toolbar-combo-text"
-  }, text !== undefined ? text : ""))))) : (/*#__PURE__*/_react.default.createElement("span", null, iconId === "font-color" ? (/*#__PURE__*/_react.default.createElement(_ui.Tooltip, {
+  }, text !== undefined ? text : "")), /*#__PURE__*/_react.default.createElement(_ui.LucideIcon, {
+    className: "w-[16px] h-[16px]",
+    name: "ChevronDown"
+  })))) : (/*#__PURE__*/_react.default.createElement("span", null, iconId === "font-color" ? (/*#__PURE__*/_react.default.createElement(_ui.Tooltip, {
     text: tooltip,
     placement: "bottom"
   }, /*#__PURE__*/_react.default.createElement(_ui.Button, {

package/lib/components/Toolbar/index.css

@@ -141,12 +141,24 @@
 
 .fortune-toolbar-combo-button {
   font-size: 12px;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  padding-left: 8px;
+  padding-right: 8px;
+  border-radius: 4px;
+  gap: 8px;
+}
+.fortune-toolbar-combo-button:hover {
+  background: hsl(var(--color-bg-default-hover));
 }
 
 .fortune-toolbar-select-option {
   font-size: 12px;
   min-width: 60px;
-  padding: 8px;
+  padding-left: 8px;
+  padding-right: 8px;
+  padding-top: 6px;
+  padding-bottom: 6px;
   cursor: pointer;
   user-select: none;
 }
@@ -171,6 +183,10 @@
   font-weight: 500;
   font-size: 14px;
   line-height: 20px;
+  max-width: 56px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .fortune-toolbar-color-picker-item {

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-1",
   "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-1",
     "@fileverse/ui": "^4.1.7-patch-21",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",