Merge branch 'dev' into fix/anon_usage_log

ludomikula · web-flow · commit dd6f42f403d5 · 2025-06-02T17:19:34.000+02:00
diff --git a/client/packages/lowcoder-design/src/components/ScrollBar.tsx b/client/packages/lowcoder-design/src/components/ScrollBar.tsx
@@ -99,9 +99,7 @@ export const ScrollBar = React.memo(({
 
   return hideScrollbar ? (
     <ScrollBarWrapper 
-      className={className} 
-      $hideplaceholder={$hideplaceholder}
-      $overflow={overflow}
+      className={className}
     >
       {prefixNode}
       {children}
@@ -110,8 +108,6 @@ export const ScrollBar = React.memo(({
   ) : (
     <ScrollBarWrapper 
       className={className}
-      $hideplaceholder={$hideplaceholder}
-      $overflow={overflow}
     >
       <SimpleBar 
         style={combinedStyle} 
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx
@@ -1044,7 +1044,13 @@ export const TableCompView = React.memo((props: {
   }
 
   if (antdColumns.length === 0) {
-    return <EmptyContent text={trans("table.emptyColumns")} />;
+    return (
+      <div>
+        {toolbar.position === "above" && !hideToolbar && toolbarView}
+        <EmptyContent text={trans("table.emptyColumns")} />
+        {toolbar.position === "below" && !hideToolbar && toolbarView}
+      </div>
+    );
   }
 
   const hideScrollbar = !showHorizontalScrollbar && !showVerticalScrollbar;
diff --git a/client/packages/lowcoder/src/comps/index.tsx b/client/packages/lowcoder/src/comps/index.tsx
@@ -192,6 +192,7 @@ import { TreeSelectComp } from "./comps/treeComp/treeSelectComp";
 import { DrawerComp } from "./hooks/drawerComp";
 import { ModalComp } from "./hooks/modalComp";
 import { defaultCollapsibleContainerData } from "./comps/containerComp/collapsibleContainerComp";
+import { ContainerComp as FloatTextContainerComp } from "./comps/containerComp/textContainerComp";
 
 type Registry = {
   [key in UICompType]?: UICompManifest;
@@ -605,7 +606,7 @@ export var uiCompMap: Registry = {
     categories: ["layout"],
     icon: FloatingTextCompIcon,
     keywords: trans("uiComp.floatTextContainerCompKeywords"),
-    comp: ContainerComp,
+    comp: FloatTextContainerComp,
     withoutLoading: true,
     layoutInfo: {
       w: 12,
diff --git a/client/packages/lowcoder/src/layout/gridLayout.tsx b/client/packages/lowcoder/src/layout/gridLayout.tsx
@@ -127,15 +127,6 @@ class GridLayout extends React.Component<GridLayoutProps, GridLayoutState> {
   componentWillUnmount() {
     // Cleanup throttled debug function
     this.throttleDebug.cancel();
-    
-    // Clear any remaining dragging data
-    draggingUtils.clearData();
-    
-    // Remove any remaining event listeners
-    if (this.ref.current) {
-      // The event listener is added in the render method using onKeyDown prop
-      // No need to manually remove it as React handles cleanup
-    }
   }
 
   static getDerivedStateFromProps(
diff --git a/client/packages/lowcoder/src/pages/userAuth/authComponents.tsx b/client/packages/lowcoder/src/pages/userAuth/authComponents.tsx
@@ -11,6 +11,7 @@ import { Col, Row, Typography } from "antd";
 import { getBrandingSetting } from "@lowcoder-ee/redux/selectors/enterpriseSelectors";
 import { useSelector } from "react-redux";
 import { buildMaterialPreviewURL } from "@lowcoder-ee/util/materialUtils";
+import { isEmpty } from "lodash";
 
 const StyledBrandingColumn = styled(Col)<{$bgImage?: string | null}>`
   background-color: rgb(234, 234, 234);
@@ -223,32 +224,38 @@ export const AuthContainer = (props: {
   isEE?: boolean;
   orgId?: string;
 }) => {
+  const brandingSettings = useSelector(getBrandingSetting);
+  
+  const showEEBranding = useMemo(() => {
+    return props.isEE && !isEmpty(brandingSettings);
+  }, [props.isEE, brandingSettings]);
+
   return (
-    <AuthCardContainer $isEE={props.isEE}>
-      {!props.isEE && (
+    <AuthCardContainer $isEE={showEEBranding}>
+      {!showEEBranding && (
         <AuthCardHeading
           $type={props.type}
-          $isEE={props.isEE}
+          $isEE={showEEBranding}
         >
           {props.heading || ""}
         </AuthCardHeading>
       )}
-      <AuthCard $isEE={props.isEE}>
+      <AuthCard $isEE={showEEBranding}>
         <BrandingWrapper
-          isEE={props.isEE}
+          isEE={showEEBranding}
         >
-          {props.isEE && (
+          {showEEBranding && (
             <AuthCardHeading
               $type={props.type}
-              $isEE={props.isEE}
+              $isEE={showEEBranding}
             >
               {props.heading || ""}
             </AuthCardHeading>
           )}
           {props.children}
         </BrandingWrapper>
       </AuthCard>
-      { props.subHeading && !props.isEE && (
+      { props.subHeading && !showEEBranding && (
         <AuthCardSubFooter>
           <img src={favicon} alt={"Lowcoder | " + trans("productDesc")} width="20px"/>
           <a href="https://lowcoder.cloud" target="_blank" rel="noreferrer">

Original file line number	Diff line number	Diff line change
`@@ -1044,7 +1044,13 @@ export const TableCompView = React.memo((props: {`
`1044`	`1044`	`}`
`1045`	`1045`
`1046`	`1046`	`if (antdColumns.length === 0) {`
`1047`		`- return <EmptyContent text={trans("table.emptyColumns")} />;`
	`1047`	`+ return (`
	`1048`	`+ <div>`
	`1049`	`+ {toolbar.position === "above" && !hideToolbar && toolbarView}`
	`1050`	`+ <EmptyContent text={trans("table.emptyColumns")} />`
	`1051`	`+ {toolbar.position === "below" && !hideToolbar && toolbarView}`
	`1052`	`+ </div>`
	`1053`	`+ );`
`1048`	`1054`	`}`
`1049`	`1055`
`1050`	`1056`	`const hideScrollbar = !showHorizontalScrollbar && !showVerticalScrollbar;`