Skip to content

Commit e31af95

Browse files
author
FalkWolsky
committed
Small fixes on Shape Component
1 parent 5c75250 commit e31af95

File tree

4 files changed

+15
-18
lines changed

4 files changed

+15
-18
lines changed

client/packages/lowcoder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,4 +130,4 @@
130130
"vite-plugin-svgr": "^2.2.2",
131131
"vite-tsconfig-paths": "^3.6.0"
132132
}
133-
}
133+
}

client/packages/lowcoder/src/comps/comps/shapeComp/shapeComp.tsx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,11 @@ export const ContainerBaseComp = (function () {
6565
<Section name={sectionNames.style}>
6666
{children.container.stylePropertyView()}
6767
</Section>
68-
{children.container.children.showHeader.getView() && (
69-
<Section name={"Header Style"}>
70-
{children.container.headerStylePropertyView()}
71-
</Section>
72-
)}
7368
{children.container.children.showBody.getView() && (
7469
<Section name={"Body Style"}>
7570
{children.container.bodyStylePropertyView()}
7671
</Section>
7772
)}
78-
{children.container.children.showFooter.getView() && (
79-
<Section name={"Footer Style"}>
80-
{children.container.footerStylePropertyView()}
81-
</Section>
82-
)}
8373
</>
8474
)}
8575
</>

client/packages/lowcoder/src/comps/comps/shapeComp/shapeTriContainer.tsx

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ContainerStyleType } from "comps/controls/styleControlConstants";
1+
import { ContainerStyleType, widthCalculator } from "comps/controls/styleControlConstants";
22
import { EditorContext } from "comps/editorState";
33
import { BackgroundColorContext } from "comps/utils/backgroundColorContext";
44
import { HintPlaceHolder, ScrollBar } from "lowcoder-design";
@@ -41,6 +41,10 @@ const Wrapper = styled.div<{ $style: ContainerStyleType }>`
4141
${(props) => props.$style && getStyle(props.$style)}
4242
`;
4343

44+
const StylesShape = styled(Coolshape)<{ $style: ContainerStyleType }>`;
45+
${(props) => props.$style && getStyle(props.$style)}
46+
`;
47+
4448
const BodyInnerGrid = styled(InnerGrid)<{
4549
$showBorder: boolean;
4650
$backgroundColor: string;
@@ -81,15 +85,13 @@ export type TriContainerProps = TriContainerViewProps & {
8185

8286
export function ShapeTriContainer(props: TriContainerProps) {
8387
const { container, icon } = props;
84-
const { showHeader, showFooter } = container;
88+
// const { showHeader, showFooter } = container;
8589
// When the header and footer are not displayed, the body must be displayed
86-
const showBody = container.showBody || (!showHeader && !showFooter);
90+
const showBody = true;
8791
const scrollbars = container.scrollbars;
8892

89-
const { items: headerItems, ...otherHeaderProps } = container.header;
9093
const { items: bodyItems, ...otherBodyProps } =
91-
container.body["0"].children.view.getView();
92-
const { items: footerItems, ...otherFooterProps } = container.footer;
94+
container.body["0"].children.view.getView();
9395
const { style, headerStyle, bodyStyle, footerStyle } = container;
9496

9597
const editorState = useContext(EditorContext);
@@ -121,14 +123,18 @@ export function ShapeTriContainer(props: TriContainerProps) {
121123
hideScrollbar={!scrollbars}
122124
>
123125
<div style={{ position: "relative", height: "100%" }}>
124-
<Coolshape
126+
<StylesShape
127+
$style={style}
125128
type={shape?.value as any}
129+
noise={false}
126130
index={shape.index}
127131
styles={{
128132
position: "absolute",
129133
top: "0",
130134
left: "50%",
131135
transform: "translateX(-50%)",
136+
width: widthCalculator(style.margin),
137+
height: "100%",
132138
}}
133139
/>
134140
<BodyInnerGrid

client/packages/lowcoder/src/pages/setting/idSource/OAuthForms/GenericOAuthForm.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ interface ConfigProvider {
6363
jwksUri?: string,
6464
scope: string,
6565
sourceMappings: any,
66+
userInfoIntrospection?: boolean,
6667
}
6768

6869
type GenericOAuthFormProp = {

0 commit comments

Comments
 (0)