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

Commita4533b0

Browse files
committed
Merge branch 'dev' into app_versioning
2 parentsacf9828 +62e83b8 commita4533b0

File tree

46 files changed

+1418
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1418
-174
lines changed

‎client/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.2
1+
2.7.3

‎client/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"lowcoder-frontend",
3-
"version":"2.7.2",
3+
"version":"2.7.3",
44
"type":"module",
55
"private":true,
66
"workspaces": [

‎client/packages/lowcoder-comps/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"lowcoder-comps",
3-
"version":"2.7.2",
3+
"version":"2.7.3",
44
"type":"module",
55
"license":"MIT",
66
"dependencies": {

‎client/packages/lowcoder-sdk-webpack-bundle/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name":"lowcoder-sdk-webpack-bundle",
33
"description":"",
4-
"version":"2.7.2",
4+
"version":"2.7.3",
55
"main":"index.jsx",
66
"scripts": {
77
"test":"echo\"Error: no test specified\" && exit 1",

‎client/packages/lowcoder-sdk/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"lowcoder-sdk",
3-
"version":"2.7.2",
3+
"version":"2.7.3",
44
"type":"module",
55
"files": [
66
"src",

‎client/packages/lowcoder/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"lowcoder",
3-
"version":"2.7.2",
3+
"version":"2.7.3",
44
"private":true,
55
"type":"module",
66
"main":"src/index.sdk.ts",

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import{BoolCodeControl,StringControl}from"comps/controls/codeControl";
1+
import{BoolCodeControl,StringControl,NumberControl}from"comps/controls/codeControl";
22
import{dropdownControl}from"comps/controls/dropdownControl";
33
import{ButtonEventHandlerControl}from"comps/controls/eventHandlerControl";
44
import{IconControl}from"comps/controls/iconControl";
@@ -137,7 +137,8 @@ const childrenMap = {
137137
disabledStyle:DisabledButtonStyleControl,
138138
animationStyle:styleControl(AnimationStyle,'animationStyle'),
139139
viewRef:RefControl<HTMLElement>,
140-
tooltip:StringControl
140+
tooltip:StringControl,
141+
tabIndex:NumberControl
141142
};
142143

143144
typeChildrenType=NewChildren<RecordConstructorToComp<typeofchildrenMap>>;
@@ -162,8 +163,12 @@ const ButtonPropertyView = React.memo((props: {
162163
disabledPropertyView(props.children),
163164
hiddenPropertyView(props.children),
164165
loadingPropertyView(props.children),
166+
props.children.tabIndex.propertyView({label:trans("prop.tabIndex")}),
165167
]
166-
:props.children.form.getPropertyView()}
168+
:[
169+
props.children.form.getPropertyView(),
170+
props.children.tabIndex.propertyView({label:trans("prop.tabIndex")}),
171+
]}
167172
</Section>
168173
</>
169174
)}
@@ -222,6 +227,7 @@ const ButtonView = React.memo((props: ToViewReturn<ChildrenType>) => {
222227
(!isDefault(props.type)&&getForm(editorState,props.form)?.disableSubmit())
223228
}
224229
onClick={handleClick}
230+
tabIndex={typeofprops.tabIndex==='number' ?props.tabIndex :undefined}
225231
>
226232
{props.prefixIcon&&<IconWrapper>{props.prefixIcon}</IconWrapper>}
227233
{

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,28 @@ export function getButtonStyle(buttonStyle: ButtonStyleType, disabledStyle: Disa
1111
consthoverColor=buttonStyle.background&&genHoverColor(buttonStyle.background);
1212
constactiveColor=buttonStyle.background&&genActiveColor(buttonStyle.background);
1313
returncss`
14-
& {
14+
&&& {
1515
border-radius:${buttonStyle.radius};
1616
border-width:${buttonStyle.borderWidth};
1717
margin:${buttonStyle.margin};
1818
padding:${buttonStyle.padding};
1919
rotate:${buttonStyle.rotation};
20+
--antd-wave-shadow-color:${buttonStyle.border};
21+
border-color:${buttonStyle.border};
22+
color:${buttonStyle.text};
23+
font-size:${buttonStyle.textSize};
24+
font-weight:${buttonStyle.textWeight};
25+
font-family:${buttonStyle.fontFamily};
26+
font-style:${buttonStyle.fontStyle};
27+
text-transform:${buttonStyle.textTransform};
28+
text-decoration:${buttonStyle.textDecoration};
29+
border-radius:${buttonStyle.radius};
30+
margin:${buttonStyle.margin};
31+
padding:${buttonStyle.padding};
32+
2033
&:not(:disabled) {
21-
--antd-wave-shadow-color:${buttonStyle.border};
22-
border-color:${buttonStyle.border};
23-
color:${buttonStyle.text};
24-
font-size:${buttonStyle.textSize};
25-
font-weight:${buttonStyle.textWeight};
26-
font-family:${buttonStyle.fontFamily};
27-
font-style:${buttonStyle.fontStyle};
28-
text-transform:${buttonStyle.textTransform};
29-
text-decoration:${buttonStyle.textDecoration};
3034
background:${buttonStyle.background};
31-
border-radius:${buttonStyle.radius};
32-
margin:${buttonStyle.margin};
33-
padding:${buttonStyle.padding};
34-
35+
3536
&:hover,
3637
&:focus {
3738
color:${buttonStyle.text};
@@ -48,14 +49,13 @@ export function getButtonStyle(buttonStyle: ButtonStyleType, disabledStyle: Disa
4849
:buttonStyle.border}!important;
4950
}
5051
}
51-
52-
/* Disabled state styling */
5352
&:disabled,
54-
&.ant-btn-disabled {
55-
color:${disabledStyle.disabledText};
56-
background:${disabledStyle.disabledBackground};
57-
border-color:${disabledStyle.disabledBorder};
58-
cursor: not-allowed;
53+
&.ant-btn-disabled,
54+
&[disabled] {
55+
background:${disabledStyle.disabledBackground}!important;
56+
cursor: not-allowed!important;
57+
color:${disabledStyle.disabledText||buttonStyle.text}!important;
58+
border-color:${disabledStyle.disabledBorder||buttonStyle.border}!important;
5959
}
6060
}
6161
`;

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{defaultasButton}from"antd/es/button";
22
import{ButtonCompWrapper,buttonRefMethods}from"comps/comps/buttonComp/buttonCompConstants";
3-
import{BoolCodeControl,StringControl}from"comps/controls/codeControl";
3+
import{BoolCodeControl,StringControl,NumberControl}from"comps/controls/codeControl";
44
import{ButtonEventHandlerControl}from"comps/controls/eventHandlerControl";
55
import{styleControl}from"comps/controls/styleControl";
66
import{AnimationStyle,AnimationStyleType,LinkStyle,LinkStyleType}from"comps/controls/styleControlConstants";
@@ -91,6 +91,7 @@ const LinkTmpComp = (function () {
9191
prefixIcon:IconControl,
9292
suffixIcon:IconControl,
9393
viewRef:RefControl<HTMLElement>,
94+
tabIndex:NumberControl,
9495
};
9596
returnnewUICompBuilder(childrenMap,(props)=>{
9697
// chrome86 bug: button children should not contain only empty span
@@ -105,6 +106,7 @@ const LinkTmpComp = (function () {
105106
disabled={props.disabled}
106107
onClick={()=>props.onEvent("click")}
107108
type={"link"}
109+
tabIndex={typeofprops.tabIndex==='number' ?props.tabIndex :undefined}
108110
>
109111
{hasChildren&&(
110112
<span>
@@ -131,6 +133,7 @@ const LinkTmpComp = (function () {
131133
{hiddenPropertyView(children)}
132134
{loadingPropertyView(children)}
133135
{showDataLoadingIndicatorsPropertyView(children)}
136+
{children.tabIndex.propertyView({label:trans("prop.tabIndex")})}
134137
</Section>
135138
<Sectionname={sectionNames.advanced}>
136139
{children.prefixIcon.propertyView({label:trans("button.prefixIcon")})}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import{BoolCodeControl,StringControl}from"comps/controls/codeControl";
1+
import{BoolCodeControl,StringControl,NumberControl}from"comps/controls/codeControl";
22
import{withDefault}from"comps/generators";
33
import{UICompBuilder}from"comps/generators/uiCompBuilder";
44
import{
@@ -68,6 +68,7 @@ const ToggleTmpComp = (function () {
6868
showBorder:withDefault(BoolControl,true),
6969
viewRef:RefControl<HTMLElement>,
7070
tooltip:StringControl,
71+
tabIndex:NumberControl,
7172
};
7273
returnnewUICompBuilder(childrenMap,(props)=>{
7374
consttext=props.showText
@@ -92,6 +93,7 @@ const ToggleTmpComp = (function () {
9293
props.onEvent("change");
9394
props.value.onChange(!props.value.value);
9495
}}
96+
tabIndex={typeofprops.tabIndex==='number' ?props.tabIndex :undefined}
9597
>
9698
{props.iconPosition==="right"&&text}
9799
{<IconWrapper>{props.value.value ?props.trueIcon :props.falseIcon}</IconWrapper>}
@@ -117,6 +119,7 @@ const ToggleTmpComp = (function () {
117119
{hiddenPropertyView(children)}
118120
{loadingPropertyView(children)}
119121
{showDataLoadingIndicatorsPropertyView(children)}
122+
{children.tabIndex.propertyView({label:trans("prop.tabIndex")})}
120123
</Section>
121124
<Sectionname={sectionNames.advanced}>
122125
{children.showText.propertyView({label:trans("toggleButton.showText")})}

0 commit comments

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