Skip to content

Dev -> Main v2.6.2 #1515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 28 commits into from
Feb 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3a7daae
Show indicator on event panel headers
Imiss-U1025 Feb 4, 2025
9f02fc7
fix issue with variable update of event panel when query change
Imiss-U1025 Feb 4, 2025
5b08e71
#1397: Selecting current activeAuthId when "inherit from login" is se…
dragonpoo Feb 4, 2025
8a0884e
Add custom control for variable header
Imiss-U1025 Feb 5, 2025
ffbe25a
apply name checking to control
Imiss-U1025 Feb 5, 2025
f1f03b0
Check only key
Imiss-U1025 Feb 5, 2025
5a374db
Fixed cancelled requests issue in custom comp
raheeliftikhar5 Feb 5, 2025
3e41004
fix import statement
Imiss-U1025 Feb 5, 2025
296e25b
Merge pull request #1506 from lowcoder-org/fix/variable_header_contro…
FalkWolsky Feb 5, 2025
0e64a0e
Make the variable name unique among editorState
Imiss-U1025 Feb 6, 2025
221a848
Merge pull request #1509 from lowcoder-org/fix/global_unique_variable…
FalkWolsky Feb 6, 2025
280387d
check variable name list for uniqueness of name
Imiss-U1025 Feb 6, 2025
2894883
load custom_component files from build package instead of sdk bundle
raheeliftikhar5 Feb 7, 2025
36f0611
Fix null pointer exception when editingApplicationDSL is null
dragonpoo Feb 7, 2025
1f6ed88
Merge pull request #1512 from lowcoder-org/fix/null_category
FalkWolsky Feb 7, 2025
9491cb9
Merge pull request #1511 from lowcoder-org/fix/global_unique_variable…
FalkWolsky Feb 7, 2025
d94a667
added mobile/table/desktop preview option with landscape/portrait mode
raheeliftikhar5 Feb 7, 2025
c3aa49a
use canvas width to update screen info
raheeliftikhar5 Feb 7, 2025
59324cd
Merge pull request #1513 from lowcoder-org/feat/mobile-preview
FalkWolsky Feb 7, 2025
22896e8
Merge pull request #1501 from lowcoder-org/feature/auth_header_of_query
FalkWolsky Feb 7, 2025
80934b5
Merge pull request #1499 from lowcoder-org/fix/show_indicator_on_even…
FalkWolsky Feb 7, 2025
15a98e8
Update to ANTd 5.23.4 - Adaptions on Responsive Layout and Introducti…
Feb 8, 2025
496c100
SplitLayout Component
Feb 8, 2025
431e705
Adapting Mobile Preview
Feb 8, 2025
9a5ce3d
Adapting Preview v2
Feb 9, 2025
34faa66
Icons and small improvements for SplitLayout
Feb 9, 2025
c94eca0
Small fixes for left menu after ANTd Update
Feb 9, 2025
041aef5
Version Update to prepare Release 2.6.2
Feb 9, 2025
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.1
2.6.2
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lowcoder-frontend",
"version": "2.6.0",
"version": "2.6.2",
"type": "module",
"private": true,
"workspaces": [
Expand Down
2 changes: 1 addition & 1 deletion client/packages/lowcoder-comps/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lowcoder-comps",
"version": "2.6.2",
"version": "2.6.3",
"type": "module",
"license": "MIT",
"dependencies": {
Expand Down
18 changes: 12 additions & 6 deletions client/packages/lowcoder-design/src/components/CustomModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,13 @@ const DEFAULT_PROPS = {
autoFocusButton: "ok",
} as const;

function CustomModalRender(props: CustomModalProps & ModalFuncProps) {
function CustomModalRender(props: Omit<CustomModalProps & ModalFuncProps, "width"> & { width?: string | number }) {
return (
<Draggable handle=".handle" disabled={!props.draggable}>
<ModalWrapper $width={props.width} $customStyles={props?.customStyles}>
<ModalWrapper
$width={props.width}
$customStyles={props?.customStyles}
>
<>
<ModalHeaderWrapper className="handle" $draggable={props.draggable}>
<ModalHeader
Expand All @@ -249,20 +252,21 @@ function CustomModalRender(props: CustomModalProps & ModalFuncProps) {
);
}


/**
* an antd modal capsulation
*/

function CustomModal(props: CustomModalProps) {
return (
<AntdModal
{...props}
width="fit-content"
modalRender={() => <CustomModalRender {...DEFAULT_PROPS} {...props} />}
width={typeof props.width === "object" ? undefined : props.width} // Ensure valid type
modalRender={() => <CustomModalRender {...props} width={typeof props.width === "object" ? undefined : props.width} />}
/>
);
}


const TitleIcon = {
error: <ErrorIcon />,
warn: <WarningIcon />,
Expand All @@ -285,6 +289,8 @@ CustomModal.confirm = (props: {
customStyles?:React.CSSProperties;
}): any => {

const fixedWidth = typeof props.width === "object" ? undefined : props.width;

const defaultConfirmProps: ModalFuncProps = {
...DEFAULT_PROPS,
okText: trans("ok"),
Expand All @@ -301,7 +307,7 @@ CustomModal.confirm = (props: {
};
// create model
const model = modalInstance.confirm({
width: "fit-content",
width: fixedWidth,
style: props.style,
centered: true,
onCancel: () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export const KeyValueList = (props: {
return (
<>
{props.list.map((item, index) => (
<IndicatorWrapper key={index}>
<IndicatorWrapper key={index} indicatorForAll={props.indicatorForAll}>
<KeyValueListItem key={index /* FIXME: find a proper key instead of `index` */}>
{item}
{!props.isStatic &&
Expand Down
2 changes: 2 additions & 0 deletions client/packages/lowcoder-design/src/icons/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ export { ReactComponent as RadioCompIconSmall } from "./v2/radio-button-s.svg";
export { ReactComponent as RangeSliderCompIconSmall } from "./v2/range-slider-s.svg"; // new
export { ReactComponent as RatingCompIconSmall } from "./v2/rating-s.svg";
export { ReactComponent as ResponsiveLayoutCompIconSmall } from "./v2/resposive-layout-s.svg"; // new
export { ReactComponent as SplitLayoutCompIconSmall } from "./v2/split-layout-s.svg"; // new
export { ReactComponent as RichTextEditorCompIconSmall } from "./v2/rich-text-editor-s.svg"; // new
export { ReactComponent as ScannerCompIconSmall } from "./v2/scanner-s.svg"; // new
export { ReactComponent as ShapesCompIconSmall } from "./v2/shapes-s.svg"; // new
Expand Down Expand Up @@ -419,6 +420,7 @@ export { ReactComponent as RadioCompIcon } from "./v2/radio-button-m.svg";
export { ReactComponent as RangeSliderCompIcon } from "./v2/range-slider-m.svg";
export { ReactComponent as RatingCompIcon } from "./v2/rating-m.svg";
export { ReactComponent as ResponsiveLayoutCompIcon } from "./v2/resposive-layout-m.svg";
export { ReactComponent as SplitLayoutCompIcon } from "./v2/split-layout-m.svg";
export { ReactComponent as RichTextEditorCompIcon } from "./v2/rich-text-editor-m.svg";
export { ReactComponent as ScannerCompIcon } from "./v2/scanner-m.svg";
export { ReactComponent as ShapesCompIcon } from "./v2/shapes-m.svg";
Expand Down
1,266 changes: 1,266 additions & 0 deletions client/packages/lowcoder-design/src/icons/v2/split-layout-l.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion client/packages/lowcoder-sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lowcoder-sdk",
"version": "2.6.2",
"version": "2.6.3",
"type": "module",
"files": [
"src",
Expand Down
6 changes: 4 additions & 2 deletions client/packages/lowcoder/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lowcoder",
"version": "2.6.1",
"version": "2.6.2",
"private": true,
"type": "module",
"main": "src/index.sdk.ts",
Expand Down Expand Up @@ -38,7 +38,7 @@
"@types/react-virtualized": "^9.21.21",
"alasql": "^4.6.2",
"animate.css": "^4.1.1",
"antd": "^5.20.0",
"antd": "^5.23.4",
"axios": "^1.7.7",
"buffer": "^6.0.3",
"clsx": "^2.0.0",
Expand All @@ -52,6 +52,7 @@
"file-saver": "^2.0.5",
"github-markdown-css": "^5.1.0",
"hotkeys-js": "^3.8.7",
"html5-device-mockups": "^3.2.1",
"immer": "^9.0.7",
"less": "^4.1.3",
"lodash": "^4.17.21",
Expand All @@ -67,6 +68,7 @@
"react": "^18.2.0",
"react-best-gradient-color-picker": "^3.0.10",
"react-colorful": "^5.5.1",
"react-device-mockups": "^0.1.12",
"react-documents": "^1.2.1",
"react-dom": "^18.2.0",
"react-draggable": "^4.4.4",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<script src="./index_custom_component_files/babel.min.js"></script>
<title>Custom Component</title>
<script
defer="defer"
src="./index_custom_component_files/runtime.351a1318.js"
></script>
<script
defer="defer"
src="./index_custom_component_files/main.ca18aca8.js"
></script>
</head>
<body></body>
</html>

Large diffs are not rendered by default.

Loading
Loading