diff --git a/client/packages/lowcoder-design/src/components/CustomModal.tsx b/client/packages/lowcoder-design/src/components/CustomModal.tsx
index ef9d97000..9b13d8b43 100644
--- a/client/packages/lowcoder-design/src/components/CustomModal.tsx
+++ b/client/packages/lowcoder-design/src/components/CustomModal.tsx
@@ -227,7 +227,7 @@ function CustomModalRender(props: CustomModalProps & ModalFuncProps) {
/>
-
{props.children}
+ {props.children}
{props.footer === null || props.footer ? (
props.footer
@@ -280,13 +280,15 @@ CustomModal.confirm = (props: {
...DEFAULT_PROPS,
okText: trans("ok"),
cancelText: trans("cancel"),
- bodyStyle: {
- fontSize: "14px",
- color: "#333333",
- lineHeight: "22px",
- minHeight: "72px",
- marginTop: "24px",
- },
+ styles: {
+ body: {
+ fontSize: "14px",
+ color: "#333333",
+ lineHeight: "22px",
+ minHeight: "72px",
+ marginTop: "24px",
+ }
+ }
};
// create model
const model = modalInstance.confirm({
@@ -321,7 +323,12 @@ CustomModal.confirm = (props: {
title={title}
okButtonType={props.confirmBtnType}
okText={props.okText}
- bodyStyle={{ ...defaultConfirmProps.bodyStyle, ...props.bodyStyle }}
+ styles={{
+ body: {
+ ...defaultConfirmProps.styles?.body,
+ ...props.bodyStyle,
+ }
+ }}
footer={props.footer}
width={props.width}
/>
diff --git a/client/packages/lowcoder-design/src/components/Modal/index.tsx b/client/packages/lowcoder-design/src/components/Modal/index.tsx
index 1964f26bc..91f35b88e 100644
--- a/client/packages/lowcoder-design/src/components/Modal/index.tsx
+++ b/client/packages/lowcoder-design/src/components/Modal/index.tsx
@@ -32,7 +32,7 @@ export function Modal(props: ModalProps) {
resizeHandles,
width: modalWidth,
height: modalHeight,
- bodyStyle,
+ styles,
children,
...otherProps
} = props;
@@ -53,7 +53,12 @@ export function Modal(props: ModalProps) {
return (
diff --git a/client/packages/lowcoder/package.json b/client/packages/lowcoder/package.json
index cc2a6c8eb..c4936531f 100644
--- a/client/packages/lowcoder/package.json
+++ b/client/packages/lowcoder/package.json
@@ -40,7 +40,7 @@
"agora-rtc-sdk-ng": "^4.19.0",
"agora-rtm-sdk": "^1.5.1",
"ali-oss": "^6.17.1",
- "antd": "5.7.2",
+ "antd": "^5.12.2",
"antd-img-crop": "^4.12.2",
"axios": "^0.21.1",
"buffer": "^6.0.3",
diff --git a/client/packages/lowcoder/src/comps/comps/fileComp/fileComp.tsx b/client/packages/lowcoder/src/comps/comps/fileComp/fileComp.tsx
index b206f2a15..e801a3a29 100644
--- a/client/packages/lowcoder/src/comps/comps/fileComp/fileComp.tsx
+++ b/client/packages/lowcoder/src/comps/comps/fileComp/fileComp.tsx
@@ -210,7 +210,7 @@ export function resolveParsedValue(files: UploadFile[]) {
.then((a) => {
const ext = mime.getExtension(f.originFileObj?.type ?? "");
if (ext === "xlsx" || ext === "csv") {
- const workbook = XLSX.read(a, { raw: true });
+ const workbook = XLSX.read(a, { raw: true, codepage: 65001 });
return XLSX.utils.sheet_to_json(workbook.Sheets[workbook.SheetNames[0]], {
raw: false,
});
diff --git a/client/packages/lowcoder/src/comps/comps/formComp/createForm.tsx b/client/packages/lowcoder/src/comps/comps/formComp/createForm.tsx
index f0223ff12..f8092a6ee 100644
--- a/client/packages/lowcoder/src/comps/comps/formComp/createForm.tsx
+++ b/client/packages/lowcoder/src/comps/comps/formComp/createForm.tsx
@@ -669,7 +669,7 @@ export const CreateForm = (props: { onCreate: CreateHandler }) => {
onCancel={() => setVisible(false)}
width="600px"
children={}
- bodyStyle={{ padding: 0 }}
+ styles={{ body: {padding: 0} }}
/>
>
diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx
index 3419b4f16..80bf6e8c1 100644
--- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx
+++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx
@@ -508,9 +508,11 @@ let MTComp = (function () {
: {}
}
contentWrapperStyle={{ maxHeight: "100%", maxWidth: "100%" }}
- bodyStyle={{
- padding: 0,
- backgroundColor: props.style.background,
+ styles={{
+ body: {
+ padding: 0,
+ backgroundColor: props.style.background,
+ }
}}
closable={false}
placement={props.placement}
diff --git a/client/packages/lowcoder/src/comps/controls/labelControl.tsx b/client/packages/lowcoder/src/comps/controls/labelControl.tsx
index ed8394042..db3087e65 100644
--- a/client/packages/lowcoder/src/comps/controls/labelControl.tsx
+++ b/client/packages/lowcoder/src/comps/controls/labelControl.tsx
@@ -178,7 +178,6 @@ export const LabelControl = (function () {
}}
placement="top"
color="#2c2c2c"
- popupVisible={!!props.tooltip}
getPopupContainer={(node: any) => node.closest(".react-grid-item")}
>
diff --git a/client/packages/lowcoder/src/comps/controls/slotControl.tsx b/client/packages/lowcoder/src/comps/controls/slotControl.tsx
index 073281159..8248e98f2 100644
--- a/client/packages/lowcoder/src/comps/controls/slotControl.tsx
+++ b/client/packages/lowcoder/src/comps/controls/slotControl.tsx
@@ -65,7 +65,7 @@ function ModalConfigView(props: {
onCancel={onCancel}
getContainer={() => document.querySelector(`#${CanvasContainerID}`) || document.body}
footer={null}
- bodyStyle={{ padding: "0" }}
+ styles={{ body: {padding: "0"} }}
zIndex={Layers.modal}
modalRender={(node) => (
{}}>
diff --git a/client/packages/lowcoder/src/comps/hooks/drawerComp.tsx b/client/packages/lowcoder/src/comps/hooks/drawerComp.tsx
index 02e8e36b4..134b0e229 100644
--- a/client/packages/lowcoder/src/comps/hooks/drawerComp.tsx
+++ b/client/packages/lowcoder/src/comps/hooks/drawerComp.tsx
@@ -127,7 +127,12 @@ let TmpDrawerComp = (function () {
onResizeStop={onResizeStop}
rootStyle={props.visible.value ? { overflow: "auto", pointerEvents: "auto" } : {}}
contentWrapperStyle={{ maxHeight: "100%", maxWidth: "100%" }}
- bodyStyle={{ padding: 0, backgroundColor: props.style.background }}
+ styles={{
+ body: {
+ padding: 0,
+ backgroundColor: props.style.background
+ }
+ }}
closable={false}
placement={props.placement}
open={props.visible.value}
diff --git a/client/packages/lowcoder/src/comps/hooks/modalComp.tsx b/client/packages/lowcoder/src/comps/hooks/modalComp.tsx
index af90a70c9..92af6fb6d 100644
--- a/client/packages/lowcoder/src/comps/hooks/modalComp.tsx
+++ b/client/packages/lowcoder/src/comps/hooks/modalComp.tsx
@@ -113,7 +113,7 @@ let TmpModalComp = (function () {
focusTriggerAfterClose={false}
getContainer={() => document.querySelector(`#${CanvasContainerID}`) || document.body}
footer={null}
- bodyStyle={bodyStyle}
+ styles={{body: bodyStyle}}
width={width}
onCancel={(e) => {
props.visible.onChange(false);
diff --git a/client/packages/lowcoder/src/pages/common/copyModal.tsx b/client/packages/lowcoder/src/pages/common/copyModal.tsx
index 6f83f0d8b..3c23efd3b 100644
--- a/client/packages/lowcoder/src/pages/common/copyModal.tsx
+++ b/client/packages/lowcoder/src/pages/common/copyModal.tsx
@@ -31,10 +31,11 @@ export function CopyModal(props: CopyModalProps) {
)?.folderId || ""
);
const { visible, close, name, type, id } = props;
-
+ const appName = name.length > 25 ? `${name.substring(0, 25)}...` : name;
+
return (
{
return (
showCreateForm(false)}
activeStepKey={"type"}
destroyOnClose={true}
diff --git a/client/packages/lowcoder/src/pages/editor/LeftContent.tsx b/client/packages/lowcoder/src/pages/editor/LeftContent.tsx
index 94ce1a978..179e2b293 100644
--- a/client/packages/lowcoder/src/pages/editor/LeftContent.tsx
+++ b/client/packages/lowcoder/src/pages/editor/LeftContent.tsx
@@ -64,9 +64,10 @@ function toDataView(value: any, name: string, desc?: ReactNode) {
} else if (_.isPlainObject(value)) {
return ;
}
+
return (
-
+
@@ -150,7 +151,6 @@ const CollapseView = React.memo(
props.onClick && props.onClick(props.name)}>
}
- headerStyle={headerWrapperStyle}
- bodyStyle={{
- padding: "0 0 0 8px",
- scrollbarGutter: "stable",
- overflowX: "hidden",
+ styles={{
+ header: headerWrapperStyle,
+ body: {
+ padding: "0 0 0 8px",
+ overflowX: "hidden",
+ scrollbarGutter: "stable",
+ }
}}
placement="bottom"
closable={false}
diff --git a/client/packages/lowcoder/src/pages/setting/permission/styledComponents.tsx b/client/packages/lowcoder/src/pages/setting/permission/styledComponents.tsx
index c57fb238a..7223016be 100644
--- a/client/packages/lowcoder/src/pages/setting/permission/styledComponents.tsx
+++ b/client/packages/lowcoder/src/pages/setting/permission/styledComponents.tsx
@@ -405,7 +405,14 @@ export function UserDetailPopup(props: { userId: string; title: string }) {
setVisible(false)}
title={title}
diff --git a/client/packages/lowcoder/src/pages/setting/theme/createModal.tsx b/client/packages/lowcoder/src/pages/setting/theme/createModal.tsx
index df9dc0da0..d1ca5265b 100644
--- a/client/packages/lowcoder/src/pages/setting/theme/createModal.tsx
+++ b/client/packages/lowcoder/src/pages/setting/theme/createModal.tsx
@@ -121,7 +121,7 @@ function CreateModal(props: CreateModalProp) {
3 ? "363px" : "313px") : "156px",
- marginBottom: (!!themeList?.length && themeList?.length) > 3 ? "4px" : "0",
+ marginBottom: (!!themeList?.length && themeList?.length > 3) ? "4px" : "0",
}}
>
{trans("theme.defaultThemeTip")}
diff --git a/client/packages/lowcoder/src/pages/setting/theme/themeList.tsx b/client/packages/lowcoder/src/pages/setting/theme/themeList.tsx
index dec9464e5..5170a1c07 100644
--- a/client/packages/lowcoder/src/pages/setting/theme/themeList.tsx
+++ b/client/packages/lowcoder/src/pages/setting/theme/themeList.tsx
@@ -39,6 +39,7 @@ function ThemeList(props: ThemeListProp) {
}
return (
e.stopPropagation()}>
tableRef.current!}
+ getPopupContainer={() => document.getElementById("theme-list-table")!}
dropdownRender={() => (