Fixed an issue that some components are not displayed in view mode.

Imiss-U1025 · Imiss-U1025 · commit dce2707f08e6 · 2024-11-15T11:08:10.000-05:00
diff --git a/client/packages/lowcoder/src/comps/comps/containerBase/containerCompBuilder.tsx b/client/packages/lowcoder/src/comps/comps/containerBase/containerCompBuilder.tsx
@@ -49,9 +49,6 @@ export class ContainerCompBuilder<
     return this;
   }
   build() {
-    if (!this.propertyViewFn) {
-      throw new Error("no propertyViewFn provided");
-    }
     if (this.childrenMap.hasOwnProperty("container")) {
       throw new Error("already has container");
     }
diff --git a/client/packages/lowcoder/src/comps/comps/containerComp/cardComp.tsx b/client/packages/lowcoder/src/comps/comps/containerComp/cardComp.tsx
@@ -263,7 +263,7 @@ export const ContainerBaseComp = (function () {
       </ReactResizeDetector>
     );
   })
-  if ((viewModeTriple() !== "admin")) {
+  if ((viewModeTriple() === "edit")) {
     builder.setPropertyViewFn((children) => <PropertyViewCardComp {...children}></PropertyViewCardComp>);
   }
   return builder
diff --git a/client/packages/lowcoder/src/comps/comps/containerComp/containerComp.tsx b/client/packages/lowcoder/src/comps/comps/containerComp/containerComp.tsx
@@ -31,7 +31,7 @@ export const ContainerBaseComp = (function () {
     );
   })
 
-  if ((viewModeTriple() !== "admin")) {
+  if ((viewModeTriple() === "edit")) {
     builder.setPropertyViewFn((children) => <PropertyViewContainerComp {...children}></PropertyViewContainerComp>);
   }
       return builder
diff --git a/client/packages/lowcoder/src/comps/comps/containerComp/pageLayoutComp.tsx b/client/packages/lowcoder/src/comps/comps/containerComp/pageLayoutComp.tsx
@@ -36,7 +36,7 @@ export const ContainerBaseComp = (function () {
       </DisabledContext.Provider>
     );
   })
