From 5630e7a1fdb2459466b8f87aa260b669390906a2 Mon Sep 17 00:00:00 2001 From: MenamAfzal Date: Wed, 15 May 2024 02:36:26 +0500 Subject: [PATCH 1/7] switch component styling adjusted --- .../lowcoder/src/comps/controls/styleControlConstants.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx b/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx index 177400446..2db0b504f 100644 --- a/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx +++ b/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx @@ -285,7 +285,7 @@ const STATIC_TEXT = { const LABEL = { name: "label", label: trans("label"), - depTheme: "canvas", + depTheme: "primarySurface", depType: DEP_TYPE.CONTRAST_TEXT, transformer: contrastText, } as const; @@ -898,7 +898,7 @@ export const LabelStyle = [ ] export const InputFieldStyle = [ - getStaticBackground(SURFACE_COLOR), + getBackground(), ...STYLING_FIELDS_CONTAINER_SEQUENCE, ] as const; From 661d088ff057442345290eb23e00180d15881070 Mon Sep 17 00:00:00 2001 From: MenamAfzal Date: Wed, 15 May 2024 03:23:04 +0500 Subject: [PATCH 2/7] other component styling adjusted --- .../src/comps/controls/styleControlConstants.tsx | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx b/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx index 2db0b504f..ba84dc694 100644 --- a/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx +++ b/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx @@ -277,7 +277,7 @@ const TEXT = { const STATIC_TEXT = { name: "staticText", label: trans("style.staticText"), - depTheme: "canvas", + depTheme: "primarySurface", depType: DEP_TYPE.CONTRAST_TEXT, transformer: contrastText, } as const; @@ -562,7 +562,7 @@ function replaceAndMergeMultipleStyles(originalArray: any[], styleToReplace: str } export const ButtonStyle = [ - getBackground('primary'), + getBackground(), ...STYLING_FIELDS_SEQUENCE ] as const; @@ -1285,14 +1285,7 @@ function handleToHoverLink(color: string) { } export const LinkStyle = [ - - { - name: "background", - label: trans("style.background"), - depTheme: "canvas", - depType: DEP_TYPE.SELF, - transformer: toSelf, - }, + getBackground(), ...replaceAndMergeMultipleStyles(STYLING_FIELDS_SEQUENCE, 'text', [...LinkTextStyle]) ] as const; From 7d41feef5d331e9008d51ccb90ab65c263059060 Mon Sep 17 00:00:00 2001 From: MenamAfzal Date: Fri, 17 May 2024 04:16:07 +0500 Subject: [PATCH 3/7] radio btn and select option setting adjusted --- .../comps/comps/selectInputComp/radioComp.tsx | 40 ++++++++++--------- .../selectInputComp/radioCompConstants.tsx | 3 +- .../comps/controls/styleControlConstants.tsx | 6 ++- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/selectInputComp/radioComp.tsx b/client/packages/lowcoder/src/comps/comps/selectInputComp/radioComp.tsx index 6b1a08fcd..330835abe 100644 --- a/client/packages/lowcoder/src/comps/comps/selectInputComp/radioComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/selectInputComp/radioComp.tsx @@ -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}; } } `; @@ -69,11 +69,12 @@ const getStyle = (style: RadioStyleType) => { const Radio = styled(AntdRadioGroup)<{ $style: RadioStyleType; $layout: ValueFromOption; + $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` @@ -112,6 +113,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); diff --git a/client/packages/lowcoder/src/comps/comps/selectInputComp/radioCompConstants.tsx b/client/packages/lowcoder/src/comps/comps/selectInputComp/radioCompConstants.tsx index a9b93d60f..077b19f90 100644 --- a/client/packages/lowcoder/src/comps/comps/selectInputComp/radioCompConstants.tsx +++ b/client/packages/lowcoder/src/comps/comps/selectInputComp/radioCompConstants.tsx @@ -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" }, @@ -40,7 +41,7 @@ export const RadioChildrenMap = { labelStyle:styleControl(LabelStyle), layout: dropdownControl(RadioLayoutOptions, "horizontal"), viewRef: RefControl, - inputFieldStyle:styleControl(RadioStyle), + inputFieldStyle:withDefault(styleControl(RadioStyle),{borderWidth: '1px'}), ...SelectInputValidationChildren, ...formDataChildren, }; diff --git a/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx b/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx index 0b867a0cb..715a34852 100644 --- a/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx +++ b/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx @@ -389,7 +389,8 @@ const TEXT_WEIGHT = { const HOVER_BACKGROUND_COLOR = { name: "hoverBackground", label: trans("style.hoverBackground"), - hoverBackground: "hoverBackground" + hoverBackground: "hoverBackground", + color: SECOND_SURFACE_COLOR, } const FONT_FAMILY = { @@ -980,7 +981,7 @@ export const MultiSelectStyle = [ export const ChildrenMultiSelectStyle = [ ...STYLING_FIELDS_SEQUENCE, - getStaticBackground(SURFACE_COLOR) + getBackground() ] as const; export const TabContainerStyle = [ @@ -1033,6 +1034,7 @@ function checkAndUncheck() { name: "uncheckedBorder", label: trans("style.uncheckedBorder"), depName: "uncheckedBackground", + color:SECOND_SURFACE_COLOR, transformer: backgroundToBorder, }, ] as const; From 150fba8e8d9ebcad7ea55ee5d2becbffc599e73f Mon Sep 17 00:00:00 2001 From: MenamAfzal Date: Fri, 17 May 2024 14:29:55 +0500 Subject: [PATCH 4/7] text comp styling adjusted --- client/packages/lowcoder/src/comps/comps/textComp.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/textComp.tsx b/client/packages/lowcoder/src/comps/comps/textComp.tsx index fd9ce1f18..2f7fa50cd 100644 --- a/client/packages/lowcoder/src/comps/comps/textComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/textComp.tsx @@ -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}; @@ -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; @@ -60,6 +59,7 @@ const getStyle = (style: TextStyleType) => { h5, h6 { color: ${style.text}; + font-weight: ${style.textWeight} !important; } img, pre { From 5f6b3b9743cbf051927779aaaa44f817b8124525 Mon Sep 17 00:00:00 2001 From: MenamAfzal Date: Fri, 17 May 2024 15:15:12 +0500 Subject: [PATCH 5/7] button background color adjusted --- .../lowcoder/src/comps/controls/styleControlConstants.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx b/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx index 715a34852..6f92ae65e 100644 --- a/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx +++ b/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx @@ -563,7 +563,7 @@ function replaceAndMergeMultipleStyles(originalArray: any[], styleToReplace: str } export const ButtonStyle = [ - getBackground(), + getBackground('primary'), ...STYLING_FIELDS_SEQUENCE ] as const; From b8cd0d9b66a9ce4238ed104187ee7dd92590942e Mon Sep 17 00:00:00 2001 From: MenamAfzal Date: Mon, 20 May 2024 13:53:17 +0500 Subject: [PATCH 6/7] borders adjusted --- .../src/comps/comps/numberInputComp/numberInputComp.tsx | 2 +- .../src/comps/comps/numberInputComp/sliderCompConstants.tsx | 2 +- client/packages/lowcoder/src/comps/comps/ratingComp.tsx | 2 +- .../lowcoder/src/comps/comps/textInputComp/inputComp.tsx | 6 +++--- .../lowcoder/src/comps/comps/textInputComp/passwordComp.tsx | 4 ++-- .../lowcoder/src/comps/comps/textInputComp/textAreaComp.tsx | 4 ++-- .../lowcoder/src/comps/comps/treeComp/treeSelectComp.tsx | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/numberInputComp/numberInputComp.tsx b/client/packages/lowcoder/src/comps/comps/numberInputComp/numberInputComp.tsx index cd633ec48..4b1595f41 100644 --- a/client/packages/lowcoder/src/comps/comps/numberInputComp/numberInputComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/numberInputComp/numberInputComp.tsx @@ -257,7 +257,7 @@ const childrenMap = { allowNull: BoolControl, onEvent: InputEventHandlerControl, viewRef: RefControl, - style: withDefault(styleControl(InputFieldStyle), {borderWidth: '1px'}), + style: styleControl(InputFieldStyle), labelStyle:styleControl(LabelStyle), prefixText : stringExposingStateControl("defaultValue"), prefixIcon: IconControl, diff --git a/client/packages/lowcoder/src/comps/comps/numberInputComp/sliderCompConstants.tsx b/client/packages/lowcoder/src/comps/comps/numberInputComp/sliderCompConstants.tsx index ad4c7e206..0626faf40 100644 --- a/client/packages/lowcoder/src/comps/comps/numberInputComp/sliderCompConstants.tsx +++ b/client/packages/lowcoder/src/comps/comps/numberInputComp/sliderCompConstants.tsx @@ -71,7 +71,7 @@ export const SliderChildren = { label: LabelControl, disabled: BoolCodeControl, onEvent: ChangeEventHandlerControl, - style: withDefault(styleControl(InputFieldStyle), {borderWidth: '1px'}), + style:styleControl(InputFieldStyle), labelStyle:styleControl(LabelStyle.filter((style)=> ['accent','validate'].includes(style.name) === false)), prefixIcon: IconControl, suffixIcon: IconControl, diff --git a/client/packages/lowcoder/src/comps/comps/ratingComp.tsx b/client/packages/lowcoder/src/comps/comps/ratingComp.tsx index 3bf8e8549..b2b7d4d5b 100644 --- a/client/packages/lowcoder/src/comps/comps/ratingComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/ratingComp.tsx @@ -43,7 +43,7 @@ const RatingBasicComp = (function () { allowHalf: BoolControl, disabled: BoolCodeControl, onEvent: eventHandlerControl(EventOptions), - style: withDefault(styleControl(InputFieldStyle), {borderWidth: '1px'}), + style:styleControl(InputFieldStyle), labelStyle: styleControl(LabelStyle.filter((style) => ['accent', 'validate'].includes(style.name) === false)), inputFieldStyle:migrateOldData(styleControl(RatingStyle), fixOldData), ...formDataChildren, diff --git a/client/packages/lowcoder/src/comps/comps/textInputComp/inputComp.tsx b/client/packages/lowcoder/src/comps/comps/textInputComp/inputComp.tsx index 3e71e3b3d..5141f1d07 100644 --- a/client/packages/lowcoder/src/comps/comps/textInputComp/inputComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/textInputComp/inputComp.tsx @@ -49,11 +49,11 @@ const childrenMap = { viewRef: RefControl, showCount: BoolControl, allowClear: BoolControl, - style: withDefault(styleControl(InputFieldStyle), {borderWidth: '1px'}), - labelStyle: styleControl(LabelStyle), + style: styleControl(InputFieldStyle), + labelStyle:styleControl(LabelStyle), prefixIcon: IconControl, suffixIcon: IconControl, - inputFieldStyle: styleControl(InputLikeStyle), + inputFieldStyle:withDefault(styleControl(InputLikeStyle),{borderWidth: '1px'}) , }; let InputBasicComp = new UICompBuilder(childrenMap, (props) => { diff --git a/client/packages/lowcoder/src/comps/comps/textInputComp/passwordComp.tsx b/client/packages/lowcoder/src/comps/comps/textInputComp/passwordComp.tsx index ca005ea32..e28655ab4 100644 --- a/client/packages/lowcoder/src/comps/comps/textInputComp/passwordComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/textInputComp/passwordComp.tsx @@ -57,9 +57,9 @@ let PasswordTmpComp = (function () { validationType: dropdownControl(TextInputValidationOptions, "Regex"), visibilityToggle: BoolControl.DEFAULT_TRUE, prefixIcon: IconControl, - style: withDefault(styleControl(InputFieldStyle), {borderWidth: '1px'}), + style:styleControl(InputFieldStyle), labelStyle: styleControl(LabelStyle), - inputFieldStyle: styleControl(InputLikeStyle) + inputFieldStyle: withDefault(styleControl(InputLikeStyle),{borderWidth: '1px'}), }; return new UICompBuilder(childrenMap, (props) => { const [inputProps, validateState] = useTextInputProps(props); diff --git a/client/packages/lowcoder/src/comps/comps/textInputComp/textAreaComp.tsx b/client/packages/lowcoder/src/comps/comps/textInputComp/textAreaComp.tsx index 530ce4afe..313ae2c7c 100644 --- a/client/packages/lowcoder/src/comps/comps/textInputComp/textAreaComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/textInputComp/textAreaComp.tsx @@ -71,9 +71,9 @@ let TextAreaTmpComp = (function () { viewRef: RefControl, allowClear: BoolControl, autoHeight: withDefault(AutoHeightControl, "fixed"), - style: withDefault(styleControl(InputFieldStyle), {borderWidth: '1px'}), + style: styleControl(InputFieldStyle), labelStyle: styleControl(LabelStyle), - inputFieldStyle: styleControl(InputLikeStyle) + inputFieldStyle: withDefault(styleControl(InputLikeStyle), {borderWidth: '1px'}), }; return new UICompBuilder(childrenMap, (props) => { const [inputProps, validateState] = useTextInputProps(props); diff --git a/client/packages/lowcoder/src/comps/comps/treeComp/treeSelectComp.tsx b/client/packages/lowcoder/src/comps/comps/treeComp/treeSelectComp.tsx index 0b9f6d3da..a9036be7c 100644 --- a/client/packages/lowcoder/src/comps/comps/treeComp/treeSelectComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/treeComp/treeSelectComp.tsx @@ -65,7 +65,7 @@ const childrenMap = { allowClear: BoolControl, showSearch: BoolControl.DEFAULT_TRUE, inputValue: stateComp(""), // search value - style: withDefault(styleControl(InputFieldStyle), {borderWidth: '1px'}), + style:styleControl(InputFieldStyle), labelStyle:styleControl(LabelStyle), inputFieldStyle: withDefault(styleControl(TreeSelectStyle), {borderWidth: '1px'}), viewRef: RefControl, From 03b6355a80835a7120e456ba9893579c85d97bb2 Mon Sep 17 00:00:00 2001 From: MenamAfzal Date: Mon, 20 May 2024 16:58:12 +0500 Subject: [PATCH 7/7] default background color for input components set to transparent --- .../src/comps/comps/numberInputComp/numberInputComp.tsx | 2 +- .../src/comps/comps/numberInputComp/sliderCompConstants.tsx | 2 +- client/packages/lowcoder/src/comps/comps/ratingComp.tsx | 2 +- .../lowcoder/src/comps/comps/textInputComp/inputComp.tsx | 2 +- .../lowcoder/src/comps/comps/textInputComp/passwordComp.tsx | 2 +- .../lowcoder/src/comps/comps/textInputComp/textAreaComp.tsx | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/numberInputComp/numberInputComp.tsx b/client/packages/lowcoder/src/comps/comps/numberInputComp/numberInputComp.tsx index c3a7ec945..7b570ec64 100644 --- a/client/packages/lowcoder/src/comps/comps/numberInputComp/numberInputComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/numberInputComp/numberInputComp.tsx @@ -257,7 +257,7 @@ const childrenMap = { allowNull: BoolControl, onEvent: InputEventHandlerControl, viewRef: RefControl, - style: styleControl(InputFieldStyle), + style: withDefault(styleControl(InputFieldStyle),{background:'transparent'}) , labelStyle:styleControl(LabelStyle), prefixText : stringExposingStateControl("defaultValue"), animationStyle: styleControl(AnimationStyle), diff --git a/client/packages/lowcoder/src/comps/comps/numberInputComp/sliderCompConstants.tsx b/client/packages/lowcoder/src/comps/comps/numberInputComp/sliderCompConstants.tsx index 859e988da..ce086bd09 100644 --- a/client/packages/lowcoder/src/comps/comps/numberInputComp/sliderCompConstants.tsx +++ b/client/packages/lowcoder/src/comps/comps/numberInputComp/sliderCompConstants.tsx @@ -71,7 +71,7 @@ export const SliderChildren = { label: LabelControl, disabled: BoolCodeControl, onEvent: ChangeEventHandlerControl, - style:styleControl(InputFieldStyle), + style: withDefault(styleControl(InputFieldStyle),{background:'transparent'}) , labelStyle:styleControl(LabelStyle.filter((style)=> ['accent','validate'].includes(style.name) === false)), prefixIcon: IconControl, suffixIcon: IconControl, diff --git a/client/packages/lowcoder/src/comps/comps/ratingComp.tsx b/client/packages/lowcoder/src/comps/comps/ratingComp.tsx index 642a56d30..f4b2cbab0 100644 --- a/client/packages/lowcoder/src/comps/comps/ratingComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/ratingComp.tsx @@ -43,7 +43,7 @@ const RatingBasicComp = (function () { allowHalf: BoolControl, disabled: BoolCodeControl, onEvent: eventHandlerControl(EventOptions), - style:styleControl(InputFieldStyle), + style: withDefault(styleControl(InputFieldStyle),{background:'transparent'}) , animationStyle: styleControl(AnimationStyle), labelStyle: styleControl( LabelStyle.filter( diff --git a/client/packages/lowcoder/src/comps/comps/textInputComp/inputComp.tsx b/client/packages/lowcoder/src/comps/comps/textInputComp/inputComp.tsx index 049a01ed7..349e30e67 100644 --- a/client/packages/lowcoder/src/comps/comps/textInputComp/inputComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/textInputComp/inputComp.tsx @@ -49,7 +49,7 @@ const childrenMap = { viewRef: RefControl, showCount: BoolControl, allowClear: BoolControl, - style: styleControl(InputFieldStyle), + style: withDefault(styleControl(InputFieldStyle),{background:'transparent'}) , labelStyle:styleControl(LabelStyle), prefixIcon: IconControl, suffixIcon: IconControl, diff --git a/client/packages/lowcoder/src/comps/comps/textInputComp/passwordComp.tsx b/client/packages/lowcoder/src/comps/comps/textInputComp/passwordComp.tsx index 7d2216bb3..94b63ab77 100644 --- a/client/packages/lowcoder/src/comps/comps/textInputComp/passwordComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/textInputComp/passwordComp.tsx @@ -57,7 +57,7 @@ let PasswordTmpComp = (function () { validationType: dropdownControl(TextInputValidationOptions, "Regex"), visibilityToggle: BoolControl.DEFAULT_TRUE, prefixIcon: IconControl, - style:styleControl(InputFieldStyle), + style: withDefault(styleControl(InputFieldStyle),{background:'transparent'}) , labelStyle: styleControl(LabelStyle), inputFieldStyle: withDefault(styleControl(InputLikeStyle),{borderWidth: '1px'}), animationStyle: styleControl(AnimationStyle), diff --git a/client/packages/lowcoder/src/comps/comps/textInputComp/textAreaComp.tsx b/client/packages/lowcoder/src/comps/comps/textInputComp/textAreaComp.tsx index 2d693481c..6171aeae4 100644 --- a/client/packages/lowcoder/src/comps/comps/textInputComp/textAreaComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/textInputComp/textAreaComp.tsx @@ -71,7 +71,7 @@ let TextAreaTmpComp = (function () { viewRef: RefControl, allowClear: BoolControl, autoHeight: withDefault(AutoHeightControl, "fixed"), - style: styleControl(InputFieldStyle), + style: withDefault(styleControl(InputFieldStyle),{background:'transparent'}) , labelStyle: styleControl(LabelStyle), inputFieldStyle: withDefault(styleControl(InputLikeStyle), {borderWidth: '1px'}), animationStyle: styleControl(AnimationStyle)