diff --git a/CHANGELOG.md b/CHANGELOG.md index 3038757a7eeee61eb96a605beac25f1a0f40ff2e..07d3b5fbd670059b740894265a2f2114fc28af90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ - 数据看板识别门户部件高度逻辑调整 - 表单对齐模式调整、新增表单mobshowunderline部件参数 - 表单分组添加区域分割样式 +- 视图内容区滚动样式抽取变量 ### Fixed diff --git a/src/control/dashboard/dashboard.scss b/src/control/dashboard/dashboard.scss index 193e57918ac1257c6841ad3127cb916f884e4001..cdc27400d6ab41952ddabacb0c11978c2c40fe5d 100644 --- a/src/control/dashboard/dashboard.scss +++ b/src/control/dashboard/dashboard.scss @@ -8,7 +8,7 @@ $control-dashboard: ( height: 100%; margin: getCssVar('control-dashboard', 'dashboard-margin'); - overflow: auto; + overflow: getCssVar(control, overflow); @include b(control-dashboard-row) { gap: getCssVar('control-dashboard', 'dashboard-margin'); diff --git a/src/control/data-view/data-view.scss b/src/control/data-view/data-view.scss index f1d2a67cd1e191f3ed40a5f501c72c14e69b1bbf..054ff40fda46c34083ee47edf9c37dfd9bdcf360 100644 --- a/src/control/data-view/data-view.scss +++ b/src/control/data-view/data-view.scss @@ -17,7 +17,7 @@ $control-dataview: (text-color: getCssVar(color, text, 0), height: 100%; --van-card-thumb-size: auto; - overflow: hidden auto; + overflow: getCssVar(control, overflow); @include e(content) { display: flex; diff --git a/src/control/list/list/list.scss b/src/control/list/list/list.scss index 1f16feca1ca9d12136764c03249c3e4185813624..0f91e0129c9a55995e63c5a9cf6924444e8a99ac 100644 --- a/src/control/list/list/list.scss +++ b/src/control/list/list/list.scss @@ -21,7 +21,7 @@ $control-list: ('text-color': getCssVar('color', 'text', 0), @include b(control-list) { height: 100%; - overflow: hidden auto; + overflow: getCssVar(control, overflow); // 加载更多样式 @include e(load-more) { diff --git a/src/control/list/md-ctrl/md-ctrl.scss b/src/control/list/md-ctrl/md-ctrl.scss index 8ba396b468cf35d82e97121227d1103e06aa4ae7..1787ce927345b8cd4e8640127c5f9517367e3698 100644 --- a/src/control/list/md-ctrl/md-ctrl.scss +++ b/src/control/list/md-ctrl/md-ctrl.scss @@ -28,7 +28,7 @@ $control-mobmdctrl: ( --van-cell-font-size: #{getCssVar(control-mobmdctrl, font-size)}; height: 100%; - overflow: hidden auto; + overflow: getCssVar(control, overflow); @include e(content) { width: 100%; diff --git a/src/panel-component/view-content-panel-container/view-content-panel-container.scss b/src/panel-component/view-content-panel-container/view-content-panel-container.scss index e25bd15f8e0ef3c6d2fff771151097eecf4b2b2c..47707b1a04693720dd18fb1b32404c0061476b44 100644 --- a/src/panel-component/view-content-panel-container/view-content-panel-container.scss +++ b/src/panel-component/view-content-panel-container/view-content-panel-container.scss @@ -1,4 +1,9 @@ -$panel-component-view-content: ('margin': 0); +$panel-component-view-content: ( + 'margin': 0, +); +$control: ( + 'overflow': hidden auto, +); @include b(view-content) { #{--van-back-top-size}: rem(44px); @@ -11,9 +16,13 @@ $panel-component-view-content: ('margin': 0); @include when(scroll) { overflow-y: auto; - .#{bem(control)} { - overflow: unset; - } + #{bem(control, overflow)}: unset; + } + @include when(embed) { + #{getCssVarName(control, overflow)}: hidden auto; + } + .#{bem(view)} { + #{getCssVarName(control, overflow)}: hidden auto; } } diff --git a/src/panel-component/view-content-panel-container/view-content-panel-container.tsx b/src/panel-component/view-content-panel-container/view-content-panel-container.tsx index 3a77dfc8a3296e3c58ed3492da3f8e3dad89a470..03c37d3149cfbc6796e39dafca33ad2170c68184 100644 --- a/src/panel-component/view-content-panel-container/view-content-panel-container.tsx +++ b/src/panel-component/view-content-panel-container/view-content-panel-container.tsx @@ -68,6 +68,7 @@ export const ViewContentPanelContainer: Component = defineComponent({ ...props.controller.containerClass, // 只有这个scroll 样式才出滚动条 ns.is('scroll', isScrollable), + ns.is('embed', view.modal.viewUsage === 4), ns.is('hidden', !props.controller.state.visible), ]; return result;