@fileverse-dev/fortune-react 1.2.64 → 1.2.66

package/es/components/Toolbar/index.js

@@ -135,6 +135,7 @@ import Combo from "./Combo";
 import Select, { Option } from "./Select";
 import SVGIcon from "../SVGIcon";
 import { useDialog } from "../../hooks/useDialog";
+import { useAlert } from "../../hooks/useAlert";
 import { SplitColumn } from "../SplitColumn";
 import { LocationCondition } from "../LocationCondition";
 import ConditionalFormat from "../ConditionFormat";
@@ -481,29 +482,33 @@ var Toolbar = function Toolbar(_a) {
   var _l = useDialog(),
     showDialog = _l.showDialog,
     hideDialog = _l.hideDialog;
+  var _m = useAlert(),
+    showAlert = _m.showAlert,
+    hideAlert = _m.hideAlert;
   var firstSelection = (_b = context.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b[0];
   var flowdata = getFlowdata(context);
   contextRef.current = context;
   var row = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.row_focus;
   var col = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
   var cell = flowdata && row != null && col != null ? (_c = flowdata === null || flowdata === void 0 ? void 0 : flowdata[row]) === null || _c === void 0 ? void 0 : _c[col] : undefined;
-  var _m = locale(context),
-    toolbar = _m.toolbar,
-    merge = _m.merge,
-    border = _m.border,
-    freezen = _m.freezen,
-    defaultFmt = _m.defaultFmt,
-    formula = _m.formula,
-    sort = _m.sort,
-    align = _m.align,
-    textWrap = _m.textWrap,
-    rotation = _m.rotation,
-    screenshot = _m.screenshot,
-    filter = _m.filter,
-    splitText = _m.splitText,
-    findAndReplace = _m.findAndReplace,
-    comment = _m.comment,
-    fontarray = _m.fontarray;
+  var _o = locale(context),
+    toolbar = _o.toolbar,
+    merge = _o.merge,
+    border = _o.border,
+    freezen = _o.freezen,
+    defaultFmt = _o.defaultFmt,
+    formula = _o.formula,
+    sort = _o.sort,
+    align = _o.align,
+    textWrap = _o.textWrap,
+    rotation = _o.rotation,
+    screenshot = _o.screenshot,
+    filter = _o.filter,
+    splitText = _o.splitText,
+    findAndReplace = _o.findAndReplace,
+    comment = _o.comment,
+    fontarray = _o.fontarray,
+    sheetconfig = _o.sheetconfig;
   var toolbarFormat = locale(context).format;
   var sheetWidth = context.luckysheetTableContentHW[0];
   var currency = settings.currency;
@@ -593,9 +598,9 @@ var Toolbar = function Toolbar(_a) {
       ctx.dataVerification.dataRegulation.value1 = "value1";
     });
   }, []);
