diff --git a/client/packages/lowcoder/src/comps/comps/appSettingsComp.tsx b/client/packages/lowcoder/src/comps/comps/appSettingsComp.tsx index 4f240f35f..64122daba 100644 --- a/client/packages/lowcoder/src/comps/comps/appSettingsComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/appSettingsComp.tsx @@ -17,15 +17,15 @@ import { DEFAULT_THEMEID } from "comps/utils/themeUtil"; import { NumberControl, RangeControl, StringControl } from "comps/controls/codeControl"; import { IconControl } from "comps/controls/iconControl"; import { dropdownControl } from "comps/controls/dropdownControl"; -import { ApplicationCategoriesEnum } from "constants/applicationConstants"; +import { ApplicationCategoriesEnum, AppUILayoutType } from "constants/applicationConstants"; import { BoolControl } from "../controls/boolControl"; -import { getNpmPackageMeta } from "../utils/remote"; import { getPromiseAfterDispatch } from "@lowcoder-ee/util/promiseUtils"; import type { AppState } from "@lowcoder-ee/redux/reducers"; import { ColorControl } from "../controls/colorControl"; import { DEFAULT_ROW_COUNT } from "@lowcoder-ee/layout/calculateUtils"; import { AppSettingContext } from "../utils/appSettingContext"; -import { isPublicApplication } from "@lowcoder-ee/redux/selectors/applicationSelector"; +import { currentApplication, isPublicApplication } from "@lowcoder-ee/redux/selectors/applicationSelector"; +import { isAggregationApp } from "util/appUtils"; const TITLE = trans("appSetting.title"); const USER_DEFINE = "__USER_DEFINE"; @@ -234,6 +234,7 @@ type ChildrenInstance = RecordConstructorToComp & { }; function AppGeneralSettingsModal(props: ChildrenInstance) { + const application = useSelector(currentApplication); const lowcoderCompsMeta = useSelector((state: AppState) => state.npmPlugin.packageMeta['lowcoder-comps']); const [lowcoderCompVersions, setLowcoderCompVersions] = useState(['latest']); const { @@ -288,7 +289,8 @@ function AppGeneralSettingsModal(props: ChildrenInstance) { - + } { const { settingType } = useContext(AppSettingContext); const themeList = useSelector(getThemeList) || []; const defaultTheme = (useSelector(getDefaultTheme) || "").toString(); - return settingType === 'canvas' ? : ; diff --git a/client/packages/lowcoder/src/pages/editor/editorView.tsx b/client/packages/lowcoder/src/pages/editor/editorView.tsx index 2c7f0de92..c722f907f 100644 --- a/client/packages/lowcoder/src/pages/editor/editorView.tsx +++ b/client/packages/lowcoder/src/pages/editor/editorView.tsx @@ -337,7 +337,11 @@ const aggregationSiderItems = [ { key: SiderKey.Setting, icon: , - } + }, + { + key: SiderKey.JS, + icon: , + }, ]; const DeviceWrapper = ({ @@ -706,9 +710,7 @@ function EditorView(props: EditorViewProps) { {application && - !isAggregationApp( - AppUILayoutType[application.applicationType] - ) && ( + ( <> {appSettingsComp.getPropertyView()}