+
@@ -173,6 +176,18 @@ const Item = observer(class Item extends React.Component
{
onCreate(details);
};
+ onOpenDate () {
+ const { space } = S.Common;
+ const { d, m, y } = this.props;
+ const ts = U.Date.timestamp(y, m, d, 12, 0, 0);
+
+ C.ObjectDateByTimestamp(space, ts, (message: any) => {
+ if (!message.error.code) {
+ U.Object.openConfig(message.details);
+ };
+ });
+ };
+
canCreate (): boolean {
const { getView, isAllowedObject } = this.props;
const view = getView();
diff --git a/src/ts/component/form/button.tsx b/src/ts/component/form/button.tsx
index 3ea06022f8..2e56b1afa7 100644
--- a/src/ts/component/form/button.tsx
+++ b/src/ts/component/form/button.tsx
@@ -10,6 +10,7 @@ interface ButtonProps {
icon?: string;
arrow?: boolean;
text?: string;
+ active?: boolean;
color?: string;
className?: string;
tooltip?: string;
@@ -44,7 +45,8 @@ const Button = forwardRef(({
onMouseEnter,
onMouseLeave,
onMouseDown,
- dataset
+ dataset,
+ active,
}, ref) => {
const [ isLoading, setIsLoading ] = useState(false);
const nodeRef = useRef(null);
@@ -56,6 +58,10 @@ const Button = forwardRef(({
cn.push('isLoading');
};
+ if (active) {
+ cn.push('active');
+ };
+
const handleMouseEnter = (e: MouseEvent) => {
if (tooltip) {
Preview.tooltipShow({ text: tooltip, element: $(nodeRef.current), typeX: tooltipX, typeY: tooltipY });
diff --git a/src/ts/component/form/input.tsx b/src/ts/component/form/input.tsx
index 8cadd9f427..e6147b897a 100644
--- a/src/ts/component/form/input.tsx
+++ b/src/ts/component/form/input.tsx
@@ -316,4 +316,4 @@ const Input = forwardRef(({
);
});
-export default Input;
+export default Input;
\ No newline at end of file
diff --git a/src/ts/component/list/object.tsx b/src/ts/component/list/object.tsx
index 52821e11ee..23bc60139e 100644
--- a/src/ts/component/list/object.tsx
+++ b/src/ts/component/list/object.tsx
@@ -1,7 +1,7 @@
import * as React from 'react';
import { observer } from 'mobx-react';
import { I, C, S, U, J, Relation, translate, keyboard } from 'Lib';
-import { IconObject, Pager, ObjectName, Cell, SelectionTarget } from 'Component';
+import { Icon, IconObject, Pager, ObjectName, Cell, SelectionTarget } from 'Component';
interface Column {
relationKey: string;
@@ -22,10 +22,15 @@ interface Props {
relationKeys?: string[];
};
+interface State {
+ sortId: string;
+ sortType: I.SortType;
+};
+
const PREFIX = 'listObject';
const LIMIT = 50;
-const ListObject = observer(class ListObject extends React.Component {
+const ListObject = observer(class ListObject extends React.Component {
public static defaultProps: Props = {
spaceId: '',
@@ -36,8 +41,15 @@ const ListObject = observer(class ListObject extends React.Component {
filters: [],
};
+ state = {
+ sortId: '',
+ sortType: I.SortType.Desc,
+ };
+
render () {
- const { subId, rootId, columns } = this.props;
+ const { sortId, sortType } = this.state;
+ const { subId, rootId } = this.props;
+ const columns = this.getColumns();
const items = this.getItems();
const { offset, total } = S.Record.getMeta(subId, '');
@@ -76,16 +88,8 @@ const ListObject = observer(class ListObject extends React.Component {
className={cn.join(' ')}
onContextMenu={e => this.onContext(e, item.id)}
>
-
-
U.Object.openConfig(item)}>
-
-
-
-
-
-
+
{content ?
{content}
: ''}
);
@@ -145,15 +158,19 @@ const ListObject = observer(class ListObject extends React.Component
{
-
-
{translate('commonName')}
-
+ {columns.map(column => {
+ let arrow = null;
- {columns.map(column => (
-
- ))}
+ if (sortId == column.relationKey) {
+ arrow =
;
+ };
+
+ return (
+
this.onSort(column.relationKey)}>
+
{column.name}{arrow}
+
+ );
+ })}
{!items.length ? (
@@ -175,7 +192,11 @@ const ListObject = observer(class ListObject extends React.Component
{
};
componentDidMount () {
- this.getData(1);
+ const columns = this.getColumns();
+
+ if (columns.length) {
+ this.setState({ sortId: columns[0].relationKey }, () => this.getData(1));
+ };
};
componentWillUnmount(): void {
@@ -190,7 +211,12 @@ const ListObject = observer(class ListObject extends React.Component {
return J.Relation.default.concat(this.props.columns.map(it => it.relationKey));
};
+ getColumns (): Column[] {
+ return ([ { relationKey: 'name', name: translate('commonName'), isObject: true } ] as any[]).concat(this.props.columns || []);
+ };
+
getData (page: number, callBack?: (message: any) => void) {
+ const { sortId, sortType } = this.state;
const { spaceId, subId, sources } = this.props;
const offset = (page - 1) * LIMIT;
const filters = [
@@ -202,9 +228,7 @@ const ListObject = observer(class ListObject extends React.Component {
U.Data.searchSubscribe({
spaceId,
subId,
- sorts: [
- { relationKey: 'lastModifiedDate', type: I.SortType.Desc }
- ],
+ sorts: [ { relationKey: sortId, type: sortType } ],
keys: this.getKeys(),
sources,
filters,
@@ -242,6 +266,18 @@ const ListObject = observer(class ListObject extends React.Component {
});
};
+ onSort (relationKey: string): void {
+ const { sortId, sortType } = this.state;
+
+ let type = I.SortType.Asc;
+
+ if (sortId == relationKey) {
+ type = sortType == I.SortType.Asc ? I.SortType.Desc : I.SortType.Asc;
+ };
+
+ this.setState({ sortId: relationKey, sortType: type }, () => this.getData(1));
+ };
+
});
export default ListObject;
\ No newline at end of file
diff --git a/src/ts/component/menu/block/mention.tsx b/src/ts/component/menu/block/mention.tsx
index ed4eaaa091..493c4e9b9d 100644
--- a/src/ts/component/menu/block/mention.tsx
+++ b/src/ts/component/menu/block/mention.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
import { observer } from 'mobx-react';
import $ from 'jquery';
import { MenuItemVertical, Loader, ObjectName, EmptySearch } from 'Component';
-import { I, S, U, J, keyboard, Mark, translate, analytics } from 'Lib';
+import { I, S, U, J, C, keyboard, Mark, translate, analytics } from 'Lib';
import { AutoSizer, CellMeasurer, InfiniteLoader, List, CellMeasurerCache } from 'react-virtualized';
interface State {
@@ -31,6 +31,7 @@ const MenuBlockMention = observer(class MenuBlockMention extends React.Component
constructor (props: I.Menu) {
super(props);
+ this.rebind = this.rebind.bind(this);
this.onClick = this.onClick.bind(this);
this.loadMoreRows = this.loadMoreRows.bind(this);
};
@@ -67,10 +68,15 @@ const MenuBlockMention = observer(class MenuBlockMention extends React.Component
cn.push('isHidden');
};
+ let object = null;
+ if (![ 'add', 'selectDate' ].includes(item.id)) {
+ object = item;
+ };
+
content = (
}
onMouseEnter={e => this.onOver(e, item)}
@@ -190,10 +196,30 @@ const MenuBlockMention = observer(class MenuBlockMention extends React.Component
const { canAdd } = data;
const filter = this.getFilter();
const sections: any[] = [];
- const length = this.items.length;
+
+
+ let items = U.Common.objectCopy(this.items);
+
+ const dates = items.filter(it => U.Object.isDateLayout(it.layout));
+
+ items = items.filter(it => !U.Object.isDateLayout(it.layout));
+
+ const length = items.length;
+
+ if (dates.length) {
+ sections.push({
+ id: 'date',
+ name: translate('commonDates'),
+ children: [
+ ...dates,
+ { id: 'selectDate', icon: 'relation c-date', name: translate(`placeholderCell${I.RelationType.Date}`) },
+ { isDiv: true },
+ ]
+ });
+ };
if (length) {
- sections.push({ id: I.MarkType.Object, name: translate('commonObjects'), children: this.items });
+ sections.push({ id: I.MarkType.Object, name: translate('commonObjects'), children: items.filter(it => !U.Object.isDateLayout(it.layout)) });
};
if (filter && canAdd) {
@@ -301,7 +327,8 @@ const MenuBlockMention = observer(class MenuBlockMention extends React.Component
return;
};
- const { param, close } = this.props;
+ const { space } = S.Common;
+ const { param, getId } = this.props;
const { data } = param;
const { onChange } = data;
const { from } = S.Common.filter;
@@ -321,17 +348,43 @@ const MenuBlockMention = observer(class MenuBlockMention extends React.Component
onChange(object, name + ' ', marks, from, to + 1);
};
+ let close = true;
+
if (item.id == 'add') {
const name = this.getFilter();
U.Object.create('', '', { name }, I.BlockPosition.Bottom, '', [ I.ObjectFlag.SelectType, I.ObjectFlag.SelectTemplate ], analytics.route.mention, (message: any) => {
cb(message.details);
});
+ } else
+ if (item.id == 'selectDate') {
+ close = false;
+
+ S.Menu.open('dataviewCalendar', {
+ element: `#${getId()} #item-${item.id}`,
+ horizontal: I.MenuDirection.Center,
+ data: {
+ rebind: this.rebind,
+ canEdit: true,
+ value: U.Date.now(),
+ onChange: (value: number) => {
+ C.ObjectDateByTimestamp(space, value, (message: any) => {
+ if (!message.error.code) {
+ cb(message.details);
+ this.props.close();
+ };
+ });
+ },
+ },
+ });
+
} else {
cb(item);
};
- close();
+ if (close) {
+ this.props.close();
+ };
};
getRowHeight (item: any) {
diff --git a/src/ts/component/menu/dataview/calendar.tsx b/src/ts/component/menu/dataview/calendar.tsx
index 4ddb9d6e42..11cdf533ce 100644
--- a/src/ts/component/menu/dataview/calendar.tsx
+++ b/src/ts/component/menu/dataview/calendar.tsx
@@ -12,7 +12,7 @@ const MenuCalendar = observer(class MenuCalendar extends React.Component
render () {
const { param } = this.props;
const { data, classNameWrap } = param;
- const { value, isEmpty, canEdit } = data;
+ const { value, isEmpty, canEdit, canClear = true } = data;
const items = this.getData();
const { m, y } = U.Date.getCalendarDateParam(value);
const todayParam = U.Date.getCalendarDateParam(this.originalValue);
@@ -115,7 +115,7 @@ const MenuCalendar = observer(class MenuCalendar extends React.Component
this.setValue(U.Date.mergeTimeWithDate(tomorrow, value), true, true)}>{translate('commonTomorrow')}
-
this.setValue(null, true, true)}>{translate('commonClear')}
+ {canClear &&
this.setValue(null, true, true)}>{translate('commonClear')}
}
this.node = node}>
+
this.refHeader = ref}
+ rootId={rootId}
+ />
+
+
+
this.refHead = ref}
+ rootId={rootId}
+ readonly={true}
+ />
+
+
+ {relations.map((item) => {
+ const isMention = item.relationKey == RELATION_KEY_MENTION;
+ const icon = isMention ? 'mention' : '';
+ const separator = isMention ?
: '';
+
+ return (
+
+
+ );
+ })}
+
+ this.refList = ref}
+ {...this.props}
+ spaceId={space}
+ subId={SUB_ID}
+ rootId={rootId}
+ columns={columns}
+ filters={filters}
+ />
+
+
-
-
- {
- S.Common.showRelativeDatesSet(v);
- analytics.event('RelativeDates', { type: v });
- }}
- />
-
+
+
+
+ {
+ S.Common.showRelativeDatesSet(v);
+ analytics.event('RelativeDates', { type: v });
+ }}
+ />
+
+
+
+
+
+
+
+
+
+
+