@fileverse-dev/fortune-react 1.2.5 → 1.2.6

package/es/components/DataVerification/RangeDialog.js

@@ -92,7 +92,6 @@ 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

@@ -162,6 +162,7 @@ var ColumnHeader = function ColumnHeader() {
     if (sheetIndex == null) return;
     var tempPointers = [];
     var colhidden = (_b = (_a = context.luckysheetfile[sheetIndex]) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.colhidden;
+    console.log(colhidden);
     if (colhidden) {
       Object.keys(colhidden).forEach(function (key) {
         var item = {
@@ -170,20 +171,36 @@ var ColumnHeader = function ColumnHeader() {
         };
         tempPointers.push(item);
       });
-      console.log(tempPointers);
       setHiddenPointers(tempPointers);
     } else {
       setHiddenPointers([]);
     }
   }, [context.visibledatacolumn, sheetIndex]);
   var showColumn = function showColumn(e, item) {
+    var _a, _b;
+    if (sheetIndex == null) return;
+    var startPoint = item.col;
+    var startCol = startPoint,
+      endCol = startPoint;
+    var colhiddenData = (_b = (_a = context.luckysheetfile[sheetIndex]) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.colhidden;
+    var findColBoundary = function findColBoundary(start, direction) {
+      var tempPoint = start;
+      while (true) {
+        var checkColIndex = tempPoint + direction;
+        if (!(colhiddenData === null || colhiddenData === void 0 ? void 0 : colhiddenData.hasOwnProperty(checkColIndex))) break;
+        tempPoint = checkColIndex;
+      }
+      return tempPoint;
+    };
+    startCol = findColBoundary(startPoint, -1);
+    endCol = findColBoundary(startPoint, 1);
     if (context.isFlvReadOnly) return;
     e.stopPropagation();
     setContext(function (ctx) {
       var _a;
       api.setSelection(ctx, [{
         row: [0, (_a = context.visibledatarow) === null || _a === void 0 ? void 0 : _a.length],
-        column: [Number(item.col) - 1, Number(item.col) + 1]
+        column: [Number(startCol) - 1, Number(endCol) + 1]
       }], {
         id: context.currentSheetId
       });
@@ -191,6 +208,15 @@ var ColumnHeader = function ColumnHeader() {
     setContext(function (ctx) {
       showSelected(ctx, "column");
     });
+    setContext(function (ctx) {
+      var _a;
+      api.setSelection(ctx, [{
+        row: [0, (_a = context.visibledatarow) === null || _a === void 0 ? void 0 : _a.length],
+        column: [Number(startCol), Number(endCol)]
+      }], {
+        id: context.currentSheetId
+      });
+    });
   };
   useEffect(function () {
     containerRef.current.scrollLeft = context.scrollLeft;

package/es/components/SheetOverlay/FormulaHint/index.js

@@ -195,14 +195,14 @@ var FormulaHint = function FormulaHint(props) {
     if (param.require === "o") {
       name = "[".concat(name, "]");
     }
-    return /*#__PURE__*/React.createElement("code", {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("code", {
       className: "luckysheet-arguments-help-parameter font-family-mono mb-1 mt-2 color-text-default",
       dir: "auto",
       key: name,
       style: {
         backgroundColor: commaCount === i ? bgColor(fn.BRAND_SECONDARY_COLOR) : "transparent"
       }
-    }, name, i !== fn.p.length - 1 && ", ");
+    }, name), i !== fn.p.length - 1 && ", ");
   })), /*#__PURE__*/React.createElement("code", {
     className: "luckysheet-arguments-paren font-family-mono mb-1 mt-2 color-text-default"
   }, ")")), /*#__PURE__*/React.createElement("div", {

package/es/components/SheetOverlay/RowHeader.js

@@ -175,12 +175,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;
       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
@@ -189,6 +207,15 @@ var RowHeader = function RowHeader() {
     setContext(function (ctx) {
       showSelected(ctx, "row");
     });
+    setContext(function (ctx) {
+      var _a;
+      api.setSelection(ctx, [{
+        row: [Number(startRow), Number(endRow)],
+        column: [0, (_a = context.visibledatacolumn) === null || _a === void 0 ? void 0 : _a.length]
+      }], {
+        id: context.currentSheetId
+      });
+    });
   };
   useEffect(function () {
     containerRef.current.scrollTop = context.scrollTop;

package/lib/components/DataVerification/RangeDialog.js

@@ -101,7 +101,6 @@ 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

@@ -171,6 +171,7 @@ var ColumnHeader = function ColumnHeader() {
     if (sheetIndex == null) return;
     var tempPointers = [];
     var colhidden = (_b = (_a = context.luckysheetfile[sheetIndex]) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.colhidden;
+    console.log(colhidden);
     if (colhidden) {
       Object.keys(colhidden).forEach(function (key) {
         var item = {
@@ -179,20 +180,36 @@ var ColumnHeader = function ColumnHeader() {
         };
         tempPointers.push(item);
       });
-      console.log(tempPointers);
       setHiddenPointers(tempPointers);
     } else {
       setHiddenPointers([]);
     }
   }, [context.visibledatacolumn, sheetIndex]);
   var showColumn = function showColumn(e, item) {
+    var _a, _b;
+    if (sheetIndex == null) return;
+    var startPoint = item.col;
+    var startCol = startPoint,
+      endCol = startPoint;
+    var colhiddenData = (_b = (_a = context.luckysheetfile[sheetIndex]) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.colhidden;
+    var findColBoundary = function findColBoundary(start, direction) {
+      var tempPoint = start;
+      while (true) {
+        var checkColIndex = tempPoint + direction;
+        if (!(colhiddenData === null || colhiddenData === void 0 ? void 0 : colhiddenData.hasOwnProperty(checkColIndex))) break;
+        tempPoint = checkColIndex;
+      }
+      return tempPoint;
+    };
+    startCol = findColBoundary(startPoint, -1);
+    endCol = findColBoundary(startPoint, 1);
     if (context.isFlvReadOnly) return;
     e.stopPropagation();
     setContext(function (ctx) {
       var _a;
       _fortuneCore.api.setSelection(ctx, [{
         row: [0, (_a = context.visibledatarow) === null || _a === void 0 ? void 0 : _a.length],
-        column: [Number(item.col) - 1, Number(item.col) + 1]
+        column: [Number(startCol) - 1, Number(endCol) + 1]
       }], {
         id: context.currentSheetId
       });
@@ -200,6 +217,15 @@ var ColumnHeader = function ColumnHeader() {
     setContext(function (ctx) {
       (0, _fortuneCore.showSelected)(ctx, "column");
     });
+    setContext(function (ctx) {
+      var _a;
+      _fortuneCore.api.setSelection(ctx, [{
+        row: [0, (_a = context.visibledatarow) === null || _a === void 0 ? void 0 : _a.length],
+        column: [Number(startCol), Number(endCol)]
+      }], {
+        id: context.currentSheetId
+      });
+    });
   };
   (0, _react.useEffect)(function () {
     containerRef.current.scrollLeft = context.scrollLeft;

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

@@ -204,14 +204,14 @@ var FormulaHint = function FormulaHint(props) {
     if (param.require === "o") {
       name = "[".concat(name, "]");
     }
-    return /*#__PURE__*/_react.default.createElement("code", {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("code", {
       className: "luckysheet-arguments-help-parameter font-family-mono mb-1 mt-2 color-text-default",
       dir: "auto",
       key: name,
       style: {
         backgroundColor: commaCount === i ? bgColor(fn.BRAND_SECONDARY_COLOR) : "transparent"
       }
-    }, name, i !== fn.p.length - 1 && ", ");
+    }, name), i !== fn.p.length - 1 && ", ");
   })), /*#__PURE__*/_react.default.createElement("code", {
     className: "luckysheet-arguments-paren font-family-mono mb-1 mt-2 color-text-default"
   }, ")")), /*#__PURE__*/_react.default.createElement("div", {

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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.2.5",
+  "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.5",
+    "@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",