Merge branch 'dev-4.2.3'

src/component/WindowManager/factory.tsx

@@ -100,7 +100,7 @@ export default function withConfirmModal(WrappedComponent: any) {
         <div
           style={{
             // 减去 topbar 和 tabbar 高度
-            height: 'calc(100vh - 28px)',
+            height: '100%',
             background: 'var(--background-secondry-color)',
             position: 'relative',
             overflow: 'auto',

src/component/WindowManager/index.less

@@ -5,7 +5,7 @@
 .menuList {
   :global {
     .ant-dropdown-menu {
-      max-height: 100vh;
+      max-height: calc(100vh - 50px);
       overflow-y: auto;
 
       .ant-dropdown-menu-item {

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>

src/layout/SpaceContainer/Sider/index.less

@@ -28,6 +28,7 @@
 
 .collapsedBtn {
   position: absolute;
+  z-index: 1;
   top: 300px;
   right: -6px;
   display: flex;

src/page/Workspace/Layout/index.less

@@ -39,5 +39,17 @@
     height: 100%;
     background-color: var(--background-primary-color);
     border-left: 1px solid var(--divider-color);
+    &>:global(.ant-tabs) {
+      height: 100%;
+      &>:global(.ant-tabs-content-holder) {
+        height: 100%;
+        &>:global(.ant-tabs-content){
+          height: 100%;
+          &>:global(.ant-tabs-tabpane) {
+            height: 100%;
+          }
+        }
+      }
+    }
   }
 }

src/page/Workspace/components/CreateTable/Partition/CreateTablePartitionRuleForm/index.less

@@ -2,8 +2,6 @@
   position: relative;
   margin-top: 16px;
   padding-left: 16px;
-  // height: calc(100vh - 133px);
-  // overflow: auto;
 
   :global {
     label {

src/page/Workspace/components/CreateTable/Partition/CreateTablePartitionRuleForm/index.tsx

@@ -29,7 +29,6 @@ import styles from './index.less';
 import { getDataSourceModeConfigByConnectionMode } from '@/common/datasource';
 
 interface IProps {
-  fixedFooter?: boolean;
   dataTypes: IDataType[];
   partitionType?: IPartitionType;
   disableCheckMaxValue?: boolean;
@@ -259,7 +258,6 @@ class CreateTablePartitionRuleForm extends Component<
     const {
       columns,
       disablePartition,
-      fixedFooter,
       selectColumns,
       addMode,
       selectColumnName,
@@ -286,9 +284,6 @@ class CreateTablePartitionRuleForm extends Component<
           ref={this.form}
           requiredMark={false}
           layout="vertical"
-          style={{
-            height: fixedFooter ? 'calc(100vh - 157px)' : 'initial',
-          }}
           onValuesChange={(_, v) => {
             this.handleSubmit();
           }}
@@ -303,7 +298,6 @@ class CreateTablePartitionRuleForm extends Component<
         >
           <div
             style={{
-              height: fixedFooter ? 'calc(100vh - 213px)' : 'initial',
               overflow: 'auto',
               marginBottom: '24px',
             }}
@@ -356,28 +350,10 @@ class CreateTablePartitionRuleForm extends Component<
             </Form.Item>
             {this.renderPartitions()}
           </div>
-          {fixedFooter ? (
-            <>
-              <div className={styles.footer}>{this.renderButtons()}</div>
-            </>
-          ) : null}
         </Form>
       </>
     );
   }
-
-  private renderButtons() {
-    return (
-      <Button
-        size="small"
-        type="primary"
-        onClick={this.handleSubmit}
-        className={styles.submitButton}
-      >
-        {formatMessage({ id: 'app.button.ok' })}
-      </Button>
-    );
-  }
 }
 
 export default CreateTablePartitionRuleForm;

src/page/Workspace/components/CreateTable/index.less

@@ -41,5 +41,6 @@
     position: relative;
     flex-grow: 1;
     flex-shrink: 1;
+    overflow-y: auto;
   }
 }

src/page/Workspace/components/CreateTableColumnForm/index.tsx

@@ -169,7 +169,7 @@ export default class CreateTableColumnForm extends Component<
         <div
           className={styles.container}
           style={{
-            height: fixedFooter ? 'calc(100vh - 115px)' : 'initial',
+            height: fixedFooter ? 'calc(100% - 40px)' : 'initial',
             border: hideBorder ? 'none' : '1px solid var(--odc-border-color)',
           }}
         >