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

Commita9ec34f

Browse files
Merge pull request#1793 from kamalqureshi/settings_navigation_app
Updated navigation app for settings and JS
2 parents0060f16 +876fe31 commita9ec34f

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

‎client/packages/lowcoder/src/comps/comps/appSettingsComp.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ import { DEFAULT_THEMEID } from "comps/utils/themeUtil";
1717
import{NumberControl,RangeControl,StringControl}from"comps/controls/codeControl";
1818
import{IconControl}from"comps/controls/iconControl";
1919
import{dropdownControl}from"comps/controls/dropdownControl";
20-
import{ApplicationCategoriesEnum}from"constants/applicationConstants";
20+
import{ApplicationCategoriesEnum,AppUILayoutType}from"constants/applicationConstants";
2121
import{BoolControl}from"../controls/boolControl";
22-
import{getNpmPackageMeta}from"../utils/remote";
2322
import{getPromiseAfterDispatch}from"@lowcoder-ee/util/promiseUtils";
2423
importtype{AppState}from"@lowcoder-ee/redux/reducers";
2524
import{ColorControl}from"../controls/colorControl";
2625
import{DEFAULT_ROW_COUNT}from"@lowcoder-ee/layout/calculateUtils";
2726
import{AppSettingContext}from"../utils/appSettingContext";
28-
import{isPublicApplication}from"@lowcoder-ee/redux/selectors/applicationSelector";
27+
import{currentApplication,isPublicApplication}from"@lowcoder-ee/redux/selectors/applicationSelector";
28+
import{isAggregationApp}from"util/appUtils";
2929

3030
constTITLE=trans("appSetting.title");
3131
constUSER_DEFINE="__USER_DEFINE";
@@ -234,6 +234,7 @@ type ChildrenInstance = RecordConstructorToComp<typeof childrenMap> & {
234234
};
235235

236236
functionAppGeneralSettingsModal(props:ChildrenInstance){
237+
constapplication=useSelector(currentApplication);
237238
constlowcoderCompsMeta=useSelector((state:AppState)=>state.npmPlugin.packageMeta['lowcoder-comps']);
238239
const[lowcoderCompVersions,setLowcoderCompVersions]=useState(['latest']);
239240
const{
@@ -288,7 +289,8 @@ function AppGeneralSettingsModal(props: ChildrenInstance) {
288289
</div>
289290
</DivStyled>
290291
</BaseSection>
291-
<BaseSection
292+
{application&&!isAggregationApp(AppUILayoutType[application.applicationType])&&
293+
<BaseSection
292294
name={"Lowcoder Comps"}
293295
width={288}
294296
noMargin
@@ -320,6 +322,7 @@ function AppGeneralSettingsModal(props: ChildrenInstance) {
320322
/>
321323
</DivStyled>
322324
</BaseSection>
325+
}
323326
<BaseSection
324327
name={"Shortcuts"}
325328
width={288}
@@ -520,7 +523,6 @@ export const AppSettingsComp = new MultiCompBuilder(childrenMap, (props) => {
520523
const{ settingType}=useContext(AppSettingContext);
521524
constthemeList=useSelector(getThemeList)||[];
522525
constdefaultTheme=(useSelector(getDefaultTheme)||"").toString();
523-
524526
returnsettingType==='canvas'
525527
?<AppCanvasSettingsModal{...children}themeList={themeList}defaultTheme={defaultTheme}/>
526528
:<AppGeneralSettingsModal{...children}themeList={themeList}defaultTheme={defaultTheme}/>;

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,11 @@ const aggregationSiderItems = [
337337
{
338338
key:SiderKey.Setting,
339339
icon:<LeftSettingIcon/>,
340-
}
340+
},
341+
{
342+
key:SiderKey.JS,
343+
icon:<LeftJSSettingIcon/>,
344+
},
341345
];
342346

343347
constDeviceWrapper=({
@@ -706,9 +710,7 @@ function EditorView(props: EditorViewProps) {
706710
<SettingsDiv>
707711
<ScrollBar>
708712
{application&&
709-
!isAggregationApp(
710-
AppUILayoutType[application.applicationType]
711-
)&&(
713+
(
712714
<>
713715
{appSettingsComp.getPropertyView()}
714716
</>

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp