From 5180d2cbcce389a3024a8d408c84201bcba64b2d Mon Sep 17 00:00:00 2001 From: liaoxuezhi <2698393+2betop@users.noreply.github.com> Date: Fri, 10 May 2024 17:20:32 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E9=81=BF=E5=85=8D=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E8=A2=AB=E6=92=91=E5=BC=80=20(#10208)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/amis-ui/scss/components/_alert.scss | 1 + .../amis-ui/scss/components/_calendar.scss | 3 +++ packages/amis-ui/scss/components/_card.scss | 4 ++++ .../amis-ui/scss/components/_cascader.scss | 6 +++++ .../amis-ui/scss/components/_city-area.scss | 2 ++ .../scss/components/_condition-builder.scss | 2 ++ packages/amis-ui/scss/components/_crud.scss | 2 ++ .../amis-ui/scss/components/_divider.scss | 5 ++++- .../amis-ui/scss/components/_formula.scss | 14 ++++++++++++ .../scss/components/_json-schema-editor.scss | 4 ++++ .../amis-ui/scss/components/_json-schema.scss | 6 +++++ packages/amis-ui/scss/components/_menu.scss | 6 +++++ packages/amis-ui/scss/components/_modal.scss | 2 ++ packages/amis-ui/scss/components/_panel.scss | 2 ++ .../scss/components/_picker-columns.scss | 2 ++ packages/amis-ui/scss/components/_popup.scss | 4 ++++ packages/amis-ui/scss/components/_steps.scss | 6 +++++ packages/amis-ui/scss/components/_tabs.scss | 4 ++++ .../amis-ui/scss/components/_timeline.scss | 2 ++ packages/amis-ui/scss/components/_toast.scss | 2 ++ .../amis-ui/scss/components/form/_combo.scss | 2 ++ .../scss/components/form/_date-range.scss | 6 +++++ .../amis-ui/scss/components/form/_excel.scss | 2 ++ .../amis-ui/scss/components/form/_file.scss | 2 ++ .../amis-ui/scss/components/form/_form.scss | 6 +++++ .../scss/components/form/_icon-select.scss | 6 +++++ .../scss/components/form/_location.scss | 4 ++++ .../scss/components/form/_nested-select.scss | 2 ++ .../amis-ui/scss/components/form/_number.scss | 2 ++ .../amis-ui/scss/components/form/_select.scss | 2 ++ .../scss/components/form/_selection.scss | 2 ++ .../amis-ui/scss/components/form/_tree.scss | 2 ++ .../scss/components/form/_user-select.scss | 22 +++++++++++++++++++ packages/amis-ui/scss/layout/_grid.scss | 2 ++ 34 files changed, 140 insertions(+), 1 deletion(-) diff --git a/packages/amis-ui/scss/components/_alert.scss b/packages/amis-ui/scss/components/_alert.scss index f0d7fc348..0ff9e42e3 100644 --- a/packages/amis-ui/scss/components/_alert.scss +++ b/packages/amis-ui/scss/components/_alert.scss @@ -38,6 +38,7 @@ &-content { flex: 1; + min-width: 0; .#{$ns}Alert-title { color: var(--alert-base-title-color); diff --git a/packages/amis-ui/scss/components/_calendar.scss b/packages/amis-ui/scss/components/_calendar.scss index 88b401042..a2f5539d7 100644 --- a/packages/amis-ui/scss/components/_calendar.scss +++ b/packages/amis-ui/scss/components/_calendar.scss @@ -193,6 +193,7 @@ .weekday { flex: 1; + min-width: 0; line-height: px2rem(30px); text-align: center; } @@ -214,6 +215,8 @@ &-body { flex: 1; + min-width: 0; + min-height: 0; overflow-y: scroll; table { diff --git a/packages/amis-ui/scss/components/_card.scss b/packages/amis-ui/scss/components/_card.scss index 39867fce4..9eceaf7f9 100644 --- a/packages/amis-ui/scss/components/_card.scss +++ b/packages/amis-ui/scss/components/_card.scss @@ -237,6 +237,8 @@ &-actions-wrapper { flex: 1; + min-width: 0; + min-height: 0; display: flex; align-items: center; justify-content: flex-end; @@ -338,6 +340,8 @@ } &-multiMedia-flex { flex: 1; + min-width: 0; + min-height: 0; display: flex; flex-direction: column; justify-content: center; diff --git a/packages/amis-ui/scss/components/_cascader.scss b/packages/amis-ui/scss/components/_cascader.scss index b898955eb..992e25bc9 100644 --- a/packages/amis-ui/scss/components/_cascader.scss +++ b/packages/amis-ui/scss/components/_cascader.scss @@ -11,6 +11,8 @@ } .#{$ns}Cascader-tab { flex: 1; + min-width: 0; + min-height: 0; width: calc((100vw - 20px) / 3); height: px2rem(260px); overflow-y: auto; @@ -77,6 +79,8 @@ } &--text { flex: 1; + min-width: 0; + min-height: 0; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -89,6 +93,8 @@ &-arrow { flex: 1; + min-width: 0; + min-height: 0; text-align: right; padding-right: px2rem(6px); > svg { diff --git a/packages/amis-ui/scss/components/_city-area.scss b/packages/amis-ui/scss/components/_city-area.scss index e047b7212..d00fa06ed 100644 --- a/packages/amis-ui/scss/components/_city-area.scss +++ b/packages/amis-ui/scss/components/_city-area.scss @@ -1,5 +1,7 @@ .#{$ns}CityArea { flex: 1; + min-width: 0; + min-height: 0; text-align: right; &-popup { diff --git a/packages/amis-ui/scss/components/_condition-builder.scss b/packages/amis-ui/scss/components/_condition-builder.scss index f51bb8ee9..c47b3bdda 100644 --- a/packages/amis-ui/scss/components/_condition-builder.scss +++ b/packages/amis-ui/scss/components/_condition-builder.scss @@ -134,6 +134,8 @@ background: #e8e9eb; display: block; flex: 1; + min-width: 0; + min-height: 0; } } } diff --git a/packages/amis-ui/scss/components/_crud.scss b/packages/amis-ui/scss/components/_crud.scss index ee9ee0999..0b710b130 100644 --- a/packages/amis-ui/scss/components/_crud.scss +++ b/packages/amis-ui/scss/components/_crud.scss @@ -111,6 +111,8 @@ &.is-mobile { .#{$ns}Crud-toolbar { flex: 1; + min-width: 0; + min-height: 0; } } } diff --git a/packages/amis-ui/scss/components/_divider.scss b/packages/amis-ui/scss/components/_divider.scss index af739d077..ecbb836c0 100644 --- a/packages/amis-ui/scss/components/_divider.scss +++ b/packages/amis-ui/scss/components/_divider.scss @@ -25,7 +25,8 @@ &--horizontal { position: relative; height: px2rem(2px); - border-bottom: var(--Divider-width) var(--Divider-style) var(--Divider-color); + border-bottom: var(--Divider-width) var(--Divider-style) + var(--Divider-color); transform-origin: 0 center; clear: both; } @@ -49,6 +50,8 @@ content: ''; height: 0; flex: 1; + min-width: 0; + min-height: 0; border-bottom: inherit; border-bottom-width: var(--Divider-width); } diff --git a/packages/amis-ui/scss/components/_formula.scss b/packages/amis-ui/scss/components/_formula.scss index de7aff437..d6968beef 100644 --- a/packages/amis-ui/scss/components/_formula.scss +++ b/packages/amis-ui/scss/components/_formula.scss @@ -154,6 +154,8 @@ &-body { flex: 1; + min-width: 0; + min-height: 0; display: flex; flex-flow: column nowrap; max-height: calc(100% - 30px); @@ -192,6 +194,8 @@ --Form-input-fontSize: var(--fontSizeSm); --gap-sm: #{px2rem(10px)}; flex: 1; + min-width: 0; + min-height: 0; max-height: 100%; } @@ -210,6 +214,8 @@ & > div { flex: 1; + min-width: 0; + min-height: 0; font-size: var(--fontSizeSm); height: var(--gap-xl); } @@ -278,6 +284,8 @@ overflow-x: hidden; overflow-y: auto; flex: 1; + min-width: 0; + min-height: 0; border-radius: var(--borderRadius); } } @@ -366,6 +374,8 @@ & > div { flex: 1; + min-width: 0; + min-height: 0; font-size: var(--fontSizeSm); height: var(--gap-xl); } @@ -374,6 +384,8 @@ &-body { @include scrollbar(); flex: 1; + min-width: 0; + min-height: 0; overflow-x: hidden; overflow-y: auto; } @@ -455,6 +467,8 @@ overflow-x: hidden; overflow-y: auto; flex: 1; + min-width: 0; + min-height: 0; } } } diff --git a/packages/amis-ui/scss/components/_json-schema-editor.scss b/packages/amis-ui/scss/components/_json-schema-editor.scss index ff5b14eba..b1985e32e 100644 --- a/packages/amis-ui/scss/components/_json-schema-editor.scss +++ b/packages/amis-ui/scss/components/_json-schema-editor.scss @@ -132,10 +132,14 @@ } &-info { + min-width: 0; + min-height: 0; + @include input-input(); @include input-border(); flex: 1; + display: flex; flex-direction: row; justify-content: space-between; diff --git a/packages/amis-ui/scss/components/_json-schema.scss b/packages/amis-ui/scss/components/_json-schema.scss index e58d73037..b396f2909 100644 --- a/packages/amis-ui/scss/components/_json-schema.scss +++ b/packages/amis-ui/scss/components/_json-schema.scss @@ -27,6 +27,8 @@ } & > * { + min-width: 0; + min-height: 0; flex: 1; } @@ -52,6 +54,8 @@ } &-value { + min-width: 0; + min-height: 0; flex: 1; margin-left: auto; display: flex; @@ -62,6 +66,8 @@ } > div { + min-width: 0; + min-height: 0; flex: 1; flex-wrap: nowrap; } diff --git a/packages/amis-ui/scss/components/_menu.scss b/packages/amis-ui/scss/components/_menu.scss index ff9d75a8d..dfb8f91f2 100644 --- a/packages/amis-ui/scss/components/_menu.scss +++ b/packages/amis-ui/scss/components/_menu.scss @@ -194,6 +194,8 @@ text-overflow: ellipsis; color: inherit; font-size: inherit; + min-width: 0; + min-height: 0; flex: 1; cursor: inherit; font-weight: inherit; @@ -290,6 +292,8 @@ position: static; overflow: hidden; display: flex; + min-width: 0; + min-height: 0; flex: 1; } .#{$ns}Nav-Menu-item-wrap { @@ -351,6 +355,8 @@ justify-content: space-between; .#{$ns}Nav-Menu-item-wrap { + min-width: 0; + min-height: 0; flex: 1; overflow: hidden; } diff --git a/packages/amis-ui/scss/components/_modal.scss b/packages/amis-ui/scss/components/_modal.scss index 9b98b86bf..438797214 100644 --- a/packages/amis-ui/scss/components/_modal.scss +++ b/packages/amis-ui/scss/components/_modal.scss @@ -252,6 +252,8 @@ display: flex; > .#{$ns}Button { + min-width: 0; + min-height: 0; flex: 1; height: px2rem(44px); diff --git a/packages/amis-ui/scss/components/_panel.scss b/packages/amis-ui/scss/components/_panel.scss index 2deb36ce4..598823396 100644 --- a/packages/amis-ui/scss/components/_panel.scss +++ b/packages/amis-ui/scss/components/_panel.scss @@ -235,6 +235,8 @@ padding: 0 var(--Panel-body-paddingLeft); > .#{$ns}Button { + min-width: 0; + min-height: 0; flex: 1; &:first-child { diff --git a/packages/amis-ui/scss/components/_picker-columns.scss b/packages/amis-ui/scss/components/_picker-columns.scss index 83e298e35..8c45a66d1 100644 --- a/packages/amis-ui/scss/components/_picker-columns.scss +++ b/packages/amis-ui/scss/components/_picker-columns.scss @@ -2,6 +2,8 @@ position: relative; background-color: var(--PickerColumns-bg); user-select: none; + min-width: 0; + min-height: 0; flex: 1; overflow: hidden; font-size: var(--PickerColumns-option-fontSize); diff --git a/packages/amis-ui/scss/components/_popup.scss b/packages/amis-ui/scss/components/_popup.scss index 21b9203d3..903bdb080 100644 --- a/packages/amis-ui/scss/components/_popup.scss +++ b/packages/amis-ui/scss/components/_popup.scss @@ -129,9 +129,13 @@ overflow-y: auto; height: 100%; display: flex; + min-width: 0; + min-height: 0; flex: 1; > div { + min-width: 0; + min-height: 0; flex: 1; } } diff --git a/packages/amis-ui/scss/components/_steps.scss b/packages/amis-ui/scss/components/_steps.scss index 3a0430bc5..555c4ca6e 100644 --- a/packages/amis-ui/scss/components/_steps.scss +++ b/packages/amis-ui/scss/components/_steps.scss @@ -4,6 +4,8 @@ padding: 0; .#{$ns}StepsItem { + min-width: 0; + min-height: 0; flex: 1; overflow: hidden; padding: 0 px2rem(8px); @@ -198,6 +200,8 @@ list-style: none; padding: 0; .#{$ns}StepsItem { + min-width: 0; + min-height: 0; flex: 1; padding: 0; overflow: visible; @@ -441,6 +445,8 @@ } &:last-child { + min-width: 0; + min-height: 0; flex: 1; .#{$ns}StepsItem-container { diff --git a/packages/amis-ui/scss/components/_tabs.scss b/packages/amis-ui/scss/components/_tabs.scss index 9b445a33d..882f35207 100644 --- a/packages/amis-ui/scss/components/_tabs.scss +++ b/packages/amis-ui/scss/components/_tabs.scss @@ -658,6 +658,8 @@ border-bottom: none; > .#{$ns}Tabs-linksContainer { + min-width: 0; + min-height: 0; flex: 1; align-items: stretch; @@ -761,6 +763,8 @@ margin: 0; border-radius: 0; padding: 0; + min-width: 0; + min-height: 0; flex: 1; border: none; } diff --git a/packages/amis-ui/scss/components/_timeline.scss b/packages/amis-ui/scss/components/_timeline.scss index 49889213e..46f6c63ca 100644 --- a/packages/amis-ui/scss/components/_timeline.scss +++ b/packages/amis-ui/scss/components/_timeline.scss @@ -4,6 +4,8 @@ .#{$ns}TimelineItem { display: flex; + min-width: 0; + min-height: 0; flex: 1; flex-direction: row; diff --git a/packages/amis-ui/scss/components/_toast.scss b/packages/amis-ui/scss/components/_toast.scss index 3587e4670..1b0e7f00b 100644 --- a/packages/amis-ui/scss/components/_toast.scss +++ b/packages/amis-ui/scss/components/_toast.scss @@ -119,6 +119,8 @@ } &-content { + min-width: 0; + min-height: 0; flex: 1; display: flex; flex-flow: column nowrap; diff --git a/packages/amis-ui/scss/components/form/_combo.scss b/packages/amis-ui/scss/components/form/_combo.scss index eaeab178f..ec2a584b1 100644 --- a/packages/amis-ui/scss/components/form/_combo.scss +++ b/packages/amis-ui/scss/components/form/_combo.scss @@ -341,6 +341,8 @@ &.is-mobile { .#{$ns}Form-item { .#{$ns}Form-rowInner { + min-width: 0; + min-height: 0; flex: 1; } } diff --git a/packages/amis-ui/scss/components/form/_date-range.scss b/packages/amis-ui/scss/components/form/_date-range.scss index 0edf83279..9c19f1060 100644 --- a/packages/amis-ui/scss/components/form/_date-range.scss +++ b/packages/amis-ui/scss/components/form/_date-range.scss @@ -75,6 +75,8 @@ outline: none; padding: 0; background: 0; + min-width: 0; + min-height: 0; flex: 1; width: 50%; line-height: px2rem(30px); @@ -188,6 +190,8 @@ padding: 0; &.is-mobile { + min-width: 0; + min-height: 0; flex: 1; .#{$ns}DateRangePicker-end { @@ -207,6 +211,8 @@ .#{$ns}DateRangePicker-start, .#{$ns}DateRangePicker-end { display: flex; + min-width: 0; + min-height: 0; flex: 1; .rdtPicker { diff --git a/packages/amis-ui/scss/components/form/_excel.scss b/packages/amis-ui/scss/components/form/_excel.scss index 3270553e7..a5189912a 100644 --- a/packages/amis-ui/scss/components/form/_excel.scss +++ b/packages/amis-ui/scss/components/form/_excel.scss @@ -17,6 +17,8 @@ } &-dropzone { + min-width: 0; + min-height: 0; flex: 1; display: flex; flex-direction: column; diff --git a/packages/amis-ui/scss/components/form/_file.scss b/packages/amis-ui/scss/components/form/_file.scss index a724707cc..37d80496e 100644 --- a/packages/amis-ui/scss/components/form/_file.scss +++ b/packages/amis-ui/scss/components/form/_file.scss @@ -196,6 +196,8 @@ &-progress { height: 5px; + min-width: 0; + min-height: 0; flex: 1; background: #ebebeb; diff --git a/packages/amis-ui/scss/components/form/_form.scss b/packages/amis-ui/scss/components/form/_form.scss index a3f3c8574..3866dce48 100644 --- a/packages/amis-ui/scss/components/form/_form.scss +++ b/packages/amis-ui/scss/components/form/_form.scss @@ -442,6 +442,8 @@ display: inline-flex; & > .#{$ns}Form-value { + min-width: 0; + min-height: 0; flex: 1; /* 如果size设置了full就占满剩余空间 */ @@ -605,6 +607,8 @@ .#{$ns}NumberControl { .#{$ns}Number { + min-width: 0; + min-height: 0; flex: 1; border: none; @@ -720,6 +724,8 @@ } .#{$ns}Form-item-controlBox { + min-width: 0; + min-height: 0; flex: 1; max-width: -moz-available; max-width: -webkit-fill-available; diff --git a/packages/amis-ui/scss/components/form/_icon-select.scss b/packages/amis-ui/scss/components/form/_icon-select.scss index aceaa4447..240354e1f 100644 --- a/packages/amis-ui/scss/components/form/_icon-select.scss +++ b/packages/amis-ui/scss/components/form/_icon-select.scss @@ -41,6 +41,8 @@ } &-main { + min-width: 0; + min-height: 0; flex: 1; overflow: auto; } @@ -91,6 +93,8 @@ } &-id { + min-width: 0; + min-height: 0; flex: 1; white-space: nowrap; overflow: hidden; @@ -213,6 +217,8 @@ &-info { margin-left: var(--IconSelect-base-margin); overflow: hidden; + min-width: 0; + min-height: 0; flex: 1; > p { diff --git a/packages/amis-ui/scss/components/form/_location.scss b/packages/amis-ui/scss/components/form/_location.scss index 5a0e31168..8385e148b 100644 --- a/packages/amis-ui/scss/components/form/_location.scss +++ b/packages/amis-ui/scss/components/form/_location.scss @@ -89,6 +89,8 @@ height: px2rem(460px); &-inner { + min-width: 0; + min-height: 0; flex: 1; padding: 0 px2rem(16px); @@ -116,6 +118,8 @@ } &.is-mobile { + min-width: 0; + min-height: 0; flex: 1; text-align: right; overflow: hidden; diff --git a/packages/amis-ui/scss/components/form/_nested-select.scss b/packages/amis-ui/scss/components/form/_nested-select.scss index eec555b87..321cf71ea 100644 --- a/packages/amis-ui/scss/components/form/_nested-select.scss +++ b/packages/amis-ui/scss/components/form/_nested-select.scss @@ -87,6 +87,8 @@ background: var(--select-base-default-option-bg-color); > .#{$ns}NestedSelect-optionLabel { + min-width: 0; + min-height: 0; flex: 1; height: px2rem(32px); overflow: hidden; diff --git a/packages/amis-ui/scss/components/form/_number.scss b/packages/amis-ui/scss/components/form/_number.scss index c96317d0c..ffaa87a05 100644 --- a/packages/amis-ui/scss/components/form/_number.scss +++ b/packages/amis-ui/scss/components/form/_number.scss @@ -552,6 +552,8 @@ border-bottom-right-radius: var(--Number-borderRadius); } .#{$ns}Number--enhance-input { + min-width: 0; + min-height: 0; flex: 1; border: 0; border-left: var(--Number-borderWidth) solid var(--Number-borderColor); diff --git a/packages/amis-ui/scss/components/form/_select.scss b/packages/amis-ui/scss/components/form/_select.scss index 14eeb9405..378dde610 100644 --- a/packages/amis-ui/scss/components/form/_select.scss +++ b/packages/amis-ui/scss/components/form/_select.scss @@ -454,6 +454,8 @@ } .#{$ns}Select-option-item-check { + min-width: 0; + min-height: 0; flex: 1; text-align: left; border-bottom: px2rem(1px) solid var(--borderColor); diff --git a/packages/amis-ui/scss/components/form/_selection.scss b/packages/amis-ui/scss/components/form/_selection.scss index d3504097b..b912139b2 100644 --- a/packages/amis-ui/scss/components/form/_selection.scss +++ b/packages/amis-ui/scss/components/form/_selection.scss @@ -148,6 +148,8 @@ flex-direction: column; .#{$ns}Table-content-virtual { + min-width: 0; + min-height: 0; flex: 1; position: relative; } diff --git a/packages/amis-ui/scss/components/form/_tree.scss b/packages/amis-ui/scss/components/form/_tree.scss index 30378fc84..57ac44b60 100644 --- a/packages/amis-ui/scss/components/form/_tree.scss +++ b/packages/amis-ui/scss/components/form/_tree.scss @@ -415,6 +415,8 @@ .#{$ns}PopUp { .#{$ns}Tree { + min-width: 0; + min-height: 0; flex: 1; .#{$ns}Tree-itemLabel { diff --git a/packages/amis-ui/scss/components/form/_user-select.scss b/packages/amis-ui/scss/components/form/_user-select.scss index 3cb0d01dc..ba9d0cf1b 100644 --- a/packages/amis-ui/scss/components/form/_user-select.scss +++ b/packages/amis-ui/scss/components/form/_user-select.scss @@ -26,11 +26,15 @@ &-search { background: var(--UserSelect--content-bg); + min-width: 0; + min-height: 0; flex: 1; } &-searchResult { width: 100vw; + min-width: 0; + min-height: 0; flex: 1; overflow-x: hidden; overflow-y: auto; @@ -118,6 +122,8 @@ width: 100vw; overflow: hidden; position: relative; + min-width: 0; + min-height: 0; flex: 1; background: var(--UserSelect--content-bg); margin-top: px2rem(16px); @@ -160,6 +166,8 @@ border-bottom: px2rem(1px) solid var(--UserSelect--border-color); > span { + min-width: 0; + min-height: 0; flex: 1; } } @@ -175,6 +183,8 @@ &-memberName { font-size: 14px; + min-width: 0; + min-height: 0; flex: 2 !important; text-align: left; user-select: none; @@ -215,6 +225,8 @@ } .option-fields { + min-width: 0; + min-height: 0; flex: 1; line-height: px2rem(18px); @@ -333,6 +345,8 @@ &-selectList { width: 100%; + min-width: 0; + min-height: 0; flex: 1; padding: 0; overflow-x: scroll; @@ -434,6 +448,8 @@ } &-searchLoadingBox { + min-width: 0; + min-height: 0; flex: 1; width: 100vw; height: 100%; @@ -456,6 +472,8 @@ border-radius: 4px; padding: 0 px2rem(16px); margin: px2rem(16px); + min-width: 0; + min-height: 0; flex: 1; overflow-y: auto; .#{$ns}UserSelect-noRecord { @@ -552,6 +570,8 @@ } &-tabs { + min-width: 0; + min-height: 0; flex: 1; display: flex; flex-direction: column; @@ -598,6 +618,8 @@ } &:last-child { + min-width: 0; + min-height: 0; flex: 1; > div { diff --git a/packages/amis-ui/scss/layout/_grid.scss b/packages/amis-ui/scss/layout/_grid.scss index 3d192a5e1..e4a4c376f 100644 --- a/packages/amis-ui/scss/layout/_grid.scss +++ b/packages/amis-ui/scss/layout/_grid.scss @@ -42,6 +42,8 @@ @include media-breakpoint-up(sm) { .#{$ns}Grid { + min-width: 0; + min-height: 0; @include make-row; flex: 1;