Fixed an issue(can not access TextComp before initialization)

Imiss-U1025 · Imiss-U1025 · commit 8b08fb4a8702 · 2024-11-15T11:07:07.000-05:00
diff --git a/client/packages/lowcoder/src/appView/bootstrapAt.tsx b/client/packages/lowcoder/src/appView/bootstrapAt.tsx
@@ -1,14 +1,16 @@
-import { loadComps } from "bootstrap/admin";
 import type { AppViewInstanceOptions } from "./AppViewInstance";
 import { createRoot } from "react-dom/client";
-
-loadComps();
+import {viewMode} from "@lowcoder-ee/util/editor";
 
 export async function bootstrapAppAt<I>(
   appId: string,
   node: Element | null,
   options: AppViewInstanceOptions<I> = {}
 ) {
+  let loadComps: any;
+  if(viewMode() !== "view") loadComps = await import("bootstrap/admin");
+  else loadComps = await import("bootstrap/view");
+  await loadComps();
   if (!node) {
     console.error("node must be not null.");
     return;
diff --git a/client/packages/lowcoder/src/bootstrap/admin/index.tsx b/client/packages/lowcoder/src/bootstrap/admin/index.tsx
@@ -1,13 +1,13 @@
 import cnchar from "cnchar";
-import { trans } from "@lowcoder-ee/i18n";
+import { trans } from "../../i18n";
 import { remoteComp } from "../../comps/comps/remoteComp/remoteComp";
 import {
   registerComp,
   type UICompManifest,
   type UICompType,
 } from "../../comps/uiCompRegistry";
-import { RemoteCompInfo } from "@lowcoder-ee/types/remoteComp";
-import { MultiIcon } from "@lowcoder-ee/comps/comps/multiIconDisplay";
+import { RemoteCompInfo } from "../../types/remoteComp";
+import { MultiIcon } from "../../comps/comps/multiIconDisplay";
 import {
   AvatarCompIcon,
   AvatarGroupCompIcon,
@@ -113,13 +113,13 @@ import {
   KanbanCompIcon,
 
 } from "lowcoder-design";
-import {TableComp} from "@lowcoder-ee/comps/comps/tableComp";
-import {TextComp} from "@lowcoder-ee/comps/comps/textComp";
-import {ModuleComp} from "@lowcoder-ee/comps/comps/moduleComp/moduleComp";
-import {InputComp} from "@lowcoder-ee/comps/comps/textInputComp/inputComp";
-import {TextAreaComp} from "@lowcoder-ee/comps/comps/textInputComp/textAreaComp";
-import {ButtonComp} from "@lowcoder-ee/comps/comps/buttonComp/buttonComp";
-import {ImageComp} from "@lowcoder-ee/comps/comps/imageComp";
+import {TableComp} from "../../comps/comps/tableComp";
+import {TextComp} from "../../comps/comps/textComp";
+import {ModuleComp} from "../../comps/comps/moduleComp/moduleComp";
+import {InputComp} from "../../comps/comps/textInputComp/inputComp";
+import {TextAreaComp} from "../../comps/comps/textInputComp/textAreaComp";
+import {ButtonComp} from "../../comps/comps/buttonComp/buttonComp";
+import {ImageComp} from "../../comps/comps/imageComp";
 
 type Registry = {
   [key in UICompType]?: UICompManifest;
diff --git a/client/packages/lowcoder/src/bootstrap/view/index.tsx b/client/packages/lowcoder/src/bootstrap/view/index.tsx
@@ -4,7 +4,15 @@ import {
   type UICompType,
   type UICompManifest
 } from "../../comps/uiCompRegistry";
-import { RemoteCompInfo } from "@lowcoder-ee/types/remoteComp";
+import { RemoteCompInfo } from "../../types/remoteComp";
+
+import {TableComp} from "../../comps/comps/tableComp";
+import {TextComp} from "../../comps/comps/textComp";
+import {ModuleComp} from "../../comps/comps/moduleComp/moduleComp";
+import {InputComp} from "../../comps/comps/textInputComp/inputComp";
+import {TextAreaComp} from "../../comps/comps/textInputComp/textAreaComp";
+import {ButtonComp} from "../../comps/comps/buttonComp/buttonComp";
+import {ImageComp} from "../../comps/comps/imageComp";
 
 type Registry = {
   [key in UICompType]?: UICompManifest;
@@ -234,7 +242,8 @@ export var uiCompMap: Registry = {
     categories: ["dashboards"],
     icon: null,
     keywords: "",
-    lazyLoad: true,
+    lazyLoad: false,
+    comp: TableComp,
     compName: "TableComp",
     compPath: "comps/tableComp/index",
     layoutInfo: {
@@ -818,8 +827,9 @@ export var uiCompMap: Registry = {
     categories: ["forms"],
     icon: null,
     keywords: "",
-    lazyLoad: true,
+    lazyLoad: false,
     compName: "InputComp",
+    comp: InputComp,
     compPath: "comps/textInputComp/inputComp",
     layoutInfo: {
       w: 6,
@@ -863,8 +873,9 @@ export var uiCompMap: Registry = {
     categories: ["forms"],
     icon: null,
     keywords: "",
-    lazyLoad: true,
+    lazyLoad: false,
     compName: "TextAreaComp",
+    comp: TextAreaComp,
     compPath: "comps/textInputComp/textAreaComp",
     layoutInfo: {
       w: 6,
@@ -1030,8 +1041,9 @@ export var uiCompMap: Registry = {
     categories: ["forms"],
     icon: null,
     keywords: "",
-    lazyLoad: true,
+    lazyLoad: false,
     compName: "ButtonComp",
+    comp: ButtonComp,
     compPath: "comps/buttonComp/buttonComp",
     layoutInfo: {
       w: 6,
@@ -1270,8 +1282,9 @@ export var uiCompMap: Registry = {
     categories: ["multimedia"],
     icon: null,
     keywords: "",
-    lazyLoad: true,
+    lazyLoad: false,
     compName: "ImageComp",
+    comp: ImageComp,
     compPath: "comps/imageComp",
     layoutInfo: {
       w: 12,
@@ -1594,8 +1607,9 @@ export var uiCompMap: Registry = {
     description: "",
     categories: [],
     keywords: "",
-    lazyLoad: true,
+    lazyLoad: false,
     compName: "ModuleComp",
+    comp: ModuleComp,
     compPath: "comps/moduleComp/moduleComp",
     layoutInfo: {
       w: 12,
@@ -1613,7 +1627,8 @@ export var uiCompMap: Registry = {
     icon: null,
     keywords: "",
     compName: "TextComp",
-    lazyLoad: true,
+    lazyLoad: false,
+    comp: TextComp,
     compPath: "comps/textComp",
     layoutInfo: {
       w: 6,
diff --git a/client/packages/lowcoder/src/index.sdk.ts b/client/packages/lowcoder/src/index.sdk.ts
@@ -59,7 +59,7 @@ export * from "util/context/ExternalEditorContext";
 export { CanvasContainerID } from "constants/domLocators";
 
 // comps
-export * from "bootstrap/admin";
+// export * from "bootstrap/admin";
 export * from "comps/comps/rootComp";
 
 // comp utils
diff --git a/client/packages/lowcoder/src/index.ts b/client/packages/lowcoder/src/index.ts
@@ -42,18 +42,13 @@ debug(`REACT_APP_ENV:, ${REACT_APP_ENV}`);
 debug(`REACT_APP_LOG_LEVEL:, ${REACT_APP_LOG_LEVEL}`);
 initTranslatorDesign().then(() => {
   initTranslator().then(async () => {
-    try {
-      if (!window.location.href.includes("view")) {
-        const bootstrap = await import("./bootstrap/admin/app").then(module => module.bootstrap);
-        bootstrap();
-      } else {
-        const bootstrap = await import("./bootstrap/view/app").then(module => module.bootstrap);
-        console.log("view")
-        bootstrap();
-      }
-      hideLoading();
-    } catch (e) {
-      log.error(e);
+    if (!window.location.href.includes("view")) {
+      const bootstrap = await import("./bootstrap/admin/app").then(module => module.bootstrap);
+      bootstrap();
+    } else {
+      const bootstrap = await import("./bootstrap/view/app").then(module => module.bootstrap);
+      bootstrap();
     }
+    hideLoading();
   })
 })
