From 8b7d61390c3fa964c2c7a6c71152938e03ad6758 Mon Sep 17 00:00:00 2001 From: Manish Dait Date: Fri, 6 Oct 2023 12:06:11 +0530 Subject: [PATCH 1/6] fix(bug): readonly not working date-component --- apps/builder/src/widgetLibrary/DateWidget/date.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/builder/src/widgetLibrary/DateWidget/date.tsx b/apps/builder/src/widgetLibrary/DateWidget/date.tsx index cd16027861..3d39d493e5 100644 --- a/apps/builder/src/widgetLibrary/DateWidget/date.tsx +++ b/apps/builder/src/widgetLibrary/DateWidget/date.tsx @@ -30,6 +30,9 @@ export const WrappedDate: FC = (props) => { } = props const changeValue = (value?: unknown) => { + if (readOnly) { + return + } new Promise((resolve) => { const message = getValidateMessage(value) handleUpdateMultiExecutionResult([ From f8f275ccae535e40b7ac9c095221f18b01974a12 Mon Sep 17 00:00:00 2001 From: Scenery <73595134+Wangtaofeng@users.noreply.github.com> Date: Fri, 22 Dec 2023 09:40:09 +0000 Subject: [PATCH 2/6] Revert "fix(bug): readonly not working date-component" --- apps/builder/src/widgetLibrary/DateWidget/date.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/apps/builder/src/widgetLibrary/DateWidget/date.tsx b/apps/builder/src/widgetLibrary/DateWidget/date.tsx index 3d39d493e5..cd16027861 100644 --- a/apps/builder/src/widgetLibrary/DateWidget/date.tsx +++ b/apps/builder/src/widgetLibrary/DateWidget/date.tsx @@ -30,9 +30,6 @@ export const WrappedDate: FC = (props) => { } = props const changeValue = (value?: unknown) => { - if (readOnly) { - return - } new Promise((resolve) => { const message = getValidateMessage(value) handleUpdateMultiExecutionResult([ From b67d163f9f4e7746b98852a13adafe589337a4b8 Mon Sep 17 00:00:00 2001 From: chenlongbo Date: Fri, 22 Dec 2023 18:20:54 +0800 Subject: [PATCH 3/6] fix: tooltip dismiss bug --- packages/illa-design | 2 +- pnpm-lock.yaml | 23 ++++++----------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/packages/illa-design b/packages/illa-design index d743f8e1c1..d192f665e6 160000 --- a/packages/illa-design +++ b/packages/illa-design @@ -1 +1 @@ -Subproject commit d743f8e1c1fcd7bf1b9080a76d4a6da6c4e305d2 +Subproject commit d192f665e6dab4c6094f16fa0bc5e8712719f60b diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a9b738ab96..aeee2f166d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -814,7 +814,7 @@ importers: specifier: ^5.0.4 version: 5.3.2 vite: - specifier: ^4.4.12 + specifier: ^4.4.2 version: 4.5.0(@types/node@18.18.13) packages/illa-design/packages/affix: @@ -2521,8 +2521,8 @@ importers: specifier: ^11.11.1 version: 11.11.1(@types/react@18.2.38)(react@18.2.0) '@floating-ui/react': - specifier: ^0.26.1 - version: 0.26.1(react-dom@18.2.0)(react@18.2.0) + specifier: ^0.26.4 + version: 0.26.4(react-dom@18.2.0)(react@18.2.0) '@illa-design/config-provider': specifier: workspace:* version: link:../config-provider @@ -5521,17 +5521,6 @@ packages: '@floating-ui/utils': 0.1.6 dev: false - /@floating-ui/react-dom@2.0.2(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-5qhlDvjaLmAst/rKb3VdlCinwTF4EYMiVxuuc/HVUjs46W0zgtbMmAZ1UTsDrRTxRmUEzl92mOtWbeeXL26lSQ==} - peerDependencies: - react: ^18.2.0 - react-dom: ^18.2.0 - dependencies: - '@floating-ui/dom': 1.5.1 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - dev: false - /@floating-ui/react-dom@2.0.4(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-CF8k2rgKeh/49UrnIBs4BdxPUV6vize/Db1d/YbCLyp9GiVZ0BEwf5AiDSxJRCr6yOkGqTFHtmrULxkEfYZ7dQ==} peerDependencies: @@ -5543,13 +5532,13 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /@floating-ui/react@0.26.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-5gyJIJ2tZOPMgmZ/vEcVhdmQiy75b7LPO71sYIiDsxGcZ4hxLuygQWCuT0YXHqppt//Eese+L6t5KnX/gZ3tVA==} + /@floating-ui/react@0.26.4(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-pRiEz+SiPyfTcckAtLkEf3KJ/sUbB4X4fWMcDm27HT2kfAq+dH+hMc2VoOkNaGpDE35a2PKo688ugWeHaToL3g==} peerDependencies: react: ^18.2.0 react-dom: ^18.2.0 dependencies: - '@floating-ui/react-dom': 2.0.2(react-dom@18.2.0)(react@18.2.0) + '@floating-ui/react-dom': 2.0.4(react-dom@18.2.0)(react@18.2.0) '@floating-ui/utils': 0.1.6 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) From b53cdb21abaf34183816554a2eb6c460df601b86 Mon Sep 17 00:00:00 2001 From: chenlongbo Date: Fri, 22 Dec 2023 18:22:43 +0800 Subject: [PATCH 4/6] chore: update pnpm lock file --- pnpm-lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aeee2f166d..a4db3b7037 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -814,7 +814,7 @@ importers: specifier: ^5.0.4 version: 5.3.2 vite: - specifier: ^4.4.2 + specifier: ^4.4.12 version: 4.5.0(@types/node@18.18.13) packages/illa-design/packages/affix: From fab6a0ac700c1714cd48a910557881ae135c710e Mon Sep 17 00:00:00 2001 From: Scenery <1507337624@qq.com> Date: Fri, 22 Dec 2023 19:01:16 +0800 Subject: [PATCH 5/6] chore: update submodule --- apps/builder/package.json | 2 +- packages/illa-design | 2 +- packages/illa-public-component | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/builder/package.json b/apps/builder/package.json index 5dd556f9ea..71698e8d9d 100644 --- a/apps/builder/package.json +++ b/apps/builder/package.json @@ -5,7 +5,7 @@ "private": true, "author": "ILLA Cloud ", "license": "Apache-2.0", - "version": "4.1.4", + "version": "4.1.5", "scripts": { "dev": "vite --strictPort --force", "build-cloud": "NODE_OPTIONS=--max-old-space-size=12288 vite build --mode cloud", diff --git a/packages/illa-design b/packages/illa-design index d192f665e6..07b58d8dbd 160000 --- a/packages/illa-design +++ b/packages/illa-design @@ -1 +1 @@ -Subproject commit d192f665e6dab4c6094f16fa0bc5e8712719f60b +Subproject commit 07b58d8dbd5ec4c19d0664ce5e1b2853dd4724bd diff --git a/packages/illa-public-component b/packages/illa-public-component index c891cb948b..bfc3c5803a 160000 --- a/packages/illa-public-component +++ b/packages/illa-public-component @@ -1 +1 @@ -Subproject commit c891cb948b25e7608442ae41140fb3e12eefef96 +Subproject commit bfc3c5803ab79b2aaf9002ba5cfa04dacd91cc4f From ed0a77080dbb8886c60b5f2630dab8ecaa896620 Mon Sep 17 00:00:00 2001 From: Scenery <1507337624@qq.com> Date: Fri, 22 Dec 2023 19:03:43 +0800 Subject: [PATCH 6/6] chore: update submodule --- packages/illa-design | 2 +- packages/illa-public-component | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/illa-design b/packages/illa-design index 07b58d8dbd..9e191ffeb0 160000 --- a/packages/illa-design +++ b/packages/illa-design @@ -1 +1 @@ -Subproject commit 07b58d8dbd5ec4c19d0664ce5e1b2853dd4724bd +Subproject commit 9e191ffeb0e4e6705e4dcebfeaa2bf4976103468 diff --git a/packages/illa-public-component b/packages/illa-public-component index bfc3c5803a..c891cb948b 160000 --- a/packages/illa-public-component +++ b/packages/illa-public-component @@ -1 +1 @@ -Subproject commit bfc3c5803ab79b2aaf9002ba5cfa04dacd91cc4f +Subproject commit c891cb948b25e7608442ae41140fb3e12eefef96