u

code/allapp/allapp-rn/src/app/(tabs)/chat.tsx

@@ -1,5 +1,7 @@
 import { Text, View } from 'react-native'
+import { ScrollView } from 'react-native-gesture-handler'
 import { AButton, ACell, ACellGroup } from '@/components/common/ao'
+import { Grid, GridItem } from '@/components/ui/grid'
 import { useMoneyCategoryStore } from '@/store/moneyCategory'
 
 export default function Demo() {
@@ -15,22 +17,13 @@ export default function Demo() {
   }
 
   return (
-    <View
-      className="flex-1"
-      style={{
-        marginTop: 34,
-      }}
-    >
-      <ACellGroup>
-        <ACell leftIcon="Zap" title="测试" rightText="测试右边" isLink />
-        <ACell leftIcon="Airplay" title="测试" rightText="测试右边" isLink />
-        <ACell leftIcon="Airplay" title="测试" rightText="测试右边" isLink />
-        <ACell leftIcon="Airplay" title="测试" rightText="测试右边" isLink />
-        <ACell leftIcon="Airplay" title="测试" rightText="测试右边" isLink />
-      </ACellGroup>
-
-      <AButton onPress={() => resetCategory()}>重置记账分类</AButton>
-      <AButton onPress={() => getCategories()}>获取记账分类</AButton>
-    </View>
+    <ScrollView>
+      <Grid className="gap-4 p-4" _extra={{ className: 'grid-cols-12' }}>
+        <GridItem className="bg-background-50 p-6 rounded-md" _extra={{ className: 'col-span-3' }} />
+        <GridItem className="bg-background-50 p-6 rounded-md" _extra={{ className: 'col-span-3' }} />
+        <GridItem className="bg-background-50 p-6 rounded-md" _extra={{ className: 'col-span-3' }} />
+        <GridItem className="bg-background-50 p-6 rounded-md" _extra={{ className: 'col-span-3' }} />
+      </Grid>
+    </ScrollView>
   )
 }

code/allapp/allapp-rn/src/app/money/category/setting/index.tsx

