Skip to content

Commit f8f2872

Browse files
added app header settings in advanced settings
1 parent df4df7d commit f8f2872

File tree

8 files changed

+46
-8
lines changed

8 files changed

+46
-8
lines changed

client/packages/lowcoder/src/components/PageSkeleton.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ export default function PageSkeleton(props: IProps) {
8383

8484
return (
8585
<Layout>
86-
{!hideHeader && isHeaderReady && (
86+
{/* {!hideHeader && isHeaderReady && (
8787
<Header
8888
headerStart={<StyledLogoWithName branding={true} />}
8989
style={{ backgroundColor: brandingConfig?.headerColor, ...props.headStyle }}
9090
/>
91-
)}
91+
)} */}
9292
<Layout>
9393
{!hideSideBar && <SideBar>{skeleton}</SideBar>}
9494
<MainContent>{!hideContent && skeleton}</MainContent>

client/packages/lowcoder/src/i18n/locales/de.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2079,7 +2079,9 @@ export const de: typeof en = {
20792079
"preloadLibsAddBtn": "Eine Bibliothek hinzufügen",
20802080
"saveSuccess": "Erfolgreich gerettet",
20812081
"AuthOrgTitle": "Willkommensbildschirm des Arbeitsbereichs",
2082-
"AuthOrgDescrition": "Die URL, unter der sich deine Nutzer beim aktuellen Arbeitsbereich anmelden können."
2082+
"AuthOrgDescrition": "Die URL, unter der sich deine Nutzer beim aktuellen Arbeitsbereich anmelden können.",
2083+
"showHeaderInPublicApps": "Kopfzeile öffentlich anzeigen",
2084+
"showHeaderInPublicAppsHelp": "Legen Sie die Sichtbarkeit des Headers in der öffentlichen Ansicht für alle Apps fest",
20832085
},
20842086
"branding": {
20852087
...en.branding,

client/packages/lowcoder/src/i18n/locales/en.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -2600,8 +2600,9 @@ export const en = {
26002600
"APIConsumption": "API Consumption",
26012601
"APIConsumptionDescription": "Here you can see the API Consumption for All Apps in the Current Workspace.",
26022602
"overallAPIConsumption": "Overall API Consumption in this Workspace till now",
2603-
"lastMonthAPIConsumption": "Last Month API Consumption, in this Workspace"
2604-
2603+
"lastMonthAPIConsumption": "Last Month API Consumption, in this Workspace",
2604+
"showHeaderInPublicApps": "Show Header In Public View",
2605+
"showHeaderInPublicAppsHelp": "Set visibility of header in public view for all apps",
26052606
},
26062607

26072608

client/packages/lowcoder/src/i18n/locales/pt.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2660,7 +2660,9 @@ export const pt: typeof en = {
26602660
"APIConsumption": "Consumo de API",
26612661
"APIConsumptionDescription": "Aqui você pode ver o consumo de API para todas as aplicações no espaço de trabalho atual.",
26622662
"overallAPIConsumption": "Consumo geral de API neste espaço de trabalho até o momento",
2663-
"lastMonthAPIConsumption": "Consumo de API do último mês, neste espaço de trabalho"
2663+
"lastMonthAPIConsumption": "Consumo de API do último mês, neste espaço de trabalho",
2664+
"showHeaderInPublicApps": "Mostrar cabeçalho em exibição pública",
2665+
"showHeaderInPublicAppsHelp": "Defina a visibilidade do cabeçalho em exibição pública para todos os aplicativos",
26642666
},
26652667

26662668

client/packages/lowcoder/src/i18n/locales/zh.ts

+2
Original file line numberDiff line numberDiff line change
@@ -2068,6 +2068,8 @@ export const zh: typeof en = {
20682068
"APIConsumptionDescription": "API 消耗是指当前工作空间中所有应用程序的 API 消耗情况,包括调用次数和调用时间.",
20692069
"overallAPIConsumption": "总体 API 消耗",
20702070
"lastMonthAPIConsumption": "上个月 API 消耗",
2071+
"showHeaderInPublicApps": "在公共视图中显示标题",
2072+
"showHeaderInPublicAppsHelp": "设置所有应用程序的标题在公共视图中的可见性",
20712073
},
20722074
branding: {
20732075
...en.branding,

client/packages/lowcoder/src/pages/editor/editorView.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ import {
5353
} from "util/localStorageUtil";
5454
import { isAggregationApp } from "util/appUtils";
5555
import EditorSkeletonView from "./editorSkeletonView";
56+
import { getCommonSettings } from "@lowcoder-ee/redux/selectors/commonSettingSelectors";
5657

5758
const LeftContent = lazy(
5859
() => import('./LeftContent')
@@ -278,6 +279,7 @@ function EditorView(props: EditorViewProps) {
278279
const editorState = useContext(EditorContext);
279280
const { readOnly, hideHeader } = useContext(ExternalEditorContext);
280281
const application = useSelector(currentApplication);
282+
const commonSettings = useSelector(getCommonSettings);
281283
const locationState = useLocation<UserGuideLocationState>().state;
282284
const showNewUserGuide = locationState?.showNewUserGuide;
283285
const showAppSnapshot = useSelector(showAppSnapshotSelector);
@@ -369,11 +371,10 @@ function EditorView(props: EditorViewProps) {
369371
return () => window.removeEventListener(eventType, updateSize);
370372
}, []);
371373

372-
const hideBodyHeader = useTemplateViewMode() || (isViewMode && !showHeaderInPublic);
374+
const hideBodyHeader = useTemplateViewMode() || (isViewMode && (!showHeaderInPublic || !commonSettings.showHeaderInPublicApps));
373375

374376
// we check if we are on the public cloud
375377
const isLowCoderDomain = window.location.hostname === 'app.lowcoder.cloud';
376-
377378
if (readOnly && hideHeader) {
378379
return (
379380
<CustomShortcutWrapper>

client/packages/lowcoder/src/pages/setting/advanced/AdvancedSetting.tsx

+29
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { getGlobalSettings } from "comps/utils/globalSettings";
2525
import { fetchJSLibrary } from "util/jsLibraryUtils";
2626
import { evalFunc } from "lowcoder-core";
2727
import { messageInstance } from "lowcoder-design/src/components/GlobalInstances";
28+
import { default as Switch } from "antd/es/switch";
2829

2930
const CodeEditor = lazy(
3031
() => import("base/codeEditor/codeEditor")
@@ -186,6 +187,34 @@ export function AdvancedSetting() {
186187
{trans("advanced.saveBtn")}
187188
</SaveButton>
188189
</div>
190+
<div className="section-title">{trans("advanced.showHeaderInPublicApps")}</div>
191+
<HelpText style={{ marginBottom: 12 }}>{trans("advanced.showHeaderInPublicAppsHelp")}</HelpText>
192+
<div className="section-content">
193+
<Switch
194+
style={{ marginBottom: 12 }}
195+
checked={
196+
settings.hasOwnProperty('showHeaderInPublicApps')
197+
? settings.showHeaderInPublicApps
198+
: true
199+
}
200+
onChange={(value: boolean) => {
201+
setSettings((v) => ({ ...v, showHeaderInPublicApps: value }));
202+
}}
203+
/>
204+
<SaveButton
205+
buttonType="primary"
206+
disabled={commonSettings.showHeaderInPublicApps === settings.showHeaderInPublicApps}
207+
onClick={
208+
() => handleSave("showHeaderInPublicApps")(
209+
settings.hasOwnProperty('showHeaderInPublicApps')
210+
? settings.showHeaderInPublicApps
211+
: true
212+
)
213+
}
214+
>
215+
{trans("advanced.saveBtn")}
216+
</SaveButton>
217+
</div>
189218
<div className="section-title">{trans("advanced.preloadJSTitle")}</div>
190219
<HelpText style={{ marginBottom: 12 }}>{trans("advanced.preloadJSHelp")}</HelpText>
191220
<div className="section-content">

client/packages/lowcoder/src/redux/reducers/uiReducers/commonSettingsReducer.ts

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export interface CommonSettingsState {
1414
preloadLibs?: string[] | null;
1515
applyPreloadCSSToHomePage?: boolean | null;
1616
runJavaScriptInHost?: boolean | null;
17+
showHeaderInPublicApps?: boolean;
1718
};
1819
setResult: boolean;
1920

0 commit comments

Comments
 (0)