@fileverse-dev/fortune-react 1.0.2-mod-20 → 1.0.2-mod-21

package/dist/index.js

@@ -6,6 +6,7 @@ var fortuneCore = require('@fileverse-dev/fortune-core');
 var React = require('react');
 var produce = require('immer');
 var _ = require('lodash');
+var ui = require('@fileverse/ui');
 var regeneratorRuntime = require('regenerator-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -448,11 +449,6 @@ var ColumnHeader = function ColumnHeader() {
       var c2 = s[i].column[1];
       columnTitleMap = fortuneCore.selectTitlesMap(columnTitleMap, c1, c2);
     }
-    console.log({
-      x: s[0].row_select,
-      y: s[0].column_select,
-      columnTitleMap: columnTitleMap
-    });
     var columnTitleRange = fortuneCore.selectTitlesRange(columnTitleMap);
     var selects = [];
     for (var j = 0; j < columnTitleRange.length; j += 1) {
@@ -1244,35 +1240,39 @@ var Dialog = function Dialog(_ref) {
     className: "fortune-dialog",
     style: containerStyle
   }, /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "fortune-modal-dialog-header"
-  }, /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "fortune-modal-dialog-icon-close",
+    className: "flex items-center justify-end border-b color-border-default py-3 px-6"
+  }, /*#__PURE__*/React__default['default'].createElement(ui.IconButton, {
+    icon: "X",
+    variant: "ghost",
     onClick: onCancel,
     tabIndex: 0
-  }, /*#__PURE__*/React__default['default'].createElement(SVGIcon, {
-    name: "close",
-    style: {
-      padding: 7,
-      cursor: "pointer"
-    }
-  }))), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "fortune-dialog-box-content",
+  })), /*#__PURE__*/React__default['default'].createElement("div", {
+    className: "px-6 pb-6 pt-4 text-body-sm",
     style: contentStyle
   }, children), type != null && (/*#__PURE__*/React__default['default'].createElement("div", {
-    className: "fortune-dialog-box-button-container"
-  }, type === "ok" ? (/*#__PURE__*/React__default['default'].createElement("div", {
-    className: "fortune-message-box-button button-default",
-    onClick: onOk,
-    tabIndex: 0
-  }, button.confirm)) : (/*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "fortune-message-box-button button-primary",
+    className: "px-6 pb-6 flex flex-row gap-2 justify-end"
+  }, type === "ok" ? (/*#__PURE__*/React__default['default'].createElement(ui.Button, {
+    variant: "default",
+    style: {
+      minWidth: "80px"
+    },
     onClick: onOk,
     tabIndex: 0
-  }, button.confirm), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "fortune-message-box-button button-default",
+  }, 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))))));
+  }, button.cancel), /*#__PURE__*/React__default['default'].createElement(ui.Button, {
+    variant: "default",
+    style: {
+      minWidth: "80px"
+    },
+    onClick: onOk,
+    tabIndex: 0
+  }, button.confirm))))));
 };
 
 var MessageBox = function MessageBox(_ref) {
@@ -1284,15 +1284,7 @@ var MessageBox = function MessageBox(_ref) {
   return /*#__PURE__*/React__default['default'].createElement(Dialog, {
     type: type,
     onOk: onOk,
-    onCancel: onCancel,
-    contentStyle: {
-      width: 300,
-      paddingTop: 20,
-      paddingBottom: 30,
-      display: "flex",
-      justifyContent: "center",
-      alignItems: "center"
-    }
+    onCancel: onCancel
   }, children);
 };
 
@@ -1376,28 +1368,27 @@ var SearchReplace = function SearchReplace(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     replaceText = _useState4[0],
     setReplaceText = _useState4[1];
-  var _useState5 = React.useState(context.showReplace),
+  var _useState5 = React.useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
-    showReplace = _useState6[0],
-    setShowReplace = _useState6[1];
-  var _useState7 = React.useState([]),
+    searchResult = _useState6[0],
+    setSearchResult = _useState6[1];
+  var _useState7 = React.useState(),
     _useState8 = _slicedToArray(_useState7, 2),
-    searchResult = _useState8[0],
-    setSearchResult = _useState8[1];
-  var _useState9 = React.useState(),
-    _useState0 = _slicedToArray(_useState9, 2),
-    selectedCell = _useState0[0],
-    setSelectedCell = _useState0[1];
+    selectedCell = _useState8[0],
+    setSelectedCell = _useState8[1];
   var _useAlert = useAlert(),
     showAlert = _useAlert.showAlert;
-  var _useState1 = React.useState({
+  var tableContainerRef = React.useRef(null);
+  var searchInputRef = React.useRef(null);
+  var replaceInputRef = React.useRef(null);
+  var _useState9 = React.useState({
       regCheck: false,
       wordCheck: false,
       caseCheck: false
     }),
-    _useState10 = _slicedToArray(_useState1, 2),
-    checkMode = _useState10[0],
-    checkModeReplace = _useState10[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    checkMode = _useState0[0],
+    checkModeReplace = _useState0[1];
   var closeDialog = React.useCallback(function () {
     ___default['default'].set(refs.globalCache, "searchDialog.mouseEnter", false);
     setContext(function (draftCtx) {
@@ -1433,97 +1424,113 @@ var SearchReplace = function SearchReplace(_ref) {
       e.stopPropagation();
     }
   }, /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "container",
-    onMouseDown: function onMouseDown(e) {
-      return e.stopPropagation();
-    }
+    className: ""
   }, /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "icon-close fortune-modal-dialog-icon-close",
+    className: "flex items-center justify-between border-b color-border-default py-3 px-6"
+  }, /*#__PURE__*/React__default['default'].createElement("h3", {
+    className: "text-heading-sm"
+  }, "Find and replace"), /*#__PURE__*/React__default['default'].createElement(ui.IconButton, {
+    icon: "X",
+    variant: "ghost",
     onClick: closeDialog,
     tabIndex: 0
-  }, /*#__PURE__*/React__default['default'].createElement(SVGIcon, {
-    name: "close",
-    style: {
-      padding: 7,
-      cursor: "pointer"
-    }
   })), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "tabBox"
-  }, /*#__PURE__*/React__default['default'].createElement("span", {
-    id: "searchTab",
-    className: showReplace ? "" : "on",
-    onClick: function onClick() {
-      return setShowReplace(false);
-    },
-    tabIndex: 0
-  }, findAndReplace.find), /*#__PURE__*/React__default['default'].createElement("span", {
-    id: "replaceTab",
-    className: showReplace ? "on" : "",
-    onClick: function onClick() {
-      return setShowReplace(true);
-    },
-    tabIndex: 0
-  }, findAndReplace.replace)), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "ctBox"
+    className: "px-6 pb-6 pt-4"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "row"
+    className: "flex flex-col gap-4"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "inputBox"
+    className: "flex flex-col gap-4"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "textboxs",
-    id: "searchInput"
-  }, findAndReplace.findTextbox, "\uFF1A", /*#__PURE__*/React__default['default'].createElement("input", {
+    id: "searchInput",
+    className: "flex flex-row gap-2 items-center"
+  }, /*#__PURE__*/React__default['default'].createElement("span", {
+    className: "find-replace-label text-heading-xsm"
+  }, findAndReplace.findTextbox, "\uFF1A"), /*#__PURE__*/React__default['default'].createElement(ui.TextField, {
+    ref: searchInputRef,
     className: "formulaInputFocus",
     autoFocus: true,
     spellCheck: "false",
     onKeyDown: function onKeyDown(e) {
       return e.stopPropagation();
     },
+    onMouseDown: function onMouseDown(e) {
+      var _searchInputRef$curre;
+      if (e.target === searchInputRef.current || ((_searchInputRef$curre = searchInputRef.current) === null || _searchInputRef$curre === void 0 ? void 0 : _searchInputRef$curre.contains(e.target))) {
+        e.stopPropagation();
+      }
+    },
     value: searchText,
     onChange: function onChange(e) {
       return setSearchText(e.target.value);
     }
-  })), showReplace && (/*#__PURE__*/React__default['default'].createElement("div", {
-    className: "textboxs",
-    id: "replaceInput"
-  }, findAndReplace.replaceTextbox, "\uFF1A", /*#__PURE__*/React__default['default'].createElement("input", {
+  })), /*#__PURE__*/React__default['default'].createElement("div", {
+    id: "replaceInput",
+    className: "flex flex-row gap-2 items-center"
+  }, /*#__PURE__*/React__default['default'].createElement("span", {
+    className: "find-replace-label text-heading-xsm"
+  }, findAndReplace.replaceTextbox, "\uFF1A"), /*#__PURE__*/React__default['default'].createElement(ui.TextField, {
+    ref: replaceInputRef,
     className: "formulaInputFocus",
     spellCheck: "false",
     onKeyDown: function onKeyDown(e) {
       return e.stopPropagation();
     },
+    onMouseDown: function onMouseDown(e) {
+      var _replaceInputRef$curr;
+      if (e.target === replaceInputRef.current || ((_replaceInputRef$curr = replaceInputRef.current) === null || _replaceInputRef$curr === void 0 ? void 0 : _replaceInputRef$curr.contains(e.target))) {
+        e.stopPropagation();
+      }
+    },
     value: replaceText,
     onChange: function onChange(e) {
       return setReplaceText(e.target.value);
     }
-  })))), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "checkboxs"
+  }))), /*#__PURE__*/React__default['default'].createElement("div", {
+    className: "flex flex-row gap-2"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
-    id: "regCheck"
-  }, /*#__PURE__*/React__default['default'].createElement("input", {
-    type: "checkbox",
-    onChange: function onChange(e) {
+    className: "find-replace-label"
+  }), /*#__PURE__*/React__default['default'].createElement("div", {
+    className: "flex flex-col gap-2 text-body-sm"
+  }, /*#__PURE__*/React__default['default'].createElement("div", {
+    id: "regCheck",
+    className: "flex flex-row gap-2 items-center"
+  }, /*#__PURE__*/React__default['default'].createElement(ui.Checkbox, {
+    className: "border-2",
+    checked: checkMode.regCheck,
+    onCheckedChange: function onCheckedChange(e) {
       return setCheckMode("regCheck", e.target.checked);
     }
   }), /*#__PURE__*/React__default['default'].createElement("span", null, findAndReplace.regexTextbox)), /*#__PURE__*/React__default['default'].createElement("div", {
-    id: "wordCheck"
-  }, /*#__PURE__*/React__default['default'].createElement("input", {
-    type: "checkbox",
-    onChange: function onChange(e) {
-      return setCheckMode("wordCheck", e.target.checked);
-    }
-  }), /*#__PURE__*/React__default['default'].createElement("span", null, findAndReplace.wholeTextbox)), /*#__PURE__*/React__default['default'].createElement("div", {
-    id: "caseCheck"
-  }, /*#__PURE__*/React__default['default'].createElement("input", {
-    type: "checkbox",
-    onChange: function onChange(e) {
+    id: "caseCheck",
+    className: "flex flex-row gap-2 items-center"
+  }, /*#__PURE__*/React__default['default'].createElement(ui.Checkbox, {
+    className: "border-2",
+    checked: checkMode.caseCheck,
+    onCheckedChange: function onCheckedChange(e) {
       return setCheckMode("caseCheck", e.target.checked);
     }
-  }), /*#__PURE__*/React__default['default'].createElement("span", null, findAndReplace.distinguishTextbox)))), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "btnBox"
-  }, showReplace && (/*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", {
+  }), /*#__PURE__*/React__default['default'].createElement("span", null, findAndReplace.distinguishTextbox)), /*#__PURE__*/React__default['default'].createElement("div", {
+    id: "wordCheck",
+    className: "flex flex-row gap-2 items-center"
+  }, /*#__PURE__*/React__default['default'].createElement(ui.Checkbox, {
+    className: "border-2",
+    checked: checkMode.wordCheck,
+    onCheckedChange: function onCheckedChange(e) {
+      return setCheckMode("wordCheck", e.target.checked);
+    }
+  }), /*#__PURE__*/React__default['default'].createElement("span", null, findAndReplace.wholeTextbox)))), /*#__PURE__*/React__default['default'].createElement(ui.Divider, {
+    className: "w-full border-t-[1px]"
+  }), /*#__PURE__*/React__default['default'].createElement("div", {
+    className: "flex flex-row gap-2 justify-center items-center"
+  }, /*#__PURE__*/React__default['default'].createElement(ui.Button, {
+    variant: "secondary",
+    className: "min-w-fit",
+    onClick: closeDialog,
+    tabIndex: 0
+  }, button.close), /*#__PURE__*/React__default['default'].createElement(ui.Button, {
     id: "replaceAllBtn",
-    className: "fortune-message-box-button button-default",
+    variant: "secondary",
+    className: "min-w-fit",
     onClick: function onClick() {
       setContext(function (draftCtx) {
         setSelectedCell(undefined);
@@ -1532,9 +1539,10 @@ var SearchReplace = function SearchReplace(_ref) {
       });
     },
     tabIndex: 0
-  }, findAndReplace.allReplaceBtn), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, findAndReplace.allReplaceBtn), /*#__PURE__*/React__default['default'].createElement(ui.Button, {
     id: "replaceBtn",
-    className: "fortune-message-box-button button-default",
+    variant: "secondary",
+    className: "min-w-fit",
     onClick: function onClick() {
       return setContext(function (draftCtx) {
         setSelectedCell(undefined);
@@ -1545,9 +1553,10 @@ var SearchReplace = function SearchReplace(_ref) {
       });
     },
     tabIndex: 0
-  }, findAndReplace.replaceBtn))), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, findAndReplace.replaceBtn), /*#__PURE__*/React__default['default'].createElement(ui.Button, {
     id: "searchAllBtn",
-    className: "fortune-message-box-button button-default",
+    variant: "secondary",
+    className: "min-w-fit",
     onClick: function onClick() {
       return setContext(function (draftCtx) {
         setSelectedCell(undefined);
@@ -1558,9 +1567,10 @@ var SearchReplace = function SearchReplace(_ref) {
       });
     },
     tabIndex: 0
-  }, findAndReplace.allFindBtn), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, findAndReplace.allFindBtn), /*#__PURE__*/React__default['default'].createElement(ui.Button, {
     id: "searchNextBtn",
-    className: "fortune-message-box-button button-default",
+    variant: "secondary",
+    className: "min-w-fit",
     onClick: function onClick() {
       return setContext(function (draftCtx) {
         setSearchResult([]);
@@ -1569,19 +1579,25 @@ var SearchReplace = function SearchReplace(_ref) {
       });
     },
     tabIndex: 0
-  }, findAndReplace.findBtn))), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "close-button fortune-message-box-button button-default",
-    onClick: closeDialog,
+  }, findAndReplace.findBtn)))), searchResult.length > 0 && (/*#__PURE__*/React__default['default'].createElement("div", {
+    ref: tableContainerRef,
+    className: "px-6 pb-6 max-h-[300px] overflow-y-auto",
+    onMouseDown: function onMouseDown(e) {
+      var _tableContainerRef$cu;
+      if (e.target === tableContainerRef.current || ((_tableContainerRef$cu = tableContainerRef.current) === null || _tableContainerRef$cu === void 0 ? void 0 : _tableContainerRef$cu.contains(e.target))) {
+        var _tableContainerRef$cu2;
+        e.stopPropagation();
+        (_tableContainerRef$cu2 = tableContainerRef.current) === null || _tableContainerRef$cu2 === void 0 ? void 0 : _tableContainerRef$cu2.focus();
+      }
+    },
     tabIndex: 0
-  }, button.close), searchResult.length > 0 && (/*#__PURE__*/React__default['default'].createElement("div", {
+  }, /*#__PURE__*/React__default['default'].createElement(ui.Table, {
     id: "searchAllbox"
-  }, /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "boxTitle"
-  }, /*#__PURE__*/React__default['default'].createElement("span", null, findAndReplace.searchTargetSheet), /*#__PURE__*/React__default['default'].createElement("span", null, findAndReplace.searchTargetCell), /*#__PURE__*/React__default['default'].createElement("span", null, findAndReplace.searchTargetValue)), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "boxMain"
-  }, searchResult.map(function (v) {
-    return /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "boxItem ".concat(___default['default'].isEqual(selectedCell, {
+  }, /*#__PURE__*/React__default['default'].createElement(ui.TableHeader, {
+    className: "color-bg-secondary"
+  }, /*#__PURE__*/React__default['default'].createElement(ui.TableRow, null, /*#__PURE__*/React__default['default'].createElement(ui.TableHead, null, findAndReplace.searchTargetSheet), /*#__PURE__*/React__default['default'].createElement(ui.TableHead, null, findAndReplace.searchTargetCell), /*#__PURE__*/React__default['default'].createElement(ui.TableHead, null, findAndReplace.searchTargetValue))), /*#__PURE__*/React__default['default'].createElement(ui.TableBody, null, searchResult.map(function (v) {
+    return /*#__PURE__*/React__default['default'].createElement(ui.TableRow, {
+      className: "".concat(___default['default'].isEqual(selectedCell, {
         r: v.r,
         c: v.c
       }) ? "on" : ""),
@@ -1600,8 +1616,14 @@ var SearchReplace = function SearchReplace(_ref) {
         });
       },
       tabIndex: 0
-    }, /*#__PURE__*/React__default['default'].createElement("span", null, v.sheetName), /*#__PURE__*/React__default['default'].createElement("span", null, v.cellPosition), /*#__PURE__*/React__default['default'].createElement("span", null, v.value));
-  }))))));
+    }, /*#__PURE__*/React__default['default'].createElement(ui.TableCell, {
+      className: "find-replace-table-cell"
+    }, v.sheetName), /*#__PURE__*/React__default['default'].createElement(ui.TableCell, {
+      className: "find-replace-table-cell"
+    }, v.cellPosition), /*#__PURE__*/React__default['default'].createElement(ui.TableCell, {
+      className: "find-replace-table-cell"
+    }, v.value));
+  })))))));
 };
 
 var LinkEditCard = function LinkEditCard(_ref) {

package/dist/index.umd.css

@@ -1187,11 +1187,11 @@ html::-webkit-scrollbar-button {
 }
 
 .fortune-dialog {
+  min-width: 368px;
   max-width: 90%;
   max-height: 90%;
-  overflow: scroll;
-  border-radius: 6px;
-  background: white;
+  border-radius: 12px;
+  background: hsl(var(--color-bg-default));
   box-shadow: rgb(0 0 0 / 10%) 5px 5px 30px;
   box-sizing: border-box;
   overflow: auto;
@@ -1251,10 +1251,11 @@ html::-webkit-scrollbar-button {
   opacity: 0.7;
 }
 
+@import "@fileverse/ui/styles";
 /*查找替换弹出框样式*/
 #fortune-search-replace {
   position: absolute;
-  padding: 30px 42px;
+  min-width: 504px;
   z-index: 1002;
 }
 
@@ -1336,10 +1337,7 @@ html::-webkit-scrollbar-button {
 }
 
 #fortune-search-replace #searchAllbox {
-  height: 210px;
-  border: 1px solid #d4d4d4;
-  margin-top: 10px;
-  overflow-y: auto;
+  overflow-y: scroll;
   position: relative;
 }
 
@@ -1413,6 +1411,14 @@ html::-webkit-scrollbar-button {
   white-space: nowrap;
 }
 
+.find-replace-label {
+  min-width: 100px;
+}
+
+.find-replace-table-cell {
+  min-width: 154px;
+}
+
 .fortune-link-modify-modal {
   position: absolute;
   overflow: hidden;
@@ -3304,8 +3310,8 @@ label {
   height: 252px;
   background: rgb(240, 240, 240);
   position: absolute;
-  bottom: -110px;
-  left: 197px;
+  bottom: 10px;
+  left: 100px;
   border-radius: 6px;
   box-shadow: 0 2px 4px rgb(0 0 0 / 20%);
   border: 1px solid rgba(0, 0, 0, 0.2);