From 344418ebad05561e3f05e5875f2cdc29fb88b600 Mon Sep 17 00:00:00 2001
From: wangyaqi <wangyaqi988@163.com>
Date: Fri, 12 Jan 2024 11:18:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9scroll-view=20directi?=
 =?UTF-8?q?on=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/list-view/list-view.uvue                     | 2 +-
 pages/component/scroll-view/scroll-view-props.uvue           | 4 ++--
 pages/component/scroll-view/scroll-view-refresher-props.uvue | 2 +-
 pages/component/scroll-view/scroll-view.uvue                 | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pages/component/list-view/list-view.uvue b/pages/component/list-view/list-view.uvue
index ff0c033d..a3e040d8 100644
--- a/pages/component/list-view/list-view.uvue
+++ b/pages/component/list-view/list-view.uvue
@@ -162,7 +162,7 @@
     </list-view>
   </view>
 
-  <scroll-view style="flex:1" direction="y">
+  <scroll-view style="flex:1" direction="vertical">
     <view class="content">
       <boolean-data :defaultValue="false" title="设置当前下拉刷新状态，true 表示下拉刷新已经被触发，false 表示下拉刷新未被触发"
         @change="change_refresher_triggered_boolean"></boolean-data>
diff --git a/pages/component/scroll-view/scroll-view-props.uvue b/pages/component/scroll-view/scroll-view-props.uvue
index a63f9442..42b89e47 100644
--- a/pages/component/scroll-view/scroll-view-props.uvue
+++ b/pages/component/scroll-view/scroll-view-props.uvue
@@ -3,7 +3,7 @@
 		<page-head title="非下拉刷新的scroll-view属性示例"></page-head>
 		<view class="uni-margin-wrap">
 			<!-- 暂时分成两个方向不同的滚动视图，原因为：scroll-view组件不支持动态改变direction。 -->
-			<scroll-view v-if="scrollX" direction="x" :scroll-top="scrollTop" :scroll-left="scrollLeft"
+			<scroll-view v-if="scrollX" direction="horizontal" :scroll-top="scrollTop" :scroll-left="scrollLeft"
 				:upper-threshold="upperThreshold" :lower-threshold="lowerThreshold" :scroll-into-view="scrollIntoView"
 				:enable-back-to-top="enableBackToTop" :scroll-with-animation="scrollWithAnimation" style="flex-direction: row;width: 100%;height: 100%;"
 				:show-scrollbar="showScrollbar" :bounces="bounces" @scrolltoupper="scrolltoupper"
@@ -12,7 +12,7 @@
 					<text class="uni-text">{{item.label}}</text>
 				</view>
 			</scroll-view>
-			<scroll-view v-else direction="y" :scroll-top="scrollTop" :scroll-left="scrollLeft"
+			<scroll-view v-else direction="vertical" :scroll-top="scrollTop" :scroll-left="scrollLeft"
 				:upper-threshold="upperThreshold" :lower-threshold="lowerThreshold" :scroll-into-view="scrollIntoView"
 				:enable-back-to-top="enableBackToTop" :scroll-with-animation="scrollWithAnimation"
 				:show-scrollbar="showScrollbar" :bounces="bounces" @scrolltoupper="scrolltoupper"
diff --git a/pages/component/scroll-view/scroll-view-refresher-props.uvue b/pages/component/scroll-view/scroll-view-refresher-props.uvue
index 1072aa3d..7cc0f6b7 100644
--- a/pages/component/scroll-view/scroll-view-refresher-props.uvue
+++ b/pages/component/scroll-view/scroll-view-refresher-props.uvue
@@ -2,7 +2,7 @@
 	<view style="flex:1;">
 		<page-head title="下拉刷新的scroll-view属性示例"></page-head>
 		<view class="uni-margin-wrap">
-			<scroll-view direction="y" :refresher-enabled="refresherEnabled" :refresher-threshold="refresherThreshold"
+			<scroll-view direction="vertical" :refresher-enabled="refresherEnabled" :refresher-threshold="refresherThreshold"
 				:refresher-default-style="refresherDefaultStyle" :refresher-background="refresherBackground"
 				:refresher-triggered="refresherTriggered" @refresherpulling="refresherpulling"
 				@refresherrefresh="refresherrefresh" @refresherrestore="refresherrestore"
diff --git a/pages/component/scroll-view/scroll-view.uvue b/pages/component/scroll-view/scroll-view.uvue
index 91788588..6b768bf0 100644
--- a/pages/component/scroll-view/scroll-view.uvue
+++ b/pages/component/scroll-view/scroll-view.uvue
@@ -10,7 +10,7 @@
 					<text class="uni-subtitle-text">纵向滚动</text>
 				</view>
 				<view>
-					<scroll-view :scroll-top="scrollTop" direction="y" class="scroll-Y" scroll-with-animation="true"
+					<scroll-view :scroll-top="scrollTop" direction="vertical" class="scroll-Y" scroll-with-animation="true"
 						@scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll">
 						<view class="scroll-view-item uni-bg-red"><text class="text">A</text></view>
 						<view class="scroll-view-item uni-bg-green"><text class="text">B</text></view>
@@ -26,7 +26,7 @@
 					<text class="uni-subtitle-text">横向滚动</text>
 				</view>
 				<view>
-					<scroll-view class="scroll-view_H" direction="x" @scroll="scroll" :scroll-left="120">
+					<scroll-view class="scroll-view_H" direction="horizontal" @scroll="scroll" :scroll-left="120">
 						<view class="scroll-view-item_H uni-bg-red"><text class="text">A</text></view>
 						<view class="scroll-view-item_H uni-bg-green"><text class="text">B</text></view>
 						<view class="scroll-view-item_H uni-bg-blue"><text class="text">C</text></view>
-- 
GitLab