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 d13e3750d82b7cb431ab319a5e0a0977fdac2331..02fe82754a8bf383d8bdbadee5c92bc928f8e0c5 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 @@ -6,8 +6,12 @@ $control: ( 'overflow': hidden auto, ); -@include b(view) { +// 设置部件滚动条默认变量,此变量用于控制启用下拉刷新时控制内容部件滚动条 +:root { #{getCssVarName(control, overflow)}: hidden auto; +} + +@include b(view) { @include b(view-header) { z-index: 1; @@ -40,20 +44,6 @@ $control: ( #{getCssVarName(control, overflow)}: unset unset; } - @include when(refresh) { - - >.#{bem(col)} { - flex: none; - } - } - - @include when(embed) { - #{getCssVarName(control, overflow)}: hidden auto; - } - - .#{bem(view)} { - #{getCssVarName(control, overflow)}: hidden auto; - } } @include b(view-content-refresh) { 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 245713f610b2261f388ad9f05aab1223cafc4dd9..6b661844bcf25d0741414e4c6a7e76a4f79c63ee 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 @@ -45,9 +45,7 @@ export const ViewContentPanelContainer: Component = defineComponent({ let isScrollable = false; // 嵌入视图不出 - if (view.modal.viewUsage === 4) { - isScrollable = false; - } else if (view.modal.viewUsage === 1) { + if (view.modal.viewUsage === 1) { // 路由视图得判断是否是首页视图下的视图 或者是 home页下的 if ( (view.modal.routeDepth === 1 && @@ -147,13 +145,6 @@ export const ViewContentPanelContainer: Component = defineComponent({ return slot; } const { layoutPos } = props.modelData; - if (this.viewModel.enablePullDownRefresh === true) { - Object.assign(layoutPos, { - heightMode: 'AUTO', - grow: 0, - basis: 0, - }); - } return ( {slot}