From f44e48d08d3f8dd347b829166107dd62e5e18c72 Mon Sep 17 00:00:00 2001 From: huanlirui Date: Mon, 29 Jan 2024 11:56:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=20element-plus=202.5?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BB=A5=E4=B8=8A=EF=BC=8Cel-form-item=20inl?= =?UTF-8?q?ine=E6=A8=A1=E5=BC=8F=E4=B8=8B=EF=BC=8Cselect=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Form/src/Form.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index 8f111a9bc..00e089e51 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -424,7 +424,12 @@ export default defineComponent({ margin-left: 0 !important; } -.@{elNamespace}-form--inline .@{elNamespace}-input { - width: 245px; +.@{elNamespace}-form--inline { + .@{elNamespace}-input { + min-width: 189.5px; + } + .@{elNamespace}-select { + min-width: 189.5px; + } } From ab98ceb85f52c5f7b87c2114997c63f1b80f216f Mon Sep 17 00:00:00 2001 From: huanlirui Date: Mon, 29 Jan 2024 15:16:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=85=BC=E5=AE=B9Form=20=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E4=B8=ADcontentMap=E4=B8=AD=E7=B1=BB=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=A1=86=E6=88=96=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=9A=84=E6=89=80=E6=9C=89=E7=BB=84=E4=BB=B6=EF=BC=8C=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E5=85=BC=E5=AE=B9=20InputNumber=20=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Form/src/Form.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index 00e089e51..298c5b0c2 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -425,11 +425,14 @@ export default defineComponent({ } .@{elNamespace}-form--inline { - .@{elNamespace}-input { - min-width: 189.5px; + :deep(.el-form-item__content) { + & > :first-child { + min-width: 229.5px; + } } - .@{elNamespace}-select { - min-width: 189.5px; + .@{elNamespace}-input-number { + // 229.5px是兼容el-input-number的最小宽度, + min-width: 229.5px; } } From a21ebe844a2d03412e3cabfb0f204982a2e6fcbc Mon Sep 17 00:00:00 2001 From: huanlirui Date: Mon, 29 Jan 2024 18:06:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update:element-plus=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0=202.5.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f862a9df..7a2f53f0e 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "driver.js": "^1.3.1", "echarts": "^5.4.3", "echarts-wordcloud": "^2.1.0", - "element-plus": "^2.4.4", + "element-plus": "^2.5.3", "lodash-es": "^4.17.21", "mitt": "^3.0.1", "nprogress": "^0.2.0",