Skip to content

Feature pagelayout comp #782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 1, 2024
Merged

Feature pagelayout comp #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
540e0a0
Adding Layout Component and global style selector
Mar 30, 2024
e5c9544
Layout Component v1
Mar 31, 2024
293733c
Adding hide and disabled properties for Responsive Layout
Mar 31, 2024
f3be8fa
Adding Features to Tabbed Container
Mar 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion client/packages/lowcoder/src/base/codeEditor/codeEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const CodeEditorTooltipContainer = styled.div`
// tooltip common
.cm-tooltip {
z-index: ${Layers.codeEditorTooltip};
border: none;
border: 1px solid #d7d9e0;
}
// make sure antd popover in the code editor available
.ant-popover {
Expand Down Expand Up @@ -84,6 +84,7 @@ export const CodeEditorTooltipContainer = styled.div`
border-radius: 8px;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.1);
transform: translate(-16px, 10px);
z-index: ${Layers.codeEditorTooltip};
}

// left minor tooltip
Expand All @@ -109,6 +110,7 @@ export const CodeEditorTooltipContainer = styled.div`
color: #4965f2;
${textStyle};
font-weight: 600;
z-index: ${Layers.codeEditorTooltip};
}

.cm-tooltip > .cm-completionInfo .hintDiv:hover {
Expand Down
205 changes: 205 additions & 0 deletions client/packages/lowcoder/src/comps/comps/containerComp/pageLayoutComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
import { CompParams } from "lowcoder-core";
import { ToDataType } from "comps/generators/multi";
import { NameConfigDisabled, NameConfigHidden, withExposingConfigs, NameConfig, CompDepsConfig } from "comps/generators/withExposing";
import { withMethodExposing } from "comps/generators/withMethodExposing";
import { NameGenerator } from "comps/utils/nameGenerator";
import { Section, sectionNames } from "lowcoder-design";
import { oldContainerParamsToNew } from "../containerBase";
import { toSimpleContainerData } from "../containerBase/simpleContainerComp";
import { disabledPropertyView, hiddenPropertyView } from "comps/utils/propertyUtils";
import { trans } from "i18n";
import { BoolCodeControl } from "comps/controls/codeControl";
import { DisabledContext } from "comps/generators/uiCompBuilder";
import React, { useContext, useEffect, useState } from "react";
import { EditorContext } from "comps/editorState";

import {
ContainerChildren,
ContainerCompBuilder,
} from "../pageLayoutComp/pageLayoutCompBuilder";
import { PageLayout } from "../pageLayoutComp/pageLayout";


export const ContainerBaseComp = (function () {
const childrenMap = {
disabled: BoolCodeControl
};

return new ContainerCompBuilder(childrenMap, (props, dispatch) => {

const [siderCollapsed, setSiderCollapsed] = useState(false);

return (
<DisabledContext.Provider value={props.disabled}>
<PageLayout {...props} siderCollapsed={siderCollapsed} setSiderCollapsed={setSiderCollapsed} />
</DisabledContext.Provider>
);
})
.setPropertyViewFn((children) => {
return (
<>
{(useContext(EditorContext).editorModeStatus === "logic" || useContext(EditorContext).editorModeStatus === "both") && (
<Section name={sectionNames.interaction}>
{disabledPropertyView(children)}
{hiddenPropertyView(children)}
{ children.container.appSelectorPropertyView()}
</Section>
)}

{(useContext(EditorContext).editorModeStatus === "layout" || useContext(EditorContext).editorModeStatus === "both") && (
<><Section name={sectionNames.layout}>
{children.container.getPropertyView()}
</Section>
<Section name={sectionNames.style}>
{ children.container.stylePropertyView() }
</Section>
{children.container.children.showHeader.getView() && (
<Section name={"Header Style"}>
{ children.container.headerStylePropertyView() }
</Section>
)}
{children.container.children.showSider.getView() && (
<Section name={"Sider Style"}>
{ children.container.siderStylePropertyView() }
</Section>
)}
<Section name={"Body Style"}>
{ children.container.bodyStylePropertyView() }
</Section>
{children.container.children.showFooter.getView() && (
<Section name={"Footer Style"}>
{ children.container.footerStylePropertyView() }
</Section>
)}
</>
)}
</>
);
})
.build();
})();

// Compatible with old data
function convertOldContainerParams(params: CompParams<any>) {
// convert older params to old params
let tempParams = oldContainerParamsToNew(params);

if (tempParams.value) {
const container = tempParams.value.container;
// old params
if (container && (container.hasOwnProperty("layout") || container.hasOwnProperty("items"))) {
const autoHeight = tempParams.value.autoHeight;
const scrollbars = tempParams.value.scrollbars;
return {
...tempParams,
value: {
container: {
showHeader: true,
body: { 0: { view: container } },
showFooter: false,
showSider: true,
autoHeight: autoHeight,
contentScrollbars: scrollbars,
},
},
};
}
}
return tempParams;
}


class ContainerTmpComp extends ContainerBaseComp {
constructor(params: CompParams<any>) {
super(convertOldContainerParams(params));
}
}

const PageLayoutCompTmP = withExposingConfigs(ContainerTmpComp, [
NameConfigHidden,
NameConfigDisabled,

new NameConfig("container", trans("export.ratingValueDesc")),
new CompDepsConfig(
"siderCollapsed",
(comp) => ({ data : comp.children.container.children.siderCollapsed.nodeWithoutCache()}),
(input) => input.data.value, trans("listView.itemsDesc")
),
]);

export const PageLayoutComp = withMethodExposing(PageLayoutCompTmP, [

{
method: {
name: "setSiderCollapsed",
description: "Set the Sider of the PageLayout to be collapsed or not",
params: [{ name: "collapsed", type: "boolean" }],
},
execute: (comp, values) => {
const page = values[0] as number;
if (page && page > 0) {
// comp.children.pagination.children.pageNo.dispatchChangeValueAction(page);
}
},
}
]);

type ContainerDataType = ToDataType<ContainerChildren<{}>>;

export function defaultPageLayoutData(
compName: string,
nameGenerator: NameGenerator
): ContainerDataType {
return {
container: {
header: toSimpleContainerData([
{
item: {
compType: "navigation",
name: nameGenerator.genItemName("pageNavigation"),
comp: {
logoUrl: "",
hidden: false,
items: [
{
label: "Home",
hidden: false,
active: false,
},
{
label: "Services",
hidden: false,
active: false,
items: [
{
label: "Lowcode Platform",
hidden: false,
active: false,
},
{
label: "App Development",
hidden: false,
active: false,
},
],
},
{
label: "About",
hidden: false,
active: false,
},
],
},
},
layoutItem: {
i: "",
h: 6,
w: 24,
x: 0,
y: 0,
},
},
]),
},
};
}
2 changes: 2 additions & 0 deletions client/packages/lowcoder/src/comps/comps/layout/mobileTabLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ MobileTabLayoutTmp = withViewFn(MobileTabLayoutTmp, (comp) => {
/>
);

//console.log("appView", appView);

if (readOnly) {
return (
<TabLayoutViewContainer>
Expand Down
Loading