Merge branch 'dev' into feature-extension

FalkWolsky · web-flow · commit 133e048953fe · 2024-11-23T22:37:59.000+01:00
diff --git a/client/packages/lowcoder/index.html b/client/packages/lowcoder/index.html
@@ -28,6 +28,8 @@
         display: flex;
         pointer-events: none;
         flex-direction: column;
+        top: 0;
+        z-index: 10000;
       }
       #loading svg {
         animation: breath 1s linear infinite;
diff --git a/client/packages/lowcoder/src/comps/comps/rootComp.tsx b/client/packages/lowcoder/src/comps/comps/rootComp.tsx
@@ -34,7 +34,7 @@ import { ExternalEditorContext } from "util/context/ExternalEditorContext";
 import { useUserViewMode } from "util/hooks";
 import React from "react";
 import { isEqual } from "lodash";
-
+import {LoadingBarHideTrigger} from "@lowcoder-ee/util/hideLoading";
 const EditorView = lazy(
   () => import("pages/editor/editorView"),
 );
@@ -138,6 +138,7 @@ const RootView = React.memo((props: RootViewProps) => {
               <div key={key}>{comp.children.queries.children[key].getView()}</div>
             ))}
             <Suspense fallback={!readOnly || isUserViewMode ? SuspenseFallback : null}>
+              <LoadingBarHideTrigger />
               <EditorView uiComp={comp.children.ui} preloadComp={comp.children.preload} />
             </Suspense>
           </EditorContext.Provider>
diff --git a/client/packages/lowcoder/src/index.ts b/client/packages/lowcoder/src/index.ts
@@ -24,7 +24,7 @@ if (!window.ResizeObserver) {
   window.ResizeObserver = ResizeObserver;
 }
 
-function hideLoading() {
+export function hideLoading() {
   // hide loading
   const node = document.getElementById("loading");
   if (node) {
@@ -42,7 +42,7 @@ debug(`REACT_APP_LOG_LEVEL:, ${REACT_APP_LOG_LEVEL}`);
  
 try {
   bootstrap();
-  hideLoading();
+  // hideLoading();
 } catch (e) {
   log.error(e);
 }
diff --git a/client/packages/lowcoder/src/pages/ApplicationV2/index.tsx b/client/packages/lowcoder/src/pages/ApplicationV2/index.tsx
@@ -73,7 +73,7 @@ import AppEditor from "../editor/AppEditor";
 import { fetchDeploymentIdAction } from "@lowcoder-ee/redux/reduxActions/configActions";
 import { getDeploymentId } from "@lowcoder-ee/redux/selectors/configSelectors";
 import { SimpleSubscriptionContextProvider } from '@lowcoder-ee/util/context/SimpleSubscriptionContext';
-
+import {LoadingBarHideTrigger} from "@lowcoder-ee/util/hideLoading";
 const TabLabel = styled.div`
   font-weight: 500;
 `;
@@ -222,6 +222,7 @@ export default function ApplicationHome() {
 
   return (
     <DivStyled>
+      <LoadingBarHideTrigger />
       <SimpleSubscriptionContextProvider>
         <Layout
           sections={[
diff --git a/client/packages/lowcoder/src/pages/userAuth/index.tsx b/client/packages/lowcoder/src/pages/userAuth/index.tsx
@@ -11,7 +11,7 @@ import { fetchConfigAction } from "redux/reduxActions/configActions";
 import { fetchUserAction } from "redux/reduxActions/userActions";
 import LoginAdmin from "./loginAdmin";
 import _ from "lodash";
-
+import {LoadingBarHideTrigger} from "@lowcoder-ee/util/hideLoading";
 export default function UserAuth() {
   const dispatch = useDispatch();
   const location = useLocation<AuthLocationState>();
@@ -50,6 +50,7 @@ export default function UserAuth() {
         fetchUserAfterAuthSuccess,
       }}
     >
+      <LoadingBarHideTrigger />
       <Switch location={location}>
         <Redirect exact from={USER_AUTH_URL} to={AUTH_LOGIN_URL} />
         <Route exact path={ADMIN_AUTH_URL} component={LoginAdmin} />
diff --git a/client/packages/lowcoder/src/util/hideLoading.tsx b/client/packages/lowcoder/src/util/hideLoading.tsx
@@ -0,0 +1,10 @@
+import {useEffect} from "react";
+import {hideLoading} from "@lowcoder-ee/index";
+
+export const LoadingBarHideTrigger = function(props: any) {
+    useEffect(() => {
+        setTimeout(() => hideLoading(), 300);
+    }, []);
+
+    return <></>
+};

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@`
`28`	`28`	`display: flex;`
`29`	`29`	`pointer-events: none;`
`30`	`30`	`flex-direction: column;`
	`31`	`+ top: 0;`
	`32`	`+ z-index: 10000;`
`31`	`33`	`}`
`32`	`34`	`#loading svg {`
`33`	`35`	`animation: breath 1s linear infinite;`