Merge branch 'dev-4.3.1' of https://code.alipay.com/oceanbase/oceanbase-developer-center into dev-4.3.1

Author: HSunboy

src/page/Project/Database/index.tsx

@@ -132,14 +132,6 @@ const Database: React.FC<IProps> = ({ id, modalStore }) => {
     );
   };
 
-  const getAuthString = (authList: DatabasePermissionType[]) => {
-    if (authList?.length === 0) return '无权限';
-    return authList
-      ?.map((i) => databasePermissionTypeMap[i]?.text || '')
-      ?.filter(Boolean)
-      ?.join(',');
-  };
-
   const clearSelectedRowKeys = () => {
     setSelectedRowKeys([]);
   };
@@ -355,14 +347,6 @@ const Database: React.FC<IProps> = ({ id, modalStore }) => {
             ellipsis: true,
             render: (collationName) => collationName || '-',
           },
-          {
-            title: '权限',
-            dataIndex: 'authorizedPermissionTypes',
-            width: 130,
-            render(v) {
-              return getAuthString(v);
-            },
-          },
           {
             title: formatMessage({
               id: 'odc.Project.Database.LastSynchronizationTime',
@@ -396,7 +380,6 @@ const Database: React.FC<IProps> = ({ id, modalStore }) => {
               const hasQueryAuth = record.authorizedPermissionTypes?.includes(
                 DatabasePermissionType.QUERY,
               );
-              const hasNoDBAuth = record.authorizedPermissionTypes?.length === 0;
 
               const curRoles = project?.currentUserResourceRoles || [];
               const hasChangeOwnerAuth = curRoles.some((role) =>
@@ -445,18 +428,6 @@ const Database: React.FC<IProps> = ({ id, modalStore }) => {
               }
               return (
                 <Action.Group size={3}>
-                  {hasNoDBAuth ? (
-                    <Action.Link
-                      key={'applyDBAuth'}
-                      onClick={() => {
-                        modalStore.changeApplyDatabasePermissionModal(true, {
-                          databaseId: record?.id,
-                        });
-                      }}
-                    >
-                      库权限申请
-                    </Action.Link>
-                  ) : null}
                   {config?.features?.task?.includes(TaskType.EXPORT) && setting.enableDBExport && (
                     <Action.Link
                       key={'export'}

src/page/Workspace/SideBar/ResourceTree/DatabaseSearchModal/components/ObjectList.tsx

@@ -151,6 +151,8 @@ const ObjectList = ({
           <div className={styles.objectlistBox}>
             {typeObjectTree?.map((i) => {
               const isDatabase = i.key === DbObjectType.database;
+              /* 在选择了库之后检索, 会检索到数据库本身(若数据库名包含searchkey), 需要前端屏蔽掉 */
+              if (isDatabase && database) return;
               if (i?.data?.length) {
                 return (
                   <div className={styles.objectTypeBox}>