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

Commit59452d2

Browse files
committed
make a seperate section for disabled
1 parentede27eb commit59452d2

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

‎client/packages/lowcoder/src/comps/comps/buttonComp/buttonComp.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import {
2121
ButtonCompWrapper,
2222
buttonRefMethods,
2323
ButtonStyleControl,
24+
DisabledButtonStyleControl,
2425
}from"./buttonCompConstants";
2526
import{RefControl}from"comps/controls/refControl";
2627
import{Tooltip}from"antd";
@@ -133,6 +134,7 @@ const childrenMap = {
133134
prefixIcon:IconControl,
134135
suffixIcon:IconControl,
135136
style:ButtonStyleControl,
137+
disabledStyle:DisabledButtonStyleControl,
136138
animationStyle:styleControl(AnimationStyle,'animationStyle'),
137139
viewRef:RefControl<HTMLElement>,
138140
tooltip:StringControl
@@ -173,6 +175,7 @@ const ButtonPropertyView = React.memo((props: {
173175
{props.children.suffixIcon.propertyView({label:trans("button.suffixIcon")})}
174176
</Section>
175177
<Sectionname={sectionNames.style}>{props.children.style.getPropertyView()}</Section>
178+
<Sectionname="Disabled">{props.children.disabledStyle.getPropertyView()}</Section>
176179
</>
177180
)}
178181
</>
@@ -212,6 +215,7 @@ const ButtonView = React.memo((props: ToViewReturn<ChildrenType>) => {
212215
<Button100
213216
ref={props.viewRef}
214217
$buttonStyle={props.style}
218+
$disabledStyle={props.disabledStyle}
215219
loading={props.loading}
216220
disabled={
217221
props.disabled||

‎client/packages/lowcoder/src/comps/comps/buttonComp/buttonCompConstants.tsx

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import{defaultasButton}from"antd/es/button";
22
import{styleControl}from"comps/controls/styleControl";
3-
import{ButtonStyleType,ButtonStyle}from"comps/controls/styleControlConstants";
3+
import{ButtonStyleType,ButtonStyle,DisabledButtonStyle}from"comps/controls/styleControlConstants";
44
import{migrateOldData}from"comps/generators/simpleGenerators";
55
importstyled,{css}from"styled-components";
66
import{genActiveColor,genHoverColor}from"lowcoder-design";
77
import{refMethods}from"comps/generators/withMethodExposing";
88
import{blurMethod,clickMethod,focusWithOptions}from"comps/utils/methodUtils";
99

10-
exportfunctiongetButtonStyle(buttonStyle:ButtonStyleType){
10+
exportfunctiongetButtonStyle(buttonStyle:ButtonStyleType,disabledStyle?:any){
1111
consthoverColor=buttonStyle.background&&genHoverColor(buttonStyle.background);
1212
constactiveColor=buttonStyle.background&&genActiveColor(buttonStyle.background);
1313
returncss`
@@ -52,19 +52,22 @@ export function getButtonStyle(buttonStyle: ButtonStyleType) {
5252
/* Disabled state styling */
5353
&:disabled,
5454
&.ant-btn-disabled {
55-
color:${buttonStyle.disabledText||buttonStyle.text};
56-
background:${buttonStyle.disabledBackground||buttonStyle.background};
55+
color:${disabledStyle?.disabledText||buttonStyle.text};
56+
background:${disabledStyle?.disabledBackground||buttonStyle.background};
5757
border-color:${
58-
buttonStyle.disabledBorder||buttonStyle.border
58+
disabledStyle?.disabledBorder||buttonStyle.border
5959
}!important;
6060
cursor: not-allowed;
6161
}
6262
}
6363
`;
6464
}
6565

66-
exportconstButton100=styled(Button)<{$buttonStyle?:ButtonStyleType}>`
67-
${(props)=>props.$buttonStyle&&getButtonStyle(props.$buttonStyle)}
66+
exportconstButton100=styled(Button)<{
67+
$buttonStyle?:ButtonStyleType;
68+
$disabledStyle?:any;
69+
}>`
70+
${(props)=>props.$buttonStyle&&getButtonStyle(props.$buttonStyle,props.$disabledStyle)}
6871
width: 100%;
6972
height: auto;
7073
display: inline-flex;
@@ -116,6 +119,10 @@ function fixOldData(oldData: any) {
116119
constButtonTmpStyleControl=styleControl(ButtonStyle,'style');
117120
exportconstButtonStyleControl=migrateOldData(ButtonTmpStyleControl,fixOldData);
118121

122+
// Create disabled style control
123+
constDisabledButtonTmpStyleControl=styleControl(DisabledButtonStyle,'disabledStyle');
124+
exportconstDisabledButtonStyleControl=migrateOldData(DisabledButtonTmpStyleControl,fixOldData);
125+
119126
exportconstbuttonRefMethods=refMethods<HTMLElement>([
120127
focusWithOptions,
121128
blurMethod,

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -991,6 +991,10 @@ export const DISABLED_STYLE_FIELDS = [
991991
exportconstButtonStyle=[
992992
getBackground('primary'),
993993
...STYLING_FIELDS_SEQUENCE,
994+
]asconst;
995+
996+
// Create separate disabled style control
997+
exportconstDisabledButtonStyle=[
994998
...DISABLED_STYLE_FIELDS,
995999
]asconst;
9961000

@@ -1013,7 +1017,6 @@ export const ToggleButtonStyle = [
10131017
...style,
10141018
};
10151019
}),
1016-
...DISABLED_STYLE_FIELDS,
10171020
]asconst;
10181021

10191022
exportconstTextStyle=[
@@ -2321,6 +2324,7 @@ export type InputFieldStyleType = StyleConfigType<typeof InputFieldStyle>;
23212324
exporttypeSignatureContainerStyleType=StyleConfigType<typeofSignatureContainerStyle>;
23222325
exporttypeColorPickerStyleType=StyleConfigType<typeofColorPickerStyle>;
23232326
exporttypeButtonStyleType=StyleConfigType<typeofButtonStyle>;
2327+
exporttypeDisabledButtonStyleType=StyleConfigType<typeofDisabledButtonStyle>;
23242328
exporttypeToggleButtonStyleType=StyleConfigType<typeofToggleButtonStyle>;
23252329
exporttypeTextStyleType=StyleConfigType<typeofTextStyle>;
23262330
exporttypeTextContainerStyleType=StyleConfigType<typeofTextContainerStyle>;

0 commit comments

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