@fileverse-dev/fortune-react 1.1.98 → 1.1.99-patch-3

package/es/components/SheetOverlay/drag_and_drop/row-helpers.js

@@ -253,24 +253,26 @@ export var useRowDragAndDrop = function useRowDragAndDrop(containerRef, selected
               }
             });
           });
-          var newDataVerification = {};
-          Object.keys(_sheet.dataVerification).forEach(function (item) {
-            var _a;
-            var itemData = (_a = _sheet.dataVerification) === null || _a === void 0 ? void 0 : _a[item];
-            var colRow = item.split("_");
-            if (colRow.length !== 2) return;
-            var presentRow = parseInt(colRow[0], 10);
-            var updatedRow = presentRow;
-            if (presentRow === sourceIndex_1) {
-              updatedRow = targetIndex;
-            } else if (presentRow > sourceIndex_1 && presentRow < targetIndex) {
-              updatedRow -= 1;
-            } else if (presentRow < sourceIndex_1 && presentRow >= targetIndex) {
-              updatedRow += 1;
-            }
-            newDataVerification["".concat(updatedRow, "_").concat(colRow[1])] = itemData;
-          });
-          _sheet.dataVerification = newDataVerification;
+          if (_sheet.dataVerification) {
+            var newDataVerification_1 = {};
+            Object.keys(_sheet.dataVerification).forEach(function (item) {
+              var _a;
+              var itemData = (_a = _sheet.dataVerification) === null || _a === void 0 ? void 0 : _a[item];
+              var colRow = item.split("_");
+              if (colRow.length !== 2) return;
+              var presentRow = parseInt(colRow[0], 10);
+              var updatedRow = presentRow;
+              if (presentRow === sourceIndex_1) {
+                updatedRow = targetIndex;
+              } else if (presentRow > sourceIndex_1 && presentRow < targetIndex) {
+                updatedRow -= 1;
+              } else if (presentRow < sourceIndex_1 && presentRow >= targetIndex) {
+                updatedRow += 1;
+              }
+              newDataVerification_1["".concat(updatedRow, "_").concat(colRow[1])] = itemData;
+            });
+            _sheet.dataVerification = newDataVerification_1;
+          }
           (_a = _sheet.calcChain) === null || _a === void 0 ? void 0 : _a.forEach(function (item) {
             if (item.r === sourceIndex_1) {
               item.r = targetIndex;

package/es/components/SheetOverlay/helper.d.ts

@@ -6,5 +6,4 @@ export declare function incrementColumn(cell: string): string;
 export declare function decrementColumn(cell: string): string;
 export declare function incrementRow(cell: string): string;
 export declare function decrementRow(cell: string): string;
-export declare function countCommasOutsideQuotes(str: string): number;
 export declare function countCommasBeforeCursor(editableDiv: HTMLDivElement): number;

package/es/components/SheetOverlay/helper.js

@@ -84,19 +84,6 @@ export function decrementRow(cell) {
   var newRowPart = Math.max(1, parsed.rowPart - 1);
   return parsed.colPart + newRowPart;
 }
-export function countCommasOutsideQuotes(str) {
-  var inQuotes = false;
-  var count = 0;
-  for (var i = 0; i < str.length; i++) {
-    var char = str[i];
-    if (char === '"') {
-      inQuotes = !inQuotes;
-    } else if (char === ',' && !inQuotes) {
-      count++;
-    }
-  }
-  return count;
-}
 export function countCommasBeforeCursor(editableDiv) {
   var selection = window.getSelection();
   if (!(selection === null || selection === void 0 ? void 0 : selection.rangeCount)) return 0;
@@ -107,12 +94,12 @@ export function countCommasBeforeCursor(editableDiv) {
   var textBeforeCursor = preCaretRange.toString();
   var inQuotes = false;
   var count = 0;
-  for (var i = 0; i < textBeforeCursor.length; i++) {
+  for (var i = 0; i < textBeforeCursor.length; i += 1) {
     var char = textBeforeCursor[i];
     if (char === '"') {
       inQuotes = !inQuotes;
-    } else if (char === ',' && !inQuotes) {
-      count++;
+    } else if (char === "," && !inQuotes) {
+      count += 1;
     }
   }
   return count;

package/es/components/SheetOverlay/index.css

@@ -1010,4 +1010,27 @@
   background: #555;
   /* darker on hover */
   /* scrollbar */
-}
+}
+
+.hide-btn {
+  padding-top: 1px;
+  position: absolute;
+  right: 5;
+  top: 5px;
+  z-index: 200;
+  width: 9px;
+}
+
+.hide-btn:hover {
+  border: 1px solid #0188fb;
+}
+
+.rotate-row-icon {
+  transform: rotate(-90deg);
+}
+
+.hide-btn-row {
+  position: absolute;
+   left: 4px;
+  z-index: 200;
+}

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

@@ -1,7 +1,7 @@
 import React from "react";
 import { Cell } from "@fileverse-dev/fortune-core";
 import "./index.css";
-export declare const getLucideIcon: (title: string) => "Ethereum" | "DollarSign" | "" | "ChevronDown" | "Undo" | "Redo" | "PaintRoller" | "Bold" | "Italic" | "Strikethrough" | "Underline" | "AlignLeft" | "AlignCenter" | "AlignRight" | "ArrowUpFromLine" | "AlignVerticalMiddle" | "ArrowDownToLine" | "TextOverflow" | "WrapText" | "TextClip" | "Baseline" | "PaintBucket" | "Border" | "MergeHorizontal" | "Percent" | "DecimalsArrowLeft" | "DecimalsArrowRight" | "PaintbrushVertical" | "Filter" | "Link" | "MessageSquarePlus" | "Image" | "Sigma" | "ShieldCheck" | "Search" | "DuneChart" | "Ellipsis";
+export declare const getLucideIcon: (title: string) => "Ethereum" | "DollarSign" | "Undo" | "Redo" | "Underline" | "Border" | "Filter" | "Link" | "Search" | "" | "Percent" | "ChevronDown" | "PaintRoller" | "Bold" | "Italic" | "Strikethrough" | "AlignLeft" | "AlignCenter" | "AlignRight" | "ArrowUpFromLine" | "AlignVerticalMiddle" | "ArrowDownToLine" | "TextOverflow" | "WrapText" | "TextClip" | "Baseline" | "PaintBucket" | "MergeHorizontal" | "DecimalsArrowLeft" | "DecimalsArrowRight" | "PaintbrushVertical" | "MessageSquarePlus" | "Image" | "Sigma" | "ShieldCheck" | "DuneChart" | "Ellipsis";
 export declare const CurrencySelector: ({ cell, defaultTextFormat, toolTipText, }: {
     cell: Cell | null | undefined;
     defaultTextFormat: string;

package/es/components/Toolbar/index.js

@@ -124,7 +124,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 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 { setSelection, getSelection } from "@fileverse-dev/fortune-core/lib/api";
+import { setSelection, getSelection } from "@fileverse-dev/fortune-core/src/api";
 import _ from "lodash";
 import { IconButton, LucideIcon, Tooltip, Command, CommandInput, CommandList, CommandEmpty, CommandGroup, CommandItem } from "@fileverse/ui";
 import DataVerificationPortal from "./dataVerificationPortal";
@@ -588,6 +588,27 @@ var Toolbar = function Toolbar(_a) {
   var _o = useState(false),
     showDataValidation = _o[0],
     setShowDataValidation = _o[1];
+  var dataVerificationClick = function dataVerificationClick() {
+    var _a;
+    var selection = getSelection(context);
+    if (!selection) {
+      setContext(function (ctx) {
+        setSelection(ctx, [{
+          row: [0, 0],
+          column: [0, 0]
+        }], {
+          id: context.currentSheetId
+        });
+      });
+    }
+    (_a = document.getElementById("data-verification-button")) === null || _a === void 0 ? void 0 : _a.click();
+    setTimeout(function () {
+      setShowDataValidation(true);
+    }, 100);
+  };
+  useEffect(function () {
+    window.dataVerificationClick = dataVerificationClick;
+  }, []);
   var getToolbarItem = useCallback(function (name, i) {
     var _a, _b, _c, _d, _e, _f, _g;
     var tooltip = toolbar[name];
@@ -970,24 +991,7 @@ var Toolbar = function Toolbar(_a) {
         iconId: name,
         tooltip: tooltip,
         key: name,
-        onClick: function onClick() {
-          var _a;
-          var selection = getSelection(context);
-          if (!selection) {
-            setContext(function (ctx) {
-              setSelection(ctx, [{
-                row: [0, 0],
-                column: [0, 0]
-              }], {
-                id: context.currentSheetId
-              });
-            });
-          }
-          (_a = document.getElementById("data-verification-button")) === null || _a === void 0 ? void 0 : _a.click();
-          setTimeout(function () {
-            setShowDataValidation(true);
-          }, 100);
-        }
+        onClick: dataVerificationClick
       }));
     }
     if (name === "locationCondition") {

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

@@ -109,7 +109,7 @@ export declare function generateAPIs(context: Context, setContext: (recipe: (ctx
         dynamicArray_compute?: any;
         dynamicArray?: any[] | undefined;
         frozen?: {
-            type: "column" | "rangeColumn" | "rangeBoth" | "both" | "row" | "rangeRow";
+            type: "row" | "column" | "both" | "rangeRow" | "rangeColumn" | "rangeBoth";
             range?: {
                 row_focus: number;
                 column_focus: number;

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

@@ -12,30 +12,30 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
     applyOp: (ops: Op[]) => void;
     getCryptoPrice: typeof getCryptoPrice;
     getCellValue: (row: number, column: number, options?: api.CommonOptions & {
-        type?: "error" | "rt" | "f" | "m" | "v" | "mc" | "ct" | "qp" | "spl" | "bg" | "lo" | "baseValue" | "baseCurrency" | "baseCurrencyPrice" | "isDataBlockFormula" | "ps" | "hl" | keyof import("@fileverse-dev/fortune-core").CellStyle | undefined;
+        type?: "m" | "mc" | "rt" | "v" | "f" | "ct" | "qp" | "spl" | "bg" | "lo" | "baseValue" | "baseCurrency" | "baseCurrencyPrice" | "isDataBlockFormula" | "ps" | "hl" | "error" | keyof import("@fileverse-dev/fortune-core").CellStyle | undefined;
     }) => any;
     onboardingActiveCell: (functionName: string) => void;
     initializeComment: (row: number, column: number) => void;
     updateSheetLiveQueryList: (subsheetIndex: number, _data: import("@fileverse-dev/fortune-core").LiveQueryData) => void;
     removeFromLiveQueryList: (subSheetIndex: number, id: string) => void;
     setCellValue: (row: number, column: number, value: any, options?: api.CommonOptions & {
-        type?: "error" | "rt" | "f" | "m" | "v" | "mc" | "ct" | "qp" | "spl" | "bg" | "lo" | "baseValue" | "baseCurrency" | "baseCurrencyPrice" | "isDataBlockFormula" | "ps" | "hl" | keyof import("@fileverse-dev/fortune-core").CellStyle | undefined;
+        type?: "m" | "mc" | "rt" | "v" | "f" | "ct" | "qp" | "spl" | "bg" | "lo" | "baseValue" | "baseCurrency" | "baseCurrencyPrice" | "isDataBlockFormula" | "ps" | "hl" | "error" | keyof import("@fileverse-dev/fortune-core").CellStyle | undefined;
     }) => void;
     setCellError: (row: number, column: number, errorMessage: {
         title: string;
         message: string;
     }) => void;
     clearCell: (row: number, column: number, options?: api.CommonOptions) => void;
-    setCellFormat: (row: number, column: number, attr: "error" | "rt" | "f" | "m" | "v" | "mc" | "ct" | "qp" | "spl" | "bg" | "lo" | "baseValue" | "baseCurrency" | "baseCurrencyPrice" | "isDataBlockFormula" | "ps" | "hl" | keyof import("@fileverse-dev/fortune-core").CellStyle, value: any, options?: api.CommonOptions) => void;
+    setCellFormat: (row: number, column: number, attr: "m" | "mc" | "rt" | "v" | "f" | "ct" | "qp" | "spl" | "bg" | "lo" | "baseValue" | "baseCurrency" | "baseCurrencyPrice" | "isDataBlockFormula" | "ps" | "hl" | "error" | keyof import("@fileverse-dev/fortune-core").CellStyle, value: any, options?: api.CommonOptions) => void;
     autoFillCell: (copyRange: import("@fileverse-dev/fortune-core").SingleRange, applyRange: import("@fileverse-dev/fortune-core").SingleRange, direction: "left" | "right" | "down" | "up") => void;
-    freeze: (type: "column" | "both" | "row", range: {
+    freeze: (type: "row" | "column" | "both", range: {
         row: number;
         column: number;
     }, options?: api.CommonOptions) => void;
-    insertRowOrColumn: (type: "column" | "row", index: number, count: number, direction?: "lefttop" | "rightbottom", options?: api.CommonOptions) => void;
-    deleteRowOrColumn: (type: "column" | "row", start: number, end: number, options?: api.CommonOptions) => void;
-    hideRowOrColumn: (rowOrColInfo: string[], type: "column" | "row") => void;
-    showRowOrColumn: (rowOrColInfo: string[], type: "column" | "row") => void;
+    insertRowOrColumn: (type: "row" | "column", index: number, count: number, direction?: "lefttop" | "rightbottom", options?: api.CommonOptions) => void;
+    deleteRowOrColumn: (type: "row" | "column", start: number, end: number, options?: api.CommonOptions) => void;
+    hideRowOrColumn: (rowOrColInfo: string[], type: "row" | "column") => void;
+    showRowOrColumn: (rowOrColInfo: string[], type: "row" | "column") => void;
     setRowHeight: (rowInfo: Record<string, number>, options?: api.CommonOptions, custom?: boolean) => void;
     setColumnWidth: (columnInfo: Record<string, number>, options?: api.CommonOptions, custom?: boolean) => void;
     getRowHeight: (rows: number[], options?: api.CommonOptions) => Record<number, number>;
@@ -57,7 +57,7 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
     getHtmlByRange: (range: import("@fileverse-dev/fortune-core").Range, options?: api.CommonOptions) => string | null;
     setSelection: (range: import("@fileverse-dev/fortune-core").Range, options?: api.CommonOptions) => void;
     setCellValuesByRange: (data: any[][], range: import("@fileverse-dev/fortune-core").SingleRange, options?: api.CommonOptions) => void;
-    setCellFormatByRange: (attr: "error" | "rt" | "f" | "m" | "v" | "mc" | "ct" | "qp" | "spl" | "bg" | "lo" | "baseValue" | "baseCurrency" | "baseCurrencyPrice" | "isDataBlockFormula" | "ps" | "hl" | keyof import("@fileverse-dev/fortune-core").CellStyle, value: any, range: import("@fileverse-dev/fortune-core").SingleRange | import("@fileverse-dev/fortune-core").Range, options?: api.CommonOptions) => void;
+    setCellFormatByRange: (attr: "m" | "mc" | "rt" | "v" | "f" | "ct" | "qp" | "spl" | "bg" | "lo" | "baseValue" | "baseCurrency" | "baseCurrencyPrice" | "isDataBlockFormula" | "ps" | "hl" | "error" | keyof import("@fileverse-dev/fortune-core").CellStyle, value: any, range: import("@fileverse-dev/fortune-core").SingleRange | import("@fileverse-dev/fortune-core").Range, options?: api.CommonOptions) => void;
     mergeCells: (ranges: import("@fileverse-dev/fortune-core").Range, type: string, options?: api.CommonOptions) => void;
     cancelMerge: (ranges: import("@fileverse-dev/fortune-core").Range, options?: api.CommonOptions) => void;
     getAllSheets: () => SheetType[];
@@ -116,7 +116,7 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
         dynamicArray_compute?: any;
         dynamicArray?: any[] | undefined;
         frozen?: {
-            type: "column" | "rangeColumn" | "rangeBoth" | "both" | "row" | "rangeRow";
+            type: "row" | "column" | "both" | "rangeRow" | "rangeColumn" | "rangeBoth";
             range?: {
                 row_focus: number;
                 column_focus: number;

package/es/components/Workbook/index.js

@@ -647,6 +647,11 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
         }
       });
     }
+    setContextWithProduce(function (ctx) {
+      if (ctx.luckysheet_selection_range) {
+        ctx.luckysheet_selection_range = [];
+      }
+    });
   }, [context, setContextWithProduce]);
   var onMoreToolbarItemsClose = useCallback(function () {
     setMoreToolbarItems(null);

package/lib/components/ContextMenu/index.js

@@ -642,7 +642,7 @@ var ContextMenu = function ContextMenu() {
       }), /*#__PURE__*/_react.default.createElement("div", null, rightclick.deleteSelected, rightclick.row))));
     }
     if (name === "hide-row") {
-      return (selection === null || selection === void 0 ? void 0 : selection.row_select) === true && ["hideSelected", "showHide"].map(function (item) {
+      return (selection === null || selection === void 0 ? void 0 : selection.row_select) && ["hideSelected", "showHide"].map(function (item) {
         return /*#__PURE__*/_react.default.createElement(_Menu.default, {
           key: item,
           onClick: function onClick() {
@@ -1086,7 +1086,7 @@ var ContextMenu = function ContextMenu() {
       left: contextMenu.x,
       top: contextMenu.y
     }
-  }, context.contextMenu.headerMenu === true ? settings.headerContextMenu.map(function (menu, i) {
+  }, context.contextMenu.headerMenu === true || context.contextMenu.headerMenu === "row" ? settings.headerContextMenu.map(function (menu, i) {
     return getMenuElement(menu, i);
   }) : settings.cellContextMenu.map(function (menu, i) {
     return getMenuElement(menu, i);

package/lib/components/DataVerification/ColorPicker.js

@@ -65,7 +65,9 @@ var ColorSection = exports.ColorSection = function ColorSection(_a) {
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "flex items-center justify-between  color-picker rounded transition-all cursor-pointer border border-gray-300",
     style: {
-      padding: "7px"
+      padding: "7px",
+      border: "var(--border-width-md, 1px) solid hsl(var(--color-border-default, #E8EBEC))",
+      borderRadius: "var(--border-radius-sm, 4px)"
     }
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "flex items-center gap-3 color-text-secondary"
@@ -80,7 +82,7 @@ var ColorSection = exports.ColorSection = function ColorSection(_a) {
   })))), /*#__PURE__*/_react.default.createElement(_ui.PopoverContent, {
     align: "start",
     alignOffset: 0,
-    className: "w-[200px] export-content-popover",
+    className: "color-picker-container",
     elevation: 2,
     side: "bottom",
     sideOffset: 4
@@ -89,18 +91,40 @@ var ColorSection = exports.ColorSection = function ColorSection(_a) {
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "flex gap-2 flex-wrap w-full"
   }, TEXT_COLORS.map(function (color) {
-    return /*#__PURE__*/_react.default.createElement("button", {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      key: color.value,
+      className: "w-7 h-7 rounded-full transition-all hover:scale-110 hover:shadow-md",
+      style: {
+        border: "".concat(color.value) === trigerColor ? "2px solid rgb(".concat(color.value, ")") : "none",
+        padding: "2px"
+      }
+    }, /*#__PURE__*/_react.default.createElement("button", {
       type: "button",
       key: color.value,
       onClick: function onClick() {
         onPick(color.value);
         setIsOpen(false);
       },
-      className: "w-7 h-7 rounded-full transition-all hover:scale-110 hover:shadow-md",
+      className: "w-full h-full rounded-full transition-all hover:scale-110 hover:shadow-md",
       style: {
         backgroundColor: "rgb(".concat(color.value, ")")
       },
       title: color.name
-    });
-  })))));
+    }));
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    className: "w-full flex justify-center",
+    onClick: function onClick() {
+      onPick("228, 232, 237");
+      setIsOpen(false);
+    }
+  }, /*#__PURE__*/_react.default.createElement(_ui.IconButton, {
+    icon: "DropletOff",
+    size: "md",
+    variant: "ghost",
+    className: "color-picker-icon"
+  }), /*#__PURE__*/_react.default.createElement(_ui.Button, {
+    size: "md",
+    variant: "ghost",
+    className: "color-picker-reset"
+  }, "Reset"))))));
 };

package/lib/components/DataVerification/DropdownList.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _fortuneCore = require("@fileverse-dev/fortune-core");
 var _react = _interopRequireWildcard(require("react"));
+var _ui = require("@fileverse/ui");
 var _context = _interopRequireDefault(require("../../context"));
 var _useOutsideClick = require("../../hooks/useOutsideClick");
 var _SVGIcon = _interopRequireDefault(require("../SVGIcon"));
@@ -154,6 +155,24 @@ var DropDownList = function DropDownList() {
         display: isMul && selected.indexOf(v) >= 0 ? "inline" : "none"
       }
     }), v);
