Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit afccd2b

Browse files
Merge pull request #592 from raheeliftikhar5/upgade-antd-5.1.12
Upgrade Antd version + decode csv using utf-8
2 parents 848d786 + ff17063 commit afccd2b

File tree

19 files changed

+293
-234
lines changed

19 files changed

+293
-234
lines changed

‎client/packages/lowcoder-design/src/components/CustomModal.tsx‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ function CustomModalRender(props: CustomModalProps & ModalFuncProps) {
227227
/>
228228
</ModalHeaderWrapper>
229229

230-
<div style={{ padding: "0 16px", ...props.bodyStyle }}>{props.children}</div>
230+
<div style={{ padding: "0 16px", ...props.styles?.body }}>{props.children}</div>
231231

232232
{props.footer === null || props.footer ? (
233233
props.footer
@@ -280,13 +280,15 @@ CustomModal.confirm = (props: {
280280
...DEFAULT_PROPS,
281281
okText: trans("ok"),
282282
cancelText: trans("cancel"),
283-
bodyStyle: {
284-
fontSize: "14px",
285-
color: "#333333",
286-
lineHeight: "22px",
287-
minHeight: "72px",
288-
marginTop: "24px",
289-
},
283+
styles: {
284+
body: {
285+
fontSize: "14px",
286+
color: "#333333",
287+
lineHeight: "22px",
288+
minHeight: "72px",
289+
marginTop: "24px",
290+
}
291+
}
290292
};
291293
// create model
292294
const model = modalInstance.confirm({
@@ -321,7 +323,12 @@ CustomModal.confirm = (props: {
321323
title={title}
322324
okButtonType={props.confirmBtnType}
323325
okText={props.okText}
324-
bodyStyle={{ ...defaultConfirmProps.bodyStyle, ...props.bodyStyle }}
326+
styles={{
327+
body: {
328+
...defaultConfirmProps.styles?.body,
329+
...props.bodyStyle,
330+
}
331+
}}
325332
footer={props.footer}
326333
width={props.width}
327334
/>

‎client/packages/lowcoder-design/src/components/Modal/index.tsx‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export function Modal(props: ModalProps) {
3232
resizeHandles,
3333
width: modalWidth,
3434
height: modalHeight,
35-
bodyStyle,
35+
styles,
3636
children,
3737
...otherProps
3838
} = props;
@@ -53,7 +53,12 @@ export function Modal(props: ModalProps) {
5353
return (
5454
<AntdModal
5555
width={width ?? modalWidth}
56-
bodyStyle={{ height: height ?? modalHeight, ...bodyStyle }}
56+
styles={{
57+
body: {
58+
height: height ?? modalHeight,
59+
...styles?.body,
60+
}
61+
}}
5762
{...otherProps}
5863
>
5964
<Resizable

‎client/packages/lowcoder-design/src/components/toolTip.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ function ToolTipLabel(
188188
placement="top"
189189
defaultOpen={false}
190190
trigger="hover"
191-
popupVisible={!!title}
192191
style={tooltipStyle}
193192
{...restProps}
194193
>

‎client/packages/lowcoder/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"agora-rtc-sdk-ng": "^4.19.0",
4141
"agora-rtm-sdk": "^1.5.1",
4242
"ali-oss": "^6.17.1",
43-
"antd": "5.7.2",
43+
"antd": "^5.12.2",
4444
"antd-img-crop": "^4.12.2",
4545
"axios": "^0.21.1",
4646
"buffer": "^6.0.3",

‎client/packages/lowcoder/src/comps/comps/fileComp/fileComp.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ export function resolveParsedValue(files: UploadFile[]) {
210210
.then((a) => {
211211
const ext = mime.getExtension(f.originFileObj?.type ?? "");
212212
if (ext === "xlsx" || ext === "csv") {
213-
const workbook = XLSX.read(a, { raw: true });
213+
const workbook = XLSX.read(a, { raw: true,codepage: 65001 });
214214
return XLSX.utils.sheet_to_json(workbook.Sheets[workbook.SheetNames[0]], {
215215
raw: false,
216216
});

‎client/packages/lowcoder/src/comps/comps/formComp/createForm.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ export const CreateForm = (props: { onCreate: CreateHandler }) => {
669669
onCancel={() => setVisible(false)}
670670
width="600px"
671671
children={<CreateFormBody {...props} />}
672-
bodyStyle={{ padding: 0 }}
672+
styles={{ body: {padding: 0} }}
673673
/>
674674
</div>
675675
</>

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -508,9 +508,11 @@ let MTComp = (function () {
508508
: {}
509509
}
510510
contentWrapperStyle={{ maxHeight: "100%", maxWidth: "100%" }}
511-
bodyStyle={{
512-
padding: 0,
513-
backgroundColor: props.style.background,
511+
styles={{
512+
body: {
513+
padding: 0,
514+
backgroundColor: props.style.background,
515+
}
514516
}}
515517
closable={false}
516518
placement={props.placement}

‎client/packages/lowcoder/src/comps/controls/labelControl.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ export const LabelControl = (function () {
178178
}}
179179
placement="top"
180180
color="#2c2c2c"
181-
popupVisible={!!props.tooltip}
182181
getPopupContainer={(node: any) => node.closest(".react-grid-item")}
183182
>
184183
<Label border={!!props.tooltip}>{props.text}</Label>

‎client/packages/lowcoder/src/comps/controls/slotControl.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function ModalConfigView(props: {
6565
onCancel={onCancel}
6666
getContainer={() => document.querySelector(`#${CanvasContainerID}`) || document.body}
6767
footer={null}
68-
bodyStyle={{ padding: "0" }}
68+
styles={{ body: {padding: "0"} }}
6969
zIndex={Layers.modal}
7070
modalRender={(node) => (
7171
<ModalStyled $background={background} onClick={() => {}}>

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,12 @@ let TmpDrawerComp = (function () {
127127
onResizeStop={onResizeStop}
128128
rootStyle={props.visible.value ? { overflow: "auto", pointerEvents: "auto" } : {}}
129129
contentWrapperStyle={{ maxHeight: "100%", maxWidth: "100%" }}
130-
bodyStyle={{ padding: 0, backgroundColor: props.style.background }}
130+
styles={{
131+
body: {
132+
padding: 0,
133+
backgroundColor: props.style.background
134+
}
135+
}}
131136
closable={false}
132137
placement={props.placement}
133138
open={props.visible.value}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /