u

code/allapp/allapp-go/.idea/data_source_mapping.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="DataSourcePerFileMappings">
     <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/4db2dbd4-857e-4234-ba5e-f8cbf0ba6e5d/console_1.sql" value="4db2dbd4-857e-4234-ba5e-f8cbf0ba6e5d" />
+    <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/4db2dbd4-857e-4234-ba5e-f8cbf0ba6e5d/console_2.sql" value="4db2dbd4-857e-4234-ba5e-f8cbf0ba6e5d" />
     <file url="file://$PROJECT_DIR$/db/queries/finance_category_default.sql" value="4db2dbd4-857e-4234-ba5e-f8cbf0ba6e5d" />
     <file url="file://$PROJECT_DIR$/db/queries/finance_category_space.sql" value="4db2dbd4-857e-4234-ba5e-f8cbf0ba6e5d" />
     <file url="file://$PROJECT_DIR$/db/queries/space.sql" value="4db2dbd4-857e-4234-ba5e-f8cbf0ba6e5d" />

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

@@ -3,6 +3,7 @@ import type { NavItem } from '@/store/navigation'
 import { Slot, usePathname, useRouter } from 'expo-router'
 import { useCallback, useEffect, useState } from 'react'
 import { Text, TouchableOpacity, View } from 'react-native'
+import { KeyboardAvoidingView } from 'react-native-keyboard-controller'
 import Animated, { useAnimatedRef } from 'react-native-reanimated'
 import Sortable from 'react-native-sortables'
 import { ADrawer, LucideIcon } from '@/components/common/ao'
@@ -71,7 +72,14 @@ export default function TabsLayout() {
   return (
     <View className="flex-1 bg-gray-100">
       <View className="flex-1 bg-white">
-        <Slot />
+        <KeyboardAvoidingView
+          behavior="padding"
+          style={{
+            flex: 1,
+          }}
+        >
+          <Slot />
+        </KeyboardAvoidingView>
       </View>
 
       <View

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

@@ -1,64 +1,68 @@
-import { useCallback } from 'react'
-import { StyleSheet, Text, View } from 'react-native'
-import Sortable from 'react-native-sortables'
-
-const DATA = Array.from({ length: 10 }, (_, index) => `Item ${index + 1}`)
-
-export default function CustomHandleExample() {
-  const renderItem = useCallback(
-    ({ item }: { item: string }) => (
-      <View style={styles.card}>
-        <Text style={styles.text}>{item}</Text>
-        <Sortable.Handle>
-          <View style={styles.handle}>
-            <Text style={styles.handleText}>::</Text>
-          </View>
-        </Sortable.Handle>
-      </View>
-    ),
-    [],
-  )
+import React from 'react'
+import {
+  StyleSheet,
+  Text,
+  TextInput,
+  TouchableOpacity,
+  View,
+} from 'react-native'
+import { KeyboardAvoidingView } from 'react-native-keyboard-controller'
 
+export default function KeyboardAvoidingViewExample() {
   return (
-    <View style={styles.container}>
-      <Sortable.Grid
-        activeItemScale={1.05}
-        columns={1}
-        data={DATA}
-        overDrag="vertical"
-        renderItem={renderItem}
-        rowGap={10}
-        highlight-next-line
-        customHandle // must be set to use a custom handle
-      />
-    </View>
+    <KeyboardAvoidingView
+      behavior="padding"
+      keyboardVerticalOffset={100}
+      style={styles.content}
+    >
+      <View style={styles.inner}>
+        <Text style={styles.heading}>Header</Text>
+        <View>
+          <TextInput placeholder="Username" style={styles.textInput} />
+          <TextInput placeholder="Password" style={styles.textInput} />
+        </View>
+        <TouchableOpacity style={styles.button}>
+          <Text style={styles.text}>Submit</Text>
+        </TouchableOpacity>
+      </View>
+    </KeyboardAvoidingView>
   )
 }
 
 const styles = StyleSheet.create({
-  card: {
-    alignItems: 'center',
-    backgroundColor: '#2e8555',
-    borderRadius: 12,
-    flexDirection: 'row',
-    justifyContent: 'center',
+  content: {
+    flex: 1,
+    maxHeight: 600,
+  },
+  heading: {
+    fontSize: 36,
+    marginBottom: 48,
+    fontWeight: '600',
+  },
+  inner: {
     padding: 24,
+    flex: 1,
+    justifyContent: 'space-between',
   },
-  container: {
-    padding: 16,
+  textInput: {
+    height: 45,
+    borderColor: '#000000',
+    borderWidth: 1,
+    borderRadius: 10,
+    marginBottom: 36,
+    paddingLeft: 10,
   },
-  handle: {
-    backgroundColor: 'rgba(0,0,0,0.2)',
-    borderRadius: 5,
-    padding: 10,
-  },
-  handleText: {
-    color: 'white',
-    fontWeight: 'bold',
+  button: {
+    marginTop: 12,
+    height: 45,
+    borderRadius: 10,
+    backgroundColor: 'rgb(40, 64, 147)',
+    justifyContent: 'center',
+    alignItems: 'center',
   },
   text: {
+    fontWeight: '500',
+    fontSize: 16,
     color: 'white',
-    flex: 1,
-    fontWeight: 'bold',
   },
 })

code/allapp/allapp-rn/src/app/_layout.tsx

@@ -4,7 +4,6 @@ import { Stack, usePathname } from 'expo-router'
 import * as SplashScreen from 'expo-splash-screen'
 import { StatusBar } from 'expo-status-bar'
 import { useEffect } from 'react'
-import { Modal, View } from 'react-native'
 import { GestureHandlerRootView } from 'react-native-gesture-handler'
 import { KeyboardProvider } from 'react-native-keyboard-controller'
 import { MenuProvider } from 'react-native-popup-menu'

code/allapp/allapp-rn/src/app/space/manage/components/SettingActions.tsx

@@ -1,8 +1,10 @@
 import type { UserSpace } from '@/types/space'
-import { useEffect, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { Text, View } from 'react-native'
+import { KeyboardAvoidingView } from 'react-native-keyboard-controller'
+import Animated, { useAnimatedStyle } from 'react-native-reanimated'
 import { toast } from 'sonner-native'
-import { LucideIcon } from '@/components/common/ao'
+import { AButton, LucideIcon } from '@/components/common/ao'
 import { AInput, AModal } from '@/components/common/ao/index'
 import {
   Actionsheet,
@@ -14,7 +16,7 @@ import {
   ActionsheetItem,
   ActionsheetItemText,
 } from '@/components/ui/actionsheet'
-import { dissolveSpaceApi } from '@/request/api/space'
+import { dissolveSpaceApi, updateSpaceNameApi } from '@/request/api/space'
 import { useUserStore } from '@/store/user'
 
 interface SettingActionsProps {
@@ -31,20 +33,25 @@ export default function SettingActions(
     isOpen,
     onClose,
     space,
-    onActionSuccess
+    onActionSuccess,
   }: SettingActionsProps,
 ) {
   const userStore = useUserStore()
-
+  const inputRef = useRef<any>(null)
   const [localSpace, setLocalSpace] = useState(space)
 
   const [showNameModal, setShowNameModal] = useState(false)
-
   const [showMemberNameModal, setShowMemberNameModal] = useState(false)
-
   useEffect(() => {
     setLocalSpace(space)
   }, [space])
+
+  useEffect(() => {
+    if (showNameModal) {
+      inputRef.current?.focus()
+    }
+  }, [showNameModal])
+
   return (
     <>
       <Actionsheet
@@ -112,7 +119,7 @@ export default function SettingActions(
               }).then((res) => {
                 if (res.isSuccess) {
                   toast.success('空间已解散')
-                  onActionSuccess?.
+                  onActionSuccess?.()
                 }
               },
               )
@@ -133,47 +140,36 @@ export default function SettingActions(
 
         </ActionsheetContent>
       </Actionsheet>
-
-      <AModal
-        title="修改空间名称"
-        showCloseIcon
-        body={
-          (
-            <View className="gap-2">
-              <Text>空间名称</Text>
-              <AInput
-                value={localSpace?.name || ''}
-                onChangeText={(val) => {
-                  setLocalSpace(prev => prev
-                    ? ({
-                        ...prev,
-                        name: val,
-                      })
-                    : null)
-                }}
-                className="flex-1"
-              />
-            </View>
-          )
-        }
+      <Actionsheet
         isOpen={showNameModal}
-        onCancel={() => {
-          setShowNameModal(false)
-          setLocalSpace(space)
-        }}
         onClose={() => {
           setShowNameModal(false)
-          setLocalSpace(space)
-        }}
-        onConfirm={async () => {
-          // 更新名称
-          if (!localSpace?.name) {
-            toast.warning('请输入空间名称')
-          }
         }}
       >
-      </AModal>
+        <KeyboardAvoidingView
+          behavior="position"
+        >
+          <ActionsheetBackdrop />
 
+          <ActionsheetContent>
+            <ActionsheetDragIndicatorWrapper>
+              <ActionsheetDragIndicator />
+            </ActionsheetDragIndicatorWrapper>
+
+            <View className="pb-6">
+              <View className="items-center mb-6">
+                <Text className="text-lg font-semibold">空间名称</Text>
+              </View>
+
+              <View className="w-full mb-4">
+                <AInput ref={inputRef} className="w-full" placeholder="请输入空间名称" />
+              </View>
+
+              <AButton className="rounded-full">保存</AButton>
+            </View>
+          </ActionsheetContent>
+        </KeyboardAvoidingView>
+      </Actionsheet>
     </>
   )
 }

code/allapp/allapp-rn/src/app/space/manage/index.tsx

@@ -39,6 +39,7 @@ export default function AuthSpace() {
   function listUserSpaces() {
     listUserSpacesApi().then((res) => {
       if (res.isSuccess) {
+        console.log(res.data)
         setSpaces(res.data.spaces)
       }
     })
@@ -55,8 +56,8 @@ export default function AuthSpace() {
         style={{
           height: ITEM_HEIGHT,
         }}
-        className={`rounded-md flex-row items-center justify-between px-4 py-3 border
-                          ${item.space_id === selectedId ? 'border-gray-700' : 'border-gray-300'}`}
+        className={`bg-[#f9f9f9] rounded-md flex-row items-center justify-between px-4 py-3 border
+                          ${item.space_id === selectedId ? 'border-gray-700' : 'border-gray-200'}`}
       >
         <View className="flex-row items-center">
           <Sortable.Handle>
@@ -211,6 +212,9 @@ export default function AuthSpace() {
             : (
                 <Sortable.Grid
                   scrollableRef={scrollableRef}
+                  keyExtractor={(item: UserSpace) => {
+                    return String(item.space_id)
+                  }}
                   activeItemScale={1}
                   columns={1}
                   data={spaces}

code/allapp/allapp-rn/src/app/space/manage/sub-page/settings.tsx

@@ -0,0 +1,13 @@
+import { View } from 'react-native'
+
+import CustomHeader from '@/components/custom/Header'
+
+export default function Settings() {
+  return (
+    <View className="flex-1">
+      <CustomHeader title="空间设置" />
+
+      <View></View>
+    </View>
+  )
+}

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

@@ -14,20 +14,27 @@ import type {
   RemoveSpaceMemberResult,
   UpdateSpaceMemberRoleParams,
   UpdateSpaceMemberRoleResult,
+  UpdateSpaceNameParams,
 } from '@/types/space'
 import alovaInstance from '../../index'
 
 const API_PREFIX = '/space'
 
-// Create Space API
+// 创建空间
 export function createSpaceApi(params: CreateSpaceParams) {
   return alovaInstance.Post<ResponseData<CreateSpaceResult>>(`${API_PREFIX}/create`, params)
 }
 
+// 查询用户下的空间列表
 export function listUserSpacesApi() {
   return alovaInstance.Post<ResponseData<ListUserSpacesResult>>(`${API_PREFIX}/list`)
 }
 
+// 修改空间名称
+export function updateSpaceNameApi(params: UpdateSpaceNameParams) {
+  return alovaInstance.Post<ResponseData<void>>(`${API_PREFIX}/name`, params)
+}
+
 // Join Space API
 export function joinSpaceApi(params: JoinSpaceParams) {
   return alovaInstance.Post<ResponseData<JoinSpaceResult>>(`${API_PREFIX}/join`, params)

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

@@ -28,8 +28,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,
@@ -44,7 +44,7 @@ const alovaInstance = createAlova({
       }
 
       if (resData.code === HttpCode.Unauthorized) {
-        toast.error('登录状态已过期，请重新登录') 
+        toast.error('登录状态已过期，请重新登录')
         useUserStore.getState().clear()
         useNavStore.getState().navigateToAuth()
         return result

code/allapp/allapp-rn/src/types/space/index.ts

@@ -34,6 +34,12 @@ export interface DissolveSpaceParams {
 export interface DissolveSpaceResult {
 }
 
+// 更新名称
+export interface UpdateSpaceNameParams {
+  space_id: number
+  space_name: string
+} 
+
 // 加入空间
 export interface JoinSpaceParams {
   invite_code: string

code/allapp/allapp-rn/test.html

@@ -1,67 +1,82 @@
-import { useCallback } from 'react';
-import { StyleSheet, Text, View } from 'react-native';
-import Sortable from 'react-native-sortables';
-
-const DATA = Array.from({ length: 4 }, (_, index) => `Item ${index + 1}`);
-
-export default function CustomHandleExample() {
-  const renderItem = useCallback(
-    ({ item }: { item: string }) => (
-      <View style={styles.card}>
-        <Text style={styles.text}>{item}</Text>
-        {/* Wraps the handle component */}
-        {/* highlight-next-line */}
-        <Sortable.Handle>
-          <View style={styles.handle}>
-            <Text style={styles.handleText}>::</Text>
-          </View>
-          {/* highlight-next-line */}
-        </Sortable.Handle>
-      </View>
-    ),
-    []
-  );
-
-  return (
-    <View style={styles.container}>
-      <Sortable.Grid
-        activeItemScale={1.05}
-        columns={1}
-        data={DATA}
-        overDrag='vertical'
-        renderItem={renderItem}
-        rowGap={10}
-        // highlight-next-line
-        customHandle // must be set to use a custom handle
-      />
-    </View>
-  );
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8"/>
+<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+<title>空间状态演示</title>
+<style>
+body{margin:0;font-family:-apple-system;background:#fff;padding:20px;}
+.space{
+  background:#f8f8f8;
+  border-radius:12px;
+  padding:16px;
+  margin-bottom:12px;
+  display:flex;
+  justify-content:space-between;
+  align-items:center;
+  border:2px solid transparent;
 }
+.space.selected{
+  border:2px solid #111;
+}
+.name{
+  font-weight:600;
+}
+.meta{font-size:12px;color:#666;margin-top:4px;}
+.tag{
+  font-size:10px;
+  padding:2px 6px;
+  border-radius:6px;
+  margin-left:6px;
+}
+.tag-default{
+  background:#e5e7eb;
+  color:#555;
+}
+.tag-current{
+  background:#111;
+  color:#fff;
+}
+.more{font-size:18px;color:#999;}
+</style>
+</head>
+<body>
 
-const styles = StyleSheet.create({
-  card: {
-    alignItems: 'center',
-    backgroundColor: '#2e8555',
-    borderRadius: 12,
-    flexDirection: 'row',
-    justifyContent: 'center',
-    padding: 24
-  },
-  container: {
-    padding: 16
-  },
-  handle: {
-    backgroundColor: 'rgba(0,0,0,0.2)',
-    borderRadius: 5,
-    padding: 10
-  },
-  handleText: {
-    color: 'white',
-    fontWeight: 'bold'
-  },
-  text: {
-    color: 'white',
-    flex: 1,
-    fontWeight: 'bold'
-  }
-});
+<!-- 当前正在使用 -->
+<div class="space">
+  <div>
+    <div class="name">
+      工作空间
+      <span class="tag tag-current">当前</span>
+      <span class="tag tag-default">默认</span>
+    </div>
+    <div class="meta">张三 · 5人</div>
+  </div>
+  <div class="more">⋯</div>
+</div>
+
+<!-- 只是默认 -->
+<div class="space">
+  <div>
+    <div class="name">
+      家庭账本
+      <span class="tag tag-default">默认</span>
+    </div>
+    <div class="meta">张三 · 3人</div>
+  </div>
+  <div class="more">⋯</div>
+</div>
+
+<!-- 被选中但未进入 -->
+<div class="space selected">
+  <div>
+    <div class="name">
+      副业空间
+    </div>
+    <div class="meta">张三 · 2人</div>
+  </div>
+  <div class="more">⋯</div>
+</div>
+
+</body>
+</html>