@fileverse-dev/fortune-react 1.1.90 → 1.1.91

package/lib/components/DataVerification/index.js

@@ -8,6 +8,7 @@ exports.default = void 0;
 var _fortuneCore = require("@fileverse-dev/fortune-core");
 var _ui = require("@fileverse/ui");
 var _react = _interopRequireWildcard(require("react"));
+var _DropdownOption = _interopRequireDefault(require("./DropdownOption"));
 var _context = _interopRequireDefault(require("../../context"));
 var _useDialog = require("../../hooks/useDialog");
 var _datepickerStyles = require("../../utils/datepickerStyles");
@@ -24,6 +25,9 @@ var __assign = void 0 && (void 0).__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
+function createId() {
+  return "".concat(Date.now(), "_").concat(Math.random().toString(36).slice(2));
+}
 (0, _datepickerStyles.injectDatepickerStyles)();
 var DataVerification = function DataVerification() {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
@@ -38,6 +42,56 @@ var DataVerification = function DataVerification() {
     button = _r.button,
     generalDialog = _r.generalDialog;
   var dateCondition = (0, _react.useState)(["between", "notBetween", "equal", "notEqualTo", "earlierThan", "noEarlierThan", "laterThan", "noLaterThan"])[0];
+  function getSheetIndex() {
+    var _a;
+    for (var i = 0; i < context.luckysheetfile.length; i += 1) {
+      if (((_a = context.luckysheetfile[i]) === null || _a === void 0 ? void 0 : _a.id) === context.currentSheetId) {
+        return i;
+      }
+    }
+    return null;
+  }
+  var _s = (0, _react.useState)([]),
+    optionItems = _s[0],
+    setOptionItems = _s[1];
+  var valuesFromArray = optionItems.map(function (i) {
+    return i.value;
+  }).join(",");
+  var colors = optionItems.map(function (i) {
+    return i.color;
+  }).join(",");
+  (0, _react.useEffect)(function () {
+    setContext(function (ctx) {
+      ctx.dataVerification.dataRegulation.color = colors;
+      ctx.dataVerification.dataRegulation.value1 = valuesFromArray;
+    });
+  }, [optionItems]);
+  (0, _react.useEffect)(function () {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var selectRow = (_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];
+    var selectCol = (_f = (_e = (_d = context.luckysheet_select_save) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.column) === null || _f === void 0 ? void 0 : _f[0];
+    var sheetIndex = getSheetIndex();
+    var dataVerificationInfo = context.luckysheetfile[sheetIndex].dataVerification;
+    var value = (_g = dataVerificationInfo === null || dataVerificationInfo === void 0 ? void 0 : dataVerificationInfo["".concat(selectRow, "_").concat(selectCol)]) === null || _g === void 0 ? void 0 : _g.value1;
+    var color = (_h = dataVerificationInfo === null || dataVerificationInfo === void 0 ? void 0 : dataVerificationInfo["".concat(selectRow, "_").concat(selectCol)]) === null || _h === void 0 ? void 0 : _h.color;
+    if (value && color) {
+      var colorValues = color === null || color === void 0 ? void 0 : color.split(",").map(function (v) {
+        return v.trim();
+      });
+      var rgbArray_1 = [];
+      for (var i = 0; i < colorValues.length; i += 3) {
+        rgbArray_1.push(colorValues.slice(i, i + 3).join(", "));
+      }
+      value = value === null || value === void 0 ? void 0 : value.split(",");
+      setOptionItems(value.map(function (v, i) {
+        return {
+          id: createId(),
+          value: v,
+          color: rgbArray_1[i]
+        };
+      }));
+    }
+  }, []);
   var dataSelectRange = (0, _react.useCallback)(function (type, value) {
     hideDialog();
     setContext(function (ctx) {
@@ -66,7 +120,7 @@ var DataVerification = function DataVerification() {
             var list = (0, _fortuneCore.getDropdownList)(ctx, value1);
             item.value1 = list.join(",");
           }
-          var currentDataVerification = (_c = ctx.luckysheetfile[(0, _fortuneCore.getSheetIndex)(ctx, ctx.currentSheetId)].dataVerification) !== null && _c !== void 0 ? _c : {};
+          var currentDataVerification = (_c = ctx.luckysheetfile[getSheetIndex()].dataVerification) !== null && _c !== void 0 ? _c : {};
           var str = range[range.length - 1].row[0];
           var edr = range[range.length - 1].row[1];
           var stc = range[range.length - 1].column[0];
@@ -82,7 +136,7 @@ var DataVerification = function DataVerification() {
               }
             }
           }
-          ctx.luckysheetfile[(0, _fortuneCore.getSheetIndex)(ctx, ctx.currentSheetId)].dataVerification = currentDataVerification;
+          ctx.luckysheetfile[getSheetIndex()].dataVerification = currentDataVerification;
         }
       });
     } else if (type === "delete") {
@@ -93,7 +147,7 @@ var DataVerification = function DataVerification() {
           showDialog(generalDialog.noSelectionError, "ok");
           return;
         }
-        var currentDataVerification = (_c = ctx.luckysheetfile[(0, _fortuneCore.getSheetIndex)(ctx, ctx.currentSheetId)].dataVerification) !== null && _c !== void 0 ? _c : {};
+        var currentDataVerification = (_c = ctx.luckysheetfile[getSheetIndex()].dataVerification) !== null && _c !== void 0 ? _c : {};
         var str = range[range.length - 1].row[0];
         var edr = range[range.length - 1].row[1];
         var stc = range[range.length - 1].column[0];
@@ -115,7 +169,7 @@ var DataVerification = function DataVerification() {
         var range = ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1];
         rangeT = (0, _fortuneCore.getRangetxt)(context, context.currentSheetId, range, context.currentSheetId);
       }
-      var index = (0, _fortuneCore.getSheetIndex)(ctx, ctx.currentSheetId);
+      var index = getSheetIndex();
       var ctxDataVerification = ctx.luckysheetfile[index].dataVerification;
       if (ctxDataVerification) {
         if (!ctx.luckysheet_select_save) return;
@@ -224,15 +278,9 @@ var DataVerification = function DataVerification() {
     }, dataVerification[v]);
   }))), ((_c = (_b = context.dataVerification) === null || _b === void 0 ? void 0 : _b.dataRegulation) === null || _c === void 0 ? void 0 : _c.type) === "dropdown" && (/*#__PURE__*/_react.default.createElement("div", {
     className: "mt-4"
-  }, /*#__PURE__*/_react.default.createElement(_ui.TextField, {
-    value: context.dataVerification.dataRegulation.value1,
-    placeholder: dataVerification.placeholder1,
-    onChange: function onChange(e) {
-      var value = e.target.value;
-      setContext(function (ctx) {
-        ctx.dataVerification.dataRegulation.value1 = value;
-      });
-    }
+  }, /*#__PURE__*/_react.default.createElement(_DropdownOption.default, {
+    optionItems: optionItems,
+    setOptionItems: setOptionItems
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: "mt-4 flex items-center"
   }, /*#__PURE__*/_react.default.createElement(_ui.Checkbox, {

package/lib/components/SheetOverlay/drag_and_drop/column-helpers.js

@@ -202,7 +202,6 @@ var useColumnDragAndDrop = exports.useColumnDragAndDrop = function useColumnDrag
       var sourceIndex_1 = dragRef.current.source;
       var sheetIdx_1 = (0, _fortuneCore.getSheetIndex)(context, context.currentSheetId);
       if (sheetIdx_1 != null && sourceIndex_1 >= 0 && Number.isFinite(finalInsertionIndex_1) && finalInsertionIndex_1 >= 0) {
-        console.log("sourceIndex", sourceIndex_1);
         setContext(function (draft) {
           var _a, _b, _c, _d;
           var _sheet = draft.luckysheetfile[sheetIdx_1];
@@ -307,7 +306,6 @@ var useColumnDragAndDrop = exports.useColumnDragAndDrop = function useColumnDrag
     dragRef.current.startX = startX;
     dragRef.current.source = clickedColIndex;
     dragRef.current.active = false;
-    console.log("initiateDrag", startX);
     dragRef.current.onDocMove = handleColumnDrag;
     dragRef.current.onDocUp = handleColumnDragEnd;
     document.addEventListener("mousemove", handleColumnDrag);

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

@@ -205,7 +205,6 @@ var useRowDragAndDrop = exports.useRowDragAndDrop = function useRowDragAndDrop(c
           rows.splice(targetIndex, 0, rowData);
           _sheet.data = rows;
           (0, _fortuneCore.updateContextWithSheetData)(draft, _sheet.data);
-          console.log("rows", sourceIndex_1);
           var d = (0, _fortuneCore.getFlowdata)(draft);
           d === null || d === void 0 ? void 0 : d.forEach(function (row) {
             row.forEach(function (cell) {
@@ -270,7 +269,6 @@ var useRowDragAndDrop = exports.useRowDragAndDrop = function useRowDragAndDrop(c
               item.r += 1;
             }
           });
-          console.log("_sheet.calcChain", _sheet.calcChain);
           (_b = window === null || window === void 0 ? void 0 : window.updateDataBlockCalcFunctionAfterRowDrag) === null || _b === void 0 ? void 0 : _b.call(window, sourceIndex_1, targetIndex, "row", context.currentSheetId);
         });
       }

package/lib/components/SheetOverlay/index.js

@@ -22,7 +22,6 @@ var _ImgBoxs = _interopRequireDefault(require("../ImgBoxs"));
 var _NotationBoxes = _interopRequireDefault(require("../NotationBoxes"));
 var _RangeDialog = _interopRequireDefault(require("../DataVerification/RangeDialog"));
 var _useDialog = require("../../hooks/useDialog");
-var _SVGIcon = _interopRequireDefault(require("../SVGIcon"));
 var _DropdownList = _interopRequireDefault(require("../DataVerification/DropdownList"));
 var _iFrameBoxs = _interopRequireDefault(require("../IFrameBoxs/iFrameBoxs"));
 var _ErrorState = _interopRequireDefault(require("../ErrorState"));
@@ -491,11 +490,7 @@ var SheetOverlay = function SheetOverlay() {
     style: {
       display: "none"
     }
-  }, /*#__PURE__*/_react.default.createElement(_SVGIcon.default, {
-    name: "caret-down-fill",
-    width: 16,
-    height: 16
-  })), context.dataVerificationDropDownList && (context.dataVerification.dataRegulation.value1 !== "" || context.dataVerification.dataRegulation.value2 !== "") && (/*#__PURE__*/_react.default.createElement(_DropdownList.default, null)), /*#__PURE__*/_react.default.createElement("div", {
+  }), context.dataVerificationDropDownList && (context.dataVerification.dataRegulation.value1 !== "" || context.dataVerification.dataRegulation.value2 !== "") && (/*#__PURE__*/_react.default.createElement(_DropdownList.default, null)), /*#__PURE__*/_react.default.createElement("div", {
     id: "luckysheet-dataVerification-showHintBox",
     ref: dataVerificationHintBoxRef
   }), /*#__PURE__*/_react.default.createElement("div", {

package/lib/components/Toolbar/index.js

@@ -457,58 +457,58 @@ var CurrencySelector = exports.CurrencySelector = function CurrencySelector(_a)
   }));
 };
 var Toolbar = function Toolbar(_a) {
-  var _b, _c, _d;
+  var _b, _c, _d, _e;
   var setMoreItems = _a.setMoreItems,
     moreItemsOpen = _a.moreItemsOpen,
     onMoreToolbarItemsClose = _a.onMoreToolbarItemsClose,
     moreToolbarItems = _a.moreToolbarItems;
-  var _e = (0, _react.useContext)(_context.default),
-    context = _e.context,
-    setContext = _e.setContext,
-    refs = _e.refs,
-    settings = _e.settings,
-    handleUndo = _e.handleUndo,
-    handleRedo = _e.handleRedo;
+  var _f = (0, _react.useContext)(_context.default),
+    context = _f.context,
+    setContext = _f.setContext,
+    refs = _f.refs,
+    settings = _f.settings,
+    handleUndo = _f.handleUndo,
+    handleRedo = _f.handleRedo;
   var contextRef = (0, _react.useRef)(context);
   var containerRef = (0, _react.useRef)(null);
-  var _f = (0, _react.useState)(-1),
-    toolbarWrapIndex = _f[0],
-    setToolbarWrapIndex = _f[1];
-  var _g = (0, _react.useState)([]),
-    itemLocations = _g[0],
-    setItemLocations = _g[1];
-  var _h = (0, _react.useState)(false),
-    showDuneModal = _h[0],
-    setShowDuneModal = _h[1];
-  var _j = (0, _react.useState)(window.innerWidth >= 1280),
-    isDesktop = _j[0],
-    setIsDesktop = _j[1];
-  var _k = (0, _useDialog.useDialog)(),
-    showDialog = _k.showDialog,
-    hideDialog = _k.hideDialog;
+  var _g = (0, _react.useState)(-1),
+    toolbarWrapIndex = _g[0],
+    setToolbarWrapIndex = _g[1];
+  var _h = (0, _react.useState)([]),
+    itemLocations = _h[0],
+    setItemLocations = _h[1];
+  var _j = (0, _react.useState)(false),
+    showDuneModal = _j[0],
+    setShowDuneModal = _j[1];
+  var _k = (0, _react.useState)(window.innerWidth >= 1280),
+    isDesktop = _k[0],
+    setIsDesktop = _k[1];
+  var _l = (0, _useDialog.useDialog)(),
+    showDialog = _l.showDialog,
+    hideDialog = _l.hideDialog;
   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 _l = (0, _fortuneCore.locale)(context),
-    toolbar = _l.toolbar,
-    merge = _l.merge,
-    border = _l.border,
-    freezen = _l.freezen,
-    defaultFmt = _l.defaultFmt,
-    formula = _l.formula,
-    sort = _l.sort,
-    align = _l.align,
-    textWrap = _l.textWrap,
-    rotation = _l.rotation,
-    screenshot = _l.screenshot,
-    filter = _l.filter,
-    splitText = _l.splitText,
-    findAndReplace = _l.findAndReplace,
-    comment = _l.comment,
-    fontarray = _l.fontarray;
+  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 toolbarFormat = (0, _fortuneCore.locale)(context).format;
   var sheetWidth = context.luckysheetTableContentHW[0];
   var currency = settings.currency;
@@ -543,6 +543,9 @@ var Toolbar = function Toolbar(_a) {
     subMenu.style.display = "none";
   }, []);
   (0, _react.useEffect)(function () {
+    window.getDataValidationComponent = function () {
+      return /*#__PURE__*/_react.default.createElement(_DataVerification.default, null);
+    };
     var handleResize = function handleResize() {
       setIsDesktop(window.innerWidth >= 1280);
     };
@@ -974,8 +977,8 @@ var Toolbar = function Toolbar(_a) {
         tooltip: tooltip,
         key: name,
         onClick: function onClick() {
-          if (context.allowEdit === false) return;
-          showDialog(/*#__PURE__*/_react.default.createElement(_DataVerification.default, null), undefined, toolbar.dataVerification);
+          var _a;
+          (_a = document.getElementById("data-verification-button")) === null || _a === void 0 ? void 0 : _a.click();
         }
       });
     }
@@ -1652,7 +1655,7 @@ var Toolbar = function Toolbar(_a) {
         });
       }
     }));
-  }, [toolbar, cell, setContext, refs.cellInput, refs.fxInput, refs.globalCache, defaultFormat, align, handleUndo, handleRedo, flowdata, formula, showDuneModal, merge, border, freezen, screenshot, sort, textWrap, rotation, filter, splitText, findAndReplace, context.luckysheet_select_save, context.defaultFontSize, context.allowEdit, comment, fontarray, hideSubMenu, showSubMenu, refs.canvas, customColor, customStyle, toolbarFormat.moreCurrency]);
+  }, [toolbar, cell, setContext, refs.cellInput, refs.fxInput, refs.globalCache, defaultFormat, align, handleUndo, handleRedo, flowdata, formula, showDuneModal, merge, border, freezen, screenshot, sort, textWrap, rotation, filter, splitText, findAndReplace, context.luckysheet_select_save, context.defaultFontSize, context.allowEdit, comment, fontarray, hideSubMenu, showSubMenu, refs.canvas, customColor, customStyle, toolbarFormat.moreCurrency, (_d = context.dataVerification) === null || _d === void 0 ? void 0 : _d.dataRegulation]);
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: containerRef,
     className: "fortune-toolbar",
@@ -1669,7 +1672,7 @@ var Toolbar = function Toolbar(_a) {
       icon: n.icon,
       iconName: n.iconName
     }, n.children);
-  }), ((_d = settings.customToolbarItems) === null || _d === void 0 ? void 0 : _d.length) > 0 ? (/*#__PURE__*/_react.default.createElement(_Divider.default, {
+  }), ((_e = settings.customToolbarItems) === null || _e === void 0 ? void 0 : _e.length) > 0 ? (/*#__PURE__*/_react.default.createElement(_Divider.default, {
     key: "customDivider"
   })) : null, (toolbarWrapIndex === -1 || isDesktop ? settings.toolbarItems : settings.toolbarItems.slice(0, toolbarWrapIndex + 1)).map(function (name, i) {
     return getToolbarItem(name, i);

package/package.json

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