@fileverse-dev/fortune-react 1.3.6 → 1.3.7-dateImport-1

package/es/components/Toolbar/index.js

@@ -123,7 +123,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   return to.concat(ar || Array.prototype.slice.call(from));
 };
 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, api, getSheetIndex } from "@fileverse-dev/fortune-core";
+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, api, getSheetIndex, is_date } from "@fileverse-dev/fortune-core";
 import _ from "lodash";
 import { IconButton, LucideIcon, Tooltip, Command, CommandInput, CommandList, CommandEmpty, CommandGroup, CommandItem } from "@fileverse/ui";
 import DataVerificationPortal from "./dataVerificationPortal";
@@ -719,6 +719,9 @@ var Toolbar = function Toolbar(_a) {
             currentFmt_1 = format.text;
           } else if (((_a = curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === null || _a === void 0 ? void 0 : _a.includes("#,##0")) || (curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === "0" || (curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === "0.00") {
             currentFmt_1 = "Number";
+          } else if (is_date(curr_2.fa)) {
+            var hasTime = curr_2.fa.includes("h") || curr_2.fa.includes("H") || curr_2.fa.includes("m") || curr_2.fa.includes("s");
+            currentFmt_1 = hasTime ? "Date time" : "Date";
           } else {
             currentFmt_1 = defaultFormat[defaultFormat.length - 1].text;
           }

package/es/components/Workbook/index.js

@@ -25,7 +25,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { defaultContext, defaultSettings, initSheetIndex, handleGlobalKeyDown, getSheetIndex, handlePaste, filterPatch, patchToOp, inverseRowColOptions, ensureSheetIndex, insertRowCol, deleteRowCol, groupValuesRefresh, insertDuneChart, getFlowdata, api, handlePasteByClick } from "@fileverse-dev/fortune-core";
+import { defaultContext, defaultSettings, initSheetIndex, handleGlobalKeyDown, getSheetIndex, handlePaste, filterPatch, patchToOp, inverseRowColOptions, ensureSheetIndex, insertRowCol, deleteRowCol, groupValuesRefresh, insertDuneChart, getFlowdata, api, handlePasteByClick, update } from "@fileverse-dev/fortune-core";
 import React, { useMemo, useState, useCallback, useEffect, useRef, useImperativeHandle } from "react";
 import "./index.css";
 import produce, { applyPatches, enablePatches, produceWithPatches } from "immer";
@@ -124,6 +124,12 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       });
       celldata === null || celldata === void 0 ? void 0 : celldata.forEach(function (d) {
         expandedData_1[d.r][d.c] = d.v;
+        var cell = d.v;
+        if (cell && cell.ct && cell.ct.t === "d" && (cell.m === undefined || cell.m === null)) {
+          try {
+            cell.m = update(cell.ct.fa || "General", cell.v);
+          } catch (e) {}
+        }
       });
       draftCtx.luckysheetfile = produce(draftCtx.luckysheetfile, function (d) {
         d[index].data = expandedData_1;

package/lib/components/Toolbar/index.js

@@ -728,6 +728,9 @@ var Toolbar = function Toolbar(_a) {
             currentFmt_1 = format.text;
           } else if (((_a = curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === null || _a === void 0 ? void 0 : _a.includes("#,##0")) || (curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === "0" || (curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === "0.00") {
             currentFmt_1 = "Number";
+          } else if ((0, _fortuneCore.is_date)(curr_2.fa)) {
+            var hasTime = curr_2.fa.includes("h") || curr_2.fa.includes("H") || curr_2.fa.includes("m") || curr_2.fa.includes("s");
+            currentFmt_1 = hasTime ? "Date time" : "Date";
           } else {
             currentFmt_1 = defaultFormat[defaultFormat.length - 1].text;
           }

package/lib/components/Workbook/index.js

@@ -133,6 +133,12 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
       });
       celldata === null || celldata === void 0 ? void 0 : celldata.forEach(function (d) {
         expandedData_1[d.r][d.c] = d.v;
+        var cell = d.v;
+        if (cell && cell.ct && cell.ct.t === "d" && (cell.m === undefined || cell.m === null)) {
+          try {
+            cell.m = (0, _fortuneCore.update)(cell.ct.fa || "General", cell.v);
+          } catch (e) {}
+        }
       });
       draftCtx.luckysheetfile = (0, _immer.default)(draftCtx.luckysheetfile, function (d) {
         d[index].data = expandedData_1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.3.6",
+  "version": "1.3.7-dateImport-1",
   "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.3.6",
+    "@fileverse-dev/fortune-core": "1.3.7-dateImport-1",
     "@fileverse/ui": "5.0.0",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",