Update Scrollbars

FalkWolsky · FalkWolsky · commit 5cadfc36b9b8 · 2024-03-24T15:54:27.000+01:00
diff --git a/client/packages/lowcoder/src/comps/comps/allComp.test.tsx b/client/packages/lowcoder/src/comps/comps/allComp.test.tsx
@@ -72,7 +72,7 @@ Object.keys(QueryMap).forEach((key) => {
 
 function logDiff(comp: any, newComp: any, prefix?: string) {
   if (_.isNil(comp.children)) {
-    console.info(`diff. comp.${prefix}: `, comp, ` newComp.${prefix}: `, newComp);
+    // console.info(`diff. comp.${prefix}: `, comp, ` newComp.${prefix}: `, newComp);
     return;
   }
   Object.keys(comp.children).forEach((key) => {
diff --git a/client/packages/lowcoder/src/comps/comps/listViewComp/listView.tsx b/client/packages/lowcoder/src/comps/comps/listViewComp/listView.tsx
@@ -215,17 +215,11 @@ export function ListView(props: Props) {
     <BackgroundColorContext.Provider value={style.background}>
       <ListViewWrapper $style={style} $paddingWidth={paddingWidth}>
         <BodyWrapper ref={ref} $autoHeight={autoHeight}>
-          {scrollbars ? (
-            <ScrollBar style={{ height: autoHeight ? "auto" : "100%", margin: "0px", padding: "0px" }}>
-              <>{<ReactResizeDetector onResize={(width?: number, height?: number) => { if (height) setListHeight(height); }} observerOptions={{ box: "border-box" }} >
-                <div style={{ height: autoHeight ? "auto" : "100%" }}>{renders}</div>
-              </ReactResizeDetector>}</>
-            </ScrollBar>
-          ) : (
+          <ScrollBar style={{ height: autoHeight ? "auto" : "100%", margin: "0px", padding: "0px" }} hideScrollbar={scrollbars}>
             <>{<ReactResizeDetector onResize={(width?: number, height?: number) => { if (height) setListHeight(height); }} observerOptions={{ box: "border-box" }} >
               <div style={{ height: autoHeight ? "auto" : "100%" }}>{renders}</div>
             </ReactResizeDetector>}</>
-          )}
+          </ScrollBar>
         </BodyWrapper>
         <FooterWrapper>
           <Pagination size="small" itemRender={pageItemRender} {...pageInfo.pagination} />
diff --git a/client/packages/lowcoder/src/comps/comps/triContainerComp/triContainer.tsx b/client/packages/lowcoder/src/comps/comps/triContainerComp/triContainer.tsx
@@ -147,8 +147,7 @@ export function TriContainer(props: TriContainerProps) {
       )}
       {showBody && (
         <BackgroundColorContext.Provider value={bodyStyle.background}>
-          {scrollbars ? (
-            <ScrollBar style={{ height: container.autoHeight ? "auto" : "100%", margin: "0px", padding: "0px" }}>
+            <ScrollBar style={{ height: container.autoHeight ? "auto" : "100%", margin: "0px", padding: "0px" }} hideScrollbar={scrollbars}>
               <BodyInnerGrid
                 $showBorder={showHeader}
                 {...otherBodyProps}
@@ -171,28 +170,6 @@ export function TriContainer(props: TriContainerProps) {
                 style={{padding: bodyStyle.containerBodyPadding}}
               />
             </ScrollBar>
-            ) : (
-            <BodyInnerGrid
-              $showBorder={showHeader}
-              {...otherBodyProps}
-              items={gridItemCompToGridItems(bodyItems)}
-              autoHeight={container.autoHeight}
-              emptyRows={14}
-              minHeight={showHeader ? "143px" : "142px"}
-              containerPadding={
-                (showHeader && showFooter) || showHeader ? [paddingWidth, 11.5] : [paddingWidth, 11]
-              }
-              hintPlaceholder={props.hintPlaceholder ?? HintPlaceHolder}
-              $backgroundColor={bodyStyle?.background || 'transparent'}
-              $borderColor={style?.border}
-              $borderWidth={style?.borderWidth}
-              $backgroundImage={bodyStyle?.backgroundImage}
-              $backgroundImageRepeat={bodyStyle?.backgroundImageRepeat}
-              $backgroundImageSize={bodyStyle?.backgroundImageSize}
-              $backgroundImagePosition={bodyStyle?.backgroundImagePosition}
-              $backgroundImageOrigin={bodyStyle?.backgroundImageOrigin}
-              style={{padding: bodyStyle.containerBodyPadding}}/>
-          )}
         </BackgroundColorContext.Provider>
       )}
       {showFooter && (
diff --git a/client/packages/lowcoder/src/comps/hooks/agoraFunctions.tsx b/client/packages/lowcoder/src/comps/hooks/agoraFunctions.tsx
@@ -43,12 +43,12 @@ const useAgora = () => {
   const leaveChannel = async () => {
     if (isJoined) {
       if (!client) {
-        console.error("Agora client is not initialized");
+        // console.error("Agora client is not initialized");
         return;
       }
 
       if (!client.localTracks.length) {
-        console.error("No local tracks to unpublish");
+        // console.error("No local tracks to unpublish");
         return;
       }
 
@@ -105,7 +105,7 @@ const useAgora = () => {
       setHeight(videoHeight!);
       // console.log(`Video width: ${videoWidth}px, height: ${videoHeight}px`);
     } else {
-      console.error("Media stream track not found");
+      // console.error("Media stream track not found");
     }
   };
 
diff --git a/client/packages/lowcoder/src/util/perfUtils.ts b/client/packages/lowcoder/src/util/perfUtils.ts
@@ -95,7 +95,7 @@ export function showCost<T>(logstr: string, fn: () => T): T {
   }
   const startTime = performance.now();
   const result = fn();
-  console.info(`${logstr} cost: ${performance.now() - startTime}`);
+  // console.info(`${logstr} cost: ${performance.now() - startTime}`);
   return result;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ Object.keys(QueryMap).forEach((key) => {`
`72`	`72`
`73`	`73`	`function logDiff(comp: any, newComp: any, prefix?: string) {`
`74`	`74`	`if (_.isNil(comp.children)) {`
`75`		- console.info(`diff. comp.${prefix}: `, comp, ` newComp.${prefix}: `, newComp);
	`75`	+ // console.info(`diff. comp.${prefix}: `, comp, ` newComp.${prefix}: `, newComp);
`76`	`76`	`return;`
`77`	`77`	`}`
`78`	`78`	`Object.keys(comp.children).forEach((key) => {`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ export function showCost<T>(logstr: string, fn: () => T): T {`
`95`	`95`	`}`
`96`	`96`	`const startTime = performance.now();`
`97`	`97`	`const result = fn();`
`98`		- console.info(`${logstr} cost: ${performance.now() - startTime}`);
	`98`	+ // console.info(`${logstr} cost: ${performance.now() - startTime}`);
`99`	`99`	`return result;`
`100`	`100`	`}`
`101`	`101`