@fileverse-dev/fortune-react 1.2.4 → 1.2.6

package/lib/components/SheetOverlay/FormulaSearch/index.js

@@ -62,7 +62,7 @@ var FormulaSearch = function FormulaSearch(props) {
   });
   if (_lodash.default.isEmpty(context.functionCandidates) && _lodash.default.isEmpty(context.defaultCandidates)) return null;
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: "flex color-border-default border flex-col luckysheet-formula-search-c-p custom-scroll",
+    className: "flex flex-col luckysheet-formula-search-c-p custom-scroll",
     id: "luckysheet-formula-search-c-p",
     style: {
       top: top

package/lib/components/SheetOverlay/RowHeader.js

@@ -184,12 +184,30 @@ var RowHeader = function RowHeader() {
     }
   }, [context.visibledatarow, sheetIndex]);
   var showRow = function showRow(e, item) {
+    var _a, _b;
+    if (sheetIndex == null) return;
+    var startPoint = item.row;
+    var startRow = startPoint,
+      endRow = startPoint;
+    var rowhiddenData = (_b = (_a = context.luckysheetfile[sheetIndex]) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.rowhidden;
+    var findRowBoundary = function findRowBoundary(start, direction) {
+      var tempPoint = start;
+      while (true) {
+        var checkRowIndex = tempPoint + direction;
+        if (!(rowhiddenData === null || rowhiddenData === void 0 ? void 0 : rowhiddenData.hasOwnProperty(checkRowIndex))) break;
+        tempPoint = checkRowIndex;
+      }
+      return tempPoint;
+    };
+    startRow = findRowBoundary(startPoint, -1);
+    endRow = findRowBoundary(startPoint, 1);
+    console.log(startRow, endRow);
     if (context.isFlvReadOnly) return;
     e.stopPropagation();
     setContext(function (ctx) {
       var _a;
       _fortuneCore.api.setSelection(ctx, [{
-        row: [Number(item.row) - 1, Number(item.row) + 1],
+        row: [Number(startRow) - 1, Number(endRow) + 1],
         column: [0, (_a = context.visibledatacolumn) === null || _a === void 0 ? void 0 : _a.length]
       }], {
         id: context.currentSheetId
@@ -198,6 +216,15 @@ var RowHeader = function RowHeader() {
     setContext(function (ctx) {
       (0, _fortuneCore.showSelected)(ctx, "row");
     });
+    setContext(function (ctx) {
+      var _a;
+      _fortuneCore.api.setSelection(ctx, [{
+        row: [Number(startRow), Number(endRow)],
+        column: [0, (_a = context.visibledatacolumn) === null || _a === void 0 ? void 0 : _a.length]
+      }], {
+        id: context.currentSheetId
+      });
+    });
   };
   (0, _react.useEffect)(function () {
     containerRef.current.scrollTop = context.scrollTop;
@@ -215,9 +242,9 @@ var RowHeader = function RowHeader() {
     onContextMenu: onContextMenu
   }, 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",
+      className: "flex flex-col gap-4 cursor-pointer align-center hide-btn-row",
       style: {
-        top: "".concat(item.top - 16, "px"),
+        top: "".concat(item.top - 15, "px"),
         zIndex: 100
       },
       onClick: function onClick(e) {
@@ -274,12 +301,13 @@ var RowHeader = function RowHeader() {
       r1 = _a.r1,
       r2 = _a.r2;
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: "fortune-row-header-selected color-bg-tertiary",
+      className: "fortune-row-header-selected",
       key: i,
       style: _lodash.default.assign({
         top: row_pre,
         height: row - row_pre - 1,
         display: "block",
+        backgroundColor: "#EFC703",
         mixBlendMode: "multiply"
       }, (0, _fortuneCore.fixRowStyleOverflowInFreeze)(context, r1, r2, (_b = refs.globalCache.freezen) === null || _b === void 0 ? void 0 : _b[context.currentSheetId]))
     });

package/lib/components/SheetOverlay/index.css

@@ -45,10 +45,12 @@
 .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 {
@@ -92,10 +94,12 @@
   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 {
@@ -133,7 +137,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;
 }
 
@@ -195,9 +199,9 @@
   z-index: 15;
   border: 2.5px solid #efc703;
   margin: -1px 0 0 -1px;
+  background: rgba(1, 136, 251, 0.15);
   display: none;
   box-sizing: content-box;
-  background: rgba(239, 199, 5, 0.02);
 }
 
 .luckysheet-cs-inner-border {
@@ -1009,16 +1013,22 @@
 }
 
 .hide-btn {
-  padding-top: 1px;
+  padding-left: 3px;
+  padding-right: 3px;
+  padding-top: 2px;
   position: absolute;
-  right: 5;
+  width: 32px;
   top: 5px;
   z-index: 200;
-  width: 9px;
 }
 
 .hide-btn:hover {
-  border: 1px solid #0188fb;
+  padding-left: 2px;
+  padding-right: 2px;
+  padding-top: 1px;
+  background-color: rgba(255, 255, 255, 1);
+  border-radius: var(--border-radius-sm, 4px);
+border: 1px solid #BDC4C8;
 }
 
 .rotate-row-icon {
@@ -1027,6 +1037,13 @@
 
 .hide-btn-row {
   position: absolute;
-   left: 4px;
+  left: 4px;
   z-index: 200;
+  width: 12px;
+}
+
+.hide-btn-row:hover {
+    background-color: white;
+    border: 1px solid #BDC4C8;
+    border-radius: 4px;
 }

package/lib/components/Toolbar/Combo.js

@@ -58,10 +58,7 @@ var Combo = function Combo(_a) {
     height: 16
   })) : (/*#__PURE__*/_react.default.createElement("span", {
     className: "fortune-toolbar-combo-text"
-  }, 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 !== undefined ? text : ""))))) : (/*#__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/Select.js

@@ -34,7 +34,7 @@ var Option = exports.Option = function Option(_a) {
   }, iconId && /*#__PURE__*/_react.default.createElement(_SVGIcon.default, {
     name: iconId
   }), /*#__PURE__*/_react.default.createElement("div", {
-    className: "fortuen-toolbar-text color-text-default text-body-sm w-full"
+    className: "fortuen-toolbar-text color-text-default text-body-sm"
   }, children));
 };
 var _default = exports.default = Select;

package/lib/components/Toolbar/index.css

@@ -141,30 +141,14 @@
 
 .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-left: 8px;
-  padding-right: 8px;
-  padding-top: 6px;
-  padding-bottom: 6px;
+  padding: 8px;
   cursor: pointer;
   user-select: none;
-  height: 32px;
-  display: flex;
-  align-items: center;
-  
 }
 
 .fortune-toolbar-select-option:hover {
@@ -187,10 +171,6 @@
   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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "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.2.4",
+    "@fileverse-dev/fortune-core": "1.2.6",
     "@fileverse/ui": "^4.1.7-patch-21",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",