haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-06-06 13:53:06 +00:00
Code Issues Releases Wiki Activity

fix: init new option (#6992)

Browse Source 
Co-authored-by: 杨国璇 <ygx@Hello-word.local>
This commit is contained in:
杨国璇 2024-11-05 10:24:29 +08:00 committed by GitHub
parent 73aa876540
commit 8f04a770f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/metadata/components/popover/options-popover/index.js
View File

@ -75,7 +75,7 @@ const OptionsPopover = ({ target, column, onToggle, onSubmit }) => {
const newOption = generateNewOption(options, newOptionName); const newOption = generateNewOption(options, newOptionName);
const newOptions = options.slice(0); const newOptions = options.slice(0);
newOptions.push(newOption); newOptions.push(newOption);
onChange(newOptions, COLUMN_DATA_OPERATION_TYPE.ADD_OPTION); onChange(newOptions, COLUMN_DATA_OPERATION_TYPE.INIT_NEW_OPTION);
setEditingOptionId(newOptionName ? '' : newOption.id); setEditingOptionId(newOptionName ? '' : newOption.id);
}, [searchValue, options, onChange]); }, [searchValue, options, onChange]);

1
frontend/src/metadata/store/operations/constants.js
View File

@ -25,6 +25,7 @@ export const COLUMN_DATA_OPERATION_TYPE = {
RENAME_OPTION: 'rename_option', RENAME_OPTION: 'rename_option',
MODIFY_OPTION_COLOR: 'modify_option_color', MODIFY_OPTION_COLOR: 'modify_option_color',
MOVE_OPTION: 'move_option', MOVE_OPTION: 'move_option',
INIT_NEW_OPTION: 'init_new_option',
}; };
export const OPERATION_ATTRIBUTES = { export const OPERATION_ATTRIBUTES = {

19
frontend/src/metadata/store/server-operator.js
View File

@ -1,12 +1,13 @@
import { seafileAPI } from '../../utils/seafile-api'; import { seafileAPI } from '../../utils/seafile-api';
import { gettext } from '../../utils/constants'; import { gettext } from '../../utils/constants';
import { Utils } from '../../utils/utils'; import { Utils } from '../../utils/utils';
import { OPERATION_TYPE } from './operations'; import { COLUMN_DATA_OPERATION_TYPE, OPERATION_TYPE } from './operations';
import { getColumnByKey } from '../utils/column'; import { getColumnByKey } from '../utils/column';
import { getRowById } from '../utils/table'; import { getRowById } from '../utils/table';
import { checkIsDir } from '../utils/row'; import { checkIsDir } from '../utils/row';
import { getFileNameFromRecord } from '../utils/cell'; import { checkIsPredefinedOption, getFileNameFromRecord } from '../utils/cell';
import ObjectUtils from '../utils/object-utils'; import ObjectUtils from '../utils/object-utils';
import { CellType } from '../constants';
const MAX_LOAD_RECORDS = 100; const MAX_LOAD_RECORDS = 100;
@ -110,8 +111,18 @@ class ServerOperator {
break; break;
} }
case OPERATION_TYPE.MODIFY_COLUMN_DATA: { case OPERATION_TYPE.MODIFY_COLUMN_DATA: {
const { repo_id, column_key, new_data } = operation; const { repo_id, column_key, new_data, option_modify_type } = operation;
window.sfMetadataContext.modifyColumnData(repo_id, column_key, new_data).then(res => { if (option_modify_type && option_modify_type === COLUMN_DATA_OPERATION_TYPE.INIT_NEW_OPTION) break;
const column = getColumnByKey(data.columns, column_key);
let origin_data = new_data;
if (column.type === CellType.SINGLE_SELECT) {
origin_data.options = Array.isArray(origin_data.options) ? origin_data.options.map(option => {
if (checkIsPredefinedOption(column, option.id)) return { id: option.id, name: option.id };
return option;
}) : [];
}
window.sfMetadataContext.modifyColumnData(repo_id, column_key, origin_data).then(res => {
callback({ operation }); callback({ operation });
}).catch(error => { }).catch(error => {
callback({ error: gettext('Failed to modify property data') }); callback({ error: gettext('Failed to modify property data') });