-  if ((viewModeTriple() !== "admin")) {
+  if ((viewModeTriple() === "edit")) {
     builder.setPropertyViewFn((children) => <PropertyViewPageLayout {...children}></PropertyViewPageLayout>);
   }
   return builder
diff --git a/client/packages/lowcoder/src/comps/comps/containerComp/textContainerComp.tsx b/client/packages/lowcoder/src/comps/comps/containerComp/textContainerComp.tsx
@@ -67,7 +67,7 @@ export const ContainerBaseComp = (function () {
   let builder = new ContainerCompBuilder(childrenMap, (props, dispatch) => {
     return <TriContainer {...props} />;
   })
-  if ((viewModeTriple() !== "admin")) {
+  if ((viewModeTriple() === "edit")) {
     builder.setPropertyViewFn((children) => <PropertyViewTextContainer {...children}></PropertyViewTextContainer>);
   }
   return builder
diff --git a/client/packages/lowcoder/src/comps/comps/formComp/formComp.tsx b/client/packages/lowcoder/src/comps/comps/formComp/formComp.tsx
@@ -197,7 +197,7 @@ const FormBaseComp = (function () {
       </DisabledContext.Provider>
     );
   })
-    if ((viewModeTriple() !== "admin")) {
+    if ((viewModeTriple() === "edit")) {
       builder.setPropertyViewFn((children) => <PropertyView {...children}></PropertyView>);
     }
       return builder
diff --git a/client/packages/lowcoder/src/comps/comps/pageLayoutComp/pageLayoutCompBuilder.tsx b/client/packages/lowcoder/src/comps/comps/pageLayoutComp/pageLayoutCompBuilder.tsx
@@ -49,9 +49,6 @@ export class ContainerCompBuilder<
     return this;
   }
   build() {
-    if (!this.propertyViewFn) {
-      throw new Error("no propertyViewFn provided");
-    }
     if (this.childrenMap.hasOwnProperty("container")) {
       throw new Error("already has container");
     }
diff --git a/client/packages/lowcoder/src/comps/comps/shapeComp/shapeComp.tsx b/client/packages/lowcoder/src/comps/comps/shapeComp/shapeComp.tsx
@@ -34,7 +34,7 @@ export const ContainerBaseComp = (function () {
       </DisabledContext.Provider>
     );
   })
-  if (viewModeTriple() !== "admin") {
+  if (viewModeTriple() === "edit") {
     builder.setPropertyViewFn((children) => <PropertyView {...children}></PropertyView>);
   }
   return builder
diff --git a/client/packages/lowcoder/src/comps/comps/tabs/tabbedContainerComp.tsx b/client/packages/lowcoder/src/comps/comps/tabs/tabbedContainerComp.tsx
@@ -304,7 +304,7 @@ export const TabbedContainerBaseComp = (function () {
       </DisabledContext.Provider>
     );
   })
-  if ((viewModeTriple() !== "admin")) {
+  if ((viewModeTriple() === "edit")) {
     builder.setPropertyViewFn((children) => <PropertyView {...children}></PropertyView>);
   }
       return builder
diff --git a/client/packages/lowcoder/src/comps/comps/triContainerComp/triContainerCompBuilder.tsx b/client/packages/lowcoder/src/comps/comps/triContainerComp/triContainerCompBuilder.tsx
@@ -49,9 +49,6 @@ export class ContainerCompBuilder<
     return this;
   }
   build() {
-    if (!this.propertyViewFn) {
-      throw new Error("no propertyViewFn provided");
-    }
     if (this.childrenMap.hasOwnProperty("container")) {
       throw new Error("already has container");
     }
diff --git a/client/packages/lowcoder/src/util/editor.ts b/client/packages/lowcoder/src/util/editor.ts
@@ -1,5 +1,5 @@
 export const viewMode = () =>  REACT_APP_VIEW_MODE;
-export const viewModeTriple = () => viewMode() === "view" ? "view" : window.location.href.includes("edit") ? "edit" : "admin";
+export const viewModeTriple = () => window.location.href.includes("view") ? "view" : window.location.href.includes("edit") ? "edit" : "admin";
 export const getLanguage = (): string => {
     return localStorage.getItem('lowcoder_uiLanguage') || 'en';
 }

Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,6 @@ export class ContainerCompBuilder<`
`49`	`49`	`return this;`
`50`	`50`	`}`
`51`	`51`	`build() {`
`52`		`- if (!this.propertyViewFn) {`
`53`		`- throw new Error("no propertyViewFn provided");`
`54`		`- }`
`55`	`52`	`if (this.childrenMap.hasOwnProperty("container")) {`
`56`	`53`	`throw new Error("already has container");`
`57`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ export const ContainerBaseComp = (function () {`
`263`	`263`	`</ReactResizeDetector>`
`264`	`264`	`);`
`265`	`265`	`})`
`266`		`- if ((viewModeTriple() !== "admin")) {`
	`266`	`+ if ((viewModeTriple() === "edit")) {`
`267`	`267`	`builder.setPropertyViewFn((children) => <PropertyViewCardComp {...children}></PropertyViewCardComp>);`
`268`	`268`	`}`
`269`	`269`	`return builder`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ export const ContainerBaseComp = (function () {`
`31`	`31`	`);`
`32`	`32`	`})`
`33`	`33`
`34`		`- if ((viewModeTriple() !== "admin")) {`
	`34`	`+ if ((viewModeTriple() === "edit")) {`
`35`	`35`	`builder.setPropertyViewFn((children) => <PropertyViewContainerComp {...children}></PropertyViewContainerComp>);`
`36`	`36`	`}`
`37`	`37`	`return builder`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ export const ContainerBaseComp = (function () {`
`36`	`36`	`</DisabledContext.Provider>`
`37`	`37`	`);`
`38`	`38`	`})`
`39`		`- if ((viewModeTriple() !== "admin")) {`
	`39`	`+ if ((viewModeTriple() === "edit")) {`
`40`	`40`	`builder.setPropertyViewFn((children) => <PropertyViewPageLayout {...children}></PropertyViewPageLayout>);`
`41`	`41`	`}`
`42`	`42`	`return builder`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ export const ContainerBaseComp = (function () {`
`67`	`67`	`let builder = new ContainerCompBuilder(childrenMap, (props, dispatch) => {`
`68`	`68`	`return <TriContainer {...props} />;`
`69`	`69`	`})`
`70`		`- if ((viewModeTriple() !== "admin")) {`
	`70`	`+ if ((viewModeTriple() === "edit")) {`
`71`	`71`	`builder.setPropertyViewFn((children) => <PropertyViewTextContainer {...children}></PropertyViewTextContainer>);`
`72`	`72`	`}`
`73`	`73`	`return builder`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ const FormBaseComp = (function () {`
`197`	`197`	`</DisabledContext.Provider>`
`198`	`198`	`);`
`199`	`199`	`})`
`200`		`- if ((viewModeTriple() !== "admin")) {`
	`200`	`+ if ((viewModeTriple() === "edit")) {`
`201`	`201`	`builder.setPropertyViewFn((children) => <PropertyView {...children}></PropertyView>);`
`202`	`202`	`}`
`203`	`203`	`return builder`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ export const ContainerBaseComp = (function () {`
`34`	`34`	`</DisabledContext.Provider>`
`35`	`35`	`);`
`36`	`36`	`})`
`37`		`- if (viewModeTriple() !== "admin") {`
	`37`	`+ if (viewModeTriple() === "edit") {`
`38`	`38`	`builder.setPropertyViewFn((children) => <PropertyView {...children}></PropertyView>);`
`39`	`39`	`}`
`40`	`40`	`return builder`
Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ export const TabbedContainerBaseComp = (function () {`
`304`	`304`	`</DisabledContext.Provider>`
`305`	`305`	`);`
`306`	`306`	`})`
`307`		`- if ((viewModeTriple() !== "admin")) {`
	`307`	`+ if ((viewModeTriple() === "edit")) {`
`308`	`308`	`builder.setPropertyViewFn((children) => <PropertyView {...children}></PropertyView>);`
`309`	`309`	`}`
`310`	`310`	`return builder`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`export const viewMode = () => REACT_APP_VIEW_MODE;`
`2`		`-export const viewModeTriple = () => viewMode() === "view" ? "view" : window.location.href.includes("edit") ? "edit" : "admin";`
	`2`	`+export const viewModeTriple = () => window.location.href.includes("view") ? "view" : window.location.href.includes("edit") ? "edit" : "admin";`
`3`	`3`	`export const getLanguage = (): string => {`
`4`	`4`	`return localStorage.getItem('lowcoder_uiLanguage') \|\| 'en';`
`5`	`5`	`}`