Skip to content

Commit 16e8b29

Browse files
authored
Merge pull request #655 from raheeliftikhar5/antd-upgrade-5.13.2
upgrade antd to v5.13.2
2 parents a0fd241 + 964fadf commit 16e8b29

18 files changed

+113
-98
lines changed

client/packages/lowcoder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"agora-access-token": "^2.0.4",
3939
"agora-rtc-sdk-ng": "^4.19.0",
4040
"agora-rtm-sdk": "^1.5.1",
41-
"antd": "^5.12.5",
41+
"antd": "^5.13.2",
4242
"axios": "^1.6.2",
4343
"buffer": "^6.0.3",
4444
"clsx": "^2.0.0",

client/packages/lowcoder/src/components/PermissionDialog/Permission.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,10 +369,10 @@ const PermissionSelector = (props: {
369369
width: "fit-content",
370370
}}
371371
$isVisible={roleSelectVisible}
372-
bordered={false}
372+
variant="borderless"
373373
defaultValue={props.supportRoles[0]}
374374
optionLabelProp="label"
375-
onChange={(value) => setSelectRole(value)}
375+
onChange={(value: string) => setSelectRole(value as ApplicationRoleType)}
376376
>
377377
{props.supportRoles.map((role) => (
378378
<CustomSelect.Option key={role.value} value={role.value} label={role.label}>

client/packages/lowcoder/src/components/PermissionDialog/PermissionList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ function PermissionLiItem(props: {
119119
width: "100px",
120120
}}
121121
defaultValue={permissionItem.role}
122-
bordered={false}
122+
variant="borderless"
123123
optionLabelProp="label"
124124
onSelect={(value: any, option: any) => {
125125
if (option.key === "delete") {

client/packages/lowcoder/src/comps/comps/dateComp/dateRangeUIView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { omit } from "lodash";
1313

1414
const { RangePicker } = DatePicker;
1515

16-
const RangePickerStyled = styled((props: any) => <RangePicker {...props} />)<{ $style: DateTimeStyleType }>`
16+
const RangePickerStyled = styled(RangePicker)<{ $style: DateTimeStyleType }>`
1717
width: 100%;
1818
${(props) => props.$style && getStyle(props.$style)}
1919
`;

client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,8 +509,11 @@ let MTComp = (function () {
509509
? { overflow: "auto", pointerEvents: "auto" }
510510
: {}
511511
}
512-
contentWrapperStyle={{ maxHeight: "100%", maxWidth: "100%" }}
513512
styles={{
513+
wrapper: {
514+
maxHeight: "100%",
515+
maxWidth: "100%"
516+
},
514517
body: {
515518
padding: 0,
516519
backgroundColor: props.style.background,

client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/ColumnNumberComp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export const ColumnNumberComp = (function () {
6565
step={step}
6666
defaultValue={props.value}
6767
autoFocus
68-
bordered={false}
68+
variant="borderless"
6969
onChange={(value) => {
7070
value = value ?? 0;
7171
props.onChange(!float ? Math.floor(value) : value);

client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnDateComp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ export const DateEdit = (props: DateEditProps) => {
170170
superNextIcon={<IconSuperNext />}
171171
superPrevIcon={<SuperPrevIcon />}
172172
allowClear={false}
173-
bordered={false}
173+
variant="borderless"
174174
autoFocus
175175
defaultValue={value}
176176
showTime={props.showTime}

client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnImgComp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const ImageComp = (function () {
3131
<Input
3232
defaultValue={props.value}
3333
autoFocus
34-
bordered={false}
34+
variant="borderless"
3535
onChange={(e) => {
3636
const value = e.target.value;
3737
props.onChange(value);

client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnLinkComp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export const LinkComp = (function () {
5959
<Input
6060
defaultValue={props.value}
6161
autoFocus
62-
bordered={false}
62+
variant="borderless"
6363
onChange={(e) => {
6464
const value = e.target.value;
6565
props.onChange(value);

client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnMarkdownComp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export const ColumnMarkdownComp = (function () {
4545
<Input
4646
defaultValue={props.value}
4747
autoFocus
48-
bordered={false}
48+
variant="borderless"
4949
onChange={(e) => {
5050
const value = e.target.value;
5151
props.onChange(value);

client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnProgressComp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export const ProgressComp = (function () {
9494
max={100}
9595
defaultValue={props.value}
9696
autoFocus
97-
bordered={false}
97+
variant="borderless"
9898
controls={{ upIcon: <TablePlusIcon />, downIcon: <TableMinusIcon /> }}
9999
onChange={(value) => {
100100
props.onChange(Number(value));

client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnStatusComp.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ const StatusEdit = (props: StatusEditPropsType) => {
5353
<CustomSelect
5454
autoFocus
5555
defaultOpen
56-
bordered={false}
56+
variant="borderless"
5757
optionLabelProp="children"
5858
open={open}
5959
defaultValue={props.value.value}
6060
style={{ width: "100%" }}
6161
suffixIcon={<PackUpIcon />}
6262
showSearch
63-
onSearch={(value) => {
63+
onSearch={(value: string) => {
6464
if (defaultStatus.findIndex((item) => item.text.includes(value)) < 0) {
6565
setStatus([
6666
...defaultStatus,
@@ -77,7 +77,7 @@ const StatusEdit = (props: StatusEditPropsType) => {
7777
status: status.find((item) => item.text === value)?.status || "none",
7878
});
7979
}}
80-
onChange={(value) => {
80+
onChange={(value: string) => {
8181
props.onChange({
8282
value,
8383
status: status.find((item) => item.text === value)?.status || "none",

client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnTagsComp.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,22 +170,22 @@ const TagEdit = (props: TagEditPropsType) => {
170170
<CustomSelect
171171
autoFocus
172172
defaultOpen
173-
bordered={false}
173+
variant="borderless"
174174
optionLabelProp="children"
175175
showSearch
176176
defaultValue={props.value}
177177
style={{ width: "100%" }}
178178
open={open}
179179
suffixIcon={<PackUpIcon />}
180-
onSearch={(value) => {
180+
onSearch={(value: string) => {
181181
if (defaultTags.findIndex((item) => item.includes(value)) < 0) {
182182
setTags([...defaultTags, value]);
183183
} else {
184184
setTags(defaultTags);
185185
}
186186
props.onChange(value);
187187
}}
188-
onChange={(value) => {
188+
onChange={(value: string | string[]) => {
189189
props.onChange(value);
190190
}}
191191
dropdownRender={(originNode: ReactNode) => (

client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/simpleTextComp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const SimpleTextComp = (function () {
2626
<Input
2727
defaultValue={props.value}
2828
autoFocus
29-
bordered={false}
29+
variant="borderless"
3030
onChange={(e) => {
3131
const value = e.target.value;
3232
props.onChange(value);

client/packages/lowcoder/src/comps/hooks/drawerComp.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,11 @@ let TmpDrawerComp = (function () {
126126
resizable={resizable}
127127
onResizeStop={onResizeStop}
128128
rootStyle={props.visible.value ? { overflow: "auto", pointerEvents: "auto" } : {}}
129-
contentWrapperStyle={{ maxHeight: "100%", maxWidth: "100%" }}
130129
styles={{
130+
wrapper: {
131+
maxHeight: "100%",
132+
maxWidth: "100%",
133+
},
131134
body: {
132135
padding: 0,
133136
backgroundColor: props.style.background

client/packages/lowcoder/src/pages/ApplicationV2/HomeLayout.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -365,17 +365,17 @@ export function HomeLayout(props: HomeLayoutProps) {
365365
<OperationWrapper>
366366
{mode !== "folders" && mode !== "module" && (
367367
<FilterDropdown
368-
bordered={false}
368+
variant="borderless"
369369
value={filterBy}
370-
onChange={(value) => setFilterBy(value as HomeResKey)}
370+
onChange={(value: any) => setFilterBy(value as HomeResKey)}
371371
options={[
372372
getFilterMenuItem(HomeResTypeEnum.All),
373373
getFilterMenuItem(HomeResTypeEnum.Application),
374374
getFilterMenuItem(HomeResTypeEnum.Module),
375375
getFilterMenuItem(HomeResTypeEnum.Navigation),
376376
...(mode !== "trash" ? [getFilterMenuItem(HomeResTypeEnum.Folder)] : []),
377377
]}
378-
getPopupContainer={(node) => node}
378+
getPopupContainer={(node: any) => node}
379379
suffixIcon={<ArrowSolidIcon />}
380380
/>
381381
)}

client/packages/lowcoder/src/pages/editor/bottom/BottomMetaDrawer.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,6 @@ export default function BottomMetaDrawer(props: BottomMetaDrawerProps) {
280280
<Drawer
281281
$vis={visible}
282282
mask={false}
283-
contentWrapperStyle={{
284-
height: "100%",
285-
boxShadow: "none",
286-
borderRadius: "0",
287-
}}
288283
rootStyle={{
289284
position: "absolute",
290285
height: "100%",
@@ -294,6 +289,11 @@ export default function BottomMetaDrawer(props: BottomMetaDrawerProps) {
294289
title={<DrawerTitleView />}
295290
styles={{
296291
header: headerWrapperStyle,
292+
wrapper: {
293+
height: "100%",
294+
boxShadow: "none",
295+
borderRadius: "0",
296+
},
297297
body: {
298298
padding: "0 0 0 8px",
299299
overflowX: "hidden",

0 commit comments

Comments
 (0)