Merge pull request #380 from APIParkLab/feature/1.9-OAuth

fix: Fix department selection issue

README.md

@@ -156,6 +156,10 @@ curl -sSO  https://download.apipark.com/install/quick-start.sh ;  bash quick-sta
 
 <br>
 
+<br>
+
+
+
 # 🚀 Use Cases
 ## Simplify AI Integration Costs
   - Connect to 100+ major models from all mainstream AI vendors, with standardized API calls requiring no additional adaptation work.
@@ -199,11 +203,20 @@ To achieve this goal, we plan to add new features to APIPark, including:
 # 📕 Documentation
 Visit [APIPark Documentation](https://docs.apipark.com/docs/deploy) for detailed installation guides, API references, and usage instructions.
 
+
+# 🧑‍🤝‍🧑Friendly Links
+<a href="https://xroute.ai/">
+  <img width="1248" height="158" alt="新建 PPTX 演示文稿 (2)_03" src="https://github.com/user-attachments/assets/0ebd694c-410a-4e3f-a793-90f1140d15df" />
+
+</a>
+<br>
+
 <br>
 
 # 🧾 License
 APIPark uses the Apache 2.0 License. For more details, please refer to the LICENSE file.
 
+
 <br>
 
 # 💌 Contact Us
@@ -215,3 +228,7 @@ For enterprise-level features and professional technical support, contact our pr
 <br>
 
 🙏 A big thanks to everyone who helped shape APIPark. We are thrilled to hear the community’s thoughts! Let’s make the world of APIs and AI stronger and more fun together. 🎉
+
+
+
+

frontend/package.json

@@ -8,7 +8,7 @@
   "description": "",
   "scripts": {
     "test": "jest",
-    "build": "set NODE_OPTIONS=--max-old-space-size=4096  && lerna run build --scope=core --stream  --verbose ",
+    "build": "set NODE_OPTIONS=--max-old-space-size=8192  && lerna run build --scope=core --stream  --verbose ",
     "serve": "lerna run preview --parallel",
     "serve:remotes": "lerna run serve --scope=remote --parallel",
     "dev": "lerna run dev --scope=core --stream",

frontend/packages/core/src/const/member/type.ts

@@ -19,7 +19,7 @@ export type MemberTableListItem = {
     enable:boolean
     departmentId:string
     roles:EntityItem[]
-    form: string
+    from: string
 };
 
 export type AddToDepartmentProps = {
@@ -41,7 +41,7 @@ export type MemberDropdownModalFieldType = {
 
 export type MemberDropdownModalProps = {
     type:'addDep'|'addChild'|'addMember'|'editMember'|'rename'
-    entity?:(MemberTableListItem & {departmentIds:string[]}) | ({id?:string, departmentIds?:string[],name?:string,form?:string})
+    entity?:(MemberTableListItem & {departmentIds:string[]}) | ({id?:string, departmentIds?:string[],name?:string,from?:string})
     selectedMemberGroupId?:string
 }
 

frontend/packages/core/src/pages/Login.tsx

@@ -93,6 +93,11 @@ const Login: FC = () => {
         const code = query.get('code')
         if (code) {
           feishuLogin(code)
+          setSpinning(false)
+          return
+        }
+        if (isInFeishuClient() && feishu) {
+          openFeishuLogin(feishu.config.client_id)
         }
         setSpinning(false)
       }
@@ -161,10 +166,25 @@ const Login: FC = () => {
     fetchLogin({ username: 'guest', password: '12345678' })
   }
 
+  const isInFeishuClient = () => {
+    // 方法1：检查User-Agent
+    const ua = navigator.userAgent.toLowerCase();
+    const isLark = ua.includes('lark') || ua.includes('feishu');
+    
+    // 方法2：检查全局对象
+    const hasSDK = typeof window.h5sdk !== 'undefined' || typeof window.tt !== 'undefined';
+    
+    // 方法3：检查URL参数
+    const params = new URLSearchParams(window.location.search);
+    const hasFeishuParams = params.has('from') || params.has('required_launch_ability');
+    
+    return isLark || hasSDK || hasFeishuParams;
+  }
+
   // 打开飞书授权页面
-  const openFeishuLogin = () => {
+  const openFeishuLogin = (id?: string) => {
     const href = window.location.origin + window.location.pathname
-    const authUrl = `https://accounts.feishu.cn/open-apis/authen/v1/authorize?client_id=${feishuAppId}&redirect_uri=${href}`
+    const authUrl = `https://accounts.feishu.cn/open-apis/authen/v1/authorize?client_id=${id || feishuAppId}&redirect_uri=${href}`
     localStorage.setItem('feishuCallbackUrl', href)
     window.location.href = authUrl
   }
@@ -336,7 +356,7 @@ const Login: FC = () => {
                         loading={loading}
                         className="h-[40px]  w-full inline-flex justify-center items-center"
                         type="default"
-                        onClick={openFeishuLogin}
+                        onClick={() => openFeishuLogin(feishuAppId)}
                       >
                         <img className="h-[30px]" src={FeishuLogo} />
                         {$t('飞书授权登录')}

frontend/packages/core/src/pages/member/MemberDropdownModal.tsx

@@ -14,8 +14,7 @@ export const MemberDropdownModal = forwardRef<MemberDropdownModalHandle,MemberDr
     const {fetchData} = useFetch()
     const [departmentList, setDepartmentList] = useState<DepartmentListItem[]>([])
     const { state } = useGlobalContext()
-    const [disableEditMemberData] = useState<boolean>(entity?.form !== 'self-build')
-
+    const [disableEditMemberData] = useState<boolean>(entity?.from === 'feishu')
     const save:()=>Promise<boolean | string> =  ()=>{
         let url:string
         let method:string

frontend/packages/core/src/pages/member/MemberList.tsx

@@ -95,14 +95,15 @@ const AddToDepartment = forwardRef<AddToDepartmentHandle, AddToDepartmentProps>(
       treeData?.map((x: DataNode) => ({
         ...x,
         name: $t((x as unknown as { name: string }).name),
-        checkable: false,
-        children: x.children?.map(y => ({ ...y, checkable: false }))
+        checkable: false, // 根节点不可选中
+        children: x.children?.map(y => ({ ...y, checkable: true })) // 子节点可以选中
       })),
     [state.language, treeData]
   )
 
-  const onCheck: TreeProps['onCheck'] = (checkedKeys: string[]) => {
-    setSelectedKeys(checkedKeys.checked)
+  const onCheck: TreeProps['onCheck'] = (checkedKeys, info) => {
+    const selectedIds = Array.isArray(checkedKeys) ? checkedKeys : checkedKeys.checked || []
+    setSelectedKeys(selectedIds)
   }
 
   useEffect(() => {
@@ -153,11 +154,12 @@ const MemberList = () => {
   const [tableHttpReload, setTableHttpReload] = useState(true)
   const [tableListDataSource, setTableListDataSource] = useState<MemberTableListItem[]>([])
   const pageListRef = useRef<ActionType>(null)
-  const { topGroupId, selectedDepartmentIds, refreshGroup } = useOutletContext<{
+  const { topGroupId, selectedDepartmentIds, refreshGroup, refreshTableCount } = useOutletContext<{
     topGroupId: string
     departmentList: DepartmentListItem[]
     selectedDepartmentIds: string[]
     refreshGroup: () => void
+    refreshTableCount: number
   }>()
   const AddMemberRef = useRef<MemberDropdownModalHandle>(null)
   const EditMemberRef = useRef<MemberDropdownModalHandle>(null)
@@ -396,7 +398,7 @@ const MemberList = () => {
       width: 600,
       okText: $t('确认'),
       okButtonProps: {
-        disabled: isActionAllowed(type) || (type === 'editMember' && entity?.form !== 'self-build')
+        disabled: isActionAllowed(type) || (type === 'editMember' && entity?.from === 'feishu')
       },
       cancelText: $t('取消'),
       closable: true,
@@ -415,6 +417,13 @@ const MemberList = () => {
     getDepartmentList()
   }, [])
 
+  // 监听外部刷新触发器
+  useEffect(() => {
+    if (refreshTableCount > 0) {
+      manualReloadTable()
+    }
+  }, [refreshTableCount])
+
   const getDepartmentList = async () => {
     setDepartmentValueEnum([])
     const { code, data, msg } = await fetchData<BasicResponse<{ department: DepartmentListItem }>>(

frontend/packages/core/src/pages/member/MemberPage.tsx

@@ -36,6 +36,11 @@ const MemberPage = ()=>{
         const [selectedDepartmentId, setSelectedDepartmentId] = useState<string>('-1')
         const {accessData,state} = useGlobalContext()
         const [refreshMemberCount, setRefreshMemberCount] = useState<number>(0)
+        const [refreshTableCount, setRefreshTableCount] = useState<number>(0)
+        
+        const refreshMemberTable = () => {
+            setRefreshTableCount(prev => prev + 1)
+        }
     const onSearchWordChange = (e:string)=>{
             setSearchWord(e || '')
         }
@@ -90,7 +95,7 @@ const MemberPage = ()=>{
                         case 'addChild':
                             return AddChildRef.current?.save().then((res)=>{if(res === true)getDepartmentList()})
                         case 'addMember':
-                            return AddMemberRef.current?.save().then((res)=>{if(res === true){getDepartmentList();setRefreshMemberCount(pre=>pre+1)}})
+                            return AddMemberRef.current?.save().then((res)=>{if(res === true){getDepartmentList();setRefreshMemberCount(pre=>pre+1);refreshMemberTable()}})
                         case 'rename':
                             return RenameRef.current?.save().then((res)=>{if(res === true)getDepartmentList()})
                         case 'delete':
@@ -262,7 +267,7 @@ const MemberPage = ()=>{
                         </div>
                     </div>
                     <div className="flex-1 p-btnbase pr-PAGE_INSIDE_X overflow-x-hidden">
-                        <Outlet context={{refreshMemberCount, selectedDepartmentIds,refreshGroup:()=>getDepartmentList()}}/>
+                        <Outlet context={{refreshMemberCount, selectedDepartmentIds,refreshGroup:()=>getDepartmentList(), refreshTableCount}}/>
                     </div>
                 </div>
             </InsidePage>);

frontend/packages/market/src/pages/serviceHub/management/ManagementInsidePage.tsx

@@ -20,7 +20,7 @@ export default function ManagementInsidePage() {
   const { message } = App.useApp()
   const { fetchData } = useFetch()
   const { setBreadcrumb } = useBreadcrumb()
-  const [activeMenu, setActiveMenu] = useState<string>('service')
+  const [activeMenu, setActiveMenu] = useState<string>('authorization')
   const { appId, teamId } = useParams<RouterParams>()
   const navigateTo = useNavigate()
   const currentUrl = useLocation().pathname
@@ -56,7 +56,7 @@ export default function ManagementInsidePage() {
   }, [accessData, accessInit, TENANT_MANAGEMENT_APP_MENU])
 
   useEffect(() => {
-    setActiveMenu(currentUrl.split('/').pop() || 'service')
+    setActiveMenu(currentUrl.split('/').pop() || 'authorization')
   }, [currentUrl])
 
   const onMenuClick: MenuProps['onClick'] = (node) => {

frontend/packages/market/src/pages/serviceHub/management/ServiceHubManagement.tsx

@@ -336,7 +336,7 @@ export default function ServiceHubManagement() {
               setTableSearchWord={setTableSearchWord}
               editApp={(row: ServiceHubAppListItem) => {
                 setAppName(row.name)
-                navigateTo(`/consumer/${row.team.id}/inside/${row.id}/service`)
+                navigateTo(`/consumer/${row.team.id}/inside/${row.id}/authorization`)
               }}
             />
           )}

readme/readme-zh-cn.md

@@ -202,6 +202,16 @@ curl -sSO https://download.apipark.com/install/quick-start.sh; bash quick-start.
 
 # 📕文档
 访问 [APIPark文档](https://docs.apipark.com/docs/deploy) 获取详细的安装指南、API 参考和使用说明。
+<br>
+
+
+
+友情链接
+<a href="https://xroute.ai/">
+
+  <img width="1248" height="158" alt="新建 PPTX 演示文稿 (2)_02(1)" src="https://github.com/user-attachments/assets/3e1cd0c1-c4c3-4f0c-8649-810d76f3166b" />
+
+</a>
 
 <br>