mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-25 06:33:48 +00:00
fix file status edit failed, remove duplicated decription property
This commit is contained in:
@@ -6,6 +6,7 @@ import Icon from '../../../../../components/icon';
|
|||||||
import { gettext } from '../../../../../utils/constants';
|
import { gettext } from '../../../../../utils/constants';
|
||||||
import { CellType, COLUMNS_ICON_CONFIG, DEFAULT_DATE_FORMAT, DEFAULT_RATE_DATA, DEFAULT_SHOOTING_TIME_FORMAT, PRIVATE_COLUMN_KEY } from '../../../../constants';
|
import { CellType, COLUMNS_ICON_CONFIG, DEFAULT_DATE_FORMAT, DEFAULT_RATE_DATA, DEFAULT_SHOOTING_TIME_FORMAT, PRIVATE_COLUMN_KEY } from '../../../../constants';
|
||||||
import { getColumnDisplayName } from '../../../../utils/column';
|
import { getColumnDisplayName } from '../../../../utils/column';
|
||||||
|
import { DEFAULT_FILE_STATUS_OPTIONS } from '../../../../constants/column/format';
|
||||||
|
|
||||||
import './index.css';
|
import './index.css';
|
||||||
|
|
||||||
@@ -44,14 +45,6 @@ const COLUMNS = [
|
|||||||
data: { format: DEFAULT_DATE_FORMAT },
|
data: { format: DEFAULT_DATE_FORMAT },
|
||||||
groupby: 'predefined',
|
groupby: 'predefined',
|
||||||
canSetData: true,
|
canSetData: true,
|
||||||
}, {
|
|
||||||
icon: COLUMNS_ICON_CONFIG[CellType.LONG_TEXT],
|
|
||||||
type: CellType.LONG_TEXT,
|
|
||||||
name: getColumnDisplayName(PRIVATE_COLUMN_KEY.FILE_DESCRIPTION),
|
|
||||||
unique: true,
|
|
||||||
key: PRIVATE_COLUMN_KEY.FILE_DESCRIPTION,
|
|
||||||
canChangeName: false,
|
|
||||||
groupby: 'predefined'
|
|
||||||
}, {
|
}, {
|
||||||
icon: COLUMNS_ICON_CONFIG[CellType.SINGLE_SELECT],
|
icon: COLUMNS_ICON_CONFIG[CellType.SINGLE_SELECT],
|
||||||
type: CellType.SINGLE_SELECT,
|
type: CellType.SINGLE_SELECT,
|
||||||
@@ -59,6 +52,7 @@ const COLUMNS = [
|
|||||||
unique: true,
|
unique: true,
|
||||||
key: PRIVATE_COLUMN_KEY.FILE_STATUS,
|
key: PRIVATE_COLUMN_KEY.FILE_STATUS,
|
||||||
canChangeName: false,
|
canChangeName: false,
|
||||||
|
data: { options: DEFAULT_FILE_STATUS_OPTIONS },
|
||||||
groupby: 'predefined'
|
groupby: 'predefined'
|
||||||
}, {
|
}, {
|
||||||
icon: COLUMNS_ICON_CONFIG[CellType.DATE],
|
icon: COLUMNS_ICON_CONFIG[CellType.DATE],
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
import { PREDEFINED_FILE_STATUS_OPTION_KEY } from './predefined';
|
||||||
import CellType from './type';
|
import CellType from './type';
|
||||||
|
|
||||||
const DATE_COLUMN_OPTIONS = [
|
const DATE_COLUMN_OPTIONS = [
|
||||||
@@ -95,6 +96,25 @@ const DEFAULT_RATE_DATA = {
|
|||||||
type: 'rate'
|
type: 'rate'
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const DEFAULT_FILE_STATUS_OPTIONS = [
|
||||||
|
{
|
||||||
|
id: PREDEFINED_FILE_STATUS_OPTION_KEY.IN_PROGRESS,
|
||||||
|
name: PREDEFINED_FILE_STATUS_OPTION_KEY.IN_PROGRESS,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: PREDEFINED_FILE_STATUS_OPTION_KEY.IN_REVIEW,
|
||||||
|
name: PREDEFINED_FILE_STATUS_OPTION_KEY.IN_REVIEW,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: PREDEFINED_FILE_STATUS_OPTION_KEY.DONE,
|
||||||
|
name: PREDEFINED_FILE_STATUS_OPTION_KEY.DONE,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: PREDEFINED_FILE_STATUS_OPTION_KEY.OUTDATED,
|
||||||
|
name: PREDEFINED_FILE_STATUS_OPTION_KEY.OUTDATED,
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
export {
|
export {
|
||||||
COLLABORATOR_COLUMN_TYPES,
|
COLLABORATOR_COLUMN_TYPES,
|
||||||
DATE_COLUMN_OPTIONS,
|
DATE_COLUMN_OPTIONS,
|
||||||
@@ -112,4 +132,5 @@ export {
|
|||||||
SINGLE_CELL_VALUE_COLUMN_TYPE_MAP,
|
SINGLE_CELL_VALUE_COLUMN_TYPE_MAP,
|
||||||
GEOLOCATION_FORMAT,
|
GEOLOCATION_FORMAT,
|
||||||
DEFAULT_RATE_DATA,
|
DEFAULT_RATE_DATA,
|
||||||
|
DEFAULT_FILE_STATUS_OPTIONS,
|
||||||
};
|
};
|
||||||
|
@@ -45,7 +45,7 @@ const InsertColumn = ({ lastColumn, height, groupOffsetLeft, insertColumn: inser
|
|||||||
setColumnMenuOpen(false);
|
setColumnMenuOpen(false);
|
||||||
setSelectedColumn(column);
|
setSelectedColumn(column);
|
||||||
if (column.groupby === 'predefined' && !column.canSetData) {
|
if (column.groupby === 'predefined' && !column.canSetData) {
|
||||||
handleSubmit(column.key, column.type, { key: column.key, data: {} });
|
handleSubmit(column.key, column.type, { key: column.key, data: column.data || {} });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
setColumnPopoverShow(true);
|
setColumnPopoverShow(true);
|
||||||
|
Reference in New Issue
Block a user