-  var _o = useState(false),
-    showDataValidation = _o[0],
-    setShowDataValidation = _o[1];
+  var _p = useState(false),
+    showDataValidation = _p[0],
+    setShowDataValidation = _p[1];
   var dataVerificationClick = function dataVerificationClick(selectedCells) {
     var _a;
     var selection = api.getSelection(context);
@@ -1283,8 +1288,12 @@ var Toolbar = function Toolbar(_a) {
         tooltip: tooltip,
         text: "\u5408\u5E76\u5355\u5143\u683C",
         onClick: function onClick() {
-          return setContext(function (ctx) {
-            handleMerge(ctx, "merge-all");
+          var confirmMessage = sheetconfig.confirmMerge;
+          showAlert(confirmMessage, "yesno", function () {
+            setContext(function (ctx) {
+              handleMerge(ctx, "merge-all");
+            });
+            hideAlert();
           });
         }
       }, function (setOpen) {
@@ -1295,10 +1304,21 @@ var Toolbar = function Toolbar(_a) {
           return /*#__PURE__*/React.createElement(Option, {
             key: value,
             onClick: function onClick() {
-              setContext(function (ctx) {
-                handleMerge(ctx, value);
-              });
-              setOpen(false);
+              if (value === "merge-cancel") {
+                setContext(function (ctx) {
+                  handleMerge(ctx, value);
+                });
+                setOpen(false);
+              } else {
+                setOpen(false);
+                var confirmMessage = sheetconfig.confirmMerge;
+                showAlert(confirmMessage, "yesno", function () {
+                  setContext(function (ctx) {
+                    handleMerge(ctx, value);
+                  });
+                  hideAlert();
+                });
+              }
             }
           }, /*#__PURE__*/React.createElement("div", {
             style: {

package/es/components/Workbook/api.d.ts

@@ -714,6 +714,7 @@ export declare function generateAPIs(context: Context, setContext: (recipe: (ctx
             chartEditNoOpt: string;
             sheetNameSpecCharError: string;
             sheetNamecannotIsEmptyError: string;
+            confirmMerge: string;
         };
         conditionformat: {
             conditionformat_greaterThan: string;

package/es/components/Workbook/index.d.ts

@@ -721,6 +721,7 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
             chartEditNoOpt: string;
             sheetNameSpecCharError: string;
             sheetNamecannotIsEmptyError: string;
+            confirmMerge: string;
         };
         conditionformat: {
             conditionformat_greaterThan: string;

package/lib/components/Toolbar/index.js

@@ -18,6 +18,7 @@ var _Combo = _interopRequireDefault(require("./Combo"));
 var _Select = _interopRequireWildcard(require("./Select"));
 var _SVGIcon = _interopRequireDefault(require("../SVGIcon"));
 var _useDialog = require("../../hooks/useDialog");
+var _useAlert = require("../../hooks/useAlert");
 var _SplitColumn = require("../SplitColumn");
 var _LocationCondition = require("../LocationCondition");
 var _ConditionFormat = _interopRequireDefault(require("../ConditionFormat"));
@@ -490,29 +491,33 @@ var Toolbar = function Toolbar(_a) {
   var _l = (0, _useDialog.useDialog)(),
     showDialog = _l.showDialog,
     hideDialog = _l.hideDialog;
+  var _m = (0, _useAlert.useAlert)(),
+    showAlert = _m.showAlert,
+    hideAlert = _m.hideAlert;
   var firstSelection = (_b = context.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b[0];
   var flowdata = (0, _fortuneCore.getFlowdata)(context);
   contextRef.current = context;
   var row = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.row_focus;
   var col = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
   var cell = flowdata && row != null && col != null ? (_c = flowdata === null || flowdata === void 0 ? void 0 : flowdata[row]) === null || _c === void 0 ? void 0 : _c[col] : undefined;
-  var _m = (0, _fortuneCore.locale)(context),
-    toolbar = _m.toolbar,
-    merge = _m.merge,
-    border = _m.border,
-    freezen = _m.freezen,
-    defaultFmt = _m.defaultFmt,
-    formula = _m.formula,
-    sort = _m.sort,
-    align = _m.align,
-    textWrap = _m.textWrap,
-    rotation = _m.rotation,
-    screenshot = _m.screenshot,
-    filter = _m.filter,
-    splitText = _m.splitText,
-    findAndReplace = _m.findAndReplace,
-    comment = _m.comment,
-    fontarray = _m.fontarray;
+  var _o = (0, _fortuneCore.locale)(context),
+    toolbar = _o.toolbar,
+    merge = _o.merge,
+    border = _o.border,
+    freezen = _o.freezen,
+    defaultFmt = _o.defaultFmt,
+    formula = _o.formula,
+    sort = _o.sort,
+    align = _o.align,
+    textWrap = _o.textWrap,
+    rotation = _o.rotation,
+    screenshot = _o.screenshot,
+    filter = _o.filter,
+    splitText = _o.splitText,
+    findAndReplace = _o.findAndReplace,
+    comment = _o.comment,
+    fontarray = _o.fontarray,
+    sheetconfig = _o.sheetconfig;
   var toolbarFormat = (0, _fortuneCore.locale)(context).format;
   var sheetWidth = context.luckysheetTableContentHW[0];
   var currency = settings.currency;
@@ -602,9 +607,9 @@ var Toolbar = function Toolbar(_a) {
       ctx.dataVerification.dataRegulation.value1 = "value1";
     });
   }, []);
-  var _o = (0, _react.useState)(false),
-    showDataValidation = _o[0],
-    setShowDataValidation = _o[1];
+  var _p = (0, _react.useState)(false),
+    showDataValidation = _p[0],
+    setShowDataValidation = _p[1];
   var dataVerificationClick = function dataVerificationClick(selectedCells) {
     var _a;
     var selection = _fortuneCore.api.getSelection(context);
@@ -1292,8 +1297,12 @@ var Toolbar = function Toolbar(_a) {
         tooltip: tooltip,
         text: "\u5408\u5E76\u5355\u5143\u683C",
         onClick: function onClick() {
-          return setContext(function (ctx) {
-            (0, _fortuneCore.handleMerge)(ctx, "merge-all");
+          var confirmMessage = sheetconfig.confirmMerge;
+          showAlert(confirmMessage, "yesno", function () {
+            setContext(function (ctx) {
+              (0, _fortuneCore.handleMerge)(ctx, "merge-all");
+            });
+            hideAlert();
           });
         }
       }, function (setOpen) {
@@ -1304,10 +1313,21 @@ var Toolbar = function Toolbar(_a) {
           return /*#__PURE__*/_react.default.createElement(_Select.Option, {
             key: value,
             onClick: function onClick() {
-              setContext(function (ctx) {
-                (0, _fortuneCore.handleMerge)(ctx, value);
-              });
-              setOpen(false);
+              if (value === "merge-cancel") {
+                setContext(function (ctx) {
+                  (0, _fortuneCore.handleMerge)(ctx, value);
+                });
+                setOpen(false);
+              } else {
+                setOpen(false);
+                var confirmMessage = sheetconfig.confirmMerge;
+                showAlert(confirmMessage, "yesno", function () {
+                  setContext(function (ctx) {
+                    (0, _fortuneCore.handleMerge)(ctx, value);
+                  });
+                  hideAlert();
+                });
+              }
             }
           }, /*#__PURE__*/_react.default.createElement("div", {
             style: {

package/lib/components/Workbook/api.d.ts

@@ -714,6 +714,7 @@ export declare function generateAPIs(context: Context, setContext: (recipe: (ctx
             chartEditNoOpt: string;
             sheetNameSpecCharError: string;
             sheetNamecannotIsEmptyError: string;
+            confirmMerge: string;
         };
         conditionformat: {
             conditionformat_greaterThan: string;

package/lib/components/Workbook/index.d.ts

@@ -721,6 +721,7 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
             chartEditNoOpt: string;
             sheetNameSpecCharError: string;
             sheetNamecannotIsEmptyError: string;
+            confirmMerge: string;
         };
         conditionformat: {
             conditionformat_greaterThan: string;

package/package.json

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