Merge branch 'dev' into fix/jwt

th37rose · web-flow · commit 496f036e3545 · 2024-06-20T16:23:56.000-04:00
diff --git a/client/packages/lowcoder/src/layout/compSelectionWrapper.tsx b/client/packages/lowcoder/src/layout/compSelectionWrapper.tsx
@@ -89,7 +89,7 @@ function getLineStyle(
 
   return `
       border: ${GRID_ITEM_BORDER_WIDTH}px ${borderStyle} ${borderColor};
-      padding: ${isHidden && !isSelected ? 0 : padding[1] - GRID_ITEM_BORDER_WIDTH}px;
+      padding: ${isHidden || !isSelected ? 0 : padding[1] - GRID_ITEM_BORDER_WIDTH}px;
       padding-left: ${padding[0] - GRID_ITEM_BORDER_WIDTH}px;
       padding-right: ${padding[0] - GRID_ITEM_BORDER_WIDTH}px;
   `;
diff --git a/client/packages/lowcoder/src/layout/gridItem.tsx b/client/packages/lowcoder/src/layout/gridItem.tsx
@@ -447,6 +447,7 @@ export function GridItem(props: GridItemProps) {
           pos,
           props.name,
           props.autoHeight,
+          props.hidden,
           Boolean(draggingUtils.isDragging())
         ),
         opacity: layoutHide ? 0 : undefined,
diff --git a/client/packages/lowcoder/src/layout/utils.ts b/client/packages/lowcoder/src/layout/utils.ts
@@ -203,6 +203,7 @@ export function setTransform(
   {top, left, width, height }: Position,
   name ?: string,
   autoHeight?: boolean,
+  hidden?: boolean,
   isDragging?: boolean,
 ): Record<string, any> {
   // Replace unitless items with px
@@ -211,7 +212,7 @@ export function setTransform(
     return /chart/i.test(str);
   }
   let updatedHeight = 'auto';
-  if (isDragging || !autoHeight || (name && containsChart(name))) {
+  if (isDragging || !autoHeight || hidden || (name && containsChart(name))) {
     updatedHeight = `${height}px`;
   }
 
diff --git a/client/packages/lowcoder/src/pages/editor/AppEditor.tsx b/client/packages/lowcoder/src/pages/editor/AppEditor.tsx
@@ -95,17 +95,16 @@ export default function AppEditor() {
       dispatch(fetchQueryLibraryDropdown());
     }
   }, [dispatch, applicationId, paramViewMode]);
-
-  useEffect(() => {
-    if (!currentUser?.id) return;
+  
+  const fetchJSDataSourceByApp = () => {
     DatasourceApi.fetchJsDatasourceByApp(applicationId).then((res) => {
       res.data.data.forEach((i) => {
         registryDataSourcePlugin(i.type, i.id, i.pluginDefinition);
       });
       setIsDataSourcePluginRegistered(true);
     });
     dispatch(setShowAppSnapshot(false));
-  }, [applicationId, dispatch, currentUser]);
+  };
 
   useEffect(() => {
     if (!fetchOrgGroupsFinished) {
@@ -129,6 +128,7 @@ export default function AppEditor() {
             },
           });
           setAppInfo(info);
+          fetchJSDataSourceByApp();
         },
       })
     );
