From 8dcdf944ca6dc038a191ba9faad839862cf5a07b Mon Sep 17 00:00:00 2001 From: RAHEEL Date: Mon, 5 Aug 2024 13:18:01 +0500 Subject: [PATCH 1/5] upgrade antd version to 5.19.4 --- .../src/components/Dropdown.tsx | 2 +- .../lowcoder-design/src/components/button.tsx | 2 +- client/packages/lowcoder/package.json | 2 +- .../lowcoder/src/components/Segmented.tsx | 9 +- .../comps/comps/buttonComp/scannerComp.tsx | 2 +- .../src/comps/comps/dateComp/dateComp.tsx | 8 +- .../pages/ApplicationV2/CreateDropdown.tsx | 2 +- .../src/pages/common/profileDropdown.tsx | 2 +- .../src/pages/editor/LeftLayersContent.tsx | 1 - .../src/pages/setting/theme/themeList.tsx | 2 +- .../src/pages/userAuth/authComponents.tsx | 2 +- client/yarn.lock | 521 +++++++++++------- 12 files changed, 334 insertions(+), 221 deletions(-) diff --git a/client/packages/lowcoder-design/src/components/Dropdown.tsx b/client/packages/lowcoder-design/src/components/Dropdown.tsx index 2dc6675a2..adc5465d9 100644 --- a/client/packages/lowcoder-design/src/components/Dropdown.tsx +++ b/client/packages/lowcoder-design/src/components/Dropdown.tsx @@ -235,7 +235,7 @@ export function Dropdown(props: DropdownProps) { props.onChange(value.toString())} + onChange={(value) => props.onChange(String(value))} defaultValue={props.defaultValue} value={props.value} options={props.options as any} diff --git a/client/packages/lowcoder-design/src/components/button.tsx b/client/packages/lowcoder-design/src/components/button.tsx index 0001442b6..3cb3be148 100644 --- a/client/packages/lowcoder-design/src/components/button.tsx +++ b/client/packages/lowcoder-design/src/components/button.tsx @@ -181,7 +181,7 @@ const TacoButton = forwardRef( props: Omit & { buttonType?: TacoButtonType; }, - ref: React.Ref + ref: React.Ref ) => { const { buttonType, ...restProps } = props; let loadingBackground; diff --git a/client/packages/lowcoder/package.json b/client/packages/lowcoder/package.json index 03c4ace78..0d13cba4f 100644 --- a/client/packages/lowcoder/package.json +++ b/client/packages/lowcoder/package.json @@ -37,7 +37,7 @@ "@types/react-test-renderer": "^18.0.0", "@types/react-virtualized": "^9.21.21", "animate.css": "^4.1.1", - "antd": "5.13.2", + "antd": "^5.19.4", "axios": "^1.6.2", "buffer": "^6.0.3", "clsx": "^2.0.0", diff --git a/client/packages/lowcoder/src/components/Segmented.tsx b/client/packages/lowcoder/src/components/Segmented.tsx index 91f8750d4..c997ce5a1 100644 --- a/client/packages/lowcoder/src/components/Segmented.tsx +++ b/client/packages/lowcoder/src/components/Segmented.tsx @@ -1,11 +1,12 @@ import { default as AntdSegmented } from "antd/es/segmented"; +import type { SegmentedProps } from "antd/es/segmented"; import styled from "styled-components"; -type PropsType> = - T extends React.ForwardRefExoticComponent ? R : never; -type SegmentedProps = PropsType; +// type PropsType> = +// T extends React.ForwardRefExoticComponent ? R : never; +// type SegmentedProps = PropsType; -const StyledSegmented = styled(AntdSegmented)>` +const StyledSegmented = styled(AntdSegmented)` width: 100%; height: 28px; border-radius: 6px; diff --git a/client/packages/lowcoder/src/comps/comps/buttonComp/scannerComp.tsx b/client/packages/lowcoder/src/comps/comps/buttonComp/scannerComp.tsx index 97c5124f5..2d853ecfe 100644 --- a/client/packages/lowcoder/src/comps/comps/buttonComp/scannerComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/buttonComp/scannerComp.tsx @@ -21,7 +21,7 @@ import { trans } from "i18n"; import React, { Suspense, useEffect, useRef, useState, useContext } from "react"; import { arrayStringExposingStateControl } from "comps/controls/codeStateControl"; import { BoolControl } from "comps/controls/boolControl"; -import type { ItemType } from "antd/es/menu/hooks/useItems"; +import type { ItemType } from "antd/es/menu/interface"; import { RefControl } from "comps/controls/refControl"; import { EditorContext } from "comps/editorState"; import { useMergeCompStyles } from "@lowcoder-ee/util/hooks"; diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx index 1b6e6e28f..101764c25 100644 --- a/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx @@ -45,10 +45,14 @@ import { dateRefMethods, disabledTime, handleDateChange } from "comps/comps/date import { DateUIView } from "./dateUIView"; import { useIsMobile } from "util/hooks"; import { RefControl } from "comps/controls/refControl"; -import { CommonPickerMethods } from "antd/es/date-picker/generatePicker/interface"; +// import { CommonPickerMethods } from "antd/es/date-picker/generatePicker/interface"; +import type { DatePickerType } from "antd/es/date-picker"; import { DateRangeUIView } from "comps/comps/dateComp/dateRangeUIView"; import { EditorContext } from "comps/editorState"; import { useMergeCompStyles } from "@lowcoder-ee/util/hooks"; +import { DatePicker } from "antd"; + +const CommonPickerMethods = _.pick(DatePicker, 'ref'); const defaultStyle = { borderStyle: 'solid', @@ -184,7 +188,7 @@ export const datePickerControl = new UICompBuilder(childrenMap, (props, dispatch animationStyle:props.animationStyle, children: ( disabledTime(props.minTime, props.maxTime)} $style={props.inputFieldStyle} disabled={props.disabled} diff --git a/client/packages/lowcoder/src/pages/ApplicationV2/CreateDropdown.tsx b/client/packages/lowcoder/src/pages/ApplicationV2/CreateDropdown.tsx index f49fc8f81..c2d93086d 100644 --- a/client/packages/lowcoder/src/pages/ApplicationV2/CreateDropdown.tsx +++ b/client/packages/lowcoder/src/pages/ApplicationV2/CreateDropdown.tsx @@ -11,7 +11,7 @@ import { TacoButton, } from "lowcoder-design"; import React, { FunctionComponent, useState } from "react"; -import type { ItemType } from "antd/es/menu/hooks/useItems"; +import type { ItemType } from "antd/es/menu/interface"; import { HomeResInfo } from "../../util/homeResUtils"; import { createAppItemClass } from "../tutorials/HomeTutorialsV2"; import styled from "styled-components"; diff --git a/client/packages/lowcoder/src/pages/common/profileDropdown.tsx b/client/packages/lowcoder/src/pages/common/profileDropdown.tsx index 3729e801d..992227bd1 100644 --- a/client/packages/lowcoder/src/pages/common/profileDropdown.tsx +++ b/client/packages/lowcoder/src/pages/common/profileDropdown.tsx @@ -27,7 +27,7 @@ import { trans } from "i18n"; import { showSwitchOrg } from "@lowcoder-ee/pages/common/customerService"; import { checkIsMobile } from "util/commonUtils"; import { selectSystemConfig } from "redux/selectors/configSelectors"; -import type { ItemType } from "antd/es/menu/hooks/useItems"; +import type { ItemType } from "antd/es/menu/interface"; const { Item } = Menu; diff --git a/client/packages/lowcoder/src/pages/editor/LeftLayersContent.tsx b/client/packages/lowcoder/src/pages/editor/LeftLayersContent.tsx index 29cf7cb1b..4b76f0741 100644 --- a/client/packages/lowcoder/src/pages/editor/LeftLayersContent.tsx +++ b/client/packages/lowcoder/src/pages/editor/LeftLayersContent.tsx @@ -39,7 +39,6 @@ import { saveCollisionStatus, } from "util/localStorageUtil"; import { default as DownOutlined } from "@ant-design/icons/DownOutlined"; -import type { ItemType } from "antd/es/menu/hooks/useItems"; import ThemeSettingsSelector from "components/ThemeSettingsSelector"; export type DisabledCollisionStatus = "true" | "false"; // "true" means collision is not enabled - Layering works, "false" means collision is enabled - Layering does not work diff --git a/client/packages/lowcoder/src/pages/setting/theme/themeList.tsx b/client/packages/lowcoder/src/pages/setting/theme/themeList.tsx index 356fa1c2f..328dcf6d6 100644 --- a/client/packages/lowcoder/src/pages/setting/theme/themeList.tsx +++ b/client/packages/lowcoder/src/pages/setting/theme/themeList.tsx @@ -146,7 +146,7 @@ function ThemeList(props: ThemeListProp) { + render={(value, theme: ThemeType) => isAdmin && ( { - const ref = useRef(null); + const ref = useRef(null); return ( <> =16.9.0" + react-dom: ">=16.9.0" + checksum: f0709d6135dca946cead159939fd92976d3bb727a7b88e523cf4d87d3914e927ce7bef068c8f1de679138cf6e502487e290ff42c96d1ee7141dfeb80667fa77d + languageName: node + linkType: hard + +"@ant-design/cssinjs@npm:^1.21.0": + version: 1.21.0 + resolution: "@ant-design/cssinjs@npm:1.21.0" dependencies: "@babel/runtime": ^7.11.1 "@emotion/hash": ^0.8.0 @@ -79,7 +102,7 @@ __metadata: peerDependencies: react: ">=16.0.0" react-dom: ">=16.0.0" - checksum: 81cd6b27dc2c3fa7bfe83f53e0962685728f93a19e2ba36fa3b7da913bba46fe730e4bb28606fa6894f85435d8cf2ade26861a2094746bed2db07113fa8da9b8 + checksum: d1fe42e18047c564d724d0c77045590d83657938bec5a360b41ddfdad518fadd71f111e7c2467e51315758799d95153a2f657996de329809efeb42af074065eb languageName: node linkType: hard @@ -90,7 +113,7 @@ __metadata: languageName: node linkType: hard -"@ant-design/icons@npm:^5.2.6, @ant-design/icons@npm:^5.3.0": +"@ant-design/icons@npm:^5.3.0": version: 5.3.6 resolution: "@ant-design/icons@npm:5.3.6" dependencies: @@ -106,9 +129,25 @@ __metadata: languageName: node linkType: hard -"@ant-design/react-slick@npm:~1.0.2": - version: 1.0.2 - resolution: "@ant-design/react-slick@npm:1.0.2" +"@ant-design/icons@npm:^5.4.0": + version: 5.4.0 + resolution: "@ant-design/icons@npm:5.4.0" + dependencies: + "@ant-design/colors": ^7.0.0 + "@ant-design/icons-svg": ^4.4.0 + "@babel/runtime": ^7.24.8 + classnames: ^2.2.6 + rc-util: ^5.31.1 + peerDependencies: + react: ">=16.0.0" + react-dom: ">=16.0.0" + checksum: 4e6e1d91a7109afc05d3759e44add8b4d7432f14b5b58ce534b700eda5f86d4c8f1fa1d165ab32a0f972b23b0d3664b7bcb895ff468ea595f6f66e0863a3e8ac + languageName: node + linkType: hard + +"@ant-design/react-slick@npm:~1.1.2": + version: 1.1.2 + resolution: "@ant-design/react-slick@npm:1.1.2" dependencies: "@babel/runtime": ^7.10.4 classnames: ^2.2.5 @@ -117,7 +156,7 @@ __metadata: throttle-debounce: ^5.0.0 peerDependencies: react: ">=16.9.0" - checksum: c2a2d14270b3551c1af16c4cc8c63e29ee7f08e4203191d834df61211235102fd5d8e4325adfa41ada1c5212e4388849ec0d23fcb980bf69790b565f363e2d1f + checksum: e3f310ceb003311a72bcade5f2171dcd05130ead2c859ebd7111b2c324b079f146fb6f2770b07a3588457fab80c6132b5ec41da4e78f2f2f2944f913c36958c2 languageName: node linkType: hard @@ -1701,7 +1740,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.10.4, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.16.7, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.23.6, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": version: 7.24.4 resolution: "@babel/runtime@npm:7.24.4" dependencies: @@ -1710,6 +1749,15 @@ __metadata: languageName: node linkType: hard +"@babel/runtime@npm:^7.10.4, @babel/runtime@npm:^7.16.7, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.23.6, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.24.4, @babel/runtime@npm:^7.24.7, @babel/runtime@npm:^7.24.8": + version: 7.25.0 + resolution: "@babel/runtime@npm:7.25.0" + dependencies: + regenerator-runtime: ^0.14.0 + checksum: 4a2a374a58eb01aaa65c5762606e90b3a1f448e0c637d42278b6cc0b42a9f5399b5f381ba9f237ee087da2860d14dd2d1de7bddcbe18be6a3cafba97e44bed64 + languageName: node + linkType: hard + "@babel/template@npm:^7.22.15, @babel/template@npm:^7.24.0, @babel/template@npm:^7.3.3": version: 7.24.0 resolution: "@babel/template@npm:7.24.0" @@ -3302,7 +3350,16 @@ __metadata: languageName: node linkType: hard -"@rc-component/color-picker@npm:~1.5.1": +"@rc-component/async-validator@npm:^5.0.3": + version: 5.0.4 + resolution: "@rc-component/async-validator@npm:5.0.4" + dependencies: + "@babel/runtime": ^7.24.4 + checksum: 30de0a62cd0dd08b5243e6a54b664f2eff3ec1529e1f6be5eac16e01946e825f3fe86138222b4a85f3ee9990dff2c83c0dd429ab1cce51fdacd28ab7f3ffb1b1 + languageName: node + linkType: hard + +"@rc-component/color-picker@npm:~1.5.3": version: 1.5.3 resolution: "@rc-component/color-picker@npm:1.5.3" dependencies: @@ -3367,25 +3424,39 @@ __metadata: languageName: node linkType: hard -"@rc-component/tour@npm:~1.12.2": - version: 1.12.3 - resolution: "@rc-component/tour@npm:1.12.3" +"@rc-component/qrcode@npm:~1.0.0": + version: 1.0.0 + resolution: "@rc-component/qrcode@npm:1.0.0" + dependencies: + "@babel/runtime": ^7.24.7 + classnames: ^2.3.2 + rc-util: ^5.38.0 + peerDependencies: + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: a1aefd3994375b3d08f15b01c7ec978a3175f7ac22da748e3413bf2c33ca54457a9aa6344b005207abd4d1bc84a2a92ca1f964a6b7d0dcecb6d178edbb58a1e5 + languageName: node + linkType: hard + +"@rc-component/tour@npm:~1.15.0": + version: 1.15.0 + resolution: "@rc-component/tour@npm:1.15.0" dependencies: "@babel/runtime": ^7.18.0 "@rc-component/portal": ^1.0.0-9 - "@rc-component/trigger": ^1.3.6 + "@rc-component/trigger": ^2.0.0 classnames: ^2.3.2 rc-util: ^5.24.4 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 1a137d235e42df80d490023d452d6b571ad1afc07a9b5d3cd9312ae8657b5f2d68209a5c7144d2b5fb9e50712a6d927a1218ea2cab4f5337a7265fa91ca9d023 + checksum: 720a577a62db39c2a5728621096e5aee229802be0c6344b05b5daa921cdf3e5443ad3a3f0720a345874e0e82a96bd45f40ebbbc67c8d7ca7c6031aa4105c8dbe languageName: node linkType: hard -"@rc-component/trigger@npm:^1.17.0, @rc-component/trigger@npm:^1.18.0, @rc-component/trigger@npm:^1.18.2, @rc-component/trigger@npm:^1.3.6, @rc-component/trigger@npm:^1.5.0, @rc-component/trigger@npm:^1.7.0": - version: 1.18.3 - resolution: "@rc-component/trigger@npm:1.18.3" +"@rc-component/trigger@npm:^2.0.0, @rc-component/trigger@npm:^2.1.1, @rc-component/trigger@npm:^2.2.0": + version: 2.2.0 + resolution: "@rc-component/trigger@npm:2.2.0" dependencies: "@babel/runtime": ^7.23.2 "@rc-component/portal": ^1.1.0 @@ -3396,7 +3467,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 272098e67b4c09e8ee8f4fa2e55054c05f2ea5196e26859a2fd1dfb63ee4f02e4ca7b60d15704defb59b34151f042ff906099aee20d67a01066d2f0b76dd0c58 + checksum: 55cb5b8b9456507a41977999b84db9247f3b0e50bc3fadc1d234187df630d208779c5c9c45d0c152f29b968740d6fa043e9496255b7aa7cc3e18347a325420e4 languageName: node linkType: hard @@ -5971,61 +6042,63 @@ __metadata: languageName: node linkType: hard -"antd@npm:5.13.2": - version: 5.13.2 - resolution: "antd@npm:5.13.2" +"antd@npm:^5.19.4": + version: 5.19.4 + resolution: "antd@npm:5.19.4" dependencies: - "@ant-design/colors": ^7.0.2 - "@ant-design/cssinjs": ^1.18.2 - "@ant-design/icons": ^5.2.6 - "@ant-design/react-slick": ~1.0.2 + "@ant-design/colors": ^7.1.0 + "@ant-design/cssinjs": ^1.21.0 + "@ant-design/cssinjs-utils": ^1.0.3 + "@ant-design/icons": ^5.4.0 + "@ant-design/react-slick": ~1.1.2 + "@babel/runtime": ^7.24.8 "@ctrl/tinycolor": ^3.6.1 - "@rc-component/color-picker": ~1.5.1 + "@rc-component/color-picker": ~1.5.3 "@rc-component/mutate-observer": ^1.1.0 - "@rc-component/tour": ~1.12.2 - "@rc-component/trigger": ^1.18.2 + "@rc-component/qrcode": ~1.0.0 + "@rc-component/tour": ~1.15.0 + "@rc-component/trigger": ^2.2.0 classnames: ^2.5.1 copy-to-clipboard: ^3.3.3 - dayjs: ^1.11.10 - qrcode.react: ^3.1.0 - rc-cascader: ~3.21.0 - rc-checkbox: ~3.1.0 - rc-collapse: ~3.7.2 - rc-dialog: ~9.3.4 - rc-drawer: ~7.0.0 - rc-dropdown: ~4.1.0 - rc-field-form: ~1.41.0 - rc-image: ~7.5.1 - rc-input: ~1.4.3 - rc-input-number: ~8.6.1 - rc-mentions: ~2.10.1 - rc-menu: ~9.12.4 - rc-motion: ^2.9.0 - rc-notification: ~5.3.0 - rc-pagination: ~4.0.4 - rc-picker: ~3.14.6 - rc-progress: ~3.5.1 - rc-rate: ~2.12.0 + dayjs: ^1.11.11 + rc-cascader: ~3.27.0 + rc-checkbox: ~3.3.0 + rc-collapse: ~3.7.3 + rc-dialog: ~9.5.2 + rc-drawer: ~7.2.0 + rc-dropdown: ~4.2.0 + rc-field-form: ~2.2.1 + rc-image: ~7.9.0 + rc-input: ~1.5.1 + rc-input-number: ~9.1.0 + rc-mentions: ~2.14.0 + rc-menu: ~9.14.1 + rc-motion: ^2.9.2 + rc-notification: ~5.6.0 + rc-pagination: ~4.2.0 + rc-picker: ~4.6.9 + rc-progress: ~4.0.0 + rc-rate: ~2.13.0 rc-resize-observer: ^1.4.0 - rc-segmented: ~2.2.2 - rc-select: ~14.11.0 - rc-slider: ~10.5.0 + rc-segmented: ~2.3.0 + rc-select: ~14.15.1 + rc-slider: ~10.6.2 rc-steps: ~6.0.1 rc-switch: ~4.1.0 - rc-table: ~7.37.0 - rc-tabs: ~14.0.0 - rc-textarea: ~1.6.3 - rc-tooltip: ~6.1.3 - rc-tree: ~5.8.2 - rc-tree-select: ~5.17.0 - rc-upload: ~4.5.2 - rc-util: ^5.38.1 + rc-table: ~7.45.7 + rc-tabs: ~15.1.1 + rc-textarea: ~1.7.0 + rc-tooltip: ~6.2.0 + rc-tree: ~5.8.8 + rc-tree-select: ~5.22.1 + rc-upload: ~4.6.0 + rc-util: ^5.43.0 scroll-into-view-if-needed: ^3.1.0 - throttle-debounce: ^5.0.0 + throttle-debounce: ^5.0.2 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: b58f985678cfe63800f2276aebc64bd91216b1a6fd25f287ddb9883c923b8d32707ced161799f146314c0be4f6eead1dbdb30127bb003240416863ac2dc91974 + checksum: df38f4bdcf9e6806a4442b1630f95e8955ee2ee2c2d14ba8547f376b318a77b3c50993d486dc3bd32eeef29c317b608988bb44f995c678d9eac2b492e2b08381 languageName: node linkType: hard @@ -8472,13 +8545,20 @@ coolshapes-react@lowcoder-org/coolshapes-react: languageName: node linkType: hard -"dayjs@npm:1.x, dayjs@npm:^1.11.10, dayjs@npm:^1.11.7, dayjs@npm:^1.9.1": +"dayjs@npm:1.x, dayjs@npm:^1.11.7, dayjs@npm:^1.9.1": version: 1.11.10 resolution: "dayjs@npm:1.11.10" checksum: a6b5a3813b8884f5cd557e2e6b7fa569f4c5d0c97aca9558e38534af4f2d60daafd3ff8c2000fed3435cfcec9e805bcebd99f90130c6d1c5ef524084ced588c4 languageName: node linkType: hard +"dayjs@npm:^1.11.11": + version: 1.11.12 + resolution: "dayjs@npm:1.11.12" + checksum: 40a4f67c2df3af125ae0ddec68d3a6d806d3009a7414bf45479aaf82f1dd82f3e139e6642e72391abccc37488897830c56afcabb4c819014130d283644df8128 + languageName: node + linkType: hard + "debounce@npm:^1.2.1": version: 1.2.1 resolution: "debounce@npm:1.2.1" @@ -13848,7 +13928,7 @@ coolshapes-react@lowcoder-org/coolshapes-react: "@types/uuid": ^8.3.4 "@vitejs/plugin-react": ^2.2.0 animate.css: ^4.1.1 - antd: 5.13.2 + antd: ^5.19.4 axios: ^1.6.2 buffer: ^6.0.3 clsx: ^2.0.0 @@ -16408,26 +16488,26 @@ coolshapes-react@lowcoder-org/coolshapes-react: languageName: node linkType: hard -"rc-cascader@npm:~3.21.0": - version: 3.21.2 - resolution: "rc-cascader@npm:3.21.2" +"rc-cascader@npm:~3.27.0": + version: 3.27.0 + resolution: "rc-cascader@npm:3.27.0" dependencies: "@babel/runtime": ^7.12.5 array-tree-filter: ^2.1.0 classnames: ^2.3.1 - rc-select: ~14.11.0 + rc-select: ~14.15.0 rc-tree: ~5.8.1 rc-util: ^5.37.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 448dd4562edb67d24259e620b026061597c1ccea2823474b4fdeec4d789f7c241bfb5e1e99daab29bb1a9c5f103f741efd4531f2f506ab35058914765be313df + checksum: 5eb6f08eac8da5d1397622f603b5e62f91ee91b08552ee22f86655fb85d0c5773d8f1cecaa4c199ab18ac1cf2fe03356c2fb0454d13be2e029f9d6241f9a053d languageName: node linkType: hard -"rc-checkbox@npm:~3.1.0": - version: 3.1.0 - resolution: "rc-checkbox@npm:3.1.0" +"rc-checkbox@npm:~3.3.0": + version: 3.3.0 + resolution: "rc-checkbox@npm:3.3.0" dependencies: "@babel/runtime": ^7.10.1 classnames: ^2.3.2 @@ -16435,11 +16515,11 @@ coolshapes-react@lowcoder-org/coolshapes-react: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: f15dd3e3e3120567b633392e37c6d904f2b3c32eb752f4197231b6d79bfa257bde9cd32616ad08c0ad5b053d7b197c9e0684479053b4dea384e466ab53f5c7b4 + checksum: 95d48a1012339163e98bea6e158e5c650e45759550c50f1615f610a19ce31b0af384df899dfded147e1b16d2016e90f16a949792bb79f5b7f6709cf95a9eb1a5 languageName: node linkType: hard -"rc-collapse@npm:~3.7.2": +"rc-collapse@npm:~3.7.3": version: 3.7.3 resolution: "rc-collapse@npm:3.7.3" dependencies: @@ -16454,9 +16534,9 @@ coolshapes-react@lowcoder-org/coolshapes-react: languageName: node linkType: hard -"rc-dialog@npm:~9.3.4": - version: 9.3.4 - resolution: "rc-dialog@npm:9.3.4" +"rc-dialog@npm:~9.5.2": + version: 9.5.2 + resolution: "rc-dialog@npm:9.5.2" dependencies: "@babel/runtime": ^7.10.1 "@rc-component/portal": ^1.0.0-8 @@ -16466,38 +16546,38 @@ coolshapes-react@lowcoder-org/coolshapes-react: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 75d689d281ae3a1a85faa2f87c95ac65995ed58f696898edbe89a79604e18213565edc1d21291c9a640379fa6705c19ec51ba9275d69cde877d21f5108eb3503 + checksum: 58e747c958ebb058c903863071c86599546c4c52a8a6a09b06faee45b55d3836b3aaac9081613497c6cc3771ae7bb2b384a75c8edc32fb1412ccdaad420dce16 languageName: node linkType: hard -"rc-drawer@npm:~7.0.0": - version: 7.0.0 - resolution: "rc-drawer@npm:7.0.0" +"rc-drawer@npm:~7.2.0": + version: 7.2.0 + resolution: "rc-drawer@npm:7.2.0" dependencies: - "@babel/runtime": ^7.10.1 + "@babel/runtime": ^7.23.9 "@rc-component/portal": ^1.1.1 classnames: ^2.2.6 rc-motion: ^2.6.1 - rc-util: ^5.36.0 + rc-util: ^5.38.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 57c646c1b99be344c995eb67c36e9f78f1af6c1c3fce78d79738fe48dbb682f0143c993888535aaa5a912906ed713cd1df5d43f4a982bd98399467e1b539987f + checksum: 1ce22b459dbe736665c1db78cca03777ef5814d0bdf8cbda1ca88dc522e4b4ec3bcda04db81c98695050c29e9406bb892ab6be06fbae2adf78a0c1bcf71b7e67 languageName: node linkType: hard -"rc-dropdown@npm:~4.1.0": - version: 4.1.0 - resolution: "rc-dropdown@npm:4.1.0" +"rc-dropdown@npm:~4.2.0": + version: 4.2.0 + resolution: "rc-dropdown@npm:4.2.0" dependencies: "@babel/runtime": ^7.18.3 - "@rc-component/trigger": ^1.7.0 + "@rc-component/trigger": ^2.0.0 classnames: ^2.2.6 rc-util: ^5.17.0 peerDependencies: react: ">=16.11.0" react-dom: ">=16.11.0" - checksum: 97417289ad4e3c3b68980c9bb80d3429fba9fdf0011f73fd1bee1b9d0c7c602ee469ac52aadca6fec85430595a8581a069750ad696472f2ca951d5e44850a6f4 + checksum: 436ef23be5436fa730327a83d853cf2cce74823fa72b813068998a180aeca7978e42bf342bc4dfe1b1cb554bfc7e013324a15ed21a9b80b778d1c9312c5c6e05 languageName: node linkType: hard @@ -16515,56 +16595,56 @@ coolshapes-react@lowcoder-org/coolshapes-react: languageName: node linkType: hard -"rc-field-form@npm:~1.41.0": - version: 1.41.0 - resolution: "rc-field-form@npm:1.41.0" +"rc-field-form@npm:~2.2.1": + version: 2.2.1 + resolution: "rc-field-form@npm:2.2.1" dependencies: "@babel/runtime": ^7.18.0 - async-validator: ^4.1.0 + "@rc-component/async-validator": ^5.0.3 rc-util: ^5.32.2 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 5340296d62e453d60ed42e19208c91ce2d2af5ff1d525829ea003109150011f3e944296a129792f749de6fc4c2113ea3297fdaef953de27606e03d73d937dc2b + checksum: 3a5ce0c10be85ceb454619f14280346a44e0c565a44c0d6f1218e08d3858fcb3a08a3ffae7fbd0a3e228df577b0a2b62e7d8540bfcca9f5b601ee8d5d3e57a68 languageName: node linkType: hard -"rc-image@npm:~7.5.1": - version: 7.5.1 - resolution: "rc-image@npm:7.5.1" +"rc-image@npm:~7.9.0": + version: 7.9.0 + resolution: "rc-image@npm:7.9.0" dependencies: "@babel/runtime": ^7.11.2 "@rc-component/portal": ^1.0.2 classnames: ^2.2.6 - rc-dialog: ~9.3.4 + rc-dialog: ~9.5.2 rc-motion: ^2.6.2 rc-util: ^5.34.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: ec5ffd6ed34a2f1502a4374a622144c1554f83a376b87ffc54712ddd891c83e423cc0e5c3c228606ee0e1dc571df685d493c9e10582b352064b2073ec72c8d4b + checksum: 90712e1d8a8d67d53356d1a9f348cd6a0c51b763e526ebfba66ef704414c2b6b948548ba5d88c8f5c6ed8e7775dfb73c6efeac873e516969459eb96a6195c207 languageName: node linkType: hard -"rc-input-number@npm:~8.6.1": - version: 8.6.1 - resolution: "rc-input-number@npm:8.6.1" +"rc-input-number@npm:~9.1.0": + version: 9.1.0 + resolution: "rc-input-number@npm:9.1.0" dependencies: "@babel/runtime": ^7.10.1 "@rc-component/mini-decimal": ^1.0.1 classnames: ^2.2.5 - rc-input: ~1.4.0 - rc-util: ^5.28.0 + rc-input: ~1.5.0 + rc-util: ^5.40.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 20b348ba1f134983fd5cc5884bd3ff3a3ff57fc072896f8fb6a97d0e239f72136331a5a728b4b5b5b2f6287d263a262971a8c36a4268d585fb4bbea2b332e28a + checksum: 8bbbe95ced30821010441db507e572a6bbee8bbbb2717767fe284d7d9a096d3c8fc385bbaeed749215aa1eb28917a260c948a05fb7b8b55fafeeb9363e7d1078 languageName: node linkType: hard -"rc-input@npm:~1.4.0, rc-input@npm:~1.4.3": - version: 1.4.5 - resolution: "rc-input@npm:1.4.5" +"rc-input@npm:~1.5.0, rc-input@npm:~1.5.1": + version: 1.5.1 + resolution: "rc-input@npm:1.5.1" dependencies: "@babel/runtime": ^7.11.1 classnames: ^2.2.1 @@ -16572,34 +16652,34 @@ coolshapes-react@lowcoder-org/coolshapes-react: peerDependencies: react: ">=16.0.0" react-dom: ">=16.0.0" - checksum: 8913ec65c1011f23d3f6b304f7fc1911c20d66d9e7941cdbacd098b221b149e7ef2edc7b511865b3c808d621dd7af99516518f1b6bfe464bb3496a7cbcda04b2 + checksum: 1fa1ed9a8b0d9aab5482ec66ac7f97c5083d036ae88ba5475f52b6926842034b6a9adc54df5e1fcb32f72b60e7c43639d51475cf2702f41e4774735fb0ed3619 languageName: node linkType: hard -"rc-mentions@npm:~2.10.1": - version: 2.10.1 - resolution: "rc-mentions@npm:2.10.1" +"rc-mentions@npm:~2.14.0": + version: 2.14.0 + resolution: "rc-mentions@npm:2.14.0" dependencies: "@babel/runtime": ^7.22.5 - "@rc-component/trigger": ^1.5.0 + "@rc-component/trigger": ^2.0.0 classnames: ^2.2.6 - rc-input: ~1.4.0 - rc-menu: ~9.12.0 - rc-textarea: ~1.6.1 + rc-input: ~1.5.0 + rc-menu: ~9.14.0 + rc-textarea: ~1.7.0 rc-util: ^5.34.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 0b1fc9690cbf76a72acf020a94eb1a33fdd2545c8170622c99e925b630d25874ab52110376861d1ec95ca50fcd8cef417e7c83fb723592073a798d86e9bb24e6 + checksum: 0c98a55660bc4f7f557a1415b7dc287ae69b1680092680eab3231c3810e1e9d23c69fb4b9428018624d375b90b41e39b887bbeb8d85b278ed6997de475ae3733 languageName: node linkType: hard -"rc-menu@npm:~9.12.0, rc-menu@npm:~9.12.4": - version: 9.12.4 - resolution: "rc-menu@npm:9.12.4" +"rc-menu@npm:~9.14.0, rc-menu@npm:~9.14.1": + version: 9.14.1 + resolution: "rc-menu@npm:9.14.1" dependencies: "@babel/runtime": ^7.10.1 - "@rc-component/trigger": ^1.17.0 + "@rc-component/trigger": ^2.0.0 classnames: 2.x rc-motion: ^2.4.3 rc-overflow: ^1.3.1 @@ -16607,11 +16687,11 @@ coolshapes-react@lowcoder-org/coolshapes-react: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 3d7770defb882a444b21d6c437b0cf8759226a98233a50d48d0554bf2addab05c67544466b54c9bcc641d7859e7a9be84031d3493a521b697d56c9b9c2a0e7f3 + checksum: 52e729ea4656f50616767559de7bc5eaae411dfba28ec79308f52a7dd2ead7a615e62097bd60429ac98cb3f996fe6bdbb6a223bdc8422cf629387c5c48c8de46 languageName: node linkType: hard -"rc-motion@npm:^2.0.0, rc-motion@npm:^2.0.1, rc-motion@npm:^2.3.0, rc-motion@npm:^2.3.4, rc-motion@npm:^2.4.3, rc-motion@npm:^2.4.4, rc-motion@npm:^2.6.1, rc-motion@npm:^2.6.2, rc-motion@npm:^2.9.0": +"rc-motion@npm:^2.0.0": version: 2.9.0 resolution: "rc-motion@npm:2.9.0" dependencies: @@ -16625,9 +16705,23 @@ coolshapes-react@lowcoder-org/coolshapes-react: languageName: node linkType: hard -"rc-notification@npm:~5.3.0": - version: 5.3.0 - resolution: "rc-notification@npm:5.3.0" +"rc-motion@npm:^2.0.1, rc-motion@npm:^2.3.0, rc-motion@npm:^2.3.4, rc-motion@npm:^2.4.3, rc-motion@npm:^2.4.4, rc-motion@npm:^2.6.1, rc-motion@npm:^2.6.2, rc-motion@npm:^2.9.0, rc-motion@npm:^2.9.2": + version: 2.9.2 + resolution: "rc-motion@npm:2.9.2" + dependencies: + "@babel/runtime": ^7.11.1 + classnames: ^2.2.1 + rc-util: ^5.43.0 + peerDependencies: + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 704dceedaf7f75e884b6a6e1134e674c1351ee6c6b1bd6a18ff73594d1ba0379cab77abd7fcad7d842ca07595bfe0a7ab291210a7144f7fd2e5e68a199e1561c + languageName: node + linkType: hard + +"rc-notification@npm:~5.6.0": + version: 5.6.0 + resolution: "rc-notification@npm:5.6.0" dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x @@ -16636,11 +16730,11 @@ coolshapes-react@lowcoder-org/coolshapes-react: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 1e6bc146e687815d784e0b4c626a9af82435086bc02bb5e19827baa523e26440d6ed03b43de83a15e0272b83bebede3b67d61c4d4af2240ae7dcdd6604f0ef58 + checksum: 265d9c1e0c31c3155cd08a3500d412b247594cffbd2eb32527f20c7688336930fa28eb0c69133d684bcce80266f2f665bb5d78c9b15af8ea9145ef32bef6241f languageName: node linkType: hard -"rc-overflow@npm:^1.3.1": +"rc-overflow@npm:^1.3.1, rc-overflow@npm:^1.3.2": version: 1.3.2 resolution: "rc-overflow@npm:1.3.2" dependencies: @@ -16655,9 +16749,9 @@ coolshapes-react@lowcoder-org/coolshapes-react: languageName: node linkType: hard -"rc-pagination@npm:~4.0.4": - version: 4.0.4 - resolution: "rc-pagination@npm:4.0.4" +"rc-pagination@npm:~4.2.0": + version: 4.2.0 + resolution: "rc-pagination@npm:4.2.0" dependencies: "@babel/runtime": ^7.10.1 classnames: ^2.3.2 @@ -16665,7 +16759,7 @@ coolshapes-react@lowcoder-org/coolshapes-react: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 2ff6f2dd6ad0b855d1e747d09534f2efe9a124af4ff4cd5d5550a6cae9392879c06f471d4ee29d2a72c2c416f89dac6e43a7788650db5b8e54001affba2b172c + checksum: 78a889bade203e559558b7b973d848c2b1626a68b24f7e458526d8839641ad4b57c62a12cc6d4107a351b3a962e2f782bd33794586dd909cd11e17032431d845 languageName: node linkType: hard @@ -16688,14 +16782,16 @@ coolshapes-react@lowcoder-org/coolshapes-react: languageName: node linkType: hard -"rc-picker@npm:~3.14.6": - version: 3.14.7 - resolution: "rc-picker@npm:3.14.7" +"rc-picker@npm:~4.6.9": + version: 4.6.11 + resolution: "rc-picker@npm:4.6.11" dependencies: - "@babel/runtime": ^7.10.1 - "@rc-component/trigger": ^1.5.0 + "@babel/runtime": ^7.24.7 + "@rc-component/trigger": ^2.0.0 classnames: ^2.2.1 - rc-util: ^5.30.0 + rc-overflow: ^1.3.2 + rc-resize-observer: ^1.4.0 + rc-util: ^5.43.0 peerDependencies: date-fns: ">= 2.x" dayjs: ">= 1.x" @@ -16712,13 +16808,13 @@ coolshapes-react@lowcoder-org/coolshapes-react: optional: true moment: optional: true - checksum: c6e8cd6f330dd05c736b59bdfae599a76068bf2a6ab4afe121b39f53653622e40929032fa3381ad59152b308a6d5fafdeecffe580bb4c9c3413776203fc99188 + checksum: 8a2b72f01132ed901b59ec65d1792af9273a29f1c343d363421d6325a14cafb325acd9b1db1670bd26b3719bdbf37178396b78b6c06cefe65d32f955c67ac837 languageName: node linkType: hard -"rc-progress@npm:~3.5.1": - version: 3.5.1 - resolution: "rc-progress@npm:3.5.1" +"rc-progress@npm:~4.0.0": + version: 4.0.0 + resolution: "rc-progress@npm:4.0.0" dependencies: "@babel/runtime": ^7.10.1 classnames: ^2.2.6 @@ -16726,13 +16822,13 @@ coolshapes-react@lowcoder-org/coolshapes-react: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: b0722a696396f985267e35e26f49c1c1bd6a17b4918eb93318fc36a7a5ffae9806932d4982a7da0d83349648ca85325b792003ec40240820fd6e00e0bc6f3c1d + checksum: cd058f1becea650142c21f7ad36fc2b3e145d06c26d432c38ba1f10c9fc0895c51471a9fe775426849b2c6e6fa3c68c6877b1a42b60014d5fa1b350524bb7ae2 languageName: node linkType: hard -"rc-rate@npm:~2.12.0": - version: 2.12.0 - resolution: "rc-rate@npm:2.12.0" +"rc-rate@npm:~2.13.0": + version: 2.13.0 + resolution: "rc-rate@npm:2.13.0" dependencies: "@babel/runtime": ^7.10.1 classnames: ^2.2.5 @@ -16740,7 +16836,7 @@ coolshapes-react@lowcoder-org/coolshapes-react: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: aa41bb6b89a53cb69641123e8e3dfe9e6bb3092fb102b80eb251d32e18c5f7ad9a6f47c7c848ece91eee68f8df5b90719e026c14a148d4645aecf3489727bed5 + checksum: 08e0327c006adbd4a6b4c4e2a8863237d81d213703cf2156cd4b161ffa28ab8c9938c4baa15c337569e2c7f28205d7afdc544f59341b6e058a73a5c7e297b813 languageName: node linkType: hard @@ -16759,9 +16855,9 @@ coolshapes-react@lowcoder-org/coolshapes-react: languageName: node linkType: hard -"rc-segmented@npm:~2.2.2": - version: 2.2.2 - resolution: "rc-segmented@npm:2.2.2" +"rc-segmented@npm:~2.3.0": + version: 2.3.0 + resolution: "rc-segmented@npm:2.3.0" dependencies: "@babel/runtime": ^7.11.1 classnames: ^2.2.1 @@ -16770,16 +16866,16 @@ coolshapes-react@lowcoder-org/coolshapes-react: peerDependencies: react: ">=16.0.0" react-dom: ">=16.0.0" - checksum: 018325f1fe183dec98a358c8180ea8483ee8e593b2fa72767b765b9f200aed4054eea6257f93f48a456324cb082fd8b8e38a9929cb71eb37ac63357ad9d89f04 + checksum: 9721af596436654a8b0df29b685604e80d40661d900baff3a2d522e41d4eb18fe9b33c6a203cb846aba1d7dfa63598910b669eb12c3d96a57f259faa2494cf60 languageName: node linkType: hard -"rc-select@npm:~14.11.0, rc-select@npm:~14.11.0-0": - version: 14.11.0 - resolution: "rc-select@npm:14.11.0" +"rc-select@npm:~14.15.0, rc-select@npm:~14.15.1": + version: 14.15.1 + resolution: "rc-select@npm:14.15.1" dependencies: "@babel/runtime": ^7.10.1 - "@rc-component/trigger": ^1.5.0 + "@rc-component/trigger": ^2.1.1 classnames: 2.x rc-motion: ^2.0.1 rc-overflow: ^1.3.1 @@ -16788,21 +16884,21 @@ coolshapes-react@lowcoder-org/coolshapes-react: peerDependencies: react: "*" react-dom: "*" - checksum: e3258545a64c687b2e3c456edf8c426961cf69823d67972580db49f470cd5bd11a7e1a55033c206b542c5c130ee45a2dd2436a9dae00c6528190d170eef6ff31 + checksum: 1dd7a52ce34816fd8db064509fe222521f4c5f2e6b43add7ce715fb56e4be30a9873ed5968af2775a70b6eab79a51d34bbad9b3aa1e68d69ee3f60586df6e99e languageName: node linkType: hard -"rc-slider@npm:~10.5.0": - version: 10.5.0 - resolution: "rc-slider@npm:10.5.0" +"rc-slider@npm:~10.6.2": + version: 10.6.2 + resolution: "rc-slider@npm:10.6.2" dependencies: "@babel/runtime": ^7.10.1 classnames: ^2.2.5 - rc-util: ^5.27.0 + rc-util: ^5.36.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 7d29cf4edee57615ab5d000cd1641216829988934db1e920243040615fa194147a4c2b065388b9d8e984a04424b67c997975fccde1e94ae85f66dca365934f1c + checksum: 16c2e138c6e0a3e44d2ed515c2adcf02cf13273274df3e6ccbabcb4c1a54fd6a9ecca5a5babc5c2930c9c3480e5462d51e96a67344e84ba202507403c69cc7b3 languageName: node linkType: hard @@ -16834,90 +16930,90 @@ coolshapes-react@lowcoder-org/coolshapes-react: languageName: node linkType: hard -"rc-table@npm:~7.37.0": - version: 7.37.0 - resolution: "rc-table@npm:7.37.0" +"rc-table@npm:~7.45.7": + version: 7.45.7 + resolution: "rc-table@npm:7.45.7" dependencies: "@babel/runtime": ^7.10.1 "@rc-component/context": ^1.4.0 classnames: ^2.2.5 rc-resize-observer: ^1.1.0 rc-util: ^5.37.0 - rc-virtual-list: ^3.11.1 + rc-virtual-list: ^3.14.2 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: bf6a2bf791ad06bc66333ec500c37236cf3b6d823607a1ca933331b5ff24498c1e2ae8bc39900ea3e0d2a598f4273c0ce99fc355799d3e182f0285774f88cbd7 + checksum: c9e3cc14dbb45593e33e2179a92a00e46de5af74d8596c8a11433a4e3420746ec597fa92b25e4d98faa10fd6a603e947f69d123bc07a21a9441b1ffc863701ab languageName: node linkType: hard -"rc-tabs@npm:~14.0.0": - version: 14.0.0 - resolution: "rc-tabs@npm:14.0.0" +"rc-tabs@npm:~15.1.1": + version: 15.1.1 + resolution: "rc-tabs@npm:15.1.1" dependencies: "@babel/runtime": ^7.11.2 classnames: 2.x - rc-dropdown: ~4.1.0 - rc-menu: ~9.12.0 + rc-dropdown: ~4.2.0 + rc-menu: ~9.14.0 rc-motion: ^2.6.2 rc-resize-observer: ^1.0.0 rc-util: ^5.34.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 4847c623b8bb219ad80d4ebd59ae7e389feb2c1a9eacd18127b3f567d0c1db555b87e88cc72bf21201d8a60cac0eed6f930261f368979d720a8a22e39567ef85 + checksum: 77065468e4e74f8737de5faba9e22ef8d5b255d2db578d4081a29ded6fab4cf18fae3d6b1db7d784c1b47f61bd6b608f6d9737cbc300952532e273a0091f8b47 languageName: node linkType: hard -"rc-textarea@npm:~1.6.1, rc-textarea@npm:~1.6.3": - version: 1.6.3 - resolution: "rc-textarea@npm:1.6.3" +"rc-textarea@npm:~1.7.0": + version: 1.7.0 + resolution: "rc-textarea@npm:1.7.0" dependencies: "@babel/runtime": ^7.10.1 classnames: ^2.2.1 - rc-input: ~1.4.0 + rc-input: ~1.5.0 rc-resize-observer: ^1.0.0 rc-util: ^5.27.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: a9774cafd228da8900859187db39b3e3ebe0fc53abe727af14a545062ba6b0d6a568f356fed77394f0f1296b328d28eba9c50068c8034d40967de8a6e283b1f5 + checksum: 42bf6723ad844a838fc74979879dc1a418a43002839c75b0f0bd667af24bdcb61c91a7418ad4131196baba35abf0cb45fdf739c0d1f9c14d86e4a6b54fb51081 languageName: node linkType: hard -"rc-tooltip@npm:~6.1.3": - version: 6.1.3 - resolution: "rc-tooltip@npm:6.1.3" +"rc-tooltip@npm:~6.2.0": + version: 6.2.0 + resolution: "rc-tooltip@npm:6.2.0" dependencies: "@babel/runtime": ^7.11.2 - "@rc-component/trigger": ^1.18.0 + "@rc-component/trigger": ^2.0.0 classnames: ^2.3.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: f67cf4e409d110f9f4098807303bd4590297f45ffb21d20f3c59a93de45b38c477eeee346e78b9c2e07bffd2ed53e22f435023113a08b553ed10e269754507e2 + checksum: 950201af1743f655a867f8e2c9892784d3bb7b9a9f8b48aa0b22c5066b351f8895683e034cf2b8a8de6780641a84dab4bc6b4ecdcb81261b26462801f5cedf11 languageName: node linkType: hard -"rc-tree-select@npm:~5.17.0": - version: 5.17.0 - resolution: "rc-tree-select@npm:5.17.0" +"rc-tree-select@npm:~5.22.1": + version: 5.22.1 + resolution: "rc-tree-select@npm:5.22.1" dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x - rc-select: ~14.11.0-0 + rc-select: ~14.15.0 rc-tree: ~5.8.1 rc-util: ^5.16.1 peerDependencies: react: "*" react-dom: "*" - checksum: 245061c480ae5625fdb016a098770d6bfac0a6445856d4870a02b78e236a6510e241a4eaef36bb36236c6dca936a992a967e327a04d0440685ad6d0ba7c18b12 + checksum: dbc8ba3af3076325c6a95ab46b25acf1d715a21b2e4e4eac83755c085a5f8475806a981d02229c14cfb3bb918f7a221219601350860982ec719afa226a77dfe3 languageName: node linkType: hard -"rc-tree@npm:~5.8.1, rc-tree@npm:~5.8.2": - version: 5.8.5 - resolution: "rc-tree@npm:5.8.5" +"rc-tree@npm:~5.8.1, rc-tree@npm:~5.8.8": + version: 5.8.8 + resolution: "rc-tree@npm:5.8.8" dependencies: "@babel/runtime": ^7.10.1 classnames: 2.x @@ -16927,7 +17023,7 @@ coolshapes-react@lowcoder-org/coolshapes-react: peerDependencies: react: "*" react-dom: "*" - checksum: 9f5d652b4a6a5c93e8b6ddb6ecbd11560d845661dcb1d7d03b97c31181592bfb54ef350fae90eff461a027639c2b1a74ec5b709920125efb7b66959377359e2f + checksum: 502c1784dd0c99de7c5861dcc7578a63b3cc6950de59e88a7655c17e23b1f786c96b0aa77c1dcad7c65719f82f13edad94548ae588c4c746b4c21b55d1fe1c3b languageName: node linkType: hard @@ -16947,9 +17043,9 @@ coolshapes-react@lowcoder-org/coolshapes-react: languageName: node linkType: hard -"rc-upload@npm:~4.5.2": - version: 4.5.2 - resolution: "rc-upload@npm:4.5.2" +"rc-upload@npm:~4.6.0": + version: 4.6.0 + resolution: "rc-upload@npm:4.6.0" dependencies: "@babel/runtime": ^7.18.3 classnames: ^2.2.5 @@ -16957,11 +17053,24 @@ coolshapes-react@lowcoder-org/coolshapes-react: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 5a7e1942657d91d78dab3a84367629d8dac7c3dcd961d8839d1d481e982504de2944c74c5b79fb63e3971ff84bc667e841e0e4305af10b37615c185e6d92d644 + checksum: 2ec8d05ec60f0b2ad492f592f54c30d18f9997e6dee00253e6ed445dce46d7a29c1d7b5c9c140e7419ba877c6cc23dfa564a96fc1d24d8488f383483c1e20f4a languageName: node linkType: hard -"rc-util@npm:^5.0.1, rc-util@npm:^5.16.1, rc-util@npm:^5.17.0, rc-util@npm:^5.18.1, rc-util@npm:^5.19.2, rc-util@npm:^5.2.0, rc-util@npm:^5.20.1, rc-util@npm:^5.21.0, rc-util@npm:^5.24.4, rc-util@npm:^5.25.2, rc-util@npm:^5.26.0, rc-util@npm:^5.27.0, rc-util@npm:^5.28.0, rc-util@npm:^5.30.0, rc-util@npm:^5.31.1, rc-util@npm:^5.32.2, rc-util@npm:^5.34.1, rc-util@npm:^5.35.0, rc-util@npm:^5.36.0, rc-util@npm:^5.37.0, rc-util@npm:^5.38.0, rc-util@npm:^5.38.1, rc-util@npm:^5.8.0": +"rc-util@npm:^5.0.1, rc-util@npm:^5.16.1, rc-util@npm:^5.17.0, rc-util@npm:^5.18.1, rc-util@npm:^5.2.0, rc-util@npm:^5.20.1, rc-util@npm:^5.24.4, rc-util@npm:^5.25.2, rc-util@npm:^5.27.0, rc-util@npm:^5.30.0, rc-util@npm:^5.32.2, rc-util@npm:^5.34.1, rc-util@npm:^5.35.0, rc-util@npm:^5.36.0, rc-util@npm:^5.38.0, rc-util@npm:^5.40.1, rc-util@npm:^5.43.0": + version: 5.43.0 + resolution: "rc-util@npm:5.43.0" + dependencies: + "@babel/runtime": ^7.18.3 + react-is: ^18.2.0 + peerDependencies: + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 48c10afb5886aed86d1f5241883f972b2b16235b0cc4867a05d061324f107aa113260c34eeb13ad18f4b66d1264dbcb3baf725c8ea34fbdaa504410d4e71b3ce + languageName: node + linkType: hard + +"rc-util@npm:^5.19.2, rc-util@npm:^5.21.0, rc-util@npm:^5.26.0, rc-util@npm:^5.31.1, rc-util@npm:^5.37.0, rc-util@npm:^5.38.1, rc-util@npm:^5.8.0": version: 5.39.1 resolution: "rc-util@npm:5.39.1" dependencies: @@ -16974,9 +17083,9 @@ coolshapes-react@lowcoder-org/coolshapes-react: languageName: node linkType: hard -"rc-virtual-list@npm:^3.11.1, rc-virtual-list@npm:^3.5.1, rc-virtual-list@npm:^3.5.2": - version: 3.11.5 - resolution: "rc-virtual-list@npm:3.11.5" +"rc-virtual-list@npm:^3.14.2, rc-virtual-list@npm:^3.5.1, rc-virtual-list@npm:^3.5.2": + version: 3.14.5 + resolution: "rc-virtual-list@npm:3.14.5" dependencies: "@babel/runtime": ^7.20.0 classnames: ^2.2.6 @@ -16985,7 +17094,7 @@ coolshapes-react@lowcoder-org/coolshapes-react: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: eca0694e057b3d139fff2c35a2eea7578b2af5ffbf1d3ae2a10929ff2edf810f502e348dac71154ed25df33fde21066b9443004461d75fda3ee112f73191cb90 + checksum: f68957cc1b78eb9bfcbad87a2d3cce942c301fd0a7dd894548cca81f64433a321b567762d745d199e6c4667f070f2437972d2a24bf6d97d5b05c53b665b706a3 languageName: node linkType: hard @@ -19677,10 +19786,10 @@ coolshapes-react@lowcoder-org/coolshapes-react: languageName: node linkType: hard -"throttle-debounce@npm:^5.0.0": - version: 5.0.0 - resolution: "throttle-debounce@npm:5.0.0" - checksum: aa8bf25828b4f8645ce863589de05d6807ea3debc147ce7d89624638ff8a16792d6d0baa0f8a32a260f0b163444d74020c6087b713ae561fde594b97b6e51f28 +"throttle-debounce@npm:^5.0.0, throttle-debounce@npm:^5.0.2": + version: 5.0.2 + resolution: "throttle-debounce@npm:5.0.2" + checksum: 90d026691bfedf692d9a5addd1d5b30460c6a87a9c588ae05779402e3bfd042bad2bf828edb05512f2e9e601566e8663443d929cf963a998207e193fb1d7eff8 languageName: node linkType: hard From 1a8f662366428610b9d75131d81802c56d34a868 Mon Sep 17 00:00:00 2001 From: RAHEEL Date: Thu, 8 Aug 2024 18:59:12 +0500 Subject: [PATCH 2/5] fixing issues --- client/packages/lowcoder/package.json | 2 +- .../src/comps/comps/dateComp/dateComp.tsx | 76 ++++++++------ .../src/comps/comps/dateComp/dateCompUtil.ts | 7 +- .../comps/comps/dateComp/dateMobileUIView.tsx | 12 ++- .../comps/comps/dateComp/dateRangeUIView.tsx | 6 ++ .../src/comps/comps/dateComp/dateUIView.tsx | 42 +++++--- .../src/comps/comps/dateComp/timeComp.tsx | 4 +- .../comps/selectInputComp/cascaderComp.tsx | 6 +- .../selectInputComp/segmentedControl.tsx | 2 +- .../column/columnTypeComps/columnDateComp.tsx | 2 +- .../lowcoder/src/comps/comps/transferComp.tsx | 13 +-- client/yarn.lock | 99 ++++++++++--------- 12 files changed, 169 insertions(+), 102 deletions(-) diff --git a/client/packages/lowcoder/package.json b/client/packages/lowcoder/package.json index 0d13cba4f..ffba8b8f0 100644 --- a/client/packages/lowcoder/package.json +++ b/client/packages/lowcoder/package.json @@ -37,7 +37,7 @@ "@types/react-test-renderer": "^18.0.0", "@types/react-virtualized": "^9.21.21", "animate.css": "^4.1.1", - "antd": "^5.19.4", + "antd": "^5.20.0", "axios": "^1.6.2", "buffer": "^6.0.3", "clsx": "^2.0.0", diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx index 101764c25..f9eab1e92 100644 --- a/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx @@ -37,22 +37,22 @@ import { } from "comps/utils/propertyUtils"; import { trans } from "i18n"; import { DATE_FORMAT, DATE_TIME_FORMAT, DateParser, PickerMode } from "util/dateTimeUtils"; -import React, { ReactNode, useContext, useEffect } from "react"; +import React, { ReactNode, useContext, useEffect, useRef } from "react"; import { IconControl } from "comps/controls/iconControl"; import { hasIcon } from "comps/utils"; import { Section, sectionNames } from "components/Section"; -import { dateRefMethods, disabledTime, handleDateChange } from "comps/comps/dateComp/dateCompUtil"; +import { CommonPickerMethods, dateRefMethods, disabledTime, handleDateChange } from "comps/comps/dateComp/dateCompUtil"; import { DateUIView } from "./dateUIView"; import { useIsMobile } from "util/hooks"; import { RefControl } from "comps/controls/refControl"; // import { CommonPickerMethods } from "antd/es/date-picker/generatePicker/interface"; -import type { DatePickerType } from "antd/es/date-picker"; +import type { PickerPropsWithMultiple } from "antd/es/date-picker/generatePicker/interface"; import { DateRangeUIView } from "comps/comps/dateComp/dateRangeUIView"; import { EditorContext } from "comps/editorState"; import { useMergeCompStyles } from "@lowcoder-ee/util/hooks"; import { DatePicker } from "antd"; +// import type { PickerRef } from ""; -const CommonPickerMethods = _.pick(DatePicker, 'ref'); const defaultStyle = { borderStyle: 'solid', @@ -173,7 +173,8 @@ export type DateCompViewProps = Pick< }; export const datePickerControl = new UICompBuilder(childrenMap, (props, dispatch) => { - useMergeCompStyles(props as Record, dispatch); + useMergeCompStyles(props as Record, dispatch); + const pickerRef = useRef(); let time = null; if (props.value.value !== '') { @@ -187,31 +188,48 @@ export const datePickerControl = new UICompBuilder(childrenMap, (props, dispatch inputFieldStyle:props.inputFieldStyle, animationStyle:props.animationStyle, children: ( - disabledTime(props.minTime, props.maxTime)} - $style={props.inputFieldStyle} - disabled={props.disabled} - {...datePickerProps(props)} - minDate={props.minDate} - maxDate={props.maxDate} - placeholder={props.placeholder} - value={time?.isValid() ? time : null} - onChange={(time) => { - handleDateChange( - time && time.isValid() - ? time.format(props.showTime ? DATE_TIME_FORMAT : DATE_FORMAT) - : "", - props.value.onChange, - props.onEvent - ); + // disabledTime(props.minTime, props.maxTime)} + // $style={props.inputFieldStyle} + // disabled={props.disabled} + // {...datePickerProps(props)} + // hourStep={props.hourStep} + // minDate={props.minDate} + // maxDate={props.maxDate} + // placeholder={props.placeholder} + // // value={time?.isValid() ? time : null} + // defaultValue={time?.isValid() ? time : null} + // onChange={(time) => { + // console.log('onchange'); + // handleDateChange( + // time && time.isValid() + // ? time.format(props.showTime ? DATE_TIME_FORMAT : DATE_FORMAT) + // : "", + // props.value.onChange, + // props.onEvent + // ); + // }} + // onPanelChange={() => { + // console.log('onPanelChange'); + // handleDateChange("", props.value.onChange, noop); + // }} + // onFocus={() => props.onEvent("focus")} + // onBlur={() => props.onEvent("blur")} + // suffixIcon={hasIcon(props.suffixIcon) && props.suffixIcon} + // /> + { + console.log('Selected Time: ', value); + console.log('Formatted Selected Time: ', dateString); }} - onPanelChange={() => { - handleDateChange("", props.value.onChange, noop); + onOpenChange={(open) => { + console.log('opne change', open); }} - onFocus={() => props.onEvent("focus")} - onBlur={() => props.onEvent("blur")} - suffixIcon={hasIcon(props.suffixIcon) && props.suffixIcon} + // onOk={onOk} /> ), ...validate(props), @@ -556,7 +574,7 @@ export let DateRangeComp = withExposingConfigs(dateRangeControl, [ ]); DateRangeComp = withMethodExposing(DateRangeComp, [ - ...dateRefMethods, + // ...dateRefMethods, { method: { name: "clearAll", diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/dateCompUtil.ts b/client/packages/lowcoder/src/comps/comps/dateComp/dateCompUtil.ts index cdd2f7662..b0b1ef0a0 100644 --- a/client/packages/lowcoder/src/comps/comps/dateComp/dateCompUtil.ts +++ b/client/packages/lowcoder/src/comps/comps/dateComp/dateCompUtil.ts @@ -4,10 +4,15 @@ import { range } from "lodash"; import { DateTimeStyleType } from "../../controls/styleControlConstants"; import { css } from "styled-components"; import { isDarkColor, lightenColor } from "components/colorSelect/colorUtils"; -import { CommonPickerMethods } from "antd/es/date-picker/generatePicker/interface"; +// import { CommonPickerMethods } from "antd/es/date-picker/generatePicker/interface"; import { blurMethod, focusMethod } from "comps/utils/methodUtils"; import { refMethods } from "comps/generators/withMethodExposing"; +export interface CommonPickerMethods { + focus: (options?: FocusOptions) => void; + blur: VoidFunction; +}; + export const handleDateChange = ( time: string, onChange: (value: string) => Promise, diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/dateMobileUIView.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/dateMobileUIView.tsx index 248b3da46..0661ee9e8 100644 --- a/client/packages/lowcoder/src/comps/comps/dateComp/dateMobileUIView.tsx +++ b/client/packages/lowcoder/src/comps/comps/dateComp/dateMobileUIView.tsx @@ -10,6 +10,12 @@ import { DataUIViewProps } from "comps/comps/dateComp/dateUIView"; import { default as SwapRightOutlined } from "@ant-design/icons/SwapRightOutlined" import { DateRangeUIViewProps } from "comps/comps/dateComp/dateRangeUIView"; import { DateCompViewProps } from "comps/comps/dateComp/dateComp"; +import type { DatePickerProps } from "antd/es/date-picker"; +import type { Dayjs } from "dayjs"; + +interface DateMobileUIViewProps extends Omit { + onChange: (value: dayjs.Dayjs | null) => void; +} const handleClick = async ( params: Pick< @@ -17,7 +23,8 @@ const handleClick = async ( "showTime" | "minDate" | "maxDate" | "disabledTime" | "onFocus" | "onBlur" > & { value: dayjs.Dayjs | null; - onChange: (value: dayjs.Dayjs | null) => void; + // onChange: (value: dayjs.Dayjs | null) => void; + onChange: DatePickerProps['onChange']; } ) => { const MobileDatePicker = (await import("antd-mobile/es/components/date-picker")).default; @@ -45,7 +52,8 @@ const handleClick = async ( }, onConfirm: (value) => { const time = dayjs(value); - params.onChange(time); + const timeString = time.format(params.showTime ? DATE_TIME_FORMAT : DATE_FORMAT); + params.onChange?.(time, timeString); }, onClose: params.onBlur, }); diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/dateRangeUIView.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/dateRangeUIView.tsx index 58af9f5eb..d31a7980a 100644 --- a/client/packages/lowcoder/src/comps/comps/dateComp/dateRangeUIView.tsx +++ b/client/packages/lowcoder/src/comps/comps/dateComp/dateRangeUIView.tsx @@ -10,6 +10,7 @@ import { EditorContext } from "../../editorState"; import { default as DatePicker } from "antd/es/date-picker"; import { hasIcon } from "comps/utils"; import { omit } from "lodash"; +import { DateParser } from "@lowcoder-ee/util/dateTimeUtils"; const { RangePicker } = DatePicker; @@ -57,6 +58,11 @@ export const DateRangeUIView = (props: DateRangeUIViewProps) => { inputReadOnly={checkIsMobile(editorState?.getAppSettings().maxWidth)} suffixIcon={hasIcon(props.suffixIcon) && props.suffixIcon} placeholder={placeholders} + minDate={props.minDate ? dayjs(props.minDate, DateParser) : undefined} + maxDate={props.maxDate ? dayjs(props.maxDate, DateParser) : undefined} + hourStep={props.hourStep as any} + minuteStep={props.minuteStep as any} + secondStep={props.secondStep as any} /> ); }; diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx index 7556037fa..b32f07c30 100644 --- a/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx +++ b/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx @@ -8,16 +8,21 @@ import styled from "styled-components"; import type { DateTimeStyleType } from "../../controls/styleControlConstants"; import { EditorContext } from "../../editorState"; import { default as DatePicker } from "antd/es/date-picker"; +import type { DatePickerProps } from "antd/es/date-picker"; +import type { Dayjs } from 'dayjs'; +import { DateParser } from "@lowcoder-ee/util/dateTimeUtils"; -const DatePickerStyled = styled(DatePicker)<{ $style: DateTimeStyleType }>` +const DatePickerStyled = styled(DatePicker)<{ $style: DateTimeStyleType }>` width: 100%; box-shadow: ${props=>`${props.$style.boxShadow} ${props.$style.boxShadowColor}`}; ${(props) => props.$style && getStyle(props.$style)} `; export interface DataUIViewProps extends DateCompViewProps { - value: dayjs.Dayjs | null; - onChange: (value: dayjs.Dayjs | null) => void; + value?: dayjs.Dayjs | null; + defaultValue?: dayjs.Dayjs | null; + // onChange: (value: dayjs.Dayjs | null) => void; + onChange: DatePickerProps['onChange']; onPanelChange: () => void; } @@ -29,16 +34,31 @@ export const DateUIView = (props: DataUIViewProps) => { const editorState = useContext(EditorContext); const placeholder = Array.isArray(props.placeholder) ? props.placeholder[0] : props.placeholder; - + console.log('props', props); return useUIView( , - disabledDate(current, props.minDate, props.maxDate)} - picker={"date"} - inputReadOnly={checkIsMobile(editorState?.getAppSettings().maxWidth)} - placeholder={placeholder} + { + console.log('Selected Time: ', value); + console.log('Formatted Selected Time: ', dateString); + }} + // onOk={onOk} /> + // disabledDate(current, props.minDate, props.maxDate)} + // picker={"date"} + // inputReadOnly={checkIsMobile(editorState?.getAppSettings().maxWidth)} + // placeholder={placeholder} + // /> + ); }; diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/timeComp.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/timeComp.tsx index 3eda24d34..a91866e12 100644 --- a/client/packages/lowcoder/src/comps/comps/dateComp/timeComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/dateComp/timeComp.tsx @@ -44,11 +44,11 @@ import React, { ReactNode, useContext, useEffect } from "react"; import { IconControl } from "comps/controls/iconControl"; import { hasIcon } from "comps/utils"; import { Section, sectionNames } from "components/Section"; -import { dateRefMethods, disabledTime, handleDateChange } from "comps/comps/dateComp/dateCompUtil"; +import { CommonPickerMethods, dateRefMethods, disabledTime, handleDateChange } from "comps/comps/dateComp/dateCompUtil"; import { TimeUIView } from "./timeUIView"; import { TimeRangeUIView } from "comps/comps/dateComp/timeRangeUIView"; import { RefControl } from "comps/controls/refControl"; -import { CommonPickerMethods } from "antd/es/date-picker/generatePicker/interface"; +// import { CommonPickerMethods } from "antd/es/date-picker/generatePicker/interface"; import { TimePickerProps } from "antd/es/time-picker"; import { EditorContext } from "comps/editorState"; diff --git a/client/packages/lowcoder/src/comps/comps/selectInputComp/cascaderComp.tsx b/client/packages/lowcoder/src/comps/comps/selectInputComp/cascaderComp.tsx index 366264b44..55b1dceaa 100644 --- a/client/packages/lowcoder/src/comps/comps/selectInputComp/cascaderComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/selectInputComp/cascaderComp.tsx @@ -62,11 +62,11 @@ let CascaderBasicComp = (function () { onFocus={() => props.onEvent("focus")} onBlur={() => props.onEvent("blur")} dropdownRender={(menus: React.ReactNode) => ( - - {menus} + + {menus} )} - onChange={(value: (string | number)[]) => { + onChange={(value: (string | number | null)[]) => { props.value.onChange(value as string[]); props.onEvent("change"); }} diff --git a/client/packages/lowcoder/src/comps/comps/selectInputComp/segmentedControl.tsx b/client/packages/lowcoder/src/comps/comps/selectInputComp/segmentedControl.tsx index c1061cc66..053493a62 100644 --- a/client/packages/lowcoder/src/comps/comps/selectInputComp/segmentedControl.tsx +++ b/client/packages/lowcoder/src/comps/comps/selectInputComp/segmentedControl.tsx @@ -106,7 +106,7 @@ let SegmentedControlBasicComp = (function () { value={props.value.value} $style={props.style} onChange={(value) => { - handleChange(value.toString()); + handleChange(String(value)); }} options={props.options .filter((option) => option.value !== undefined && !option.hidden) diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnDateComp.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnDateComp.tsx index 11a3107c4..22a95d2d5 100644 --- a/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnDateComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnDateComp.tsx @@ -183,7 +183,7 @@ export const DateEdit = (props: DateEditProps) => { overflow: "hidden", }} onOpenChange={(open) => setPanelOpen(open)} - onChange={(value, dateString) => props.onChange(dateString)} + onChange={(value, dateString) => props.onChange(dateString as string)} onBlur={props.onChangeEnd} /> diff --git a/client/packages/lowcoder/src/comps/comps/transferComp.tsx b/client/packages/lowcoder/src/comps/comps/transferComp.tsx index d124e8410..197b57673 100644 --- a/client/packages/lowcoder/src/comps/comps/transferComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/transferComp.tsx @@ -9,7 +9,8 @@ import { Section, sectionNames } from "lowcoder-design"; import { hiddenPropertyView } from "comps/utils/propertyUtils"; import { trans } from "i18n"; import { NumberControl, StringControl } from "comps/controls/codeControl"; -import { Transfer } from "antd"; +import { default as Transfer } from "antd/es/transfer"; +import type { TransferKey } from "antd/es/transfer/interface"; import ReactResizeDetector from "react-resize-detector"; import { changeEvent, eventHandlerControl, searchEvent, selectedChangeEvent } from "../controls/eventHandlerControl"; import styled, { css } from "styled-components"; @@ -85,15 +86,15 @@ const TransferView = (props: RecordConstructorToView & { } }, [height, width]); - const handleChange = (newTargetKeys: string[]) => { - props.targetKeys.onChange(newTargetKeys); + const handleChange = (newTargetKeys: TransferKey[]) => { + props.targetKeys.onChange(newTargetKeys as string[]); props.dispatch(changeChildAction("targerObject", Array.isArray(props.items.value) ? props.items.value.filter(item => newTargetKeys.includes(item.key as string)) : [], false)); props.onEvent('change') }; - const onSelectChange = (sourceSelectedKeys: string[], targetSelectedKeys: string[]) => { - setSelectedKeys([...sourceSelectedKeys, ...targetSelectedKeys]); - props.dispatch(changeChildAction("selectedKeys", [sourceSelectedKeys, targetSelectedKeys], false)); + const onSelectChange = (sourceSelectedKeys: TransferKey[], targetSelectedKeys: TransferKey[]) => { + setSelectedKeys([...sourceSelectedKeys, ...targetSelectedKeys] as string[]); + props.dispatch(changeChildAction("selectedKeys", [sourceSelectedKeys as string[], targetSelectedKeys as string[]], false)); props.onEvent('selectedChange') }; diff --git a/client/yarn.lock b/client/yarn.lock index cd1ecff33..cf03878a8 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -106,6 +106,15 @@ __metadata: languageName: node linkType: hard +"@ant-design/fast-color@npm:^2.0.6": + version: 2.0.6 + resolution: "@ant-design/fast-color@npm:2.0.6" + dependencies: + "@babel/runtime": ^7.24.7 + checksum: 01f81ff5901ee13b3b6dab3884cc07e4fbd82e412404179ad053828f7f218acd0b6ced89ab28440e96e9c51177d90c17020095627b78ebb2468ecb98294287de + languageName: node + linkType: hard + "@ant-design/icons-svg@npm:^4.4.0": version: 4.4.2 resolution: "@ant-design/icons-svg@npm:4.4.2" @@ -3359,18 +3368,18 @@ __metadata: languageName: node linkType: hard -"@rc-component/color-picker@npm:~1.5.3": - version: 1.5.3 - resolution: "@rc-component/color-picker@npm:1.5.3" +"@rc-component/color-picker@npm:~2.0.0": + version: 2.0.1 + resolution: "@rc-component/color-picker@npm:2.0.1" dependencies: + "@ant-design/fast-color": ^2.0.6 "@babel/runtime": ^7.23.6 - "@ctrl/tinycolor": ^3.6.1 classnames: ^2.2.6 rc-util: ^5.38.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: b0e54b69e583f62978aafa44e23a8f30a441352e37dc4b69772d2f19ce201b1e79b6ea1edda9fa1e71312205b5633f0709a215d976029e53cd133ff7f594dccb + checksum: 0c1f45362f50391d09488adca615d4810ad15e240b5938d1014cc22379cb900225eb186ca210c4d78f8abbcd626ff859e47c32c373a181783873fe4069455de4 languageName: node linkType: hard @@ -6042,9 +6051,9 @@ __metadata: languageName: node linkType: hard -"antd@npm:^5.19.4": - version: 5.19.4 - resolution: "antd@npm:5.19.4" +"antd@npm:^5.20.0": + version: 5.20.0 + resolution: "antd@npm:5.20.0" dependencies: "@ant-design/colors": ^7.1.0 "@ant-design/cssinjs": ^1.21.0 @@ -6053,7 +6062,7 @@ __metadata: "@ant-design/react-slick": ~1.1.2 "@babel/runtime": ^7.24.8 "@ctrl/tinycolor": ^3.6.1 - "@rc-component/color-picker": ~1.5.3 + "@rc-component/color-picker": ~2.0.0 "@rc-component/mutate-observer": ^1.1.0 "@rc-component/qrcode": ~1.0.0 "@rc-component/tour": ~1.15.0 @@ -6069,25 +6078,25 @@ __metadata: rc-dropdown: ~4.2.0 rc-field-form: ~2.2.1 rc-image: ~7.9.0 - rc-input: ~1.5.1 - rc-input-number: ~9.1.0 - rc-mentions: ~2.14.0 + rc-input: ~1.6.2 + rc-input-number: ~9.2.0 + rc-mentions: ~2.15.0 rc-menu: ~9.14.1 rc-motion: ^2.9.2 rc-notification: ~5.6.0 rc-pagination: ~4.2.0 - rc-picker: ~4.6.9 + rc-picker: ~4.6.11 rc-progress: ~4.0.0 rc-rate: ~2.13.0 rc-resize-observer: ^1.4.0 rc-segmented: ~2.3.0 rc-select: ~14.15.1 - rc-slider: ~10.6.2 + rc-slider: ~11.1.3 rc-steps: ~6.0.1 rc-switch: ~4.1.0 rc-table: ~7.45.7 rc-tabs: ~15.1.1 - rc-textarea: ~1.7.0 + rc-textarea: ~1.8.1 rc-tooltip: ~6.2.0 rc-tree: ~5.8.8 rc-tree-select: ~5.22.1 @@ -6098,7 +6107,7 @@ __metadata: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: df38f4bdcf9e6806a4442b1630f95e8955ee2ee2c2d14ba8547f376b318a77b3c50993d486dc3bd32eeef29c317b608988bb44f995c678d9eac2b492e2b08381 + checksum: 168781db7dd152153a7850d25c27301c132b127fa444f91496c2fd345307ab9c9baafc16686a36b5b9b497b046a01ec44e0bf330489d9245fee34919803da46e languageName: node linkType: hard @@ -13928,7 +13937,7 @@ coolshapes-react@lowcoder-org/coolshapes-react: "@types/uuid": ^8.3.4 "@vitejs/plugin-react": ^2.2.0 animate.css: ^4.1.1 - antd: ^5.19.4 + antd: ^5.20.0 axios: ^1.6.2 buffer: ^6.0.3 clsx: ^2.0.0 @@ -16626,25 +16635,25 @@ coolshapes-react@lowcoder-org/coolshapes-react: languageName: node linkType: hard -"rc-input-number@npm:~9.1.0": - version: 9.1.0 - resolution: "rc-input-number@npm:9.1.0" +"rc-input-number@npm:~9.2.0": + version: 9.2.0 + resolution: "rc-input-number@npm:9.2.0" dependencies: "@babel/runtime": ^7.10.1 "@rc-component/mini-decimal": ^1.0.1 classnames: ^2.2.5 - rc-input: ~1.5.0 + rc-input: ~1.6.0 rc-util: ^5.40.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 8bbbe95ced30821010441db507e572a6bbee8bbbb2717767fe284d7d9a096d3c8fc385bbaeed749215aa1eb28917a260c948a05fb7b8b55fafeeb9363e7d1078 + checksum: 0fb00352c014614044aad1deeb344c2d8e45b0e5303890f83a01ee90bee47c9846b7d2bf7cafb4fcf5fc9d39eac2088de69ad580d03583ca0b8489fb5c81b355 languageName: node linkType: hard -"rc-input@npm:~1.5.0, rc-input@npm:~1.5.1": - version: 1.5.1 - resolution: "rc-input@npm:1.5.1" +"rc-input@npm:~1.6.0, rc-input@npm:~1.6.2": + version: 1.6.3 + resolution: "rc-input@npm:1.6.3" dependencies: "@babel/runtime": ^7.11.1 classnames: ^2.2.1 @@ -16652,25 +16661,25 @@ coolshapes-react@lowcoder-org/coolshapes-react: peerDependencies: react: ">=16.0.0" react-dom: ">=16.0.0" - checksum: 1fa1ed9a8b0d9aab5482ec66ac7f97c5083d036ae88ba5475f52b6926842034b6a9adc54df5e1fcb32f72b60e7c43639d51475cf2702f41e4774735fb0ed3619 + checksum: ed73ac0275d5b989eddcb0202b8eed9a6d2d12c8b82646d814eb67b78e3956e6b624d8461a377c454d91cbfebd405893d24bd9bc377a1ee6a910b4a09c426fc7 languageName: node linkType: hard -"rc-mentions@npm:~2.14.0": - version: 2.14.0 - resolution: "rc-mentions@npm:2.14.0" +"rc-mentions@npm:~2.15.0": + version: 2.15.0 + resolution: "rc-mentions@npm:2.15.0" dependencies: "@babel/runtime": ^7.22.5 "@rc-component/trigger": ^2.0.0 classnames: ^2.2.6 - rc-input: ~1.5.0 + rc-input: ~1.6.0 rc-menu: ~9.14.0 - rc-textarea: ~1.7.0 + rc-textarea: ~1.8.0 rc-util: ^5.34.1 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 0c98a55660bc4f7f557a1415b7dc287ae69b1680092680eab3231c3810e1e9d23c69fb4b9428018624d375b90b41e39b887bbeb8d85b278ed6997de475ae3733 + checksum: bead0b303bee045186b941c61e6af93777b406904f2c40546cdfd7cbed016140b3a36d1cc66b0ed3a7cfb34d3a18fa01e588933d42bcaf8e68cbb21bde2f05c0 languageName: node linkType: hard @@ -16782,9 +16791,9 @@ coolshapes-react@lowcoder-org/coolshapes-react: languageName: node linkType: hard -"rc-picker@npm:~4.6.9": - version: 4.6.11 - resolution: "rc-picker@npm:4.6.11" +"rc-picker@npm:~4.6.11": + version: 4.6.12 + resolution: "rc-picker@npm:4.6.12" dependencies: "@babel/runtime": ^7.24.7 "@rc-component/trigger": ^2.0.0 @@ -16808,7 +16817,7 @@ coolshapes-react@lowcoder-org/coolshapes-react: optional: true moment: optional: true - checksum: 8a2b72f01132ed901b59ec65d1792af9273a29f1c343d363421d6325a14cafb325acd9b1db1670bd26b3719bdbf37178396b78b6c06cefe65d32f955c67ac837 + checksum: 76338976623731347b6102188442498eb01001712256596cb3b2ecc7cbfdcb192d42d617600ac3c4baf40e63857fc872e1d2d7ffcd663ca6d26c7f72ccbffdc5 languageName: node linkType: hard @@ -16888,9 +16897,9 @@ coolshapes-react@lowcoder-org/coolshapes-react: languageName: node linkType: hard -"rc-slider@npm:~10.6.2": - version: 10.6.2 - resolution: "rc-slider@npm:10.6.2" +"rc-slider@npm:~11.1.3": + version: 11.1.5 + resolution: "rc-slider@npm:11.1.5" dependencies: "@babel/runtime": ^7.10.1 classnames: ^2.2.5 @@ -16898,7 +16907,7 @@ coolshapes-react@lowcoder-org/coolshapes-react: peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 16c2e138c6e0a3e44d2ed515c2adcf02cf13273274df3e6ccbabcb4c1a54fd6a9ecca5a5babc5c2930c9c3480e5462d51e96a67344e84ba202507403c69cc7b3 + checksum: eadf2e0e981525fbd3d5e403d7cfece12372603f7c64e32c417b5d20d939c6520d9c7c318b1396bfcb14d95fbc35e5bed9403ab41b5cba60659f253ada3d92f5 languageName: node linkType: hard @@ -16965,19 +16974,19 @@ coolshapes-react@lowcoder-org/coolshapes-react: languageName: node linkType: hard -"rc-textarea@npm:~1.7.0": - version: 1.7.0 - resolution: "rc-textarea@npm:1.7.0" +"rc-textarea@npm:~1.8.0, rc-textarea@npm:~1.8.1": + version: 1.8.1 + resolution: "rc-textarea@npm:1.8.1" dependencies: "@babel/runtime": ^7.10.1 classnames: ^2.2.1 - rc-input: ~1.5.0 + rc-input: ~1.6.0 rc-resize-observer: ^1.0.0 rc-util: ^5.27.0 peerDependencies: react: ">=16.9.0" react-dom: ">=16.9.0" - checksum: 42bf6723ad844a838fc74979879dc1a418a43002839c75b0f0bd667af24bdcb61c91a7418ad4131196baba35abf0cb45fdf739c0d1f9c14d86e4a6b54fb51081 + checksum: f7a4f78f6346c66f974209007d915688815e5c13472d2f8fb05d2836e1ffb040afdf88e4a320f4e1f484a82c33b19d8b65c9a71ff8cb78adeb9d02d2cbc08eb6 languageName: node linkType: hard From 43d142ad3af4f770abec85889ef215bc61356713 Mon Sep 17 00:00:00 2001 From: RAHEEL Date: Fri, 9 Aug 2024 01:06:24 +0500 Subject: [PATCH 3/5] fixing issues --- .../src/comps/comps/dateComp/dateComp.tsx | 80 +++++++------------ .../comps/comps/dateComp/dateMobileUIView.tsx | 2 +- .../src/comps/comps/dateComp/dateUIView.tsx | 36 +++------ .../comps/comps/mediaComp/colorPickerComp.tsx | 3 +- .../src/comps/controls/labelControl.tsx | 6 +- 5 files changed, 46 insertions(+), 81 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx index f9eab1e92..e9a0627a4 100644 --- a/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx @@ -37,7 +37,7 @@ import { } from "comps/utils/propertyUtils"; import { trans } from "i18n"; import { DATE_FORMAT, DATE_TIME_FORMAT, DateParser, PickerMode } from "util/dateTimeUtils"; -import React, { ReactNode, useContext, useEffect, useRef } from "react"; +import React, { ReactNode, useContext, useEffect } from "react"; import { IconControl } from "comps/controls/iconControl"; import { hasIcon } from "comps/utils"; import { Section, sectionNames } from "components/Section"; @@ -46,18 +46,9 @@ import { DateUIView } from "./dateUIView"; import { useIsMobile } from "util/hooks"; import { RefControl } from "comps/controls/refControl"; // import { CommonPickerMethods } from "antd/es/date-picker/generatePicker/interface"; -import type { PickerPropsWithMultiple } from "antd/es/date-picker/generatePicker/interface"; import { DateRangeUIView } from "comps/comps/dateComp/dateRangeUIView"; import { EditorContext } from "comps/editorState"; import { useMergeCompStyles } from "@lowcoder-ee/util/hooks"; -import { DatePicker } from "antd"; -// import type { PickerRef } from ""; - - -const defaultStyle = { - borderStyle: 'solid', - borderWidth: '1px', -} const EventOptions = [changeEvent, focusEvent, blurEvent] as const; @@ -173,8 +164,7 @@ export type DateCompViewProps = Pick< }; export const datePickerControl = new UICompBuilder(childrenMap, (props, dispatch) => { - useMergeCompStyles(props as Record, dispatch); - const pickerRef = useRef(); + useMergeCompStyles(props as Record, dispatch); let time = null; if (props.value.value !== '') { @@ -188,48 +178,32 @@ export const datePickerControl = new UICompBuilder(childrenMap, (props, dispatch inputFieldStyle:props.inputFieldStyle, animationStyle:props.animationStyle, children: ( - // disabledTime(props.minTime, props.maxTime)} - // $style={props.inputFieldStyle} - // disabled={props.disabled} - // {...datePickerProps(props)} - // hourStep={props.hourStep} - // minDate={props.minDate} - // maxDate={props.maxDate} - // placeholder={props.placeholder} - // // value={time?.isValid() ? time : null} - // defaultValue={time?.isValid() ? time : null} - // onChange={(time) => { - // console.log('onchange'); - // handleDateChange( - // time && time.isValid() - // ? time.format(props.showTime ? DATE_TIME_FORMAT : DATE_FORMAT) - // : "", - // props.value.onChange, - // props.onEvent - // ); - // }} - // onPanelChange={() => { - // console.log('onPanelChange'); - // handleDateChange("", props.value.onChange, noop); - // }} - // onFocus={() => props.onEvent("focus")} - // onBlur={() => props.onEvent("blur")} - // suffixIcon={hasIcon(props.suffixIcon) && props.suffixIcon} - // /> - { - console.log('Selected Time: ', value); - console.log('Formatted Selected Time: ', dateString); + disabledTime(props.minTime, props.maxTime)} + $style={props.inputFieldStyle} + disabled={props.disabled} + {...datePickerProps(props)} + hourStep={props.hourStep} + minDate={props.minDate} + maxDate={props.maxDate} + placeholder={props.placeholder} + // value={time?.isValid() ? time : null} + onChange={(time) => { + handleDateChange( + time && time.isValid() + ? time.format(props.showTime ? DATE_TIME_FORMAT : DATE_FORMAT) + : "", + props.value.onChange, + props.onEvent + ); }} - onOpenChange={(open) => { - console.log('opne change', open); + onPanelChange={() => { + handleDateChange("", props.value.onChange, noop); }} - // onOk={onOk} + onFocus={() => props.onEvent("focus")} + onBlur={() => props.onEvent("blur")} + suffixIcon={hasIcon(props.suffixIcon) && props.suffixIcon} /> ), ...validate(props), @@ -574,7 +548,7 @@ export let DateRangeComp = withExposingConfigs(dateRangeControl, [ ]); DateRangeComp = withMethodExposing(DateRangeComp, [ - // ...dateRefMethods, + ...dateRefMethods, { method: { name: "clearAll", diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/dateMobileUIView.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/dateMobileUIView.tsx index 0661ee9e8..c0efbe2fc 100644 --- a/client/packages/lowcoder/src/comps/comps/dateComp/dateMobileUIView.tsx +++ b/client/packages/lowcoder/src/comps/comps/dateComp/dateMobileUIView.tsx @@ -22,7 +22,7 @@ const handleClick = async ( DateCompViewProps, "showTime" | "minDate" | "maxDate" | "disabledTime" | "onFocus" | "onBlur" > & { - value: dayjs.Dayjs | null; + value?: dayjs.Dayjs | null; // onChange: (value: dayjs.Dayjs | null) => void; onChange: DatePickerProps['onChange']; } diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx index b32f07c30..755718500 100644 --- a/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx +++ b/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx @@ -34,31 +34,21 @@ export const DateUIView = (props: DataUIViewProps) => { const editorState = useContext(EditorContext); const placeholder = Array.isArray(props.placeholder) ? props.placeholder[0] : props.placeholder; - console.log('props', props); return useUIView( , - { - console.log('Selected Time: ', value); - console.log('Formatted Selected Time: ', dateString); - }} - // onOk={onOk} + disabledDate(current, props.minDate, props.maxDate)} + picker={"date"} + inputReadOnly={checkIsMobile(editorState?.getAppSettings().maxWidth)} + placeholder={placeholder} /> - // disabledDate(current, props.minDate, props.maxDate)} - // picker={"date"} - // inputReadOnly={checkIsMobile(editorState?.getAppSettings().maxWidth)} - // placeholder={placeholder} - // /> - ); }; diff --git a/client/packages/lowcoder/src/comps/comps/mediaComp/colorPickerComp.tsx b/client/packages/lowcoder/src/comps/comps/mediaComp/colorPickerComp.tsx index 80b1218d1..66ee2fd4c 100644 --- a/client/packages/lowcoder/src/comps/comps/mediaComp/colorPickerComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/mediaComp/colorPickerComp.tsx @@ -17,6 +17,7 @@ import { jsonObjectExposingStateControl, stringExposingStateControl } from "comp import { dropdownControl } from "comps/controls/dropdownControl"; import { ArrayOrJSONObjectControl } from "comps/controls/codeControl"; import { useMergeCompStyles } from "@lowcoder-ee/util/hooks"; +import { JSONObject } from "@lowcoder-ee/util/jsonTypes"; export function getStyle(style: ColorPickerStyleType) { return css` @@ -88,7 +89,7 @@ export const ColorPickerComp = new UICompBuilder(childrenMap, (props, dispatch) props.color.onChange({ hex: value.toHexString().toUpperCase(), hsb: value.toHsb(), - rgb: value.toRgb(), + rgb: value.toRgb() as any, }) props.onEvent('change') }} diff --git a/client/packages/lowcoder/src/comps/controls/labelControl.tsx b/client/packages/lowcoder/src/comps/controls/labelControl.tsx index 7d8b4ad8f..781c6ccc2 100644 --- a/client/packages/lowcoder/src/comps/controls/labelControl.tsx +++ b/client/packages/lowcoder/src/comps/controls/labelControl.tsx @@ -45,7 +45,7 @@ function getStyle(style: any) { `; } -const LabelViewWrapper = styled.div<{ $style: any, inputFieldStyle: any,$animationStyle:any }>` +const LabelViewWrapper = styled.div<{ $style: any, $inputFieldStyle: any,$animationStyle:any }>` ${(props) => { return ( props.$style && { @@ -56,7 +56,7 @@ const LabelViewWrapper = styled.div<{ $style: any, inputFieldStyle: any,$animati } ); }} - ${(props) => props.inputFieldStyle && getStyle(props.inputFieldStyle)} + ${(props) => props.$inputFieldStyle && getStyle(props.$inputFieldStyle)} ${(props) => props.$animationStyle && props.$animationStyle} display: flex; flex-direction: column; @@ -177,7 +177,7 @@ export const LabelControl = (function () { return new MultiCompBuilder(childrenMap, (props) => (args: LabelViewProps) => { - return + return Date: Fri, 9 Aug 2024 21:38:40 +0500 Subject: [PATCH 4/5] fix datepicker and timepicker --- .../src/comps/comps/dateComp/dateComp.tsx | 42 +++-- .../src/comps/comps/dateComp/dateUIView.tsx | 5 +- .../src/comps/comps/dateComp/timeComp.tsx | 36 +++- .../src/comps/controls/labelControl.tsx | 157 +++++++++--------- .../packages/lowcoder/src/layout/gridItem.tsx | 3 +- 5 files changed, 148 insertions(+), 95 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx index e9a0627a4..5a2494a63 100644 --- a/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx @@ -37,7 +37,7 @@ import { } from "comps/utils/propertyUtils"; import { trans } from "i18n"; import { DATE_FORMAT, DATE_TIME_FORMAT, DateParser, PickerMode } from "util/dateTimeUtils"; -import React, { ReactNode, useContext, useEffect } from "react"; +import React, { ReactNode, useContext, useEffect, useState } from "react"; import { IconControl } from "comps/controls/iconControl"; import { hasIcon } from "comps/utils"; import { Section, sectionNames } from "components/Section"; @@ -164,12 +164,19 @@ export type DateCompViewProps = Pick< }; export const datePickerControl = new UICompBuilder(childrenMap, (props, dispatch) => { - useMergeCompStyles(props as Record, dispatch); - - let time = null; + useMergeCompStyles(props as Record, dispatch); + + let time: dayjs.Dayjs | null = null; if (props.value.value !== '') { time = dayjs(props.value.value, DateParser); } + + const [tempValue, setTempValue] = useState(time); + + useEffect(() => { + const value = props.value.value ? dayjs(props.value.value, DateParser) : null; + setTempValue(value); + }, [props.value.value]) return props.label({ required: props.required, @@ -177,6 +184,7 @@ export const datePickerControl = new UICompBuilder(childrenMap, (props, dispatch labelStyle: props.labelStyle, inputFieldStyle:props.inputFieldStyle, animationStyle:props.animationStyle, + onMouseDown: (e) => e.stopPropagation(), children: ( { handleDateChange( time && time.isValid() @@ -289,24 +297,37 @@ export const dateRangeControl = (function () { return new UICompBuilder(childrenMap, (props, dispatch) => { useMergeCompStyles(props as Record, dispatch); - let start = null; - let end = null; + let start: dayjs.Dayjs | null = null; if (props.start.value !== '') { start = dayjs(props.start.value, DateParser); } - + + let end: dayjs.Dayjs | null = null; if (props.end.value !== '') { end = dayjs(props.end.value, DateParser); } + const [tempStartValue, setTempStartValue] = useState(start); + const [tempEndValue, setTempEndValue] = useState(end); + + useEffect(() => { + const value = props.start.value ? dayjs(props.start.value, DateParser) : null; + setTempStartValue(value); + }, [props.start.value]) + + useEffect(() => { + const value = props.end.value ? dayjs(props.end.value, DateParser) : null; + setTempEndValue(value); + }, [props.end.value]) + const children = ( e.stopPropagation(), ...(startResult.validateStatus !== "success" ? startResult : endResult.validateStatus !== "success" diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx index 755718500..58310258e 100644 --- a/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx +++ b/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx @@ -18,10 +18,9 @@ const DatePickerStyled = styled(DatePicker)<{ $style: DateTimeStyleType } ${(props) => props.$style && getStyle(props.$style)} `; + export interface DataUIViewProps extends DateCompViewProps { - value?: dayjs.Dayjs | null; - defaultValue?: dayjs.Dayjs | null; - // onChange: (value: dayjs.Dayjs | null) => void; + value?: DatePickerProps['value']; onChange: DatePickerProps['onChange']; onPanelChange: () => void; } diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/timeComp.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/timeComp.tsx index a91866e12..323099b15 100644 --- a/client/packages/lowcoder/src/comps/comps/dateComp/timeComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/dateComp/timeComp.tsx @@ -40,7 +40,7 @@ import { } from "comps/utils/propertyUtils"; import { trans } from "i18n"; import { TIME_FORMAT, TimeParser } from "util/dateTimeUtils"; -import React, { ReactNode, useContext, useEffect } from "react"; +import React, { ReactNode, useContext, useEffect, useState } from "react"; import { IconControl } from "comps/controls/iconControl"; import { hasIcon } from "comps/utils"; import { Section, sectionNames } from "components/Section"; @@ -146,10 +146,17 @@ export type TimeCompViewProps = Pick< export const timePickerControl = new UICompBuilder(childrenMap, (props, dispatch) => { useMergeCompStyles(props as Record, dispatch); - let time = null; + let time: dayjs.Dayjs | null = null; if(props.value.value !== '') { time = dayjs(props.value.value, TimeParser); } + + const [tempValue, setTempValue] = useState(time); + + useEffect(() => { + const value = props.value.value ? dayjs(props.value.value, TimeParser) : null; + setTempValue(value); + }, [props.value.value]) return props.label({ required: props.required, @@ -157,12 +164,13 @@ export const timePickerControl = new UICompBuilder(childrenMap, (props, dispatch labelStyle: props.labelStyle, inputFieldStyle:props.inputFieldStyle, animationStyle:props.animationStyle, + onMouseDown: (e) => e.stopPropagation(), children: ( disabledTime(props.minTime, props.maxTime)} {...timePickerComps(props)} hourStep={props.hourStep as hourStepType} @@ -258,22 +266,35 @@ export const timeRangeControl = (function () { return new UICompBuilder(childrenMap, (props, dispatch) => { useMergeCompStyles(props as Record, dispatch); - let start = null; + let start: dayjs.Dayjs | null = null; if(props.start.value !== '') { start = dayjs(props.start.value, TimeParser); } - let end = null; + let end: dayjs.Dayjs | null = null; if(props.end.value !== '') { end = dayjs(props.end.value, TimeParser); } + const [tempStartValue, setTempStartValue] = useState(start); + const [tempEndValue, setTempEndValue] = useState(end); + + useEffect(() => { + const value = props.start.value ? dayjs(props.start.value, TimeParser) : null; + setTempStartValue(value); + }, [props.start.value]) + + useEffect(() => { + const value = props.end.value ? dayjs(props.end.value, TimeParser) : null; + setTempEndValue(value); + }, [props.end.value]) + const children = ( disabledTime(props.minTime, props.maxTime)} {...timePickerComps(props)} hourStep={props.hourStep as hourStepType} @@ -301,6 +322,7 @@ export const timeRangeControl = (function () { inputFieldStyle:props.inputFieldStyle, animationStyle:props.animationStyle, children: children, + onMouseDown: (e) => e.stopPropagation(), ...(startResult.validateStatus !== "success" ? startResult : endResult.validateStatus !== "success" diff --git a/client/packages/lowcoder/src/comps/controls/labelControl.tsx b/client/packages/lowcoder/src/comps/controls/labelControl.tsx index 781c6ccc2..705ba099f 100644 --- a/client/packages/lowcoder/src/comps/controls/labelControl.tsx +++ b/client/packages/lowcoder/src/comps/controls/labelControl.tsx @@ -25,6 +25,7 @@ type LabelViewProps = Pick; childrenInputFieldStyle?: Record; animationStyle?: Record; + onMouseDown?: React.MouseEventHandler; }; const StyledStarIcon = styled(StarIcon)` @@ -177,86 +178,94 @@ export const LabelControl = (function () { return new MultiCompBuilder(childrenMap, (props) => (args: LabelViewProps) => { - return - - {!props.hidden && !isEmpty(props.text) && ( - + {!props.hidden && !isEmpty(props.text) && ( + + {props.tooltip}} + arrow={{ + pointAtCenter: true, + }} + placement="top" + color="#2c2c2c" + getPopupContainer={(node: any) => node.closest(".react-grid-item")} + > + + + {args.required && } + + )} + - {props.tooltip}} - arrow={{ - pointAtCenter: true, - }} - placement="top" - color="#2c2c2c" - getPopupContainer={(node: any) => node.closest(".react-grid-item")} - > - - - {args.required && } - - )} - - {args.children} - - + {args.children} + + - {args.help && Boolean((args.children as ReactElement)?.props.value) && ( - - {args.help} - - )} - } + {args.help && Boolean((args.children as ReactElement)?.props.value) && ( + + {args.help} + + )} + + ); + } ) .setPropertyViewFn((children) => (
diff --git a/client/packages/lowcoder/src/layout/gridItem.tsx b/client/packages/lowcoder/src/layout/gridItem.tsx index 49b651579..47a04e87b 100644 --- a/client/packages/lowcoder/src/layout/gridItem.tsx +++ b/client/packages/lowcoder/src/layout/gridItem.tsx @@ -141,13 +141,14 @@ export function GridItem(props: GridItemProps) { onDrag={onDrag} onDragEnd={onDragEnd} onMouseDown={(e) => { + e.stopPropagation(); + // allow mouseDown event on lowcoder-comp-kanban to make drag/drop work if((props.compType as string).includes('lowcoder-comp-kanban')) return; // allow mouseDown event on lowcoder-comp-excalidraw to make drag/drop work if((props.compType as string).includes('lowcoder-comp-excalidraw')) return; - e.stopPropagation(); const event = new MouseEvent("mousedown"); document.dispatchEvent(event); }} From 7e8dfe032e6e30915293fd1a4e3b090e7d9052c3 Mon Sep 17 00:00:00 2001 From: RAHEEL Date: Mon, 12 Aug 2024 13:04:23 +0500 Subject: [PATCH 5/5] fix datepicker column in table --- .../column/columnTypeComps/columnDateComp.tsx | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnDateComp.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnDateComp.tsx index 22a95d2d5..471f4f546 100644 --- a/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnDateComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnDateComp.tsx @@ -12,7 +12,7 @@ import { isNumber } from "lodash"; import dayjs from "dayjs"; import utc from "dayjs/plugin/utc"; import { CalendarCompIconSmall, PrevIcon, SuperPrevIcon } from "lowcoder-design"; -import { useState } from "react"; +import { useEffect, useRef, useState } from "react"; import styled from "styled-components"; import { DateParser, DATE_FORMAT } from "util/dateTimeUtils"; @@ -149,11 +149,20 @@ type DateEditProps = { }; export const DateEdit = (props: DateEditProps) => { + const pickerRef = useRef(); const [panelOpen, setPanelOpen] = useState(true); let value = dayjs(props.value, DateParser); if (!value.isValid()) { value = dayjs(0, DateParser); } + + const [tempValue, setTempValue] = useState(value); + + useEffect(() => { + const value = props.value ? dayjs(props.value, DateParser) : null; + setTempValue(value); + }, [props.value]) + return ( { @@ -161,8 +170,13 @@ export const DateEdit = (props: DateEditProps) => { props.onChangeEnd(); } }} + onMouseDown={(e) => { + e.stopPropagation(); + e.preventDefault(); + }} > } prevIcon={} @@ -172,7 +186,7 @@ export const DateEdit = (props: DateEditProps) => { allowClear={false} variant="borderless" autoFocus - defaultValue={value} + value={tempValue} showTime={props.showTime} showNow={true} defaultOpen={true} @@ -184,7 +198,7 @@ export const DateEdit = (props: DateEditProps) => { }} onOpenChange={(open) => setPanelOpen(open)} onChange={(value, dateString) => props.onChange(dateString as string)} - onBlur={props.onChangeEnd} + onBlur={() => props.onChangeEnd()} /> );