@fileverse-dev/fortune-react 1.2.0 → 1.2.2

package/es/components/DataVerification/RangeDialog.js

@@ -18,10 +18,12 @@ var RangeDialog = function RangeDialog() {
     rangeTxt2 = _c[0],
     setRangeTxt2 = _c[1];
   var close = useCallback(function () {
+    var _a;
     setContext(function (ctx) {
       ctx.rangeDialog.show = false;
       ctx.rangeDialog.singleSelect = false;
     });
+    (_a = document.getElementById("data-verification-button")) === null || _a === void 0 ? void 0 : _a.click();
     if (!context.rangeDialog) return;
     var rangeDialogType = context.rangeDialog.type;
     if (rangeDialogType.indexOf("between") >= 0) {
@@ -90,6 +92,7 @@ var RangeDialog = function RangeDialog() {
       minWidth: "80px"
     },
     onClick: function onClick() {
+      console.log("rangeTxt2", rangeTxt2);
       setContext(function (ctx) {
         ctx.rangeDialog.rangeTxt = rangeTxt2;
       });

package/es/components/SheetOverlay/ColumnHeader.js

@@ -1,5 +1,4 @@
-import { colLocation, colLocationByIndex, selectTitlesMap, selectTitlesRange, handleColSizeHandleMouseDown, handleColumnHeaderMouseDown, isAllowEdit, getFlowdata, fixColumnStyleOverflowInFreeze, handleColFreezeHandleMouseDown, getSheetIndex, fixPositionOnFrozenCells, showSelected } from "@fileverse-dev/fortune-core";
-import { api } from "@fileverse-dev/fortune-core";
+import { colLocation, colLocationByIndex, selectTitlesMap, selectTitlesRange, handleColSizeHandleMouseDown, handleColumnHeaderMouseDown, isAllowEdit, getFlowdata, fixColumnStyleOverflowInFreeze, handleColFreezeHandleMouseDown, getSheetIndex, fixPositionOnFrozenCells, showSelected, api } from "@fileverse-dev/fortune-core";
 import _ from "lodash";
 import React, { useContext, useState, useRef, useCallback, useEffect, useMemo } from "react";
 import WorkbookContext from "../../context";
@@ -196,6 +195,15 @@ var ColumnHeader = function ColumnHeader() {
   useEffect(function () {
     containerRef.current.scrollLeft = context.scrollLeft;
   }, [context.scrollLeft]);
+  var _h = useState(0),
+    hovered = _h[0],
+    setHovered = _h[1];
+  var onMouseMoveHideRight = useCallback(function () {
+    setHovered(-21);
+  }, []);
+  var onMouseLeaveHideRight = useCallback(function () {
+    setHovered(0);
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     ref: containerRef,
     className: "fortune-col-header",
@@ -239,10 +247,12 @@ var ColumnHeader = function ColumnHeader() {
     }))));
   }), hiddenPointers.map(function (item) {
     return /*#__PURE__*/React.createElement("div", {
-      className: "flex gap-4 cursor-pointer hide-btn align-center",
+      onMouseEnter: onMouseMoveHideRight,
+      onMouseLeave: onMouseLeaveHideRight,
+      className: "flex gap-4 cursor-pointer hide-btn-right align-center",
       style: {
         height: context.columnHeaderHeight - 12,
-        left: "".concat(item.left + 6, "px")
+        left: "".concat(item.left + 8 + hovered, "px")
       },
       onClick: function onClick(e) {
         return showColumn(e, item);

package/es/components/SheetOverlay/RowHeader.js

@@ -1,5 +1,4 @@
-import { rowLocation, rowLocationByIndex, selectTitlesMap, selectTitlesRange, handleContextMenu, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, fixRowStyleOverflowInFreeze, handleRowFreezeHandleMouseDown, getSheetIndex, showSelected, fixPositionOnFrozenCells } from "@fileverse-dev/fortune-core";
-import { api } from "@fileverse-dev/fortune-core";
+import { rowLocation, rowLocationByIndex, selectTitlesMap, selectTitlesRange, handleContextMenu, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, fixRowStyleOverflowInFreeze, handleRowFreezeHandleMouseDown, getSheetIndex, showSelected, fixPositionOnFrozenCells, api } from "@fileverse-dev/fortune-core";
 import _ from "lodash";
 import React, { useContext, useState, useRef, useCallback, useEffect, useMemo } from "react";
 import WorkbookContext from "../../context";
@@ -207,9 +206,9 @@ var RowHeader = function RowHeader() {
     onContextMenu: onContextMenu
   }, hiddenPointers.map(function (item) {
     return /*#__PURE__*/React.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) {

package/es/components/SheetOverlay/index.css

@@ -1013,16 +1013,42 @@
 }
 
 .hide-btn {
-  padding-top: 1px;
+  padding-left: 2px;
+  padding-top: 2px;
   position: absolute;
   right: 5;
   top: 5px;
   z-index: 200;
-  width: 9px;
 }
 
 .hide-btn:hover {
-  border: 1px solid #0188fb;
+  padding-left: 1px;
+  padding-top: 1px;
+  width: 28px;
+  border: 1px solid black;
+  background-color: rgba(255, 255, 255, 1);
+  border-radius: var(--border-radius-sm, 4px);
+}
+
+.hide-btn-right {
+  padding-right: 3px;
+  padding-top: 2px;
+  position: absolute;
+  right: 5;
+  top: 5px;
+  z-index: 200;
+  margin-right: 20px;
+}
+
+.hide-btn-right:hover {
+  padding-right: 2px;
+  padding-top: 1px;
+  z-index: 198;
+  justify-content: end;
+  width: 30px;
+  border: 1px solid black;
+  background-color: rgba(255, 255, 255, 1);
+  border-radius: var(--border-radius-sm, 4px);
 }
 
 .rotate-row-icon {
@@ -1031,6 +1057,13 @@
 
 .hide-btn-row {
   position: absolute;
-   left: 4px;
+  left: 4px;
   z-index: 200;
+  width: 15px;
+}
+
+.hide-btn-row:hover {
+    background-color: white;
+    border: 1px solid black;
+    border-radius: 4px;
 }

package/es/components/Toolbar/index.js

@@ -123,8 +123,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   return to.concat(ar || Array.prototype.slice.call(from));
 };
 import React, { useContext, useCallback, useRef, useEffect, useState } from "react";
-import { toolbarItemClickHandler, handleTextBackground, handleTextColor, handleTextSize, normalizedCellAttr, getFlowdata, newComment, editComment, deleteComment, showHideComment, showHideAllComments, autoSelectionFormula, handleSum, locale, handleMerge, handleBorder, toolbarItemSelectedFunc, handleFreeze, insertImage, showImgChooser, updateFormat, handleSort, handleHorizontalAlign, handleVerticalAlign, handleScreenShot, createFilter, clearFilter, applyLocation, insertDuneChart } from "@fileverse-dev/fortune-core";
-import { api } from "@fileverse-dev/fortune-core";
+import { toolbarItemClickHandler, handleTextBackground, handleTextColor, handleTextSize, normalizedCellAttr, getFlowdata, newComment, editComment, deleteComment, showHideComment, showHideAllComments, autoSelectionFormula, handleSum, locale, handleMerge, handleBorder, toolbarItemSelectedFunc, handleFreeze, insertImage, showImgChooser, updateFormat, handleSort, handleHorizontalAlign, handleVerticalAlign, handleScreenShot, createFilter, clearFilter, applyLocation, insertDuneChart, api } from "@fileverse-dev/fortune-core";
 import _ from "lodash";
 import { IconButton, LucideIcon, Tooltip, Command, CommandInput, CommandList, CommandEmpty, CommandGroup, CommandItem } from "@fileverse/ui";
 import DataVerificationPortal from "./dataVerificationPortal";

package/lib/components/DataVerification/RangeDialog.js

@@ -27,10 +27,12 @@ var RangeDialog = function RangeDialog() {
     rangeTxt2 = _c[0],
     setRangeTxt2 = _c[1];
   var close = (0, _react.useCallback)(function () {
+    var _a;
     setContext(function (ctx) {
       ctx.rangeDialog.show = false;
       ctx.rangeDialog.singleSelect = false;
     });
+    (_a = document.getElementById("data-verification-button")) === null || _a === void 0 ? void 0 : _a.click();
     if (!context.rangeDialog) return;
     var rangeDialogType = context.rangeDialog.type;
     if (rangeDialogType.indexOf("between") >= 0) {
@@ -99,6 +101,7 @@ var RangeDialog = function RangeDialog() {
       minWidth: "80px"
     },
     onClick: function onClick() {
+      console.log("rangeTxt2", rangeTxt2);
       setContext(function (ctx) {
         ctx.rangeDialog.rangeTxt = rangeTxt2;
       });

package/lib/components/SheetOverlay/ColumnHeader.js

@@ -204,6 +204,15 @@ var ColumnHeader = function ColumnHeader() {
   (0, _react.useEffect)(function () {
     containerRef.current.scrollLeft = context.scrollLeft;
   }, [context.scrollLeft]);
+  var _h = (0, _react.useState)(0),
+    hovered = _h[0],
+    setHovered = _h[1];
+  var onMouseMoveHideRight = (0, _react.useCallback)(function () {
+    setHovered(-21);
+  }, []);
+  var onMouseLeaveHideRight = (0, _react.useCallback)(function () {
+    setHovered(0);
+  }, []);
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: containerRef,
     className: "fortune-col-header",
@@ -247,10 +256,12 @@ var ColumnHeader = function ColumnHeader() {
     }))));
   }), hiddenPointers.map(function (item) {
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: "flex gap-4 cursor-pointer hide-btn align-center",
+      onMouseEnter: onMouseMoveHideRight,
+      onMouseLeave: onMouseLeaveHideRight,
+      className: "flex gap-4 cursor-pointer hide-btn-right align-center",
       style: {
         height: context.columnHeaderHeight - 12,
-        left: "".concat(item.left + 6, "px")
+        left: "".concat(item.left + 8 + hovered, "px")
       },
       onClick: function onClick(e) {
         return showColumn(e, item);

package/lib/components/SheetOverlay/RowHeader.js

@@ -215,9 +215,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) {

package/lib/components/SheetOverlay/index.css

@@ -1013,16 +1013,42 @@
 }
 
 .hide-btn {
-  padding-top: 1px;
+  padding-left: 2px;
+  padding-top: 2px;
   position: absolute;
   right: 5;
   top: 5px;
   z-index: 200;
-  width: 9px;
 }
 
 .hide-btn:hover {
-  border: 1px solid #0188fb;
+  padding-left: 1px;
+  padding-top: 1px;
+  width: 28px;
+  border: 1px solid black;
+  background-color: rgba(255, 255, 255, 1);
+  border-radius: var(--border-radius-sm, 4px);
+}
+
+.hide-btn-right {
+  padding-right: 3px;
+  padding-top: 2px;
+  position: absolute;
+  right: 5;
+  top: 5px;
+  z-index: 200;
+  margin-right: 20px;
+}
+
+.hide-btn-right:hover {
+  padding-right: 2px;
+  padding-top: 1px;
+  z-index: 198;
+  justify-content: end;
+  width: 30px;
+  border: 1px solid black;
+  background-color: rgba(255, 255, 255, 1);
+  border-radius: var(--border-radius-sm, 4px);
 }
 
 .rotate-row-icon {
@@ -1031,6 +1057,13 @@
 
 .hide-btn-row {
   position: absolute;
-   left: 4px;
+  left: 4px;
   z-index: 200;
+  width: 15px;
+}
+
+.hide-btn-row:hover {
+    background-color: white;
+    border: 1px solid black;
+    border-radius: 4px;
 }

package/package.json

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