@fileverse-dev/fortune-react 1.1.75 → 1.1.78

package/es/components/ContextMenu/index.js

@@ -148,6 +148,31 @@ var ContextMenu = function ContextMenu() {
     info = _b.info,
     toolbar = _b.toolbar,
     splitText = _b.splitText;
+  var addRowColRightAvobe = function addRowColRightAvobe(type, direction) {
+    var _a, _b, _c;
+    var position = (_c = (_b = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.column) === null || _c === void 0 ? void 0 : _c[0];
+    if (position == null) return;
+    var count = 1;
+    if (count < 1) return;
+    var insertRowColOp = {
+      type: type,
+      index: position,
+      count: count,
+      direction: direction,
+      id: context.currentSheetId
+    };
+    setContext(function (draftCtx) {
+      try {
+        insertRowCol(draftCtx, insertRowColOp);
+        draftCtx.contextMenu = {};
+      } catch (err) {
+        if (err.message === "maxExceeded") showAlert(rightclick.columnOverLimit, "ok");else if (err.message === "readOnly") showAlert(rightclick.cannotInsertOnColumnReadOnly, "ok");
+        draftCtx.contextMenu = {};
+      }
+    }, {
+      insertRowColOp: insertRowColOp
+    });
+  };
   var getMenuElement = useCallback(function (name, i) {
     var _a, _b, _c, _d;
     var selection = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0];
@@ -404,30 +429,7 @@ var ContextMenu = function ContextMenu() {
         return /*#__PURE__*/React.createElement(Menu, {
           key: "add-col-".concat(dir),
           onClick: function onClick() {
-            var _a, _b, _c;
-            var position = (_c = (_b = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.column) === null || _c === void 0 ? void 0 : _c[0];
-            if (position == null) return;
-            var count = 1;
-            if (count < 1) return;
-            var direction = "rightbottom";
-            var insertRowColOp = {
-              type: "column",
-              index: position,
-              count: count,
-              direction: direction,
-              id: context.currentSheetId
-            };
-            setContext(function (draftCtx) {
-              try {
-                insertRowCol(draftCtx, insertRowColOp);
-                draftCtx.contextMenu = {};
-              } catch (err) {
-                if (err.message === "maxExceeded") showAlert(rightclick.columnOverLimit, "ok");else if (err.message === "readOnly") showAlert(rightclick.cannotInsertOnColumnReadOnly, "ok");
-                draftCtx.contextMenu = {};
-              }
-            }, {
-              insertRowColOp: insertRowColOp
-            });
+            addRowColRightAvobe("column", "rightbottom");
           }
         }, /*#__PURE__*/React.createElement("div", {
           className: "context-item"
@@ -441,30 +443,7 @@ var ContextMenu = function ContextMenu() {
         return /*#__PURE__*/React.createElement(Menu, {
           key: "add-row-".concat(dir),
           onClick: function onClick() {
-            var _a, _b, _c;
-            var position = (_c = (_b = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.row) === null || _c === void 0 ? void 0 : _c[0];
-            if (position == null) return;
-            var count = 1;
-            if (count < 1) return;
-            var direction = dir === "top" ? "lefttop" : "rightbottom";
-            var insertRowColOp = {
-              type: "row",
-              index: position,
-              count: count,
-              direction: direction,
-              id: context.currentSheetId
-            };
-            setContext(function (draftCtx) {
-              try {
-                insertRowCol(draftCtx, insertRowColOp);
-                draftCtx.contextMenu = {};
-              } catch (err) {
-                if (err.message === "maxExceeded") showAlert(rightclick.rowOverLimit, "ok");else if (err.message === "readOnly") showAlert(rightclick.cannotInsertOnRowReadOnly, "ok");
-                draftCtx.contextMenu = {};
-              }
-            }, {
-              insertRowColOp: insertRowColOp
-            });
+            addRowColRightAvobe("row", "rightbottom");
           }
         }, /*#__PURE__*/React.createElement("div", {
           className: "context-item"

package/es/components/SheetTab/SheetItem.js

@@ -19,9 +19,6 @@ var SheetItem = function SheetItem(_a) {
   var _d = useState(false),
     dragOver = _d[0],
     setDragOver = _d[1];
-  var _e = useState("#c3c3c3"),
-    svgColor = _e[0],
-    setSvgColor = _e[1];
   var showAlert = useAlert().showAlert;
   useEffect(function () {
     setContext(function (draftCtx) {
@@ -212,7 +209,7 @@ var SheetItem = function SheetItem(_a) {
     name: "downArrow",
     width: 12,
     style: {
-      fill: 'var(--color-icon-default)'
+      fill: "var(--color-icon-default)"
     }
   })), !!sheet.color && (/*#__PURE__*/React.createElement("div", {
     className: "luckysheet-sheets-item-color",

package/es/components/SheetTab/index.css

@@ -1,7 +1,6 @@
 .luckysheet-sheet-area {
   width: 100%;
   box-sizing: border-box;
-  /* background-color: #fafafc; */
   color: #444;
   height: 36px;
   padding: 0 30px 0 44px;
@@ -195,7 +194,7 @@
   justify-content: center;
   height: 29px;
   width: 29px;
-  background-color: var(--color-bg-secondary);
+  background-color: hsl(var(--color-bg-secondary)) !important;
 }
 
 .fortune-sheettab-button:hover {

package/es/components/SheetTab/index.js

@@ -81,7 +81,7 @@ var SheetTab = function SheetTab() {
   useEffect(function () {
     var selection = context.luckysheet_select_save;
     if (selection) {
-      var re = calcSelectionInfo(context, "en");
+      var re = calcSelectionInfo(context);
       setCalInfo(re);
     }
   }, [context.luckysheet_select_save]);
@@ -214,8 +214,16 @@ var SheetTab = function SheetTab() {
     });
   })), isShowBoundary && isShowScrollBtn && (/*#__PURE__*/React.createElement("div", {
     className: "boundary boundary-right"
-  }))), isShowScrollBtn && (/*#__PURE__*/React.createElement(IconButton, {
+  }))), isShowScrollBtn && (/*#__PURE__*/React.createElement("div", {
     id: "fortune-sheettab-leftscroll",
+    className: "fortune-sheettab-scroll",
+    ref: leftScrollRef,
+    onClick: function onClick() {
+      scrollBy(-scrollDelta);
+    },
+    tabIndex: 0
+  }, /*#__PURE__*/React.createElement(IconButton, {
+    name: "arrow-doubleleft",
     className: "fortune-sheettab-button border-none shadow-none",
     onClick: function onClick() {
       scrollBy(-scrollDelta);
@@ -224,8 +232,16 @@ var SheetTab = function SheetTab() {
     icon: "ChevronLeft",
     size: "md",
     variant: "secondary"
-  })), isShowScrollBtn && (/*#__PURE__*/React.createElement(IconButton, {
-    id: "fortune-sheettab-leftscroll",
+  }))), isShowScrollBtn && (/*#__PURE__*/React.createElement("div", {
+    id: "fortune-sheettab-rightscroll",
+    className: "fortune-sheettab-scroll",
+    ref: rightScrollRef,
+    onClick: function onClick() {
+      scrollBy(scrollDelta);
+    },
+    tabIndex: 0
+  }, /*#__PURE__*/React.createElement(IconButton, {
+    name: "arrow-doubleright",
     className: "fortune-sheettab-button border-none shadow-none",
     onClick: function onClick() {
       scrollBy(scrollDelta);
@@ -234,7 +250,7 @@ var SheetTab = function SheetTab() {
     icon: "ChevronRight",
     size: "md",
     variant: "secondary"
-  }))), /*#__PURE__*/React.createElement("div", {
+  })))), /*#__PURE__*/React.createElement("div", {
     className: "fortune-sheet-area-right"
   }, statsFilter.length === 6 && (/*#__PURE__*/React.createElement(Popover, null, /*#__PURE__*/React.createElement(PopoverTrigger, {
     className: "p-0 m-0 mr-2"

package/es/components/Workbook/index.js

@@ -15,7 +15,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { defaultContext, defaultSettings, initSheetIndex, handleGlobalKeyDown, getSheetIndex, handlePaste, filterPatch, patchToOp, inverseRowColOptions, ensureSheetIndex, insertRowCol, deleteRowCol, locale, calcSelectionInfo, groupValuesRefresh, insertDuneChart, getFlowdata, api, handlePasteByClick } from "@fileverse-dev/fortune-core";
+import { defaultContext, defaultSettings, initSheetIndex, handleGlobalKeyDown, getSheetIndex, handlePaste, filterPatch, patchToOp, inverseRowColOptions, ensureSheetIndex, insertRowCol, deleteRowCol, groupValuesRefresh, insertDuneChart, getFlowdata, api, handlePasteByClick } from "@fileverse-dev/fortune-core";
 import React, { useMemo, useState, useCallback, useEffect, useRef, useImperativeHandle } from "react";
 import "./index.css";
 import produce, { applyPatches, enablePatches, produceWithPatches } from "immer";
@@ -84,31 +84,12 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   var _c = useState(defaultContext(refs)),
     context = _c[0],
     setContext = _c[1];
-  var formula = locale(context).formula;
   var _d = useState(null),
     moreToolbarItems = _d[0],
     setMoreToolbarItems = _d[1];
-  var _e = useState({
-      numberC: 0,
-      count: 0,
-      sum: 0,
-      max: 0,
-      min: 0,
-      average: ""
-    }),
-    calInfo = _e[0],
-    setCalInfo = _e[1];
   var mergedSettings = useMemo(function () {
     return _.assign(_.cloneDeep(defaultSettings), props);
   }, __spreadArray([], _.values(props), true));
-  useEffect(function () {
-    var selection = context.luckysheet_select_save;
-    var lang = props.lang;
-    if (selection) {
-      var re = calcSelectionInfo(context, lang);
-      setCalInfo(re);
-    }
-  }, [context.luckysheet_select_save]);
   var initSheetData = useCallback(function (draftCtx, newData, index) {
     var _a, _b;
     var celldata = newData.celldata,
@@ -723,6 +704,10 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       e.stopPropagation();
     },
     className: "fortune-popover-backdrop"
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "fortune-stat-area"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "luckysheet-sheet-selection-calInfo"
   })), context.showDunePreview && (/*#__PURE__*/React.createElement(DunePreview, {
     url: context.showDunePreview.url,
     position: context.showDunePreview.position,

package/lib/components/ContextMenu/index.js

@@ -157,6 +157,31 @@ var ContextMenu = function ContextMenu() {
     info = _b.info,
     toolbar = _b.toolbar,
     splitText = _b.splitText;
+  var addRowColRightAvobe = function addRowColRightAvobe(type, direction) {
+    var _a, _b, _c;
+    var position = (_c = (_b = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.column) === null || _c === void 0 ? void 0 : _c[0];
+    if (position == null) return;
+    var count = 1;
+    if (count < 1) return;
+    var insertRowColOp = {
+      type: type,
+      index: position,
+      count: count,
+      direction: direction,
+      id: context.currentSheetId
+    };
+    setContext(function (draftCtx) {
+      try {
+        (0, _fortuneCore.insertRowCol)(draftCtx, insertRowColOp);
+        draftCtx.contextMenu = {};
+      } catch (err) {
+        if (err.message === "maxExceeded") showAlert(rightclick.columnOverLimit, "ok");else if (err.message === "readOnly") showAlert(rightclick.cannotInsertOnColumnReadOnly, "ok");
+        draftCtx.contextMenu = {};
+      }
+    }, {
+      insertRowColOp: insertRowColOp
+    });
+  };
   var getMenuElement = (0, _react.useCallback)(function (name, i) {
     var _a, _b, _c, _d;
     var selection = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0];
@@ -413,30 +438,7 @@ var ContextMenu = function ContextMenu() {
         return /*#__PURE__*/_react.default.createElement(_Menu.default, {
           key: "add-col-".concat(dir),
           onClick: function onClick() {
-            var _a, _b, _c;
-            var position = (_c = (_b = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.column) === null || _c === void 0 ? void 0 : _c[0];
-            if (position == null) return;
-            var count = 1;
-            if (count < 1) return;
-            var direction = "rightbottom";
-            var insertRowColOp = {
-              type: "column",
-              index: position,
-              count: count,
-              direction: direction,
-              id: context.currentSheetId
-            };
-            setContext(function (draftCtx) {
-              try {
-                (0, _fortuneCore.insertRowCol)(draftCtx, insertRowColOp);
-                draftCtx.contextMenu = {};
-              } catch (err) {
-                if (err.message === "maxExceeded") showAlert(rightclick.columnOverLimit, "ok");else if (err.message === "readOnly") showAlert(rightclick.cannotInsertOnColumnReadOnly, "ok");
-                draftCtx.contextMenu = {};
-              }
-            }, {
-              insertRowColOp: insertRowColOp
-            });
+            addRowColRightAvobe("column", "rightbottom");
           }
         }, /*#__PURE__*/_react.default.createElement("div", {
           className: "context-item"
@@ -450,30 +452,7 @@ var ContextMenu = function ContextMenu() {
         return /*#__PURE__*/_react.default.createElement(_Menu.default, {
           key: "add-row-".concat(dir),
           onClick: function onClick() {
-            var _a, _b, _c;
-            var position = (_c = (_b = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.row) === null || _c === void 0 ? void 0 : _c[0];
-            if (position == null) return;
-            var count = 1;
-            if (count < 1) return;
-            var direction = dir === "top" ? "lefttop" : "rightbottom";
-            var insertRowColOp = {
-              type: "row",
-              index: position,
-              count: count,
-              direction: direction,
-              id: context.currentSheetId
-            };
-            setContext(function (draftCtx) {
-              try {
-                (0, _fortuneCore.insertRowCol)(draftCtx, insertRowColOp);
-                draftCtx.contextMenu = {};
-              } catch (err) {
-                if (err.message === "maxExceeded") showAlert(rightclick.rowOverLimit, "ok");else if (err.message === "readOnly") showAlert(rightclick.cannotInsertOnRowReadOnly, "ok");
-                draftCtx.contextMenu = {};
-              }
-            }, {
-              insertRowColOp: insertRowColOp
-            });
+            addRowColRightAvobe("row", "rightbottom");
           }
         }, /*#__PURE__*/_react.default.createElement("div", {
           className: "context-item"

package/lib/components/SheetTab/SheetItem.js

@@ -28,9 +28,6 @@ var SheetItem = function SheetItem(_a) {
   var _d = (0, _react.useState)(false),
     dragOver = _d[0],
     setDragOver = _d[1];
-  var _e = (0, _react.useState)("#c3c3c3"),
-    svgColor = _e[0],
-    setSvgColor = _e[1];
   var showAlert = (0, _useAlert.useAlert)().showAlert;
   (0, _react.useEffect)(function () {
     setContext(function (draftCtx) {
@@ -221,7 +218,7 @@ var SheetItem = function SheetItem(_a) {
     name: "downArrow",
     width: 12,
     style: {
-      fill: 'var(--color-icon-default)'
+      fill: "var(--color-icon-default)"
     }
   })), !!sheet.color && (/*#__PURE__*/_react.default.createElement("div", {
     className: "luckysheet-sheets-item-color",

package/lib/components/SheetTab/index.css

@@ -1,7 +1,6 @@
 .luckysheet-sheet-area {
   width: 100%;
   box-sizing: border-box;
-  /* background-color: #fafafc; */
   color: #444;
   height: 36px;
   padding: 0 30px 0 44px;
@@ -195,7 +194,7 @@
   justify-content: center;
   height: 29px;
   width: 29px;
-  background-color: var(--color-bg-secondary);
+  background-color: hsl(var(--color-bg-secondary)) !important;
 }
 
 .fortune-sheettab-button:hover {

package/lib/components/SheetTab/index.js

@@ -90,7 +90,7 @@ var SheetTab = function SheetTab() {
   (0, _react.useEffect)(function () {
     var selection = context.luckysheet_select_save;
     if (selection) {
-      var re = (0, _fortuneCore.calcSelectionInfo)(context, "en");
+      var re = (0, _fortuneCore.calcSelectionInfo)(context);
       setCalInfo(re);
     }
   }, [context.luckysheet_select_save]);
@@ -223,8 +223,16 @@ var SheetTab = function SheetTab() {
     });
   })), isShowBoundary && isShowScrollBtn && (/*#__PURE__*/_react.default.createElement("div", {
     className: "boundary boundary-right"
-  }))), isShowScrollBtn && (/*#__PURE__*/_react.default.createElement(_ui.IconButton, {
+  }))), isShowScrollBtn && (/*#__PURE__*/_react.default.createElement("div", {
     id: "fortune-sheettab-leftscroll",
+    className: "fortune-sheettab-scroll",
+    ref: leftScrollRef,
+    onClick: function onClick() {
+      scrollBy(-scrollDelta);
+    },
+    tabIndex: 0
+  }, /*#__PURE__*/_react.default.createElement(_ui.IconButton, {
+    name: "arrow-doubleleft",
     className: "fortune-sheettab-button border-none shadow-none",
     onClick: function onClick() {
       scrollBy(-scrollDelta);
@@ -233,8 +241,16 @@ var SheetTab = function SheetTab() {
     icon: "ChevronLeft",
     size: "md",
     variant: "secondary"
-  })), isShowScrollBtn && (/*#__PURE__*/_react.default.createElement(_ui.IconButton, {
-    id: "fortune-sheettab-leftscroll",
+  }))), isShowScrollBtn && (/*#__PURE__*/_react.default.createElement("div", {
+    id: "fortune-sheettab-rightscroll",
+    className: "fortune-sheettab-scroll",
+    ref: rightScrollRef,
+    onClick: function onClick() {
+      scrollBy(scrollDelta);
+    },
+    tabIndex: 0
+  }, /*#__PURE__*/_react.default.createElement(_ui.IconButton, {
+    name: "arrow-doubleright",
     className: "fortune-sheettab-button border-none shadow-none",
     onClick: function onClick() {
       scrollBy(scrollDelta);
@@ -243,7 +259,7 @@ var SheetTab = function SheetTab() {
     icon: "ChevronRight",
     size: "md",
     variant: "secondary"
-  }))), /*#__PURE__*/_react.default.createElement("div", {
+  })))), /*#__PURE__*/_react.default.createElement("div", {
     className: "fortune-sheet-area-right"
   }, statsFilter.length === 6 && (/*#__PURE__*/_react.default.createElement(_ui.Popover, null, /*#__PURE__*/_react.default.createElement(_ui.PopoverTrigger, {
     className: "p-0 m-0 mr-2"

package/lib/components/Workbook/index.js

@@ -93,31 +93,12 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
   var _c = (0, _react.useState)((0, _fortuneCore.defaultContext)(refs)),
     context = _c[0],
     setContext = _c[1];
-  var formula = (0, _fortuneCore.locale)(context).formula;
   var _d = (0, _react.useState)(null),
     moreToolbarItems = _d[0],
     setMoreToolbarItems = _d[1];
-  var _e = (0, _react.useState)({
-      numberC: 0,
-      count: 0,
-      sum: 0,
-      max: 0,
-      min: 0,
-      average: ""
-    }),
-    calInfo = _e[0],
-    setCalInfo = _e[1];
   var mergedSettings = (0, _react.useMemo)(function () {
     return _lodash.default.assign(_lodash.default.cloneDeep(_fortuneCore.defaultSettings), props);
   }, __spreadArray([], _lodash.default.values(props), true));
-  (0, _react.useEffect)(function () {
-    var selection = context.luckysheet_select_save;
-    var lang = props.lang;
-    if (selection) {
-      var re = (0, _fortuneCore.calcSelectionInfo)(context, lang);
-      setCalInfo(re);
-    }
-  }, [context.luckysheet_select_save]);
   var initSheetData = (0, _react.useCallback)(function (draftCtx, newData, index) {
     var _a, _b;
     var celldata = newData.celldata,
@@ -732,6 +713,10 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
       e.stopPropagation();
     },
     className: "fortune-popover-backdrop"
+  })), /*#__PURE__*/_react.default.createElement("div", {
+    className: "fortune-stat-area"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "luckysheet-sheet-selection-calInfo"
   })), context.showDunePreview && (/*#__PURE__*/_react.default.createElement(_DunePreview.default, {
     url: context.showDunePreview.url,
     position: context.showDunePreview.position,

package/package.json

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