diff --git a/frontend/packages/common/src/components/aoplatform/MemberTransfer.tsx b/frontend/packages/common/src/components/aoplatform/MemberTransfer.tsx index d7972d94..ac3b513d 100644 --- a/frontend/packages/common/src/components/aoplatform/MemberTransfer.tsx +++ b/frontend/packages/common/src/components/aoplatform/MemberTransfer.tsx @@ -1,5 +1,5 @@ -import { TransferProps, TreeDataNode, Tree, Spin, Input } from "antd"; +import { TransferProps, TreeDataNode, Tree, Spin, Input, Empty } from "antd"; import { DataNode } from "antd/es/tree"; import { Ref, forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react"; import { ApartmentOutlined, LoadingOutlined, UserOutlined } from "@ant-design/icons"; @@ -149,10 +149,9 @@ const generateTree = ( return (
} spinning={loading} className=''> - setSearchWord(e.target.value)} value={searchWord} /> - setSearchWord(e.target.value)} value={searchWord} /> + <>{ translatedDataSource && translatedDataSource.length > 0 ? - + : }
); diff --git a/frontend/packages/core/src/pages/team/TeamInsideMember.tsx b/frontend/packages/core/src/pages/team/TeamInsideMember.tsx index dedf4f37..97408e9d 100644 --- a/frontend/packages/core/src/pages/team/TeamInsideMember.tsx +++ b/frontend/packages/core/src/pages/team/TeamInsideMember.tsx @@ -20,7 +20,7 @@ import WithPermission from "@common/components/aoplatform/WithPermission.tsx"; import { $t } from "@common/locales/index.ts"; export const getDepartmentWithMember = (department:(DepartmentListItem & {type?:'department'|'member'})[],departmentMap:Map) : (DepartmentWithMemberItem | undefined)[] =>{ - return department.map((x:DepartmentListItem & {type?:'department'|'member'})=>{ + return department?.map((x:DepartmentListItem & {type?:'department'|'member'})=>{ const res = ({ ...x, key:x.id, @@ -28,7 +28,7 @@ export const getDepartmentWithMember = (department:(DepartmentListItem & {type?: type: x.type || 'department', children:((x.type === 'member' || (!x.children||x.children.length === 0 )&& (!departmentMap.get(x.id) || departmentMap.get(x.id)!.length === 0))? undefined : [...(x.children && x.children.length > 0 ? getDepartmentWithMember(x.children,departmentMap) : []),...departmentMap.get(x.id) || []]) }); - return res}).filter(node=>node.type === 'member' ||( node.children && node.children.length > 0)) + return res})?.filter(node=>node.type === 'member' ||( node.children && node.children.length > 0)) || [] } export const addMemberToDepartment = (departmentMap: Map, departmentId: string, member: MemberItem) => { @@ -84,6 +84,7 @@ const TeamInsideMember:FC = ()=>{ addMemberToDepartment(departmentMap, '_withoutDepartment', member); } }); + const finalData = departmentResponse.data.department ? [ @@ -93,7 +94,7 @@ const TeamInsideMember:FC = ()=>{ name: departmentResponse.data.department.name, title:departmentResponse.data.department.name, children: [ - ...getDepartmentWithMember(departmentResponse.data.department.children, departmentMap), + ...getDepartmentWithMember(departmentResponse.data.department?.children || [], departmentMap), ...departmentMap.get('_withoutDepartment') || [] ] } @@ -116,7 +117,6 @@ const TeamInsideMember:FC = ()=>{ setAllMemberSelectedDepartIds((pre)=>[...pre, topDepartmentId]) } - return {data:finalData, success: true} }).catch(()=>({data:[], success:false})) } @@ -218,7 +218,6 @@ const TeamInsideMember:FC = ()=>{ const changeMemberInfo = (value:string[],entity:TeamMemberTableListItem )=>{ - //console.log(value) return new Promise((resolve, reject) => { fetchData>(`team/member/role`, {method: 'PUT',eoBody:({roles:value, users:[entity.user.id]}), eoParams: {team:teamId}}).then(response => { const {code, msg} = response diff --git a/frontend/packages/market/src/pages/serviceHub/ServiceHubDetail.tsx b/frontend/packages/market/src/pages/serviceHub/ServiceHubDetail.tsx index 4284e0cd..69c21350 100644 --- a/frontend/packages/market/src/pages/serviceHub/ServiceHubDetail.tsx +++ b/frontend/packages/market/src/pages/serviceHub/ServiceHubDetail.tsx @@ -89,10 +89,10 @@ const ServiceHubDetail = ()=>{ const getMySelectList = ()=>{ setMySystemOptionList([]) - fetchData>('simple/apps/mine',{method:'GET'}).then(response=>{ + fetchData>('apps/can_subscribe',{method:'GET'}).then(response=>{ const {code,data,msg} = response if(code === STATUS_CODE.SUCCESS){ - setMySystemOptionList(data.apps?.map((x:SimpleSystemItem)=>{return { + setMySystemOptionList(data.apps?.map((x:EntityItem)=>{return { label:x.name, value:x.id }})) }else{