@@ -238,7 +238,7 @@ export default function MoneyCategorySetting() {
                 >
                   <LucideIcon icon="Trash" size={18} color="#fff" />
                   <Text className="text-base text-white ">
-                    拖到这里删除
+                    {draggingDeleteZone ? '松手删除（将删除该类下所有记录）' : '拖到这里删除'}
                   </Text>
                 </View>
               </Sortable.BaseZone>

code/allapp/allapp-rn/src/app/money/record/editor/components/CategoryGrid copy.tsx

@@ -0,0 +1,111 @@
+import type { ViewStyle } from 'react-native'
+import type { MoneyCategoryItem } from '@/types/money/category'
+import React, { useEffect, useMemo, useRef } from 'react'
+import { FlatList, Pressable, Text, View } from 'react-native'
+import MoneyCategoryIcon from '@/components/common/MoneyCategoryIcon'
+
+interface CategoryGridProps {
+  data: MoneyCategoryItem[]
+  selectedCategory?: MoneyCategoryItem | null
+  onSelectCategory?: (item: MoneyCategoryItem | null) => void
+
+  className?: string
+  style?: ViewStyle
+}
+
+export default function CategoryGrid({
+  data,
+  selectedCategory,
+  onSelectCategory,
+  className,
+  style,
+}: CategoryGridProps) {
+  const flatListRef = useRef<FlatList<any>>(null)
+
+  // 每行 4 个，补齐空项
+  const memoItems = useMemo(() => {
+    const items = [...data]
+    const remainder = items.length % 4
+    if (remainder > 0) {
+      const emptyCount = 4 - remainder
+      for (let i = 0; i < emptyCount; i++) {
+        items.push({ id: `empty-${i}` } as any)
+      }
+    }
+    return items
+  }, [data])
+
+  // 自动滚动到选中行
+  useEffect(() => {
+    if (!selectedCategory || !flatListRef.current)
+      return
+
+    // 找到选中项下标
+    const itemIndex = data.findIndex(item => item.id === selectedCategory.id)
+    if (itemIndex === -1 || !flatListRef.current)
+      return
+
+    setTimeout(() => {
+      if (flatListRef.current) {
+        flatListRef.current.scrollToIndex({
+          index: Math.floor(itemIndex / 4),
+          animated: true,
+          viewPosition: 0.5,
+        })
+      }
+    }, 0)
+  }, [selectedCategory])
+
+  return (
+    <FlatList
+      ref={flatListRef}
+      data={memoItems}
+      numColumns={4}
+      keyExtractor={item => item.id.toString()}
+      showsVerticalScrollIndicator={false}
+      className={`${className}`}
+      style={[style]}
+      getItemLayout={(data, index) => {
+        return { length: 80, offset: 80 * index, index }
+      }}
+      renderItem={({ item }) => {
+        if (!('name' in item))
+          return <View style={{ flex: 1 / 4, margin: 4 }} />
+
+        const isSelected = selectedCategory?.id === item.id
+
+        return (
+          <Pressable
+            style={{ flex: 1 / 4, height: 80, alignItems: 'center' }}
+            onPress={() => onSelectCategory?.(item)}
+            onLayout={(event) => {
+              const { height } = event.nativeEvent.layout
+              console.log('Pressable 高度:', height)
+            }}
+          >
+            <View
+              style={{
+                width: 46,
+                height: 46,
+                borderRadius: 28,
+                marginTop: 4,
+                justifyContent: 'center',
+                alignItems: 'center',
+                backgroundColor: isSelected ? '#333' : '#F3F4F6',
+              }}
+            >
+              <MoneyCategoryIcon
+                name={item.icon}
+                size={28}
+                color={isSelected ? '#fff' : '#000'}
+              />
+            </View>
+            <Text style={{ marginBottom: 4, fontSize: 14, textAlign: 'center' }}>
+              {item.name}
+            </Text>
+          </Pressable>
+        )
+      }}
+    />
+  )
+}

code/allapp/allapp-rn/src/app/money/record/editor/components/CategoryGrid.tsx

@@ -1,89 +1,83 @@
-import type { ViewStyle } from 'react-native'
+import type { FlatList } from 'react-native'
 import type { MoneyCategoryItem } from '@/types/money/category'
-import React, { useMemo } from 'react'
-import { FlatList, Pressable, Text, View } from 'react-native'
+import React, { useEffect, useRef } from 'react'
+import { Pressable, Text, View } from 'react-native'
+import { ScrollView } from 'react-native-gesture-handler'
 import MoneyCategoryIcon from '@/components/common/MoneyCategoryIcon'
+import { Grid, GridItem } from '@/components/ui/grid'
 
 interface CategoryGridProps {
   data: MoneyCategoryItem[]
   selectedCategory?: MoneyCategoryItem | null
   onSelectCategory?: (item: MoneyCategoryItem | null) => void
-
-  className?: string
-  style?: ViewStyle
 }
 
 export default function CategoryGrid({
   data,
   selectedCategory,
   onSelectCategory,
-  className,
-  style,
 }: CategoryGridProps) {
-  // 计算补齐数组，让每行4个
-  const memoItems = useMemo(() => {
-    const items = [...data]
-    const remainder = items.length % 4
-    if (remainder > 0) {
-      const emptyCount = 4 - remainder
-      for (let i = 0; i < emptyCount; i++) {
-        items.push({ id: `empty-${i}` } as any)
+  const flatListRef = useRef<FlatList<any>>(null)
+
+  // 自动滚动到选中行
+  useEffect(() => {
+    if (!selectedCategory || !flatListRef.current)
+      return
+
+    // 找到选中项下标
+    const itemIndex = data.findIndex(item => item.id === selectedCategory.id)
+    if (itemIndex === -1 || !flatListRef.current)
+      return
+
+    setTimeout(() => {
+      if (flatListRef.current) {
+        flatListRef.current.scrollToIndex({
+          index: Math.floor(itemIndex / 4),
+          animated: true,
+          viewPosition: 0.5,
+        })
       }
-    }
-    return items
-  }, [data])
+    }, 0)
+  }, [selectedCategory])
 
   return (
-    <FlatList
-      data={memoItems}
-      numColumns={4}
-      keyExtractor={item => item.id.toString()}
-      showsVerticalScrollIndicator={false}
-      className={`${className}`}
-      style={[style]}
-      renderItem={({ item }) => {
-        if (!('name' in item)) {
-          return <View style={{ flex: 1 / 4, margin: 4 }} />
-        }
-
-        const isSelected = selectedCategory?.id === item.id
-
-        return (
-          <Pressable
-            style={{ flex: 1 / 4, margin: 4, alignItems: 'center' }}
-            onPress={() => onSelectCategory?.(item)}
-          >
-            <View
-              style={{
-                width: 46,
-                height: 46,
-                borderRadius: 28,
-                marginTop: 4,
-                justifyContent: 'center',
-                alignItems: 'center',
-                backgroundColor: isSelected ? '#333' : '#F3F4F6',
-              }}
+    <ScrollView>
+      <Grid className="gap-4 px-2 py-4 justify-start" _extra={{ className: 'grid-cols-12' }}>
+        {data.map((item) => {
+          const isSelected = selectedCategory?.id === item.id
+          return (
+            <GridItem
+              _extra={{ className: 'col-span-3' }}
+              key={item.id}
             >
-              <MoneyCategoryIcon
-                name={item.icon}
-                size={28}
-                color={
-                  isSelected ? '#fff' : '#000'
-                }
-              />
-            </View>
-            <Text
-              style={{
-                marginBottom: 4,
-                fontSize: 14,
-                textAlign: 'center',
-              }}
-            >
-              {item.name}
-            </Text>
-          </Pressable>
-        )
-      }}
-    />
+              <Pressable
+                style={{ alignItems: 'center' }}
+                onPress={() => onSelectCategory?.(item)}
+              >
+                <View
+                  style={{
+                    width: 46,
+                    height: 46,
+                    borderRadius: 28,
+                    justifyContent: 'center',
+                    alignItems: 'center',
+                    backgroundColor: isSelected ? '#333' : '#F3F4F6',
+                  }}
+                >
+                  <MoneyCategoryIcon
+                    name={item.icon}
+                    size={28}
+                    color={isSelected ? '#fff' : '#000'}
+                  />
+                </View>
+                <Text style={{ fontSize: 14, textAlign: 'center' }}>
+                  {item.name}
+                </Text>
+              </Pressable>
+            </GridItem>
+          )
+        })}
+      </Grid>
+    </ScrollView>
   )
 }

code/allapp/allapp-rn/src/request/index.ts

@@ -32,8 +32,8 @@ function isWhiteListed(url: string) {
 }
 
 const alovaInstance = createAlova({
-  baseURL: 'http://192.168.5.6:8086/app',
-  // baseURL: 'http://192.168.1.137:8086/app',
+  // baseURL: 'http://192.168.5.6:8086/app',
+  baseURL: 'http://192.168.1.137:8086/app',
   requestAdapter: axiosRequestAdapter(),
   timeout: 5000,
   cacheFor: null,

code/allapp/allapp-rn/src/store/moneyCategory.ts

@@ -107,7 +107,7 @@ export const useMoneyCategoryStore = create<MoneyCategoryStore>()(
       try {
         await queryMoneyCategoryApi().then((res) => {
           if (res.isSuccess) {
-            set({ categories: res.data.categories || [] })
+            get().setCategories(res.data.categories || [])
           }
         }).catch((err) => {
           console.log(err)