From 160899a6b0679790560f8dc2e000cfd85585bfd1 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Mon, 30 Dec 2024 09:10:47 +0800 Subject: [PATCH 1/4] refactor(Input): style to fit the input-group mode Co-Authored-By: A5196060 <166673003+A5196060@users.noreply.github.com> --- .../Input/BootstrapInputGroup.razor.scss | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/BootstrapBlazor/Components/Input/BootstrapInputGroup.razor.scss b/src/BootstrapBlazor/Components/Input/BootstrapInputGroup.razor.scss index f690285b3ab..ccac3533f6e 100644 --- a/src/BootstrapBlazor/Components/Input/BootstrapInputGroup.razor.scss +++ b/src/BootstrapBlazor/Components/Input/BootstrapInputGroup.razor.scss @@ -2,6 +2,7 @@ > .datetime-picker, > .select, > .switch, + > .bb-clearable-input, > .auto-complete { width: 1%; flex: 1 1 auto; @@ -39,6 +40,20 @@ } } } + + > .bb-clearable-input:not(:first-child) { + > input { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } + } + + > .bb-clearable-input:not(:last-child) { + > input { + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + } } .input-group-xs { From 7cee3032762c6699cf5b2eaf6d4ac5ae53c04690 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Mon, 30 Dec 2024 09:10:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E5=8F=B3?= =?UTF-8?q?=E4=BE=A7=E9=97=B4=E9=9A=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Input/BootstrapInput.razor.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/Input/BootstrapInput.razor.scss b/src/BootstrapBlazor/Components/Input/BootstrapInput.razor.scss index a1ea2c7166d..771d3452904 100644 --- a/src/BootstrapBlazor/Components/Input/BootstrapInput.razor.scss +++ b/src/BootstrapBlazor/Components/Input/BootstrapInput.razor.scss @@ -14,7 +14,7 @@ color: var(--bb-border-hover-color); cursor: pointer; position: absolute; - right: 11px; + right: 10px; display: none; } From 3df469b1c3330d5b99a82a4e7deba9ab88121c6c Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Mon, 30 Dec 2024 09:11:20 +0800 Subject: [PATCH 3/4] chore: bump version 9.2.0 --- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 46b5ff3f9b1..047f0af70a4 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@ - 9.2.0-beta01 + 9.2.0 From e07313a5c492e40cbd22a52d1f498412ae617bc0 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Mon, 30 Dec 2024 09:25:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?doc:=20=E5=A2=9E=E5=8A=A0=20Clearable=20?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/Inputs.razor | 29 +++++++++++++++++++ src/BootstrapBlazor.Server/Locales/en-US.json | 4 ++- src/BootstrapBlazor.Server/Locales/zh-CN.json | 4 ++- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/Inputs.razor b/src/BootstrapBlazor.Server/Components/Samples/Inputs.razor index 00f975a613a..499511f1a7d 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Inputs.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/Inputs.razor @@ -222,4 +222,33 @@ + +
+
+ +
+
+
+
+ +
+
+
+
+ + + + +
+
+ + + + +
+
+ + diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json index 64872a4fbea..f1e8eed7059 100644 --- a/src/BootstrapBlazor.Server/Locales/en-US.json +++ b/src/BootstrapBlazor.Server/Locales/en-US.json @@ -2780,7 +2780,9 @@ "InputsFormatStringSetting": "Set up", "InputsFormatStringTips": "The BootstrapInput component binds byte[] array and formats it as an example of base64 encoded string", "UseInputEvent": "Whether use oninput event when bind-value", - "IsTrim": "automatically trim white space when entering content" + "IsTrim": "automatically trim white space when entering content", + "ClearableTitle": "Clearable", + "ClearableIntro": "By setting the Clearable=\"true\" parameter, a small Clear button will be displayed when the component gains focus or when the mouse hovers over it." }, "BootstrapBlazor.Server.Components.Samples.InputNumbers": { "InputNumbersTitle": "InputNumber", diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json index 19cc87cf5dc..9711b659ec7 100644 --- a/src/BootstrapBlazor.Server/Locales/zh-CN.json +++ b/src/BootstrapBlazor.Server/Locales/zh-CN.json @@ -2780,7 +2780,9 @@ "InputsFormatStringSetting": "设置", "InputsFormatStringTips": "BootstrapInput 组件绑定 byte[] 数组，格式化成 base64 编码字符串示例", "UseInputEvent": "是否在文本框输入值时触发", - "IsTrim": "是否自动去除空格" + "IsTrim": "是否自动去除空格", + "ClearableTitle": "清除", + "ClearableIntro": "通过设置 Clearable=\"true\" 参数，使组件获得焦点或者鼠标悬浮时显示一个 清除 小按钮" }, "BootstrapBlazor.Server.Components.Samples.InputNumbers": { "InputNumbersTitle": "InputNumber 组件",