Skip to content

Commit 94c674f

Browse files
FalkWolskyFalkWolsky
authored
Merge pull request #1515 from lowcoder-org/dev
Dev -> Main v2.6.2
2 parents e2df7b6 + 041aef5 commit 94c674f

File tree

53 files changed

+12810
-257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+12810
-257
lines changed

‎client/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.1
1+
2.6.2

‎client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-frontend",
3-
"version": "2.6.0",
3+
"version": "2.6.2",
44
"type": "module",
55
"private": true,
66
"workspaces": [

‎client/packages/lowcoder-comps/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-comps",
3-
"version": "2.6.2",
3+
"version": "2.6.3",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,13 @@ const DEFAULT_PROPS = {
220220
autoFocusButton: "ok",
221221
} as const;
222222

223-
function CustomModalRender(props: CustomModalProps & ModalFuncProps) {
223+
function CustomModalRender(props: Omit<CustomModalProps & ModalFuncProps, "width"> & { width?: string | number }) {
224224
return (
225225
<Draggable handle=".handle" disabled={!props.draggable}>
226-
<ModalWrapper $width={props.width} $customStyles={props?.customStyles}>
226+
<ModalWrapper
227+
$width={props.width}
228+
$customStyles={props?.customStyles}
229+
>
227230
<>
228231
<ModalHeaderWrapper className="handle" $draggable={props.draggable}>
229232
<ModalHeader
@@ -249,20 +252,21 @@ function CustomModalRender(props: CustomModalProps & ModalFuncProps) {
249252
);
250253
}
251254

255+
252256
/**
253257
* an antd modal capsulation
254258
*/
255-
256259
function CustomModal(props: CustomModalProps) {
257260
return (
258261
<AntdModal
259262
{...props}
260-
width="fit-content"
261-
modalRender={() => <CustomModalRender {...DEFAULT_PROPS} {...props} />}
263+
width={typeof props.width === "object" ? undefined : props.width} // Ensure valid type
264+
modalRender={() => <CustomModalRender {...props} width={typeof props.width === "object" ? undefined : props.width} />}
262265
/>
263266
);
264267
}
265268

269+
266270
const TitleIcon = {
267271
error: <ErrorIcon />,
268272
warn: <WarningIcon />,
@@ -285,6 +289,8 @@ CustomModal.confirm = (props: {
285289
customStyles?:React.CSSProperties;
286290
}): any => {
287291

292+
const fixedWidth = typeof props.width === "object" ? undefined : props.width;
293+
288294
const defaultConfirmProps: ModalFuncProps = {
289295
...DEFAULT_PROPS,
290296
okText: trans("ok"),
@@ -301,7 +307,7 @@ CustomModal.confirm = (props: {
301307
};
302308
// create model
303309
const model = modalInstance.confirm({
304-
width: "fit-content",
310+
width: fixedWidth,
305311
style: props.style,
306312
centered: true,
307313
onCancel: () => {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export const KeyValueList = (props: {
100100
return (
101101
<>
102102
{props.list.map((item, index) => (
103-
<IndicatorWrapper key={index}>
103+
<IndicatorWrapper key={index} indicatorForAll={props.indicatorForAll}>
104104
<KeyValueListItem key={index /* FIXME: find a proper key instead of `index` */}>
105105
{item}
106106
{!props.isStatic &&

‎client/packages/lowcoder-design/src/icons/index.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ export { ReactComponent as RadioCompIconSmall } from "./v2/radio-button-s.svg";
317317
export { ReactComponent as RangeSliderCompIconSmall } from "./v2/range-slider-s.svg"; // new
318318
export { ReactComponent as RatingCompIconSmall } from "./v2/rating-s.svg";
319319
export { ReactComponent as ResponsiveLayoutCompIconSmall } from "./v2/resposive-layout-s.svg"; // new
320+
export { ReactComponent as SplitLayoutCompIconSmall } from "./v2/split-layout-s.svg"; // new
320321
export { ReactComponent as RichTextEditorCompIconSmall } from "./v2/rich-text-editor-s.svg"; // new
321322
export { ReactComponent as ScannerCompIconSmall } from "./v2/scanner-s.svg"; // new
322323
export { ReactComponent as ShapesCompIconSmall } from "./v2/shapes-s.svg"; // new
@@ -419,6 +420,7 @@ export { ReactComponent as RadioCompIcon } from "./v2/radio-button-m.svg";
419420
export { ReactComponent as RangeSliderCompIcon } from "./v2/range-slider-m.svg";
420421
export { ReactComponent as RatingCompIcon } from "./v2/rating-m.svg";
421422
export { ReactComponent as ResponsiveLayoutCompIcon } from "./v2/resposive-layout-m.svg";
423+
export { ReactComponent as SplitLayoutCompIcon } from "./v2/split-layout-m.svg";
422424
export { ReactComponent as RichTextEditorCompIcon } from "./v2/rich-text-editor-m.svg";
423425
export { ReactComponent as ScannerCompIcon } from "./v2/scanner-m.svg";
424426
export { ReactComponent as ShapesCompIcon } from "./v2/shapes-m.svg";

‎client/packages/lowcoder-design/src/icons/v2/split-layout-l.svg

Lines changed: 1266 additions & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/v2/split-layout-m.svg

Lines changed: 9 additions & 0 deletions
Loading

‎client/packages/lowcoder-design/src/icons/v2/split-layout-s.svg

Lines changed: 9 additions & 0 deletions
Loading

‎client/packages/lowcoder-sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-sdk",
3-
"version": "2.6.2",
3+
"version": "2.6.3",
44
"type": "module",
55
"files": [
66
"src",

‎client/packages/lowcoder/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder",
3-
"version": "2.6.1",
3+
"version": "2.6.2",
44
"private": true,
55
"type": "module",
66
"main": "src/index.sdk.ts",
@@ -38,7 +38,7 @@
3838
"@types/react-virtualized": "^9.21.21",
3939
"alasql": "^4.6.2",
4040
"animate.css": "^4.1.1",
41-
"antd": "^5.20.0",
41+
"antd": "^5.23.4",
4242
"axios": "^1.7.7",
4343
"buffer": "^6.0.3",
4444
"clsx": "^2.0.0",
@@ -52,6 +52,7 @@
5252
"file-saver": "^2.0.5",
5353
"github-markdown-css": "^5.1.0",
5454
"hotkeys-js": "^3.8.7",
55+
"html5-device-mockups": "^3.2.1",
5556
"immer": "^9.0.7",
5657
"less": "^4.1.3",
5758
"lodash": "^4.17.21",
@@ -67,6 +68,7 @@
6768
"react": "^18.2.0",
6869
"react-best-gradient-color-picker": "^3.0.10",
6970
"react-colorful": "^5.5.1",
71+
"react-device-mockups": "^0.1.12",
7072
"react-documents": "^1.2.1",
7173
"react-dom": "^18.2.0",
7274
"react-draggable": "^4.4.4",

‎client/packages/lowcoder/public/custom_component/custom_component.html

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
6+
<meta name="viewport" content="width=device-width,initial-scale=1" />
7+
<script src="./index_custom_component_files/babel.min.js"></script>
8+
<title>Custom Component</title>
9+
<script
10+
defer="defer"
11+
src="./index_custom_component_files/runtime.351a1318.js"
12+
></script>
13+
<script
14+
defer="defer"
15+
src="./index_custom_component_files/main.ca18aca8.js"
16+
></script>
17+
</head>
18+
<body></body>
19+
</html>

‎client/packages/lowcoder/public/custom_component/index_custom_component_files/babel.min.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy