test/ant-design-blazor
1
0
Fork 0
mirror of https://gitee.com/ant-design-blazor/ant-design-blazor.git synced 2024-12-04 21:17:36 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix(module: input): missing disabled attribute (#1048)

Browse Source
This commit is contained in:
Andrzej Bakun 2021-01-27 06:42:04 +01:00 committed by GitHub
parent 234dcc93e7
commit 536bb9a586
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/input-number/InputNumber.razor
View File

@ -13,6 +13,6 @@
</div>
<div class="ant-input-number-input-wrap">
<input @ref="Ref" role="spinbutton" aria-valuemin="@Min" aria-valuemax="@Max" autocomplete="off" max="@Max" min="@Min" step="@Step"
aria-valuenow="@CurrentValue" class="ant-input-number-input" @bind="@CurrentValueAsString" @oninput="OnInput" @onfocus="@OnFocus" @onblur="@OnBlurAsync" />
aria-valuenow="@CurrentValue" class="ant-input-number-input" @bind="@CurrentValueAsString" @oninput="OnInput" @onfocus="@OnFocus" @onblur="@OnBlurAsync" disabled="@Disabled" />
</div>
</div>

40
components/input/Input.cs
View File

@ -440,43 +440,53 @@ namespace AntDesign
builder.AddAttribute(43, "style", Style);
}
bool needsDisabled = Disabled;
if (Attributes != null)
{
builder.AddMultipleAttributes(44, Attributes);
if (!Attributes.TryGetValue("disabled", out object disabledAttribute))
{
needsDisabled = ((bool?)disabledAttribute ?? needsDisabled) | Disabled;
}
}
if (AdditionalAttributes != null)
{
builder.AddMultipleAttributes(45, AdditionalAttributes);
if (!AdditionalAttributes.TryGetValue("disabled", out object disabledAttribute))
{
needsDisabled = ((bool?)disabledAttribute ?? needsDisabled) | Disabled;
}
}
builder.AddAttribute(50, "Id", Id);
builder.AddAttribute(51, "type", Type);
builder.AddAttribute(60, "placeholder", Placeholder);
builder.AddAttribute(61, "value", CurrentValue);
builder.AddAttribute(62, "disabled", needsDisabled);
// onchange 和 onblur 事件会导致点击 OnSearch 按钮时不触发 Click 事件，暂时取消这两个事件
if (!IgnoreOnChangeAndBlur)
{
builder.AddAttribute(62, "onchange", CallbackFactory.Create(this, OnChangeAsync));
builder.AddAttribute(65, "onblur", CallbackFactory.Create(this, OnBlurAsync));
builder.AddAttribute(70, "onchange", CallbackFactory.Create(this, OnChangeAsync));
builder.AddAttribute(71, "onblur", CallbackFactory.Create(this, OnBlurAsync));
}
builder.AddAttribute(63, "onkeypress", CallbackFactory.Create(this, OnKeyPressAsync));
builder.AddAttribute(64, "onkeydown", CallbackFactory.Create(this, OnkeyDownAsync));
builder.AddAttribute(65, "onkeyup", CallbackFactory.Create(this, OnKeyUpAsync));
builder.AddAttribute(66, "oninput", CallbackFactory.Create(this, OnInputAsync));
builder.AddAttribute(67, "onfocus", CallbackFactory.Create(this, OnFocusAsync));
builder.AddAttribute(68, "onmouseup", CallbackFactory.Create(this, OnMouseUpAsync));
builder.AddElementReferenceCapture(69, r => Ref = r);
builder.AddAttribute(72, "onkeypress", CallbackFactory.Create(this, OnKeyPressAsync));
builder.AddAttribute(73, "onkeydown", CallbackFactory.Create(this, OnkeyDownAsync));
builder.AddAttribute(74, "onkeyup", CallbackFactory.Create(this, OnKeyUpAsync));
builder.AddAttribute(75, "oninput", CallbackFactory.Create(this, OnInputAsync));
builder.AddAttribute(76, "onfocus", CallbackFactory.Create(this, OnFocusAsync));
builder.AddAttribute(77, "onmouseup", CallbackFactory.Create(this, OnMouseUpAsync));
builder.AddElementReferenceCapture(90, r => Ref = r);
builder.CloseElement();
if (Suffix != null)
{
// suffix
builder.OpenElement(71, "span");
builder.AddAttribute(72, "class", $"{PrefixCls}-suffix");
builder.AddContent(73, Suffix);
builder.OpenElement(91, "span");
builder.AddAttribute(92, "class", $"{PrefixCls}-suffix");
builder.AddContent(93, Suffix);
builder.CloseElement();
}
@ -488,9 +498,9 @@ namespace AntDesign
if (AddOnAfter != null)
{
// addOnAfter
builder.OpenElement(81, "span");
builder.AddAttribute(82, "class", $"{PrefixCls}-group-addon");
builder.AddContent(83, AddOnAfter);
builder.OpenElement(100, "span");
builder.AddAttribute(101, "class", $"{PrefixCls}-group-addon");
builder.AddContent(102, AddOnAfter);
builder.CloseElement();
}

1
components/input/TextArea.razor
View File

@ -18,6 +18,7 @@
{ "id", Id },
{ "style", Style },
{ "class", ClassMapper.Class },
{ "disabled", Disabled },
};
if (Attributes != null)