Skip to content

Commit d5eb4b3

Browse files
author
FalkWolsky
committed
Icon Fix in Table Column Editor
1 parent 0d40d43 commit d5eb4b3

File tree

1 file changed

+22
-9
lines changed

1 file changed

+22
-9
lines changed

client/packages/lowcoder/src/comps/comps/tableComp/column/tableColumnComp.tsx

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
withFunction,
2222
wrapChildAction,
2323
} from "lowcoder-core";
24-
import { AlignClose, AlignLeft, AlignRight, IconRadius, TextSizeIcon, controlItem } from "lowcoder-design";
24+
import { AlignClose, AlignLeft, AlignRight, IconRadius, BorderWidthIcon, TextSizeIcon, FontFamilyIcon, TextWeigthIcon, ImageCompIcon, controlItem } from "lowcoder-design";
2525
import { ColumnTypeComp, ColumnTypeCompMap } from "./columnTypeComp";
2626
import { ColorControl } from "comps/controls/colorControl";
2727
import { JSONValue } from "util/jsonTypes";
@@ -106,18 +106,21 @@ export const columnChildrenMap = {
106106
borderWidth: withDefault(RadiusControl, ""),
107107
radius: withDefault(RadiusControl, ""),
108108
textSize: withDefault(RadiusControl, ""),
109-
textWeight: withDefault(RadiusControl, "regular"),
110-
fontFamily: withDefault(RadiusControl, "sans-serif"),
109+
textWeight: withDefault(StringControl, "regular"),
110+
fontFamily: withDefault(StringControl, "sans-serif"),
111111
cellColor: CellColorComp,
112112
textOverflow: withDefault(TextOverflowControl, "ellipsis"),
113113
linkColor: withDefault(ColorControl, "#3377ff"),
114114
linkHoverColor: withDefault(ColorControl, ""),
115115
linkActiveColor: withDefault(ColorControl, ""),
116116
};
117117

118-
const StyledIcon = styled.span`
119-
margin: 0 4px 0 14px;
120-
`;
118+
const StyledBorderRadiusIcon = styled(IconRadius)` width: 24px; margin: 0 8px 0 -3px; padding: 3px;`;
119+
const StyledBorderIcon = styled(BorderWidthIcon)` width: 24px; margin: 0 8px 0 -3px; padding: 3px;`;
120+
const StyledTextSizeIcon = styled(TextSizeIcon)` width: 24px; margin: 0 8px 0 -3px; padding: 3px;`;
121+
const StyledFontFamilyIcon = styled(FontFamilyIcon)` width: 24px; margin: 0 8px 0 -3px; padding: 3px;`;
122+
const StyledTextWeightIcon = styled(TextWeigthIcon)` width: 24px; margin: 0 8px 0 -3px; padding: 3px;`;
123+
const StyledBackgroundImageIcon = styled(ImageCompIcon)` width: 24px; margin: 0 0px 0 -12px;`;
121124

122125
/**
123126
* export for test.
@@ -257,19 +260,29 @@ export class ColumnComp extends ColumnInitComp {
257260
})}
258261
{this.children.borderWidth.propertyView({
259262
label: trans('style.borderWidth'),
260-
preInputNode: <StyledIcon as={IconRadius} title="" />,
263+
preInputNode: <StyledBorderIcon as={BorderWidthIcon} title="" />,
261264
placeholder: '1px',
262265
})}
263266
{this.children.radius.propertyView({
264267
label: trans('style.borderRadius'),
265-
preInputNode: <StyledIcon as={IconRadius} title="" />,
268+
preInputNode: <StyledBorderRadiusIcon as={IconRadius} title="" />,
266269
placeholder: '3px',
267270
})}
268271
{this.children.textSize.propertyView({
269272
label: trans('style.textSize'),
270-
preInputNode: <StyledIcon as={TextSizeIcon} title="" />,
273+
preInputNode: <StyledTextSizeIcon as={TextSizeIcon} title="" />,
271274
placeholder: '14px',
272275
})}
276+
{this.children.textWeight.propertyView({
277+
label: trans('style.textWeight'),
278+
preInputNode: <StyledTextWeightIcon as={TextWeigthIcon} title="" />,
279+
placeholder: 'regular',
280+
})}
281+
{this.children.fontFamily.propertyView({
282+
label: trans('style.fontFamily'),
283+
preInputNode: <StyledFontFamilyIcon as={FontFamilyIcon} title="" />,
284+
placeholder: 'sans-serif',
285+
})}
273286
{this.children.textOverflow.getPropertyView()}
274287
{this.children.cellColor.getPropertyView()}
275288
</>

0 commit comments

Comments
 (0)