@smart-link/rn-im 1.0.24 → 1.1.1

package/dist/pages/address-list/Organization.js

@@ -1,16 +1,16 @@
-import { CaihIcon as Icon, dp, ListRow, Loading, NavigationPage, SearchBar, useTheme, Checkbox, } from '@smart-link/rn-ui';
-import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
+import { ListRow, Loading, NavigationPage, SearchBar, Toast, } from '@smart-link/rn-ui';
+import React, { useCallback, useEffect, useState } from 'react';
+import { ScrollView, Text, View } from 'react-native';
 import { useTranslationAddrList } from '../../hooks/useTranslation';
 import { listTree, listUser } from '../../api/addressList';
-import ChatAvatar from '../../components/ChatAvatar/ChatAvatar';
+import OrgPath from "./components/OrgPath";
+import RenderUserItem from "./components/RenderUserItem";
 const Organization = ({ navigation, route: { params } }) => {
     const [orgPath, setOrgPath] = useState([]);
     const [orgList, setOrgList] = useState([]);
     const [userList, setUserList] = useState([]);
     const [loading, setLoading] = useState(false);
     const { t } = useTranslationAddrList();
-    const orgPathScroll = useRef(null);
     useEffect(() => {
         navigation.setOptions({ title: t('addressList') });
         if (!params) {
@@ -19,26 +19,23 @@ const Organization = ({ navigation, route: { params } }) => {
         setOrgPath([
             {
                 id: params.groupRootIds,
-                groupName: params.groupCategoryName,
+                name: params.groupCategoryName,
             },
         ]);
         queryListTree(params.groupRootIds);
-    }, [params]);
+        queryUserList({ groupId: params.groupRootIds });
+    }, [navigation, params]);
     const onPressSearch = useCallback(() => {
         console.log('onPressSearch: ');
         navigation.navigate('UserSearch', {});
     }, [navigation]);
-    const handleGroupCategory = (item) => {
+    const handleGroup = (item) => {
         orgPath.push({
             id: item.groupId,
-            groupName: item.groupName,
-            groupIdPath: item.groupIdPath,
+            name: item.groupName,
         });
         setOrgPath(orgPath);
-        if (item.parent) {
-            queryListTree(item.groupId);
-            return;
-        }
+        queryListTree(item.groupId);
         queryUserList(item);
     };
     const handleUser = (item) => {
@@ -58,24 +55,21 @@ const Organization = ({ navigation, route: { params } }) => {
         })
             .catch(err => {
             setLoading(false);
-            // Toast.error(t('requestFail'));
+            Toast.error(t('requestFail'));
             setOrgList([]);
         });
     };
     const queryUserList = (item) => {
         setLoading(true);
         listUser({
-            groupCategoryId: item.groupId,
-            groupId: '',
-            groupIdPathLike: item.groupIdPath,
+            groupId: item.groupId,
             pageNum: 1,
-            pageSize: 100,
+            pageSize: 1000,
             queryAll: false,
-            userStatus: '',
+            userStatus: 'valid',
         })
             .then(({ data }) => {
             setLoading(false);
-            setOrgList([]);
             setUserList(data);
         })
             .catch(err => {
@@ -84,53 +78,23 @@ const Organization = ({ navigation, route: { params } }) => {
     };
     const changeOrg = (org, index) => {
         setLoading(true);
-        listTree({
-            groupCatId: params === null || params === void 0 ? void 0 : params.groupCategoryId,
-            parentId: org.id,
-            groupStatus: 'valid',
-            queryChild: false,
-        })
-            .then(({ data }) => {
-            setOrgList(data);
-            setUserList([]);
-            setLoading(false);
-        })
-            .catch(err => {
-            // Toast.error(t('requestFail'));
-            setOrgList([]);
-            setLoading(false);
+        console.log(org);
+        queryListTree(org.id);
+        queryUserList({
+            groupId: org.id,
         });
         let tmp = orgPath.slice(0, index + 1);
         setOrgPath(tmp);
     };
-    const scrollOrgPath = () => {
-        if (orgPath.length > 1) {
-            orgPathScroll.current.scrollToEnd();
-        }
-        else {
-            orgPathScroll.current.scrollTo({ x: 0, y: 0, animated: false });
-        }
-    };
     return (<NavigationPage noPadding>
-            <View style={{ height: 10 }}/>
-            <SearchBar onSearch={onPressSearch}/>
-            <View style={{ height: 8 }}/>
+            <View style={{ paddingVertical: 8, paddingHorizontal: 10 }}>
+                <SearchBar onSearch={onPressSearch}/>
+            </View>
 
-            {orgPath.length > 0 && (<View style={styles.orgBreadcrumb}>
-                    <ScrollView ref={orgPathScroll} horizontal={true} onContentSizeChange={scrollOrgPath} onLayout={scrollOrgPath} showsHorizontalScrollIndicator={false} contentContainerStyle={{ paddingRight: 40 }}>
-                        {orgPath.map((path, index) => {
-                if (index !== orgPath.length - 1) {
-                    return (<TouchableOpacity key={path.id} onPress={() => changeOrg(path, index)}>
-                                        <RenderPathItem path={path} index={index} orgPath={orgPath} active/>
-                                    </TouchableOpacity>);
-                }
-                return <RenderPathItem path={path} key={path.id} index={index} orgPath={orgPath}/>;
-            })}
-                    </ScrollView>
-                </View>)}
+            <OrgPath orgPath={orgPath} onChange={changeOrg}/>
             <ScrollView style={{ flex: 1 }}>
                 {orgList.length > 0 &&
-            orgList.map((org) => (<ListRow key={org.groupId} onPress={() => handleGroupCategory(org)} title={org.groupName} topSeparator="full"/>))}
+            orgList.map((org) => (<ListRow key={org.groupId} onPress={() => handleGroup(org)} title={org.groupName} topSeparator="full"/>))}
                 {userList.length > 0 &&
             userList.map((item) => (<ListRow key={item.userId} onPress={() => handleUser(item)} title={<RenderUserItem data={item}/>} topSeparator="full"/>))}
                 {userList.length === 0 && orgList.length === 0 && (<View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
@@ -140,52 +104,4 @@ const Organization = ({ navigation, route: { params } }) => {
             <Loading loading={loading} loadingText={t('loading')}/>
         </NavigationPage>);
 };
-const RenderPathItem = (props) => {
-    const { path, index, active, orgPath } = props;
-    const theme = useTheme();
-    return (<View key={index} style={[styles.orgPathItem]}>
-            <Text style={{
-            textAlignVertical: 'center',
-            fontSize: 16,
-            height: 40,
-            lineHeight: 40,
-            color: active ? theme.primaryColor : '#A3A5A8',
-        }}>
-                {path.groupName}
-            </Text>
-            {index !== orgPath.length - 1 && (<Icon style={{
-                textAlignVertical: 'center',
-                height: 40,
-                lineHeight: 40,
-            }} name="list-arrow" size={18} color={'#bbb'}/>)}
-        </View>);
-};
-export const RenderUserItem = (props) => {
-    const { data, checkable, disabled, checked } = props;
-    return (<View style={{ flexDirection: 'row', alignItems: 'center' }}>
-            {checkable && (<View style={{ marginRight: 10 }}>
-                    <Checkbox style={disabled ? { pointerEvents: 'none' } : undefined} checked={checked}/>
-                </View>)}
-            <ChatAvatar disabled={disabled} size={dp(40)} id={data.userId} url={data.avatars} name={data.userName}/>
-            <Text style={{ marginLeft: dp(10), fontSize: 16, color: '#333' }}>{data.userName}</Text>
-        </View>);
-};
-const styles = StyleSheet.create({
-    orgBreadcrumb: {
-        backgroundColor: '#fff',
-        marginBottom: dp(10),
-        paddingHorizontal: dp(10),
-    },
-    orgPathItem: {
-        height: dp(40),
-        lineHeight: dp(40),
-        flexDirection: 'row',
-        backgroundColor: '#fff',
-    },
-    avatars: {
-        height: dp(40),
-        width: dp(40),
-        borderRadius: dp(20),
-    },
-});
 export default Organization;

package/dist/pages/address-list/UserDetail.js

@@ -12,17 +12,17 @@ import React, { useEffect, useState } from 'react';
 import { StyleSheet, Text, View, Dimensions } from 'react-native';
 import { useTranslationAddrList } from '../../hooks/useTranslation';
 import { getImManager } from '../../init';
-import { CardInfo, Line } from './CardInfo';
-import UserJobs from './UserJobs';
+import { CardInfo, Line } from './components/CardInfo';
+import UserJobs from './components/UserJobs';
 import ChatAvatar from '../../components/ChatAvatar/ChatAvatar';
-import { queryUser } from '../../api/addressList';
+import { queryUsersByCond } from '../../api/addressList';
 const { width } = Dimensions.get('window');
 const UserDetail = ({ navigation, route: { params } }) => {
     const [detail, setDetail] = useState({});
     const { t } = useTranslationAddrList();
     useEffect(() => {
         navigation.setOptions({ title: t('userDetail') });
-        queryUser(params.userId).then(({ data }) => {
+        queryUsersByCond([params.userId]).then(({ data }) => {
             console.log('userDetail: ', data[0]);
             setDetail(data[0]);
         });
@@ -34,7 +34,7 @@ const UserDetail = ({ navigation, route: { params } }) => {
     return (<NavigationPage noPadding scroll>
             <CardInfo>
                 <Line>
-                    <ChatAvatar id={detail.userId} size={dp(60)} name={detail.userName} url={detail.avatars} priority={'outside'} disabled/>
+                    <ChatAvatar id={detail.userId} size={dp(60)} name={detail.userName} url={detail.avatars} disabled needUpdate/>
                     <View style={styles.accountInfo}>
                         <Text style={styles.username} numberOfLines={2}>
                             {detail.userName}

package/dist/pages/address-list/UserSearch.js

@@ -1,19 +1,19 @@
 import { NavigationPage, ListRow, HeaderSearchBar } from '@smart-link/rn-ui';
 import React, { memo, useEffect, useState } from 'react';
 import { Text, View, StyleSheet } from 'react-native';
-import { useTranslationAddrList } from '../../hooks/useTranslation';
-import { RenderUserItem } from './Organization';
+import useTranslation from '../../hooks/useTranslation';
 import { searchUser } from '../../api/addressList';
 import { getImManager } from '../../init';
 import { useDispatch } from 'react-redux';
 import { onSelectUser } from '../../slice/contact/contact.slice';
 import { useContact } from '../../hooks/useImSelector';
+import RenderUserItem from "./components/RenderUserItem";
 const UserSearch = memo(({ navigation, route: { params } }) => {
     const [keyword, setKeyword] = useState('');
     const { selectUsers } = useContact();
     const { checkable } = params || {};
     const [userList, setUserList] = useState([]);
-    const { t } = useTranslationAddrList();
+    const { t } = useTranslation();
     const imManager = getImManager();
     const dispatch = useDispatch();
     const selectCount = Object.keys(selectUsers).length;
@@ -23,16 +23,15 @@ const UserSearch = memo(({ navigation, route: { params } }) => {
         }
         searchUser({
             userNameLike: keyword,
-            tenantId: imManager.user.tenantId,
         }).then(({ data }) => {
-            setUserList(data);
+            setUserList(data || []);
         });
     }, [keyword]);
     const handleUser = (item) => {
         navigation.navigate('UserDetail', { userId: item.userId, userAccount: item.userAccount });
     };
     return (<>
-            <HeaderSearchBar value={keyword} onSubmitEditing={setKeyword}/>
+            <HeaderSearchBar value={keyword} onSubmitEditing={setKeyword} confirmText={selectCount > 0 ? `${t('confirm')}(${selectCount})` : undefined}/>
             <NavigationPage noPadding scroll={userList.length > 0}>
                 {userList.length > 0 ? (userList.map((item) => (<ListRow key={item.userId} onPress={() => {
                 if (checkable) {
@@ -45,7 +44,7 @@ const UserSearch = memo(({ navigation, route: { params } }) => {
                         <Text>{t('noData')}</Text>
                     </View>)}
             </NavigationPage>
-    </>);
+        </>);
 });
 const styles = StyleSheet.create({
     noData: {

package/dist/pages/address-list/addressList.routes.d.ts

@@ -46,5 +46,14 @@ declare const addressListRoutes: readonly [{
         readonly animation: "fade";
         readonly headerShown: false;
     };
+}, {
+    readonly name: "MyGroups";
+    readonly component: ({ navigation }: {
+        navigation: import("@react-navigation/native-stack").NativeStackNavigationProp<import("..").IMPageParamList, "MyGroups", undefined>;
+        route: import("@react-navigation/native").RouteProp<import("..").IMPageParamList, "MyGroups">;
+    }) => import("react").JSX.Element;
+    readonly options: {
+        readonly title: "";
+    };
 }];
 export default addressListRoutes;

package/dist/pages/address-list/addressList.routes.js

@@ -3,6 +3,7 @@ import UserSearch from './UserSearch';
 import ChooseContact from './ChooseContact';
 import Organization from './Organization';
 import AddressList from './AddressList';
+import MyGroups from "./MyGroups";
 const addressListRoutes = [
     {
         name: 'AddressList',
@@ -41,5 +42,12 @@ const addressListRoutes = [
             headerShown: false,
         },
     },
+    {
+        name: 'MyGroups',
+        component: MyGroups,
+        options: {
+            title: ''
+        }
+    }
 ];
 export default addressListRoutes;

package/dist/pages/address-list/components/Icons.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+type IconProps = {
+    size: number;
+    color: string;
+};
+export declare const Unfold: (props: IconProps) => React.JSX.Element;
+export declare const Group: (props: IconProps) => React.JSX.Element;
+export {};

package/dist/pages/address-list/components/Icons.js

@@ -0,0 +1,15 @@
+import { dp } from '@smart-link/rn-ui';
+import React from 'react';
+import { Svg, Path } from 'react-native-svg';
+export const Unfold = (props) => {
+    const { size = 32, color } = props || {};
+    return (<Svg viewBox="0 0 1024 1024" width={dp(size)} height={dp(size)}>
+            <Path d="M832 800H256a32 32 0 0 1-32-32V192a32 32 0 0 1 64 0v544h544a32 32 0 1 1 0 64z" fill={color}/>
+        </Svg>);
+};
+export const Group = (props) => {
+    const { size = 32, color } = props || {};
+    return <Svg viewBox="0 0 1024 1024" width={dp(size)} height={dp(size)}>
+        <Path fill={color} d="M630.79033203 470.75556641c45.00966797-35.34433594 74.04433594-90.08525391 74.04433594-151.60605469 0-106.34326172-86.50634766-192.85136719-192.85048828-192.85136719-106.34501953 0-192.85136719 86.50634766-192.85136719 192.85136719 0 61.52080078 29.06542969 116.26171875 74.04609375 151.60605469C274.65576172 518.12158203 190.56640625 633.91308594 190.56640625 769.1328125v64.28320313c0 17.76708984 14.37626953 32.14248047 32.14335938 32.14248046h578.55058593c17.76621094 0 32.14160156-14.37539062 32.14160157-32.14248047v-64.28320312c0.00087891-135.25224609-84.05771484-251.01123047-202.6116211-298.37724609zM511.9859375 190.58398437c70.90664063 0 128.56816406 57.65888672 128.56816406 128.56640626S582.89257813 447.71679687 511.9859375 447.71679687 383.41601562 390.05615234 383.41601562 319.14951172s57.66152344-128.56640625 128.56904297-128.56640625z m257.1328125 610.69306641H254.85048828V769.1328125c0-141.77988281 115.35292969-257.1328125 257.16533203-257.1328125 141.78076172 0 257.10117187 115.35292969 257.10117188 257.1328125v32.14335938zM296.81738281 481.92998047c0.87978516-1.94589844 0.87978516-4.01748047 1.31835938-6.02666016 0.31376953-1.22431641 0.65917969-2.38447266 0.81738281-3.67207031 0.24960937-2.54267578 0.09404297-4.95791016-0.25136719-7.43818359-0.12568359-1.31835938 0.18808594-2.57431641-0.12568359-3.89179688-0.18808594-0.75410156-0.72070313-1.28759766-0.94130859-2.04169922-0.50097656-1.44316406-1.19267578-2.72988281-1.8834961-4.07988281-1.31835938-2.76328125-2.76328125-5.2734375-4.7399414-7.50058594-0.28300781-0.31376953-0.62841797-0.53349609-0.9413086-0.84726562a30.84345703 30.84345703 0 0 0-10.10742187-7.03125c-34.77832031-15.50566406-57.25283203-50.03349609-57.25283203-88.07607422 0-44.7609375 30.31962891-83.30449219 73.76132812-93.75732422 17.26347656-4.17568359 27.87275391-21.53320313 23.72958984-38.79667969-4.20644531-17.26435547-21.62724609-27.74707031-38.79667968-23.72958984-72.41308594 17.4515625-122.98007813 81.73476563-122.98007813 156.28359375 0 40.68017578 15.47490234 78.81591797 41.77880859 107.8180664C116.55458984 502.49023437 62.00175781 589.18291016 62.00175781 687.27324219v49.71972656c0 17.76621094 14.37539062 32.14160156 32.14160156 32.14160156s32.14160156-14.37539062 32.14160157-32.14160156v-49.71972656c0-88.89257813 59.76386719-165.16582031 145.51611328-186.76142578 10.67167969-1.50732422 20.37041016-8.00332031 25.0171875-18.58183594zM823.64082031 459.14082031c26.30302734-29.00214844 41.77617188-67.13964844 41.77617188-107.8180664 0-72.60117187-48.90234375-136.44492187-118.93007813-155.24648438-17.10615234-4.584375-34.74667969 5.5546875-39.39257812 22.69335938-4.61425781 17.16943359 5.55556641 34.77919922 22.69423828 39.39257812 41.99677734 11.26845703 71.34609375 49.59404297 71.34609375 93.16230469 0 38.04257812-22.44375 72.50800781-57.19042969 88.04355469-3.89091797 1.69628906-7.3125 4.05-10.26298828 7.12617187-0.25048828 0.28300781-0.56601563 0.47109375-0.81650391 0.75410156-2.00917969 2.22714844-3.45234375 4.80234375-4.80234375 7.59550782-0.65917969 1.35-1.37988281 2.60507812-1.85097656 4.01748046-0.21972656 0.72158203-0.75410156 1.28759766-0.9421875 2.04082032-0.31289062 1.31835938 0 2.57519531-0.12480469 3.89355468-0.34628906 2.47851563-0.50097656 4.89550781-0.25136718 7.43730469 0.15820313 1.28759766 0.50097656 2.44775391 0.81738281 3.67207031 0.43769531 2.00917969 0.43769531 4.08076172 1.31748047 6.02666016 4.64589844 10.57851562 14.34375 17.07626953 25.01455078 18.58183594 85.753125 21.59736328 145.51787109 97.86884766 145.51787109 186.76142578v49.71972656c0 17.76621094 14.37539062 32.14160156 32.14160157 32.14160157s32.14072266-14.37539062 32.14072265-32.14160157v-49.71972656c0.00175781-98.09208984-54.55107422-184.78564453-138.20185547-228.13417969z"></Path>
+    </Svg>;
+};

package/dist/pages/address-list/components/OrgPath.d.ts

@@ -0,0 +1,12 @@
+import React from "react";
+export type IOrgPath = {
+    id: string;
+    name: string;
+    type?: 'org' | 'role' | 'orgCategory';
+};
+export type OrgPathProps = {
+    orgPath: IOrgPath[];
+    onChange: (org: IOrgPath, index: number) => void;
+};
+declare const _default: React.MemoExoticComponent<({ orgPath, onChange }: OrgPathProps) => React.JSX.Element | null>;
+export default _default;

package/dist/pages/address-list/components/OrgPath.js

@@ -0,0 +1,59 @@
+import React, { memo, useRef } from "react";
+import { ScrollView, StyleSheet, Text, TouchableOpacity, View } from "react-native";
+import { CaihIcon as Icon, dp, useTheme } from "@smart-link/rn-ui";
+const OrgPath = ({ orgPath, onChange }) => {
+    const orgPathScroll = useRef(null);
+    if (!orgPath.length)
+        return null;
+    const scrollOrgPath = () => {
+        var _a, _b;
+        if (orgPath.length > 1) {
+            (_a = orgPathScroll.current) === null || _a === void 0 ? void 0 : _a.scrollToEnd();
+        }
+        else {
+            (_b = orgPathScroll.current) === null || _b === void 0 ? void 0 : _b.scrollTo({ x: 0, y: 0, animated: false });
+        }
+    };
+    return <View style={styles.orgBreadcrumb}>
+                <ScrollView ref={orgPathScroll} horizontal={true} onContentSizeChange={scrollOrgPath} onLayout={scrollOrgPath} showsHorizontalScrollIndicator={false} contentContainerStyle={{ paddingRight: 40 }}>
+                    {orgPath.map((path, index) => {
+            if (index !== orgPath.length - 1) {
+                return (<TouchableOpacity key={path.id} onPress={() => onChange(path, index)}>
+                                    <RenderPathItem path={path} index={index} orgPath={orgPath} active/>
+                                </TouchableOpacity>);
+            }
+            return <RenderPathItem path={path} key={path.id} index={index} orgPath={orgPath}/>;
+        })}
+                </ScrollView>
+            </View>;
+};
+const RenderPathItem = (props) => {
+    const { path, index, active, orgPath } = props;
+    const theme = useTheme();
+    return (<View key={index} style={[styles.orgPathItem]}>
+            <Text style={{
+            textAlignVertical: 'center',
+            fontSize: 16,
+            color: active ? theme.primaryColor : '#A3A5A8',
+        }}>
+                {path.name}
+            </Text>
+            {index !== orgPath.length - 1 && (<Icon style={{
+                textAlignVertical: 'center',
+            }} name="list-arrow" size={18} color={'#bbb'}/>)}
+        </View>);
+};
+const styles = StyleSheet.create({
+    orgBreadcrumb: {
+        backgroundColor: '#fff',
+        marginBottom: dp(10),
+        paddingHorizontal: dp(10),
+    },
+    orgPathItem: {
+        height: dp(40),
+        flexDirection: 'row',
+        backgroundColor: '#fff',
+        alignItems: 'center',
+    },
+});
+export default memo(OrgPath);

package/dist/pages/address-list/components/RenderUserItem.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="react" />
+import { IUser } from "@smart-link/im-base";
+declare const RenderUserItem: (props: {
+    data: IUser;
+    checkable?: boolean;
+    checked?: boolean;
+    disabled?: boolean;
+}) => import("react").JSX.Element;
+export default RenderUserItem;

package/dist/pages/address-list/components/RenderUserItem.js

@@ -0,0 +1,14 @@
+import { View, Text } from "react-native";
+import { Checkbox, dp } from "@smart-link/rn-ui";
+import ChatAvatar from "../../../components/ChatAvatar";
+const RenderUserItem = (props) => {
+    const { data, checkable, disabled, checked } = props;
+    return (<View style={{ flexDirection: 'row', alignItems: 'center' }}>
+            {checkable && (<View style={{ marginRight: 10 }}>
+                    <Checkbox disabled={disabled} style={disabled ? { pointerEvents: 'none' } : undefined} checked={checked}/>
+                </View>)}
+            <ChatAvatar disabled={disabled} size={dp(40)} id={data.userId} url={data.avatars} name={data.userName}/>
+            <Text style={{ marginLeft: dp(10), fontSize: 16, color: '#333' }}>{data.userName}</Text>
+        </View>);
+};
+export default RenderUserItem;

package/dist/pages/address-list/{UserJobs.js → components/UserJobs.js}

@@ -1,6 +1,6 @@
 import { dp, useTheme } from '@smart-link/rn-ui';
 import { View, Text, StyleSheet } from 'react-native';
-import { useTranslationAddrList } from '../../hooks/useTranslation';
+import { useTranslationAddrList } from '../../../hooks/useTranslation';
 import { CardInfo, Line } from './CardInfo';
 const UserJobs = (props) => {
     const { jobs } = props;
@@ -10,7 +10,7 @@ const UserJobs = (props) => {
     return (<CardInfo>
             {(jobs === null || jobs === void 0 ? void 0 : jobs.length) > 0 &&
             jobs.map(job => {
-                let isMainJob = job.majorFlag === 'y';
+                let isMainJob = job.major === 'y';
                 return (<Line key={job.groupId}>
                             <View style={isMainJob ? styles.mainJob : styles.partJob}>
                                 <Text style={{ color: isMainJob ? '#fff' : theme.primaryColor }}>

package/dist/pages/address-list/useGroupCategory.d.ts

@@ -0,0 +1,2 @@
+import { IGroupCategory } from "../../interface";
+export default function useGroupCategory(): IGroupCategory[];

package/dist/pages/address-list/useGroupCategory.js

@@ -0,0 +1,11 @@
+import { useEffect, useState } from "react";
+import { listGroupCategory } from "../../api/addressList";
+export default function useGroupCategory() {
+    const [groupCategoryList, setGroupCategoryList] = useState([]);
+    useEffect(() => {
+        listGroupCategory({}).then(({ data }) => {
+            setGroupCategoryList(data);
+        });
+    }, []);
+    return groupCategoryList;
+}

package/dist/pages/address-list/useRoleList.d.ts

@@ -0,0 +1,2 @@
+import { IRole } from "../../interface";
+export default function useRoleList(): IRole[];

package/dist/pages/address-list/useRoleList.js

@@ -0,0 +1,11 @@
+import { useEffect, useState } from "react";
+import { listRole } from "../../api/addressList";
+export default function useRoleList() {
+    const [roleList, setRoleList] = useState([]);
+    useEffect(() => {
+        listRole().then(({ data }) => {
+            setRoleList(data);
+        });
+    }, []);
+    return roleList;
+}

package/dist/pages/collection/Collection.js

@@ -7,31 +7,75 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { NavigationPage, dp, useNavigation, HeaderSearchBar } from '@smart-link/rn-ui';
+import { NavigationPage, dp, useNavigation, HeaderSearchBar, ActionSheet } from '@smart-link/rn-ui';
 import React, { useEffect, useState } from 'react';
 import { Text, TouchableOpacity, View, StyleSheet, FlatList } from 'react-native';
 import useTranslation from '../../hooks/useTranslation';
 import { getImManager } from '../../init';
 import { useCollection, useConversation } from '../../hooks/useImSelector';
 import ContentFactory from './ContentFactory';
+import { CollectionActions, ConversationActions, MessageActions } from '@smart-link/im-base';
 import { borderStyle, shadowStyle } from '../../components/styles';
 import FormatTimeText from '../../components/FormatTimeText';
-import { ConfirmActionSheet } from '../../utils/common-action-sheet';
+import { cloneDeep } from "lodash-es";
+import { StackActions } from "@react-navigation/native";
 const Collection = () => {
     const { t } = useTranslation();
     const [keyword, setKeyword] = useState('');
     const { currentConversation } = useConversation();
     const { collections } = useCollection();
     const navigation = useNavigation();
+    const imManager = getImManager();
     useEffect(() => {
-        getImManager().selectCollections(keyword);
+        imManager.selectCollections(keyword);
     }, [keyword]);
     const onPressCollection = (collection) => {
-        ConfirmActionSheet(t('sendTo') + (currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.name), () => __awaiter(void 0, void 0, void 0, function* () {
-            // TODO: 发送收藏消息
-            yield getImManager().sendCollectionMessage(collection);
-            navigation.goBack();
-        }), t);
+        const { close } = ActionSheet.open({
+            title: null,
+            options: [
+                {
+                    text: t('jumpToChatContext'),
+                    onPress: () => __awaiter(void 0, void 0, void 0, function* () {
+                        close();
+                        if (currentConversation) {
+                            navigation.dispatch(StackActions.popToTop());
+                        }
+                        yield imManager.store.dispatch(ConversationActions.initSearchConversation(imManager, collection.conversationId, collection.messageSeq));
+                        navigation.navigate('MessageList');
+                    })
+                },
+                currentConversation ? {
+                    text: t('sendTo') + (currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.name),
+                    onPress: () => {
+                        close();
+                        imManager.sendCollectionMessage(collection);
+                        navigation.goBack();
+                    }
+                } : {
+                    text: t('forward'),
+                    onPress: () => {
+                        close();
+                        const forwardMessage = cloneDeep(collection);
+                        if (forwardMessage.payload) {
+                            forwardMessage.payload.forward = true;
+                        }
+                        imManager.store.dispatch(MessageActions.setForwardMessage(forwardMessage));
+                        navigation.navigate('ForwardToConversation');
+                    }
+                },
+                {
+                    text: t('unCollect'),
+                    textColor: '#ff0617',
+                    onPress: () => {
+                        close();
+                        imManager.store.dispatch(CollectionActions.unCollection(imManager, collection));
+                    }
+                }
+            ],
+            cancelButton: {
+                text: t('cancel'),
+            }
+        });
     };
     const keyExtractor = (item) => item.messageSeq;
     const itemSeparatorComponent = () => <View style={styles.h10}/>;