-  }));
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    className: "w-full flex align-center",
+    style: {
+      height: "28px"
+    }
+  }, /*#__PURE__*/_react.default.createElement(_ui.IconButton, {
+    icon: "Pencil",
+    size: "sm",
+    variant: "ghost",
+    className: "color-picker-icon pt-2"
+  }), /*#__PURE__*/_react.default.createElement(_ui.Button, {
+    size: "md",
+    variant: "ghost",
+    className: "color-picker-reset",
+    onClick: function onClick() {
+      var _a;
+      (_a = window === null || window === void 0 ? void 0 : window.dataVerificationClick) === null || _a === void 0 ? void 0 : _a.call(window);
+    }
+  }, "Edit")));
 };
 var _default = exports.default = DropDownList;

package/lib/components/DataVerification/DropdownOption.js

@@ -181,7 +181,7 @@ var DynamicInputList = function DynamicInputList(_a) {
   }, optionItems.map(function (item, index) {
     return /*#__PURE__*/_react.default.createElement("li", {
       key: item.id,
-      className: (0, _ui.cn)("relative flex optionItems-center gap-3 transition mb-4", draggingIndex === index && "scale-[0.99] opacity-80 shadow-lg rounded-xl"),
+      className: (0, _ui.cn)("relative flex optionItems-center gap-2 transition mb-4", draggingIndex === index && "scale-[0.99] opacity-80 shadow-lg rounded-xl"),
       onDragOver: function onDragOver(e) {
         return onDragOverRow(index, e);
       },
@@ -248,6 +248,9 @@ var DynamicInputList = function DynamicInputList(_a) {
         e.target.focus();
       },
       key: item.id,
+      onKeyDown: function onKeyDown(e) {
+        e.stopPropagation();
+      },
       className: "w-full",
       placeholder: "Option ".concat(index + 1),
       value: item.value,
@@ -273,7 +276,10 @@ var DynamicInputList = function DynamicInputList(_a) {
   }, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     variant: "secondary",
     onClick: handleAdd,
-    className: ""
+    size: "sm",
+    style: {
+      fontWeight: 500
+    }
   }, "Add another item")));
 };
 var _default = exports.default = DynamicInputList;

