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

Theme/setting#891

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
raheeliftikhar5 merged 11 commits intolowcoder-org:devfromMenamAfzal:theme/setting
May 20, 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@@ -257,10 +257,11 @@ const childrenMap = {
allowNull: BoolControl,
onEvent: InputEventHandlerControl,
viewRef: RefControl<HTMLInputElement>,
style: withDefault(styleControl(InputFieldStyle), {borderWidth: '1px'}),
labelStyle: styleControl(LabelStyle),
style: withDefault(styleControl(InputFieldStyle),{background:'transparent'}) ,
labelStyle:styleControl(LabelStyle),
prefixText : stringExposingStateControl("defaultValue"),
animationStyle: styleControl(AnimationStyle),
prefixText: stringExposingStateControl('defaultValue'),

prefixIcon: IconControl,
inputFieldStyle: withDefault(styleControl(InputLikeStyle), {borderWidth: '1px'}) ,
// validation
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ export const SliderChildren = {
label: LabelControl,
disabled: BoolCodeControl,
onEvent: ChangeEventHandlerControl,
style: withDefault(styleControl(InputFieldStyle), {borderWidth: '1px'}),
style: withDefault(styleControl(InputFieldStyle),{background:'transparent'}) ,
labelStyle:styleControl(LabelStyle.filter((style)=> ['accent','validate'].includes(style.name) === false)),
prefixIcon: IconControl,
suffixIcon: IconControl,
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ const RatingBasicComp = (function () {
allowHalf: BoolControl,
disabled: BoolCodeControl,
onEvent: eventHandlerControl(EventOptions),
style: withDefault(styleControl(InputFieldStyle), {borderWidth: '1px'}),
style: withDefault(styleControl(InputFieldStyle),{background:'transparent'}) ,
animationStyle: styleControl(AnimationStyle),
labelStyle: styleControl(
LabelStyle.filter(
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,53 +14,53 @@ import { trans } from "i18n";
import { fixOldInputCompData } from "../textInputComp/textInputConstants";
import { migrateOldData } from "comps/generators/simpleGenerators";

const getStyle = (style: RadioStyleType) => {
const getStyle = (style: RadioStyleType, inputFieldStyle?:RadioStyleType) => {
return css`
.ant-radio-wrapper:not(.ant-radio-wrapper-disabled) {
color: ${style.staticText};
color: ${inputFieldStyle?.staticText};
// height: 22px;
max-width: calc(100% - 8px);
padding: ${style.padding};
padding: ${inputFieldStyle?.padding};
span:not(.ant-radio) {
${EllipsisTextCss};
font-family:${style.fontFamily};
font-size:${style.textSize};
font-weight:${style.textWeight};
font-style:${style.fontStyle};
text-transform:${style.textTransform};
text-decoration:${style.textDecoration};
font-family:${inputFieldStyle?.fontFamily};
font-size:${inputFieldStyle?.textSize};
font-weight:${inputFieldStyle?.textWeight};
font-style:${inputFieldStyle?.fontStyle};
text-transform:${inputFieldStyle?.textTransform};
text-decoration:${inputFieldStyle?.textDecoration};
}

.ant-radio-checked {
.ant-radio-inner {
background-color: ${style.checkedBackground};
border-color: ${style.checkedBackground};
background-color: ${inputFieldStyle?.checkedBackground};
border-color: ${inputFieldStyle?.uncheckedBorder};
}

&::after {
border-color: ${style.checkedBackground};
border-color: ${inputFieldStyle?.uncheckedBorder};
}
}

.ant-radio-inner {
background-color: ${style.uncheckedBackground};
border-color: ${style.uncheckedBorder};
border-width:${style.borderWidth};
background-color: ${inputFieldStyle?.uncheckedBackground};
border-color: ${inputFieldStyle?.uncheckedBorder};
border-width:${inputFieldStyle?.borderWidth};
&::after {
background-color: ${style.checked};
background-color: ${inputFieldStyle?.checked};
}
}

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

&:hover .ant-radio-inner,
.ant-radio:hover .ant-radio-inner,
.ant-radio-input:focus + .ant-radio-inner {
border-color: ${style.checkedBackground};
border-color: ${inputFieldStyle?.uncheckedBorder};
}
}
`;
Expand All@@ -69,11 +69,12 @@ const getStyle = (style: RadioStyleType) => {
const Radio = styled(AntdRadioGroup)<{
$style: RadioStyleType;
$layout: ValueFromOption<typeof RadioLayoutOptions>;
$inputFieldStyle:RadioStyleType
}>`
width: 100%;
min-height: 32px;

${(props) => props.$style && getStyle(props.$style)}
${(props) => props.$style && getStyle(props.$style, props.$inputFieldStyle)}
${(props) => {
if (props.$layout === "horizontal") {
return css`
Expand DownExpand Up@@ -113,6 +114,7 @@ let RadioBasicComp = (function () {
disabled={props.disabled}
value={props.value.value}
$style={props.style}
$inputFieldStyle={props.inputFieldStyle}
$layout={props.layout}
onChange={(e) => {
handleChange(e.target.value);
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { RefControl } from "comps/controls/refControl";

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

export const RadioLayoutOptions = [
{ label: trans("radio.horizontal"), value: "horizontal" },
Expand All@@ -40,7 +41,7 @@ export const RadioChildrenMap = {
labelStyle:styleControl(LabelStyle),
layout: dropdownControl(RadioLayoutOptions, "horizontal"),
viewRef: RefControl<HTMLDivElement>,
inputFieldStyle:styleControl(RadioStyle),
inputFieldStyle:withDefault(styleControl(RadioStyle),{borderWidth: '1px'}),
animationStyle: styleControl(AnimationStyle),
...SelectInputValidationChildren,
...formDataChildren,
Expand Down
8 changes: 4 additions & 4 deletionsclient/packages/lowcoder/src/comps/comps/textComp.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,10 +26,6 @@ const getStyle = (style: TextStyleType) => {
border-radius: ${(style.radius ? style.radius : "4px")};
border: ${(style.borderWidth ? style.borderWidth : "0px")} solid ${style.border};
color: ${style.text};
font-size: ${style.textSize} !important;
font-weight: ${style.textWeight} !important;
font-family: ${style.fontFamily} !important;
font-style:${style.fontStyle} !important;
text-transform:${style.textTransform} !important;
text-decoration:${style.textDecoration} !important;
background-color: ${style.background};
Expand All@@ -40,6 +36,9 @@ const getStyle = (style: TextStyleType) => {
margin: ${style.margin} !important;
padding: ${style.padding};
width: ${widthCalculator(style.margin)};
font-family: ${style.fontFamily} !important;
font-style:${style.fontStyle} !important;
font-size: ${style.textSize} !important;
// height: ${heightCalculator(style.margin)};
h1 {
line-height: 1.5;
Expand All@@ -60,6 +59,7 @@ const getStyle = (style: TextStyleType) => {
h5,
h6 {
color: ${style.text};
font-weight: ${style.textWeight} !important;
}
img,
pre {
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,11 +49,11 @@ const childrenMap = {
viewRef: RefControl<InputRef>,
showCount: BoolControl,
allowClear: BoolControl,
style: withDefault(styleControl(InputFieldStyle), {borderWidth: '1px'}),
labelStyle:styleControl(LabelStyle),
style: withDefault(styleControl(InputFieldStyle),{background:'transparent'}) ,
labelStyle:styleControl(LabelStyle),
prefixIcon: IconControl,
suffixIcon: IconControl,
inputFieldStyle:styleControl(InputLikeStyle),
inputFieldStyle:withDefault(styleControl(InputLikeStyle),{borderWidth: '1px'}),
animationStyle: styleControl(AnimationStyle),
};

Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,10 +57,10 @@ let PasswordTmpComp = (function () {
validationType: dropdownControl(TextInputValidationOptions, "Regex"),
visibilityToggle: BoolControl.DEFAULT_TRUE,
prefixIcon: IconControl,
style: withDefault(styleControl(InputFieldStyle), {borderWidth: '1px'}),
style: withDefault(styleControl(InputFieldStyle),{background:'transparent'}) ,
labelStyle: styleControl(LabelStyle),
inputFieldStyle: styleControl(InputLikeStyle),
animationStyle: styleControl(AnimationStyle),
inputFieldStyle:withDefault(styleControl(InputLikeStyle),{borderWidth: '1px'}),
animationStyle: styleControl(AnimationStyle),
};
return new UICompBuilder(childrenMap, (props) => {
const [inputProps, validateState] = useTextInputProps(props);
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,9 +71,9 @@ let TextAreaTmpComp = (function () {
viewRef: RefControl<TextAreaRef>,
allowClear: BoolControl,
autoHeight: withDefault(AutoHeightControl, "fixed"),
style: withDefault(styleControl(InputFieldStyle), {borderWidth: '1px'}),
style: withDefault(styleControl(InputFieldStyle),{background:'transparent'}) ,
labelStyle: styleControl(LabelStyle),
inputFieldStyle: styleControl(InputLikeStyle),
inputFieldStyle: withDefault(styleControl(InputLikeStyle), {borderWidth: '1px'}),
animationStyle: styleControl(AnimationStyle)
};
return new UICompBuilder(childrenMap, (props) => {
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ const childrenMap = {
allowClear: BoolControl,
showSearch: BoolControl.DEFAULT_TRUE,
inputValue: stateComp<string>(""), // search value
style: withDefault(styleControl(InputFieldStyle), {borderWidth: '1px'}),
style:styleControl(InputFieldStyle),
labelStyle:styleControl(LabelStyle),
inputFieldStyle: withDefault(styleControl(TreeSelectStyle), {borderWidth: '1px'}),
viewRef: RefControl<BaseSelectRef>,
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -563,7 +563,8 @@ const HOVER_BACKGROUND_COLOR = {
name: "hoverBackground",
label: trans("style.hoverBackground"),
hoverBackground: "hoverBackground",
};
color: SECOND_SURFACE_COLOR,
}

const FONT_FAMILY = {
name: "fontFamily",
Expand DownExpand Up@@ -768,8 +769,8 @@ function replaceAndMergeMultipleStyles(
}

export const ButtonStyle = [
getBackground(),
...STYLING_FIELDS_SEQUENCE,
getBackground('primary'),
...STYLING_FIELDS_SEQUENCE
] as const;

export const ToggleButtonStyle = [
Expand DownExpand Up@@ -1111,7 +1112,7 @@ export const LabelStyle = [
];

export const InputFieldStyle = [
getStaticBackground(SURFACE_COLOR),
getBackground(),
getStaticBorder(),
...STYLING_FIELDS_CONTAINER_SEQUENCE.filter(
(style) => ["border"].includes(style.name) === false
Expand DownExpand Up@@ -1199,7 +1200,7 @@ export const MultiSelectStyle = [

export const ChildrenMultiSelectStyle = [
...STYLING_FIELDS_SEQUENCE,
getStaticBackground(SURFACE_COLOR),
getBackground()
] as const;

export const TabContainerStyle = [
Expand DownExpand Up@@ -1266,6 +1267,7 @@ function checkAndUncheck() {
name: "uncheckedBorder",
label: trans("style.uncheckedBorder"),
depName: "uncheckedBackground",
color:SECOND_SURFACE_COLOR,
transformer: backgroundToBorder,
},
] as const;
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp