From e2588debd32206993f2cc19b71d8d403fab0ef08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=9B=BD=E7=92=87?= <37972689+YangGuoXuan-0503@users.noreply.github.com> Date: Sat, 29 Jun 2024 20:02:36 +0800 Subject: [PATCH] feat: optimize code (#6272) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: optimize code * feat: optimize code * feat: optimize code --------- Co-authored-by: 杨国璇 --- .../metadata-view/_basic/constants/column/icon.js | 4 ++-- .../components/scrollbar/right-scrollbar.js | 15 ++++----------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/frontend/src/metadata/metadata-view/_basic/constants/column/icon.js b/frontend/src/metadata/metadata-view/_basic/constants/column/icon.js index 99b1c55da7..7668cd4e70 100644 --- a/frontend/src/metadata/metadata-view/_basic/constants/column/icon.js +++ b/frontend/src/metadata/metadata-view/_basic/constants/column/icon.js @@ -11,9 +11,9 @@ const COLUMNS_ICON_CONFIG = { const COLUMNS_ICON_NAME = { [CellType.CREATOR]: 'Creator', - [CellType.LAST_MODIFIER]: 'Last_modifier', + [CellType.LAST_MODIFIER]: 'Last modifier', [CellType.CTIME]: 'CTime', - [CellType.MTIME]: 'Last_modified_time', + [CellType.MTIME]: 'Last modified time', [CellType.DEFAULT]: 'Text', [CellType.TEXT]: 'Text', }; diff --git a/frontend/src/metadata/metadata-view/components/scrollbar/right-scrollbar.js b/frontend/src/metadata/metadata-view/components/scrollbar/right-scrollbar.js index 668adc6bd2..d693286f21 100644 --- a/frontend/src/metadata/metadata-view/components/scrollbar/right-scrollbar.js +++ b/frontend/src/metadata/metadata-view/components/scrollbar/right-scrollbar.js @@ -1,7 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { HEADER_HEIGHT_TYPE, isEmptyObject, Z_INDEX } from '../../_basic'; -import { GRID_HEADER_DEFAULT_HEIGHT, GRID_HEADER_DOUBLE_HEIGHT } from '../../constants'; +import { Z_INDEX } from '../../_basic'; const propTypes = { table: PropTypes.object.isRequired, @@ -46,13 +45,6 @@ class RightScrollbar extends React.Component { return {}; }; - getGridHeaderHeight = () => { - const headerSettings = this.props.table.header_settings || {}; - const headerHeight = isEmptyObject(headerSettings) ? HEADER_HEIGHT_TYPE.DEFAULT : headerSettings.header_height; - const height = headerHeight === HEADER_HEIGHT_TYPE.DOUBLE ? GRID_HEADER_DOUBLE_HEIGHT : GRID_HEADER_DEFAULT_HEIGHT; - return height; - }; - getContainerStyle = () => { const style = {}; const component = window.sfMetadataBody; @@ -60,8 +52,9 @@ class RightScrollbar extends React.Component { style.height = component.resultContentRef.clientHeight; style.zIndex = Z_INDEX.SCROLL_BAR; } - /* page-header + seatable-app-header + table-header-top + first row(grid-header) */ - style.top = 50 + 10 + 48 + this.getGridHeaderHeight(); + + /* sf-metadata-footer have 30px height */ + style.bottom = 30; /* sf-metadata-wrapper have 10px margin */ style.right = '10px'; return style;