From bfade5e2448eb6cd866be2d66f821d50a8073922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com>
Date: Tue, 22 Oct 2024 19:38:47 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E8=A7=86=E5=9B=BE=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E5=8C=BA=E6=BB=9A=E5=8A=A8=E6=A0=B7=E5=BC=8F=E6=8A=BD=E5=8F=96?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                    |  1 +
 src/control/dashboard/dashboard.scss            |  2 +-
 src/control/data-view/data-view.scss            |  2 +-
 src/control/list/list/list.scss                 |  2 +-
 src/control/list/md-ctrl/md-ctrl.scss           |  2 +-
 .../view-content-panel-container.scss           | 17 +++++++++++++----
 .../view-content-panel-container.tsx            |  1 +
 7 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3038757a7e..07d3b5fbd6 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 193e57918a..cdc27400d6 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 f1d2a67cd1..054ff40fda 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 1f16feca1c..0f91e0129c 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 8ba396b468..1787ce9273 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 e25bd15f8e..47707b1a04 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 3a77dfc8a3..03c37d3149 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;
-- 
Gitee