From 577b523a5f6075a0ee2444302a54359e8949e5ed Mon Sep 17 00:00:00 2001
From: shutao <shutao@dcloud.io>
Date: Fri, 29 Nov 2024 15:47:29 +0800
Subject: [PATCH] add long-waterflow-nested

---
 pages.json                                    |  4 +--
 pages/tabBar/template.uvue                    |  2 +-
 .../long-waterflow-nested.uvue}               |  2 +-
 .../long-waterflow-page.uvue}                 | 32 +++++++++----------
 4 files changed, 20 insertions(+), 20 deletions(-)
 rename pages/template/{long-grid-nested/long-grid-nested.uvue => long-waterflow-nested/long-waterflow-nested.uvue} (96%)
 rename pages/template/{long-grid-nested/long-grid-page.uvue => long-waterflow-nested/long-waterflow-page.uvue} (90%)

diff --git a/pages.json b/pages.json
index 0cd19637..7bdd5cb0 100644
--- a/pages.json
+++ b/pages.json
@@ -2215,7 +2215,7 @@
 			}
 		},
 		{
-			"path": "pages/template/long-grid-nested/long-grid-nested",
+			"path": "pages/template/long-waterflow-nested/long-waterflow-nested",
 			"style": {
 				"navigationBarTitleText": "顶部banner瀑布流长列表嵌套滚动示例",
 				"enablePullDownRefresh": true
@@ -3353,4 +3353,4 @@
 			]
 		}
 	]
-}
\ No newline at end of file
+}
diff --git a/pages/tabBar/template.uvue b/pages/tabBar/template.uvue
index 1f0eab61..2b89fed6 100644
--- a/pages/tabBar/template.uvue
+++ b/pages/tabBar/template.uvue
@@ -86,7 +86,7 @@
               },
               {
                 name: '顶部banner瀑布流长列表（嵌套滚动）',
-                url: 'long-grid-nested'
+                url: 'long-waterflow-nested'
               },
               // #endif
               {
diff --git a/pages/template/long-grid-nested/long-grid-nested.uvue b/pages/template/long-waterflow-nested/long-waterflow-nested.uvue
similarity index 96%
rename from pages/template/long-grid-nested/long-grid-nested.uvue
rename to pages/template/long-waterflow-nested/long-waterflow-nested.uvue
index 0ede4be5..2c9eb99d 100644
--- a/pages/template/long-grid-nested/long-grid-nested.uvue
+++ b/pages/template/long-waterflow-nested/long-waterflow-nested.uvue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-  import longPage from './long-grid-page.uvue';
+  import longPage from './long-waterflow-page.uvue';
 
   type SwiperTabsItem = {
     x : number,
diff --git a/pages/template/long-grid-nested/long-grid-page.uvue b/pages/template/long-waterflow-nested/long-waterflow-page.uvue
similarity index 90%
rename from pages/template/long-grid-nested/long-grid-page.uvue
rename to pages/template/long-waterflow-nested/long-waterflow-page.uvue
index 365bbeb0..5346f1b1 100644
--- a/pages/template/long-grid-nested/long-grid-page.uvue
+++ b/pages/template/long-waterflow-nested/long-waterflow-page.uvue
@@ -1,12 +1,12 @@
 <template>
-  <grid-view :id="id" class="grid" :rebound="false" :scroll-y="true" :custom-nested-scroll="true"
+  <waterflow :id="id" class="grid" :rebound="false" :scroll-y="true" :custom-nested-scroll="true"
   	main-axis-gap="8px"	cross-axis-gap="8px" cross-axis-count=2
     @scrolltolower="loadData(null)" associative-container="nested-scroll-view">
-    <grid-item class="grid-item" v-for="(item, _) in datagrid" :key="item.plugin_id" type=1>
-      <view class="grid-item-icon">
-        <image class="grid-item-icon-image" :src="item.plugin_img_link" mode="aspectFit"></image>
+    <flow-item class="flow-item" v-for="(item, _) in datagrid" :key="item.plugin_id" type=1>
+      <view class="flow-item-icon">
+        <image class="flow-item-icon-image" :src="item.plugin_img_link" mode="aspectFit"></image>
       </view>
-      <view class="grid-item-fill">
+      <view class="flow-item-fill">
         <view class="flex-row">
           <text class="title">{{item.plugin_name}}</text>
         </view>
@@ -25,18 +25,18 @@
           <text class="update-date-value">{{item.update_date}}</text>
         </view>
       </view>
-    </grid-item type="20">
-    <grid-item slot="load-more" class="loading" type=6>
+    </flow-item type="20">
+    <flow-item slot="load-more" class="loading" type=6>
       <uni-loading :loading="loading" color="#999" :text="loadingText"></uni-loading>
-    </grid-item>
-  </grid-view>
+    </flow-item>
+  </waterflow>
 </template>
 
 <script>
   const SERVER_URL = "https://unidemo.dcloud.net.cn/plugin/uniappx-plugin-list"
   const PAGE_SIZE = 10; // 最大值 10
 
-  type gridItem = {
+  type flowItem = {
     plugin_id : number,
     plugin_img_link : string,
     plugin_name : string,
@@ -49,7 +49,7 @@
 
   type ResponseDataType = {
     code : number,
-    data : gridItem[]
+    data : flowItem[]
   }
 
   export default {
@@ -70,7 +70,7 @@
     data() {
       return {
         loading: false,
-        datagrid: [] as gridItem[],
+        datagrid: [] as flowItem[],
         isEnded: false,
         loadingError: '',
         currentPage: 1
@@ -170,21 +170,21 @@
     background-color: #f7f7f7;
   }
 
-  .grid-item {
+  .flow-item {
     flex-direction: column;
     border-radius: 5px;
     background-color: #ffffff;
   }
 
-  .grid-item-icon {
+  .flow-item-icon {
     position: relative;
   }
 
-  .grid-item-icon-image {
+  .flow-item-icon-image {
     width: 100%;
   }
 
-  .grid-item-fill {
+  .flow-item-fill {
     flex: 1;
     padding: 5px;
   }
-- 
GitLab