Merge branch 'dev-4.2.3' into dev-4.2.4

oceanbase · Jan 16, 2024 · 62be5d5 · 62be5d5
2 parents ed94cc6 + 54a8056
commit 62be5d5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/component/Task/DataArchiveTask/CreateModal/index.tsx b/src/component/Task/DataArchiveTask/CreateModal/index.tsx
@@ -467,7 +467,7 @@ const CreateModal: React.FC<IProps> = (props) => {
             projectId={projectId}
           />
         </Space>
-        <Space direction="vertical" size={24}>
+        <Space direction="vertical" size={24} style={{ width: '100%' }}>
           <ArchiveRange tables={tables} />
           <VariableConfig form={form} />
         </Space>

diff --git a/src/component/Task/DataClearTask/CreateModal/index.tsx b/src/component/Task/DataClearTask/CreateModal/index.tsx
@@ -345,7 +345,7 @@ const CreateModal: React.FC<IProps> = (props) => {
             /*源端数据库*/ projectId={projectId}
           />
         </Space>
-        <Space direction="vertical" size={24}>
+        <Space direction="vertical" size={24} style={{ width: '100%' }}>
           <ArchiveRange tables={tables} />
           <VariableConfig form={form} />
         </Space>

diff --git a/src/layout/SpaceContainer/Sider/MineItem/index.tsx b/src/layout/SpaceContainer/Sider/MineItem/index.tsx
@@ -53,7 +53,8 @@ const MineItem: React.FC<IProps> = function ({
   const [changePasswordLoading, setChangePasswordLoading] = useState(false);
   const recordRef = useRef<RecordRef>();
   const havePasswordLogin = !!settingStore.serverSystemInfo?.passwordLoginEnabled;
-  const hasUserInfo = !haveOCP() && !isClient();
+  const showUserInfo = !isClient();
+  const allowEditUser = !haveOCP() && showUserInfo;
   const RoleNames = user?.roles?.length
     ? user?.roles
         ?.filter((item) => item.enabled)
@@ -101,7 +102,7 @@ const MineItem: React.FC<IProps> = function ({
         }}
         menu={
           <Menu selectedKeys={null} key="user" className={!isClient() ? styles.userMenu : ''}>
-            {hasUserInfo && (
+            {showUserInfo && (
               <>
                 <Menu.Item key={'username'}>
                   <Tooltip placement="right" title={userName}>
@@ -117,7 +118,7 @@ const MineItem: React.FC<IProps> = function ({
               </>
             )}
 
-            {hasUserInfo && havePasswordLogin ? (
+            {allowEditUser && havePasswordLogin ? (
               <Menu.Item
                 onClick={() => {
                   setChangePasswordModalVisible(true);
@@ -171,7 +172,7 @@ const MineItem: React.FC<IProps> = function ({
             )}
 
             <Menu.Divider />
-            {hasUserInfo && (
+            {allowEditUser && (
               <Menu.Item onClick={handleLogout} key={'exit'}>
                 {formatMessage({ id: 'odc.Sider.MineItem.Exit' }) /*退出*/}
               </Menu.Item>

diff --git a/src/layout/SpaceContainer/Sider/index.less b/src/layout/SpaceContainer/Sider/index.less
@@ -28,6 +28,7 @@
 
 .collapsedBtn {
   position: absolute;
+  z-index: 1;
   top: 300px;
   right: -6px;
   display: flex;