package/lib/components/DataVerification/RangeDialog.js

@@ -8,7 +8,6 @@ exports.default = void 0;
 var _fortuneCore = require("@fileverse-dev/fortune-core");
 var _ui = require("@fileverse/ui");
 var _react = _interopRequireWildcard(require("react"));
-var _ = _interopRequireDefault(require("."));
 var _context = _interopRequireDefault(require("../../context"));
 var _useDialog = require("../../hooks/useDialog");
 var _ConditionRules = _interopRequireDefault(require("../ConditionFormat/ConditionRules"));
@@ -48,7 +47,6 @@ var RangeDialog = function RangeDialog() {
       }), undefined, (0, _fortuneCore.locale)(context).conditionformat["conditionformat_".concat(rulesType)]);
       return;
     }
-    showDialog(/*#__PURE__*/_react.default.createElement(_.default, null), undefined, toolbar.dataVerification);
   }, [setContext, showDialog, context]);
   (0, _react.useEffect)(function () {
     setRangeTxt2((0, _getDisplayedRangeTxt.getDisplayedRangeTxt)(context));

package/lib/components/DataVerification/index.css

@@ -203,4 +203,24 @@
 
 .color-picker:hover {
   background: hsl(var(--color-bg-default-hover, #F2F4F5));
+}
+
+.color-picker-container {
+  border: 1px solid hsl(var(--color-border-default, #E8EBEC)) !important;
+  box-shadow: 0 4px 16px -4px rgba(0, 0, 0, 0.15);
+  width: 230px !important;
+}
+
+.color-picker-reset {
+  min-width: 0px;
+  padding-left: 0px;
+  margin-left: 0px;
+}
+
+.color-picker-reset:hover {
+  background-color: white;
+}
+
+.color-picker-icon:hover {
+  background-color: white;
 }

package/lib/components/DataVerification/index.js

@@ -93,6 +93,14 @@ var DataVerification = function DataVerification() {
       }));
     }
   }, []);
+  var dataSelectRange = (0, _react.useCallback)(function (type, value) {
+    hideDialog();
+    setContext(function (ctx) {
+      ctx.rangeDialog.show = true;
+      ctx.rangeDialog.type = type;
+      ctx.rangeDialog.rangeTxt = value;
+    });
+  }, [hideDialog, setContext]);
   var btn = (0, _react.useCallback)(function (type) {
     if (type === "confirm") {
       setContext(function (ctx) {
@@ -219,7 +227,7 @@ var DataVerification = function DataVerification() {
   return /*#__PURE__*/_react.default.createElement("div", {
     id: "fortune-data-verification"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "flex flex-col gap-4",
+    className: "flex flex-col gap-4 h-[calc(100vh-270px)] overflow-y-auto no-scrollbar",
     style: {
       width: "345px",
       padding: "16px"
@@ -235,7 +243,17 @@ var DataVerification = function DataVerification() {
     }),
     "aria-hidden": "true",
     readOnly: true,
-    value: (_a = context.dataVerification.dataRegulation) === null || _a === void 0 ? void 0 : _a.rangeTxt
+    value: (_a = context.dataVerification.dataRegulation) === null || _a === void 0 ? void 0 : _a.rangeTxt,
+    onChange: function onChange(e) {
+      var value = e.target.value;
+      setContext(function (ctx) {
+        ctx.dataVerification.dataRegulation.rangeTxt = value;
+      });
+    },
+    onClick: function onClick() {
+      hideDialog();
+      dataSelectRange("rangeTxt", context.dataVerification.dataRegulation.value1);
+    }
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: "flex flex-col"
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -280,7 +298,7 @@ var DataVerification = function DataVerification() {
       });
     }
   }), /*#__PURE__*/_react.default.createElement("span", {
-    className: "ml-2"
+    className: "ml-2 text-body-sm"
   }, dataVerification.allowMultiSelect)))), ((_e = (_d = context.dataVerification) === null || _d === void 0 ? void 0 : _d.dataRegulation) === null || _e === void 0 ? void 0 : _e.type) === "checkbox" && (/*#__PURE__*/_react.default.createElement("div", {
     className: "mt-4 space-y-2"
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -396,7 +414,7 @@ var DataVerification = function DataVerification() {
         });
       }
     }), /*#__PURE__*/_react.default.createElement("span", {
-      className: "ml-2"
+      className: "ml-2 text-body-sm"
     }, dataVerification[v]));
   }), ((_o = (_m = context.dataVerification) === null || _m === void 0 ? void 0 : _m.dataRegulation) === null || _o === void 0 ? void 0 : _o.hintShow) && (/*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_ui.TextField, {
     placeholder: dataVerification.placeholder5,
@@ -408,7 +426,11 @@ var DataVerification = function DataVerification() {
       });
     }
   }))))), /*#__PURE__*/_react.default.createElement(_ui.Divider, {
-    className: "w-full border-t-[1px] my-4"
+    className: "border-t-[1px]",
+    style: {
+      width: "315px",
+      margin: "0 16px 16px 16px"
+    }
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: "flex gap-2 justify-between items-center",
     style: {
@@ -432,7 +454,9 @@ var DataVerification = function DataVerification() {
       minWidth: "80px"
     },
     onClick: function onClick() {
+      var _a;
       btn("confirm");
+      (_a = document.getElementById("data-verification-button")) === null || _a === void 0 ? void 0 : _a.click();
     }
   }, button.confirm))));
 };