1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-21 19:37:28 +00:00

add_child_tags context option (#7448)

Co-authored-by: zhouwenxuan <aries@Mac.local>
This commit is contained in:
Aries
2025-02-08 16:16:13 +08:00
committed by GitHub
parent 3998d3be44
commit 65ef9f704b
7 changed files with 48 additions and 25 deletions

View File

@@ -0,0 +1,11 @@
export const OPERATION = {
EDIT_TAG: 'edit_tag',
SET_SUB_TAGS: 'set_sub_tags',
DELETE_TAG: 'delete_tag',
DELETE_TAGS: 'delete_tags',
NEW_SUB_TAG: 'new_sub_tag',
MERGE_TAGS: 'merge_tags',
ADD_CHILD_TAGS: 'add_child_tags',
};
export const POPUP_EDITOR_OPERATION_KEYS = [OPERATION.SET_SUB_TAGS, OPERATION.ADD_CHILD_TAGS];

View File

@@ -5,12 +5,13 @@ import PopupEditorContainer from './popup-editor-container';
import PreviewEditorContainer from './preview-editor-container';
import { checkIsColumnSupportPreview, checkIsPopupColumnEditor } from '../../utils/column';
import { EDITOR_TYPE } from '../../constants/grid';
import { POPUP_EDITOR_OPERATION_KEYS } from '../../constants/context-menu';
const EditorContainer = (props) => {
const { column, openEditorMode } = props;
const { column, openEditorMode, operation } = props;
if (!column || !isValidElement(column.editor)) return null;
if (checkIsPopupColumnEditor(column)) {
if (checkIsPopupColumnEditor(column) || POPUP_EDITOR_OPERATION_KEYS.includes(operation)) {
return <PopupEditorContainer { ...props } />;
}
if (checkIsColumnSupportPreview(column) && openEditorMode === EDITOR_TYPE.PREVIEWER) {

View File

@@ -55,7 +55,7 @@ class PopupEditorContainer extends React.Component {
};
createEditor = () => {
const { column, record, height, onPressTab, editorPosition, columns, modifyColumnData, readOnly } = this.props;
const { column, record, height, onPressTab, editorPosition, columns, modifyColumnData, readOnly, operation } = this.props;
const value = this.getInitialValue();
let editorProps = {
@@ -78,6 +78,7 @@ class PopupEditorContainer extends React.Component {
column,
readOnly,
onPressTab,
operation,
};
return (

View File

@@ -121,8 +121,8 @@ class InteractionMasks extends React.Component {
});
};
onOpenEditorEvent = (mode) => {
this.setState({ openEditorMode: mode }, () => {
onOpenEditorEvent = (mode, op) => {
this.setState({ openEditorMode: mode, selectedOperation: op }, () => {
this.openEditor(null);
});
};
@@ -206,7 +206,6 @@ class InteractionMasks extends React.Component {
const { isEditorEnabled, selectedPosition, openEditorMode } = this.state;
const { columns } = this.props;
const selectedColumn = getSelectedColumn({ selectedPosition, columns });
// how to open editors?
// 1. editor is closed
// 2. record-cell is editable or open editor with preview mode
@@ -1031,7 +1030,7 @@ class InteractionMasks extends React.Component {
};
render() {
const { selectedRange, isEditorEnabled, draggedRange, selectedPosition, firstEditorKeyDown, openEditorMode, editorPosition } = this.state;
const { selectedRange, isEditorEnabled, draggedRange, selectedPosition, firstEditorKeyDown, openEditorMode, editorPosition, selectedOperation } = this.state;
const { columns, isGroupView, recordGetterByIndex, scrollTop, getScrollLeft, editorPortalTarget, contextMenu } = this.props;
const isSelectedSingleCell = selectedRangeIsSingleCell(selectedRange);
return (
@@ -1066,6 +1065,7 @@ class InteractionMasks extends React.Component {
onCommit={this.onCommit}
onCommitCancel={this.onCommitCancel}
modifyColumnData={this.props.modifyColumnData}
operation={selectedOperation}
{...{
...this.getSelectedDimensions(selectedPosition),
...this.state.editorPosition