Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3e4fa6f

Browse files
Merge branch 'dev' into add/lineHeight
2 parents32dc4ec +f8f2872 commit3e4fa6f

File tree

17 files changed

+186634
-41068
lines changed

17 files changed

+186634
-41068
lines changed

‎client/packages/lowcoder-comps/src/comps/calendarComp/calendarComp.tsx‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import {
3232
hiddenPropertyView,
3333
ChangeEventHandlerControl,
3434
DragEventHandlerControl,
35+
CalendarEventHandlerControl,
3536
Section,
3637
sectionNames,
3738
dropdownControl,
@@ -45,7 +46,9 @@ import {
4546
CalendarDeleteIcon,
4647
Tooltip,
4748
useMergeCompStyles,
48-
}from"lowcoder-sdk";
49+
EditorContext,
50+
CompNameContext,
51+
}from'lowcoder-sdk';
4952

5053
import{
5154
DefaultWithFreeViewOptions,
@@ -76,7 +79,7 @@ let childrenMap: any = {
7679
resourcesEvents:jsonValueExposingStateControl("resourcesEvents",resourcesEventsDefaultData),
7780
resources:jsonValueExposingStateControl("resources",resourcesDefaultData),
7881
resourceName:withDefault(StringControl,trans("calendar.resourcesDefault")),
79-
onEvent:ChangeEventHandlerControl,
82+
onEvent:CalendarEventHandlerControl,
8083
// onDropEvent: safeDragEventHandlerControl,
8184
editable:withDefault(BoolControl,true),
8285
showEventTime:withDefault(BoolControl,true),
@@ -120,6 +123,12 @@ let CalendarBasicComp = (function () {
120123
currentFreeView?:string;
121124
currentPremiumView?:string;
122125
},dispatch:any)=>{
126+
127+
constcomp=useContext(EditorContext).getUICompByName(
128+
useContext(CompNameContext)
129+
);
130+
constonEventVal=comp?.toJsonValue().comp.onEvent;
131+
123132

124133
consttheme=useContext(ThemeContext);
125134
constref=createRef<HTMLDivElement>();
@@ -303,7 +312,12 @@ let CalendarBasicComp = (function () {
303312
};
304313
showModal(eventInfo,true);
305314
}else{
306-
showModal(editEvent.current,false);
315+
if(onEventVal&&onEventVal.some((e:any)=>e.name==='doubleClick')){
316+
// Check if 'doubleClick' is included in the array
317+
props.onEvent('doubleClick');
318+
}else{
319+
showModal(editEvent.currentasEventType,false);
320+
}
307321
}
308322
};
309323

@@ -433,7 +447,6 @@ let CalendarBasicComp = (function () {
433447
props.onDropEvent("dropEvent");
434448
}
435449
};
436-
437450
return(
438451
<Wrapper
439452
ref={ref}

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

Lines changed: 2 additions & 2 deletions
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/comps/comps/tableComp/tableCompView.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ const TableWrapper = styled.div<{
189189
190190
.ant-table.ant-table-middle .ant-table-cell-with-append .ant-table-row-expand-icon {
191191
top: 14px;
192+
margin-right:5px;
192193
}
193194
194195
.ant-table {

‎client/packages/lowcoder/src/comps/controls/eventHandlerControl.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,11 @@ export const DragEventHandlerControl = eventHandlerControl([
700700
dropEvent,
701701
]asconst);
702702

703+
exportconstCalendarEventHandlerControl=eventHandlerControl([
704+
changeEvent,
705+
doubleClickEvent,
706+
]asconst);
707+
703708
exportconstElementEventHandlerControl=eventHandlerControl([
704709
openEvent,
705710
editedEvent,

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

Lines changed: 3 additions & 1 deletion
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‎

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

26082609

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

Lines changed: 3 additions & 1 deletion
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‎

Lines changed: 2 additions & 0 deletions
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‎

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

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

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

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

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

Lines changed: 29 additions & 0 deletions
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{defaultasSwitch}from"antd/es/switch";
2829

2930
constCodeEditor=lazy(
3031
()=>import("base/codeEditor/codeEditor")
@@ -186,6 +187,34 @@ export function AdvancedSetting() {
186187
{trans("advanced.saveBtn")}
187188
</SaveButton>
188189
</div>
190+
<divclassName="section-title">{trans("advanced.showHeaderInPublicApps")}</div>
191+
<HelpTextstyle={{marginBottom:12}}>{trans("advanced.showHeaderInPublicAppsHelp")}</HelpText>
192+
<divclassName="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
<divclassName="section-title">{trans("advanced.preloadJSTitle")}</div>
190219
<HelpTextstyle={{marginBottom:12}}>{trans("advanced.preloadJSHelp")}</HelpText>
191220
<divclassName="section-content">

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp