diff --git a/client/packages/lowcoder/src/app.tsx b/client/packages/lowcoder/src/app.tsx index 05dbeaab25..5818f36aeb 100644 --- a/client/packages/lowcoder/src/app.tsx +++ b/client/packages/lowcoder/src/app.tsx @@ -274,129 +274,112 @@ class AppIndex extends React.Component { type="text/html" href={window.location.href} media="(aspect-ratio: 1280/720)" - />, - - , - , - ]} - - - + + + - + - - - - - - - - - - - + + + + + + + + + + + - {this.props.isFetchUserFinished && this.props.defaultHomePage? ( - !this.props.orgDev ? ( - - ) : ( - - ) + {this.props.isFetchUserFinished && this.props.defaultHomePage ? ( + !this.props.orgDev ? ( + ) : ( - - )} + + ) + ) : ( + + )} - + - {developEnv() && ( - <> - - - - - - )} - - + {developEnv() && ( + <> + + + + + + )} + + ); } @@ -453,7 +436,7 @@ export function bootstrap() { const root = createRoot(container!); root.render( - + ); } diff --git a/client/packages/lowcoder/src/pages/editor/editorView.tsx b/client/packages/lowcoder/src/pages/editor/editorView.tsx index 11d818d47c..144e593f7a 100644 --- a/client/packages/lowcoder/src/pages/editor/editorView.tsx +++ b/client/packages/lowcoder/src/pages/editor/editorView.tsx @@ -1,6 +1,6 @@ import { default as Divider } from "antd/es/divider"; import { default as Menu } from "antd/es/menu"; -import { default as Sider} from "antd/es/layout/Sider"; +import { default as Sider } from "antd/es/layout/Sider"; import { PreloadComp } from "comps/comps/preLoadComp"; import UIComp from "comps/comps/uiComp"; import { EditorContext } from "comps/editorState"; @@ -64,69 +64,69 @@ import Flex from "antd/es/flex"; // import { BottomSkeleton } from "./bottom/BottomContent"; const Header = lazy( - () => import("pages/common/header") - .then(module => ({default: module.default})) + () => import("pages/common/header") + .then(module => ({ default: module.default })) ); const BottomSkeleton = lazy( - () => import("pages/editor/bottom/BottomContent") - .then(module => ({default: module.BottomSkeleton})) + () => import("pages/editor/bottom/BottomContent") + .then(module => ({ default: module.BottomSkeleton })) ); const LeftContent = lazy( () => import('./LeftContent') - .then(module => ({default: module.LeftContent})) + .then(module => ({ default: module.LeftContent })) ); const LeftLayersContent = lazy( () => import('./LeftLayersContent') - .then(module => ({default: module.LeftLayersContent})) + .then(module => ({ default: module.LeftLayersContent })) ); const RightPanel = lazy(() => import('pages/editor/right/RightPanel')); const EditorTutorials = lazy(() => import('pages/tutorials/editorTutorials')); const Bottom = lazy(() => import('./bottom/BottomPanel')); const CustomShortcutWrapper = lazy( () => import('pages/editor/editorHotKeys') - .then(module => ({default: module.CustomShortcutWrapper})) + .then(module => ({ default: module.CustomShortcutWrapper })) ); const EditorGlobalHotKeys = lazy( () => import('pages/editor/editorHotKeys') - .then(module => ({default: module.EditorGlobalHotKeys})) + .then(module => ({ default: module.EditorGlobalHotKeys })) ); const EditorHotKeys = lazy( () => import('pages/editor/editorHotKeys') - .then(module => ({default: module.EditorHotKeys})) + .then(module => ({ default: module.EditorHotKeys })) ); const Body = lazy( () => import('pages/common/styledComponent') - .then(module => ({default: module.Body})) + .then(module => ({ default: module.Body })) ); const EditorContainer = lazy( () => import('pages/common/styledComponent') - .then(module => ({default: module.EditorContainer})) + .then(module => ({ default: module.EditorContainer })) ); const EditorContainerWithViewMode = lazy( () => import('pages/common/styledComponent') - .then(module => ({default: module.EditorContainerWithViewMode})) + .then(module => ({ default: module.EditorContainerWithViewMode })) ); const Height100Div = lazy( () => import('pages/common/styledComponent') - .then(module => ({default: module.Height100Div})) + .then(module => ({ default: module.Height100Div })) ); const LeftPanel = lazy( () => import('pages/common/styledComponent') - .then(module => ({default: module.LeftPanel})) + .then(module => ({ default: module.LeftPanel })) ); const MiddlePanel = lazy( () => import('pages/common/styledComponent') - .then(module => ({default: module.MiddlePanel})) + .then(module => ({ default: module.MiddlePanel })) ); const HelpDropdown = lazy( () => import('pages/common/help') - .then(module => ({default: module.HelpDropdown})) + .then(module => ({ default: module.HelpDropdown })) ); const PreviewHeader = lazy( () => import('pages/common/previewHeader') - .then(module => ({default: module.PreviewHeader})) + .then(module => ({ default: module.PreviewHeader })) ); const HookCompContainer = styled.div` @@ -141,9 +141,8 @@ const HookCompContainer = styled.div` `; const ViewBody = styled.div<{ $hideBodyHeader?: boolean; $height?: number }>` - height: ${(props) => `calc(${ - props.$height ? props.$height + "px" : "100vh" - } - env(safe-area-inset-bottom) - + height: ${(props) => `calc(${props.$height ? props.$height + "px" : "100vh" + } - env(safe-area-inset-bottom) - ${props.$hideBodyHeader ? "0px" : TopHeaderHeight} )`}; `; @@ -498,7 +497,7 @@ function EditorView(props: EditorViewProps) { ); } - + return uiComp.getView(); }, [ showAppSnapshot, @@ -511,12 +510,12 @@ function EditorView(props: EditorViewProps) { if (isViewMode) return uiComp.getView(); return ( - editorState.deviceType === "mobile" || editorState.deviceType === "tablet" ? ( + editorState.deviceType === "mobile" || editorState.deviceType === "tablet" ? ( - {uiComp.getView()} + deviceType={editorState.deviceType} + deviceOrientation={editorState.deviceOrientation} + > + {uiComp.getView()} ) : (
@@ -547,7 +546,7 @@ function EditorView(props: EditorViewProps) { return ( - {application && {appSettingsComp?.children?.title?.getView?.() || application?.name}} + {application && {appSettingsComp?.children?.title?.getView?.() || application?.name}} {isLowCoderDomain || isLocalhost && [ // Adding Support for iframely to be able to embedd apps as iframes application?.name ? ([ @@ -557,10 +556,7 @@ function EditorView(props: EditorViewProps) { , , ]), - , - , - , - , + , // adding Hubspot Support for Analytics ]} @@ -579,7 +575,7 @@ function EditorView(props: EditorViewProps) { ); } - + // history mode, display with the right panel, a little trick const showRight = panelStatus.right || showAppSnapshot; @@ -595,32 +591,29 @@ function EditorView(props: EditorViewProps) { return ( <> - - {application && {appSettingsComp?.children?.title?.getView?.() || application?.name}} - {isLowCoderDomain || isLocalhost && [ - // Adding Support for iframely to be able to embedd apps as iframes - application?.name ? ([ - , - , - ]) : ([ - , - , - ]), - , - , - , - , - // adding Clearbit Support for Analytics - - ]} - - { - // log.debug("layout: onDragEnd. Height100Div"); - editorState.setDragging(false); - draggingUtils.clearData(); - } } - > + + {application && {appSettingsComp?.children?.title?.getView?.() || application?.name}} + {isLowCoderDomain || isLocalhost && [ + // Adding Support for iframely to be able to embedd apps as iframes + application?.name ? ([ + , + , + ]) : ([ + , + , + ]), + , + // adding Clearbit Support for Analytics + + ]} + + { + // log.debug("layout: onDragEnd. Height100Div"); + editorState.setDragging(false); + draggingUtils.clearData(); + }} + > {isPublicApp ? : ( @@ -671,7 +664,7 @@ function EditorView(props: EditorViewProps) { {panelStatus.left && editorModeStatus !== "layout" && ( {menuKey === SiderKey.State && } - + <> {menuKey === SiderKey.Setting && ( @@ -717,7 +710,7 @@ function EditorView(props: EditorViewProps) { {trans("leftPanel.toolbarPreload")} - + {props.preloadComp.getJSLibraryPropertyView()} )}