From 97cb3410790596f5d571c1531b2c3a3a1eb8c59f Mon Sep 17 00:00:00 2001 From: Eduard Carrerars Date: Fri, 31 Jan 2025 12:27:49 +0100 Subject: [PATCH 1/3] feat(Label): use human_date prop and add title --- src/widgets/base/Label.tsx | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/widgets/base/Label.tsx b/src/widgets/base/Label.tsx index eb3e25eb8..01eb804fc 100644 --- a/src/widgets/base/Label.tsx +++ b/src/widgets/base/Label.tsx @@ -27,6 +27,7 @@ const Label = (props: Props) => { const formContext = useContext(FormContext) as FormContextType; const addColon = fieldForLabel !== null; let labelText = addColon && label.length > 1 ? label + " :" : label; + let labelTitle = ""; if (!ooui.fieldForLabel && ooui._id) { labelText = formContext.getFieldValue(ooui._id); if ( @@ -34,7 +35,22 @@ const Label = (props: Props) => { ooui.fieldType === "time" || ooui.fieldType === "datetime" ) { - labelText = labelText ? dayjs(labelText).fromNow() : ""; + const formats = { + date: "DD/MM/YYYY", + time: "HH:mm", + datetime: "DD/MM/YYYY HH:mm", + }; + labelTitle = labelText + ? dayjs(labelText).format( + formats[ooui.fieldType as keyof typeof formats], + ) + : ""; + if (ooui.humanDate) { + labelText = labelText ? dayjs(labelText).fromNow() : ""; + } else { + labelText = labelTitle; + labelTitle = ""; + } } } const responsiveAlign = responsiveBehaviour ? "left" : "right"; @@ -57,7 +73,7 @@ const Label = (props: Props) => { /> )} - + From 93bf5429f23889e52da4272bff58a3753c79bcc1 Mon Sep 17 00:00:00 2001 From: ecarreras <294235+ecarreras@users.noreply.github.com> Date: Mon, 3 Feb 2025 09:48:35 +0000 Subject: [PATCH 2/3] feat: update gisce/ooui to v2.28.0 https://github.com/gisce/ooui/releases/tag/v2.28.0 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 574385bfa..86ab632f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@ant-design/colors": "^7.2.0", "@ant-design/plots": "^1.0.9", "@gisce/fiber-diagram": "2.1.1", - "@gisce/ooui": "2.27.1", + "@gisce/ooui": "2.28.0", "@gisce/react-formiga-components": "1.9.2", "@gisce/react-formiga-table": "1.9.1", "@monaco-editor/react": "^4.4.5", @@ -3382,9 +3382,9 @@ } }, "node_modules/@gisce/ooui": { - "version": "2.27.1", - "resolved": "https://registry.npmjs.org/@gisce/ooui/-/ooui-2.27.1.tgz", - "integrity": "sha512-i80nAgB7lAKqbDMgLPXcOmS3a4Jxd17H0KUzUg5SQZv5WcgAzfDuGii3E+mpItV5oLwOGuk523YCVt2PJgnRAg==", + "version": "2.28.0", + "resolved": "https://registry.npmjs.org/@gisce/ooui/-/ooui-2.28.0.tgz", + "integrity": "sha512-ENTSc9GcBQ3uRUe0gBR3XsvSmzXJVWiHY13lG/zpPS8iahk6+JtDVDf3XjG1YPj+0JExfTMniz+viBFNNL5hBQ==", "dependencies": { "@gisce/conscheck": "1.0.9", "html-entities": "^2.3.3", diff --git a/package.json b/package.json index 94fabd5f7..d97f84db5 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "@ant-design/colors": "^7.2.0", "@ant-design/plots": "^1.0.9", "@gisce/fiber-diagram": "2.1.1", - "@gisce/ooui": "2.27.1", + "@gisce/ooui": "2.28.0", "@gisce/react-formiga-components": "1.9.2", "@gisce/react-formiga-table": "1.9.1", "@monaco-editor/react": "^4.4.5", From 5338bee526641ea54aca47d2e04afe5165494c1d Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 3 Feb 2025 09:54:48 +0000 Subject: [PATCH 3/3] chore(release): 2.60.0 [skip ci] # [2.60.0](https://github.com/gisce/react-ooui/compare/v2.59.2...v2.60.0) (2025-02-03) ### Features * **Label:** use human_date prop and add title ([97cb341](https://github.com/gisce/react-ooui/commit/97cb3410790596f5d571c1531b2c3a3a1eb8c59f)) * update gisce/ooui to v2.28.0 ([93bf542](https://github.com/gisce/react-ooui/commit/93bf5429f23889e52da4272bff58a3753c79bcc1)) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 86ab632f7..cb5d62721 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@gisce/react-ooui", - "version": "2.59.2", + "version": "2.60.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@gisce/react-ooui", - "version": "2.59.2", + "version": "2.60.0", "dependencies": { "@ant-design/colors": "^7.2.0", "@ant-design/plots": "^1.0.9", diff --git a/package.json b/package.json index d97f84db5..81fbf53a8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@gisce/react-ooui", - "version": "2.59.2", + "version": "2.60.0", "engines": { "node": "20.5.0" },