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

Dev -> Main for 2.4.4#1038

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.

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

Already on GitHub?Sign in to your account

Merged
FalkWolsky merged 4 commits intomainfromdev
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,8 @@ import { refMethods } from "comps/generators/withMethodExposing";
import { blurMethod, clickMethod, focusWithOptions } from "comps/utils/methodUtils";

export function getButtonStyle(buttonStyle: ButtonStyleType) {
const hoverColor = genHoverColor(buttonStyle.background);
const activeColor = genActiveColor(buttonStyle.background);
const hoverColor =buttonStyle.background &&genHoverColor(buttonStyle.background);
const activeColor =buttonStyle.background &&genActiveColor(buttonStyle.background);
return css`
&&& {
border-radius: ${buttonStyle.radius};
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ const Link = styled(Button)<{
padding: ${props.$style.padding};
font-size: ${props.$style.textSize};
font-style:${props.$style.fontStyle};
font-family:${props.$style.fontFamily};
${props.$style.fontFamily && `font-family:${props.$style.fontFamily}`};
font-weight:${props.$style.textWeight};
border: ${props.$style.borderWidth} ${props.$style.borderStyle} ${props.$style.border};
border-radius:${props.$style.radius ? props.$style.radius:'0px'};
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ import { AutoHeightControl } from "comps/controls/autoHeightControl";

import { useContext } from "react";
import { EditorContext } from "comps/editorState";
import { useMergeCompStyles } from "@lowcoder-ee/index.sdk";
import { useMergeCompStyles } from "@lowcoder-ee/util/hooks";

type IProps = DividerProps & {
$style: DividerStyleType;
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { trans } from "i18n";

import { useContext } from "react";
import { EditorContext } from "comps/editorState";
import { useMergeCompStyles } from "@lowcoder-ee/util/hooks";

type IProps = {
$justify: boolean;
Expand DownExpand Up@@ -135,16 +136,18 @@ const childrenMap = {
logoUrl: StringControl,
logoEvent: withDefault(eventHandlerControl(logoEventHandlers), [{ name: "click" }]),
horizontalAlignment: alignWithJustifyControl(),
style: migrateOldData(styleControl(NavigationStyle), fixOldStyleData),
animationStyle: styleControl(AnimationStyle),
style: migrateOldData(styleControl(NavigationStyle, 'style'), fixOldStyleData),
animationStyle: styleControl(AnimationStyle, 'animationStyle'),
items: withDefault(navListComp(), [
{
label: trans("menuItem") + " 1",
},
]),
};

const NavCompBase = new UICompBuilder(childrenMap, (props) => {
const NavCompBase = new UICompBuilder(childrenMap, (props, dispatch) => {
useMergeCompStyles(props, dispatch);

const data = props.items;
const items = (
<>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import { CommonNameConfig, NameConfig, withExposingConfigs } from "../../generat
import { SliderChildren, SliderPropertyView, SliderStyled, SliderWrapper } from "./sliderCompConstants";
import { hasIcon } from "comps/utils";
import { BoolControl } from "comps/controls/boolControl";
import { useMergeCompStyles } from "@lowcoder-ee/util/hooks";

const RangeSliderBasicComp = (function () {
const childrenMap = {
Expand All@@ -14,7 +15,8 @@ const RangeSliderBasicComp = (function () {
end: numberExposingStateControl("end", 60),
vertical: BoolControl,
};
return new UICompBuilder(childrenMap, (props) => {
return new UICompBuilder(childrenMap, (props, dispatch) => {
useMergeCompStyles(props as Record<string, any>, dispatch);
return props.label({
style: props.style,
labelStyle: props.labelStyle,
Expand Down
2 changes: 1 addition & 1 deletionclient/packages/lowcoder/src/comps/comps/rootComp.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ function RootView(props: RootViewProps) {
localDefaultTheme;

const themeId = selectedTheme ? selectedTheme.id : (
previewTheme ? "" : 'default-theme-id'
previewTheme ? "preview-theme" : 'default-theme-id'
);

useEffect(() => {
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,14 +75,10 @@ export const getStyle = (style: CheckboxStyleType) => {
&:hover .ant-checkbox-inner,
.ant-checkbox:hover .ant-checkbox-inner,
.ant-checkbox-input + ant-checkbox-inner {
background-color:${style.hoverBackground?style.hoverBackground : '#fff'};
${style.hoverBackground&& `background-color: ${style.hoverBackground}`};
}

&:hover .ant-checkbox-checked .ant-checkbox-inner,
.ant-checkbox:hover .ant-checkbox-inner,
.ant-checkbox-input + ant-checkbox-inner {
background-color:${style.hoverBackground ? style.hoverBackground : '#ffff'};
}


&:hover .ant-checkbox-inner,
.ant-checkbox:hover .ant-checkbox-inner,
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,9 +25,9 @@ let MultiSelectBasicComp = (function () {
defaultValue: arrayStringExposingStateControl("defaultValue", ["1", "2"]),
value: arrayStringExposingStateControl("value"),
style: styleControl(InputFieldStyle , 'style'),
labelStyle:styleControl(LabelStyle , 'labelStyle'),
inputFieldStyle:styleControl(MultiSelectStyle , 'inputFieldStyle'),
childrenInputFieldStyle:styleControl(ChildrenMultiSelectStyle),
labelStyle:styleControl(LabelStyle , 'labelStyle'),
inputFieldStyle:styleControl(MultiSelectStyle , 'inputFieldStyle'),
childrenInputFieldStyle:styleControl(ChildrenMultiSelectStyle, 'childrenInputFieldStyle'),
margin: MarginControl,
padding: PaddingControl,
};
Expand Down
14 changes: 10 additions & 4 deletionsclient/packages/lowcoder/src/comps/controls/styleControl.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -863,17 +863,23 @@ export function styleControl<T extends readonly SingleColorConfig[]>(
const {comp, compType} = useContext(CompContext);
const theme = useContext(ThemeContext);
const bgColor = useContext(BackgroundColorContext);
const { themeId } = theme || {};
const isPreviewTheme = themeId === 'preview-theme';
const isDefaultTheme = themeId === 'default-theme-id';


const appSettingsComp = editorState?.getAppSettingsComp();
const preventAppStylesOverwriting = appSettingsComp?.getView()?.preventAppStylesOverwriting;
const { themeId } = theme || {};
const { appliedThemeId, preventStyleOverwriting } = comp?.comp?.container || comp?.comp || {};
const appTheme = !preventStyleOverwriting && !preventAppStylesOverwriting
const appTheme =isPreviewTheme || isDefaultTheme || (!preventStyleOverwriting && !preventAppStylesOverwriting)
? theme?.theme
: undefined;
const compTheme = compType && !preventStyleOverwriting && !preventAppStylesOverwriting
const compTheme =isPreviewTheme || isDefaultTheme || (compType && !preventStyleOverwriting && !preventAppStylesOverwriting)
? {
...(theme?.theme?.components?.[compType]?.[styleKey] || {}) as unknown as Record<string, string>
...(
theme?.theme?.components?.[compType]?.[styleKey]
|| defaultTheme.components?.[compType]?.[styleKey]
) as unknown as Record<string, string>
}
: undefined;
const styleProps = (!comp && !compType) || preventStyleOverwriting || preventAppStylesOverwriting || appliedThemeId === themeId
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1459,8 +1459,8 @@ export const TableHeaderStyle = [
FONT_FAMILY,
FONT_STYLE,
TEXT,
getStaticBackground(SURFACE_COLOR),
getBackground("primarySurface"),
//getStaticBackground(SURFACE_COLOR),
//getBackground("primarySurface"),
{
name: "headerBackground",
label: trans("style.tableHeaderBackground"),
Expand Down
1 change: 1 addition & 0 deletionsclient/packages/lowcoder/src/constants/routesURL.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ export const ORGANIZATION_SETTING = "/setting/organization";
export const THEME_SETTING = "/setting/theme";
export const PLUGINS_SETTING = "/setting/plugins";
export const THEME_DETAIL = "/setting/theme/detail";
export const THEME_DETAIL_URL = `${THEME_DETAIL}/:themeId`;

export const OAUTH_PROVIDER_SETTING = "/setting/oauth-provider";
export const OAUTH_PROVIDER_DETAIL = "/setting/oauth-provider/detail";
Expand Down
111 changes: 74 additions & 37 deletionsclient/packages/lowcoder/src/constants/themeConstants.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
import { ThemeDetail } from "@lowcoder-ee/api/commonSettingApi";

const theme = {
primary: "#3377FF",
textDark: "#222222",
textLight: "#FFFFFF",
canvas: "#F5F5F6",
primarySurface: "#FFFFFF",
border: "#D7D9E0",
radius: "4px",
borderWidth: "1px",
borderStyle: "solid",
margin: "3px",
padding: "3px",
gridColumns: "24",
textSize: "14px",
text: "#222222",
animation: "",
animationDelay: "",
animationDuration: "",
opacity: "1",
boxShadow: "",
boxShadowColor: "",
animationIterationCount: "",
};

const text = {
style: {
borderWidth: 0,
Expand All@@ -16,7 +40,14 @@ const input = {
},
inputFieldStyle: {
borderWidth: '1px',
border: '#D7D9E0'
border: theme.border,
}
};

const select = {
...input,
childrenInputFieldStyle: {
borderWidth: '0px',
}
};

Expand DownExpand Up@@ -77,12 +108,6 @@ const step = {
style: {text:'#D7D9E0'}
};

const treeSelect = {
inputFieldStyle: {
borderWidth: '1px',
}
};

const pageLayout = {
style: {
borderWidth: '1px',
Expand All@@ -95,34 +120,45 @@ const qrCode = {
}
};

const divider= {
const divider = {
style: {
radius: "0px"
}
};

const navigation = {
style: {
borderWidth: '0px',
}
}

const slider = {
...input,
inputFieldStyle: {
...input.inputFieldStyle,
track: '#D7D9E0',
}
}

const switchComp = {
...input,
inputFieldStyle: {
...input.inputFieldStyle,
unchecked: '#D7D9E0',
}
}

const checkbox = {
...input,
inputFieldStyle: {
...input.inputFieldStyle,
uncheckedBorder: '#D7D9E0',
}
}


export const defaultTheme: ThemeDetail = {
primary: "#3377FF",
textDark: "#222222",
textLight: "#FFFFFF",
canvas: "#F5F5F6",
primarySurface: "#FFFFFF",
border: "#D7D9E0",
radius: "4px",
borderWidth: "1px",
borderStyle: "solid",
margin: "3px",
padding: "3px",
gridColumns: "24",
textSize: "14px",
text: "#222222",
animation: "",
animationDelay: "",
animationDuration: "",
opacity: "1",
boxShadow: "",
boxShadowColor: "",
animationIterationCount: "",
...theme,
components: {
text,
input,
Expand All@@ -133,24 +169,25 @@ export const defaultTheme: ThemeDetail = {
tabbedContainer,
step,
qrCode,
treeSelect,
pageLayout,
divider,
navigation,
slider,
checkbox,
password: input,
numberInput: input,
textArea: input,
autocomplete: input,
switch: input,
checkbox: input,
radio: input,
switch: switchComp,
radio: checkbox,
date: input,
dateRange: input,
time: input,
timeRange: input,
slider: input,
rangeSlider: input,
rangeSlider: slider,
segmentedControl,
select: input,
multiSelect: input,
select: select,
multiSelect: select,
treeSelect: select,
},
};
Loading
[8]ページ先頭
©2009-2025 Movatter.jp