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

Commit32b706f

Browse files
committed
[Feat]:#1867 add styles for the button column
1 parent0e5aa97 commit32b706f

File tree

3 files changed

+26
-6
lines changed

3 files changed

+26
-6
lines changed

‎client/packages/lowcoder/src/comps/comps/tableComp/column/simpleColumnTypeComps.tsx‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { BoolCodeControl, StringControl } from "comps/controls/codeControl";
44
import{dropdownControl}from"comps/controls/dropdownControl";
55
import{disabledPropertyView,loadingPropertyView}from"comps/utils/propertyUtils";
66
import{trans}from"i18n";
7-
import{useStyle}from"comps/controls/styleControl";
8-
import{ButtonStyle}from"comps/controls/styleControlConstants";
7+
import{styleControl,useStyle}from"comps/controls/styleControl";
8+
import{ButtonStyle,TableColumnButtonStyle}from"comps/controls/styleControlConstants";
99
import{Button100}from"comps/comps/buttonComp/buttonCompConstants";
1010
import{IconControl}from"comps/controls/iconControl";
1111
import{hasIcon}from"comps/utils";
@@ -58,10 +58,11 @@ const childrenMap = {
5858
disabled:BoolCodeControl,
5959
prefixIcon:IconControl,
6060
suffixIcon:IconControl,
61+
style:styleControl(TableColumnButtonStyle,'style',{boldTitle:true}),
6162
};
6263

6364
constButtonStyled=React.memo(({ props}:{props:ToViewReturn<RecordConstructorToComp<typeofchildrenMap>>})=>{
64-
conststyle=useStyle(ButtonStyle);
65+
constthemeButtonStyle=useStyle(ButtonStyle);
6566
consthasText=!!props.text;
6667
consthasPrefixIcon=hasIcon(props.prefixIcon);
6768
consthasSuffixIcon=hasIcon(props.suffixIcon);
@@ -85,7 +86,10 @@ const ButtonStyled = React.memo(({ props }: { props: ToViewReturn<RecordConstruc
8586
onClick={handleClick}
8687
loading={props.loading}
8788
disabled={props.disabled}
88-
$buttonStyle={props.buttonType==="primary" ?style :undefined}
89+
$buttonStyle={props.buttonType==="primary" ?({
90+
...themeButtonStyle,
91+
...(props.styleasany),
92+
}asany) :undefined}
8993
style={buttonStyle}
9094
icon={hasPrefixIcon ?props.prefixIcon :undefined}
9195
>
@@ -120,6 +124,7 @@ const ButtonCompTmp = (function () {
120124
})}
121125
{loadingPropertyView(children)}
122126
{disabledPropertyView(children)}
127+
{children.style.getPropertyView()}
123128
{children.onClick.propertyView()}
124129
</>
125130
))

‎client/packages/lowcoder/src/comps/controls/styleControl.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -937,11 +937,12 @@ function calcColors<ColorMap extends Record<string, string>>(
937937
returnresasColorMap;
938938
}
939939

940-
constTitleDiv=styled.div`
940+
constTitleDiv=styled.div<{$boldTitle?:boolean}>`
941941
display: flex;
942942
justify-content: space-between;
943943
font-size: 13px;
944944
line-height: 1;
945+
font-weight:${(props)=>(props.$boldTitle ?600 :400)};
945946
946947
span:nth-of-type(2) {
947948
cursor: pointer;
@@ -1149,6 +1150,7 @@ const useThemeStyles = (
11491150
exportfunctionstyleControl<TextendsreadonlySingleColorConfig[]>(
11501151
colorConfigs:T,
11511152
styleKey:string='',
1153+
options?:{boldTitle?:boolean},
11521154
){
11531155
typeColorMap={[KinNames<T>]:string};
11541156
constchildrenMap:any={};
@@ -1268,7 +1270,7 @@ export function styleControl<T extends readonly SingleColorConfig[]>(
12681270

12691271
return(
12701272
<>
1271-
<TitleDiv>
1273+
<TitleDiv$boldTitle={options?.boldTitle}>
12721274
<span>{label}</span>
12731275
{showReset&&(
12741276
<span

‎client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2371,6 +2371,18 @@ export const RichTextEditorStyle = [
23712371
BORDER_WIDTH,
23722372
]asconst;
23732373

2374+
exportconstTableColumnButtonStyle=[
2375+
getBackground('primary'),
2376+
{
2377+
name:"text",
2378+
label:trans("style.text"),
2379+
color:"#000000",
2380+
},
2381+
PADDING,
2382+
BORDER,
2383+
]asconst;
2384+
2385+
23742386
exporttypeQRCodeStyleType=StyleConfigType<typeofQRCodeStyle>;
23752387
exporttypeTimeLineStyleType=StyleConfigType<typeofTimeLineStyle>;
23762388
exporttypeAvatarStyleType=StyleConfigType<typeofAvatarStyle>;
@@ -2437,6 +2449,7 @@ export type TableColumnStyleType = StyleConfigType<typeof TableColumnStyle>;
24372449
exporttypeTableColumnLinkStyleType=StyleConfigType<
24382450
typeofTableColumnLinkStyle
24392451
>;
2452+
exporttypeTableColumnButtonStyleType=StyleConfigType<typeofTableColumnButtonStyle>;
24402453
exporttypeTableSummaryRowStyleType=StyleConfigType<typeofTableSummaryRowStyle>;
24412454
exporttypeFileStyleType=StyleConfigType<typeofFileStyle>;
24422455
exporttypeFileViewerStyleType=StyleConfigType<typeofFileViewerStyle>;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp