@fileverse-dev/fortune-react 1.0.2-mod-52 → 1.0.2-mod-54

package/dist/components/Dialog/index.d.ts

@@ -8,6 +8,8 @@ type Props = {
     contentStyle?: React.CSSProperties;
     children?: React.ReactNode;
     title?: string | React.ReactNode;
+    okLabel?: string;
+    cancelLabel?: string;
 };
 declare const Dialog: React.FC<Props>;
 export default Dialog;

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

@@ -130,7 +130,7 @@ export declare function generateAPIs(context: Context, setContext: (recipe: (ctx
             partiallyError: string;
             readOnlyError: string;
             dataNullError: string;
-            noSeletionError: string;
+            noSelectionError: string;
             cannotSelectMultiple: string;
         };
         functionlist: ({
@@ -424,7 +424,7 @@ export declare function generateAPIs(context: Context, setContext: (recipe: (ctx
             freezenColumnRange: string;
             freezenRCRange: string;
             freezenCancel: string;
-            noSeletionError: string;
+            noSelectionError: string;
             rangeRCOverErrorTitle: string;
             rangeRCOverError: string;
         };

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

@@ -137,7 +137,7 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
             partiallyError: string;
             readOnlyError: string;
             dataNullError: string;
-            noSeletionError: string;
+            noSelectionError: string;
             cannotSelectMultiple: string;
         };
         functionlist: ({
@@ -431,7 +431,7 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
             freezenColumnRange: string;
             freezenRCRange: string;
             freezenCancel: string;
-            noSeletionError: string;
+            noSelectionError: string;
             rangeRCOverErrorTitle: string;
             rangeRCOverError: string;
         };

package/dist/hooks/useDialog.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
 export declare function useDialog(): {
-    showDialog: (content: string | React.ReactNode, type?: "ok" | "yesno", title?: string | React.ReactNode, onOk?: () => void, onCancel?: () => void) => void;
+    showDialog: (content: string | React.ReactNode, type?: "ok" | "yesno", title?: string | React.ReactNode, okLabel?: string, cancelLabel?: string, onOk?: () => void, onCancel?: () => void) => void;
     hideDialog: () => void;
 };

package/dist/index.esm.js

@@ -1532,7 +1532,9 @@ var Dialog = function Dialog(_ref) {
     children = _ref.children,
     containerStyle = _ref.containerStyle,
     contentStyle = _ref.contentStyle,
-    title = _ref.title;
+    title = _ref.title,
+    okLabel = _ref.okLabel,
+    cancelLabel = _ref.cancelLabel;
   var _useContext = useContext(WorkbookContext),
     context = _useContext.context;
   var _locale = locale(context),
@@ -1563,21 +1565,21 @@ var Dialog = function Dialog(_ref) {
     },
     onClick: onOk,
     tabIndex: 0
-  }, button.confirm)) : (/*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button$1, {
+  }, okLabel || button.confirm)) : (/*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button$1, {
     variant: "secondary",
     style: {
       minWidth: "80px"
     },
     onClick: onCancel,
     tabIndex: 0
-  }, button.cancel), /*#__PURE__*/React.createElement(Button$1, {
+  }, cancelLabel || button.cancel), /*#__PURE__*/React.createElement(Button$1, {
     variant: "default",
     style: {
       minWidth: "80px"
     },
     onClick: onOk,
     tabIndex: 0
-  }, button.confirm))))));
+  }, okLabel || button.confirm))))));
 };
 
 var MessageBox = function MessageBox(_ref) {
@@ -2596,14 +2598,16 @@ function useDialog() {
   var _useContext = useContext(ModalContext),
     showModal = _useContext.showModal,
     hideModal = _useContext.hideModal;
-  var showDialog = useCallback(function (content, type, title) {
-    var onOk = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : hideModal;
-    var onCancel = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : hideModal;
+  var showDialog = useCallback(function (content, type, title, okLabel, cancelLabel) {
+    var onOk = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : hideModal;
+    var onCancel = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : hideModal;
     showModal(/*#__PURE__*/React.createElement(Dialog, {
       type: type,
       onOk: onOk,
       onCancel: onCancel,
-      title: title
+      title: title,
+      okLabel: okLabel,
+      cancelLabel: cancelLabel
     }, content));
   }, [hideModal, showModal]);
   return {
@@ -2689,7 +2693,7 @@ var DataVerification = function DataVerification() {
         var _ctx$dataVerification3, _ctx$dataVerification4, _ctx$luckysheetfile$g2;
         var range = getRangeByTxt(ctx, (_ctx$dataVerification3 = ctx.dataVerification) === null || _ctx$dataVerification3 === void 0 ? void 0 : (_ctx$dataVerification4 = _ctx$dataVerification3.dataRegulation) === null || _ctx$dataVerification4 === void 0 ? void 0 : _ctx$dataVerification4.rangeTxt);
         if (range.length === 0) {
-          showDialog(generalDialog.noSeletionError, "ok");
+          showDialog(generalDialog.noSelectionError, "ok");
           return;
         }
         var currentDataVerification = (_ctx$luckysheetfile$g2 = ctx.luckysheetfile[getSheetIndex(ctx, ctx.currentSheetId)].dataVerification) !== null && _ctx$luckysheetfile$g2 !== void 0 ? _ctx$luckysheetfile$g2 : {};
@@ -3842,10 +3846,13 @@ var SheetOverlay = function SheetOverlay() {
   useEffect(function () {
     if (context.warnDialog) {
       setTimeout(function () {
-        showDialog(context.warnDialog, "ok");
+        showDialog(context.warnDialog, "yesno", "Invalid data", "Retry");
+        setContext(function (ctx) {
+          ctx.warnDialog = undefined;
+        });
       }, 240);
     }
-  }, [context.warnDialog]);
+  }, [context.warnDialog, setContext, showDialog]);
   useEffect(function () {
     refs.cellArea.current.scrollLeft = context.scrollLeft;
     refs.cellArea.current.scrollTop = context.scrollTop;
@@ -4160,9 +4167,8 @@ var SheetOverlay = function SheetOverlay() {
     name: "caret-down-fill",
     width: 16,
     height: 16
-  })), context.dataVerificationDropDownList && /*#__PURE__*/React.createElement(DropDownList, null), /*#__PURE__*/React.createElement("div", {
+  })), context.dataVerificationDropDownList && (context.dataVerification.dataRegulation.value1 !== "" || context.dataVerification.dataRegulation.value2 !== "") && (/*#__PURE__*/React.createElement(DropDownList, null)), /*#__PURE__*/React.createElement("div", {
     id: "luckysheet-dataVerification-showHintBox",
-    className: "luckysheet-mousedown-cancel",
     ref: dataVerificationHintBoxRef
   }), /*#__PURE__*/React.createElement("div", {
     className: "luckysheet-cell-copy"
@@ -4638,7 +4644,7 @@ var SplitColumn = function SplitColumn() {
       }
     }
     if (dataCover) {
-      showDialog(splitText.splitConfirmToExe, "yesno", undefined, function () {
+      showDialog(splitText.splitConfirmToExe, "yesno", undefined, undefined, undefined, function () {
         hideDialog();
         setContext(function (ctx) {
           updateMoreCell(r, c, dataArr, ctx);
@@ -5853,8 +5859,24 @@ var Toolbar = function Toolbar(_ref) {
         tooltip: tooltip,
         showArrow: false
       }, function (setOpen) {
-        return /*#__PURE__*/React.createElement(Select, null, [9, 10, 11, 12, 14, 16, 18, 20, 22, 24, 26, 28, 36, 48, 72].map(function (num) {
-          return /*#__PURE__*/React.createElement(Option, {
+        return /*#__PURE__*/React.createElement(Select, {
+          style: {
+            minWidth: "fit-content",
+            width: "50px"
+          }
+        }, [9, 10, 11, 12, 14, 16, 18, 20, 22, 24, 26, 28, 36, 48, 72].map(function (num) {
+          return /*#__PURE__*/React.createElement("div", {
+            className: "fortune-toolbar-select-option text-body-sm text-center color-text-default",
+            style: {
+              minWidth: "fit-content",
+              padding: "0px",
+              width: "36px",
+              height: "36px",
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+              fontSize: "14px"
+            },
             key: num,
             onClick: function onClick() {
               setContext(function (draftContext) {
@@ -6087,7 +6109,7 @@ var Toolbar = function Toolbar(_ref) {
             onClick: function onClick() {
               var _context$luckysheet_s2, _context$luckysheet_s3;
               if (context.luckysheet_select_save == null) {
-                showDialog(freezen.noSeletionError, "ok");
+                showDialog(freezen.noSelectionError, "ok");
                 return;
               }
               var last = context.luckysheet_select_save[0];

package/dist/index.js

@@ -1544,7 +1544,9 @@ var Dialog = function Dialog(_ref) {
     children = _ref.children,
     containerStyle = _ref.containerStyle,
     contentStyle = _ref.contentStyle,
-    title = _ref.title;
+    title = _ref.title,
+    okLabel = _ref.okLabel,
+    cancelLabel = _ref.cancelLabel;
   var _useContext = React.useContext(WorkbookContext),
     context = _useContext.context;
   var _locale = fortuneCore.locale(context),
@@ -1575,21 +1577,21 @@ var Dialog = function Dialog(_ref) {
     },
     onClick: onOk,
     tabIndex: 0
-  }, button.confirm)) : (/*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(ui.Button, {
+  }, okLabel || button.confirm)) : (/*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(ui.Button, {
     variant: "secondary",
     style: {
       minWidth: "80px"
     },
     onClick: onCancel,
     tabIndex: 0
-  }, button.cancel), /*#__PURE__*/React__default['default'].createElement(ui.Button, {
+  }, cancelLabel || button.cancel), /*#__PURE__*/React__default['default'].createElement(ui.Button, {
     variant: "default",
     style: {
       minWidth: "80px"
     },
     onClick: onOk,
     tabIndex: 0
-  }, button.confirm))))));
+  }, okLabel || button.confirm))))));
 };
 
 var MessageBox = function MessageBox(_ref) {
@@ -2608,14 +2610,16 @@ function useDialog() {
   var _useContext = React.useContext(ModalContext),
     showModal = _useContext.showModal,
     hideModal = _useContext.hideModal;
-  var showDialog = React.useCallback(function (content, type, title) {
-    var onOk = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : hideModal;
-    var onCancel = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : hideModal;
+  var showDialog = React.useCallback(function (content, type, title, okLabel, cancelLabel) {
+    var onOk = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : hideModal;
+    var onCancel = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : hideModal;
     showModal(/*#__PURE__*/React__default['default'].createElement(Dialog, {
       type: type,
       onOk: onOk,
       onCancel: onCancel,
-      title: title
+      title: title,
+      okLabel: okLabel,
+      cancelLabel: cancelLabel
     }, content));
   }, [hideModal, showModal]);
   return {
@@ -2701,7 +2705,7 @@ var DataVerification = function DataVerification() {
         var _ctx$dataVerification3, _ctx$dataVerification4, _ctx$luckysheetfile$g2;
         var range = fortuneCore.getRangeByTxt(ctx, (_ctx$dataVerification3 = ctx.dataVerification) === null || _ctx$dataVerification3 === void 0 ? void 0 : (_ctx$dataVerification4 = _ctx$dataVerification3.dataRegulation) === null || _ctx$dataVerification4 === void 0 ? void 0 : _ctx$dataVerification4.rangeTxt);
         if (range.length === 0) {
-          showDialog(generalDialog.noSeletionError, "ok");
+          showDialog(generalDialog.noSelectionError, "ok");
           return;
         }
         var currentDataVerification = (_ctx$luckysheetfile$g2 = ctx.luckysheetfile[fortuneCore.getSheetIndex(ctx, ctx.currentSheetId)].dataVerification) !== null && _ctx$luckysheetfile$g2 !== void 0 ? _ctx$luckysheetfile$g2 : {};
@@ -3854,10 +3858,13 @@ var SheetOverlay = function SheetOverlay() {
   React.useEffect(function () {
     if (context.warnDialog) {
       setTimeout(function () {
-        showDialog(context.warnDialog, "ok");
+        showDialog(context.warnDialog, "yesno", "Invalid data", "Retry");
+        setContext(function (ctx) {
+          ctx.warnDialog = undefined;
+        });
       }, 240);
     }
-  }, [context.warnDialog]);
+  }, [context.warnDialog, setContext, showDialog]);
   React.useEffect(function () {
     refs.cellArea.current.scrollLeft = context.scrollLeft;
     refs.cellArea.current.scrollTop = context.scrollTop;
@@ -4172,9 +4179,8 @@ var SheetOverlay = function SheetOverlay() {
     name: "caret-down-fill",
     width: 16,
     height: 16
-  })), context.dataVerificationDropDownList && /*#__PURE__*/React__default['default'].createElement(DropDownList, null), /*#__PURE__*/React__default['default'].createElement("div", {
+  })), context.dataVerificationDropDownList && (context.dataVerification.dataRegulation.value1 !== "" || context.dataVerification.dataRegulation.value2 !== "") && (/*#__PURE__*/React__default['default'].createElement(DropDownList, null)), /*#__PURE__*/React__default['default'].createElement("div", {
     id: "luckysheet-dataVerification-showHintBox",
-    className: "luckysheet-mousedown-cancel",
     ref: dataVerificationHintBoxRef
   }), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "luckysheet-cell-copy"
@@ -4650,7 +4656,7 @@ var SplitColumn = function SplitColumn() {
       }
     }
     if (dataCover) {
-      showDialog(splitText.splitConfirmToExe, "yesno", undefined, function () {
+      showDialog(splitText.splitConfirmToExe, "yesno", undefined, undefined, undefined, function () {
         hideDialog();
         setContext(function (ctx) {
           fortuneCore.updateMoreCell(r, c, dataArr, ctx);
@@ -5865,8 +5871,24 @@ var Toolbar = function Toolbar(_ref) {
         tooltip: tooltip,
         showArrow: false
       }, function (setOpen) {
-        return /*#__PURE__*/React__default['default'].createElement(Select, null, [9, 10, 11, 12, 14, 16, 18, 20, 22, 24, 26, 28, 36, 48, 72].map(function (num) {
-          return /*#__PURE__*/React__default['default'].createElement(Option, {
+        return /*#__PURE__*/React__default['default'].createElement(Select, {
+          style: {
+            minWidth: "fit-content",
+            width: "50px"
+          }
+        }, [9, 10, 11, 12, 14, 16, 18, 20, 22, 24, 26, 28, 36, 48, 72].map(function (num) {
+          return /*#__PURE__*/React__default['default'].createElement("div", {
+            className: "fortune-toolbar-select-option text-body-sm text-center color-text-default",
+            style: {
+              minWidth: "fit-content",
+              padding: "0px",
+              width: "36px",
+              height: "36px",
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+              fontSize: "14px"
+            },
             key: num,
             onClick: function onClick() {
               setContext(function (draftContext) {
@@ -6099,7 +6121,7 @@ var Toolbar = function Toolbar(_ref) {
             onClick: function onClick() {
               var _context$luckysheet_s2, _context$luckysheet_s3;
               if (context.luckysheet_select_save == null) {
-                showDialog(freezen.noSeletionError, "ok");
+                showDialog(freezen.noSelectionError, "ok");
                 return;
               }
               var last = context.luckysheet_select_save[0];