Merge remote-tracking branch 'github-pro/main' into feature/liujian-1.9

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

@@ -153,7 +153,7 @@ const Login: FC = () => {
 
   // 打开飞书授权页面
   const openFeishuLogin = () => {
-    const href = location.href
+    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}`
     localStorage.setItem('feishuCallbackUrl', href)
     window.location.href = authUrl

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

@@ -396,7 +396,7 @@ const MemberList = () => {
       width: 600,
       okText: $t('确认'),
       okButtonProps: {
-        disabled: isActionAllowed(type) || entity?.form !== 'self-build'
+        disabled: isActionAllowed(type) || (type === 'editMember' && entity?.form !== 'self-build')
       },
       cancelText: $t('取消'),
       closable: true,