Skip to content

Commit b85e090

Browse files
replace gantt icons (#426)
* replace gantt icons * replace gantt etalons
1 parent 6e940c9 commit b85e090

File tree

6 files changed

+62
-24
lines changed

6 files changed

+62
-24
lines changed

packages/angular/src/app/components/library/task-list-gantt/task-list-gantt.component.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@
2727
></dxi-column>
2828

2929
<dxo-toolbar>
30-
<dxi-item name="undo"></dxi-item>
31-
<dxi-item name="redo"></dxi-item>
30+
<dxi-item name="undo" [options]="{ icon: 'revert' }"></dxi-item>
31+
<dxi-item name="redo" [options]="{ icon: 'redo' }"></dxi-item>
3232
<dxi-item name="separator"></dxi-item>
33-
<dxi-item name="collapseAll"></dxi-item>
34-
<dxi-item name="expandAll"></dxi-item>
33+
<dxi-item name="collapseAll" [options]="{ icon: 'arrowdown' }"></dxi-item>
34+
<dxi-item name="expandAll" [options]="{ icon: 'arrowup' }"></dxi-item>
3535
<dxi-item name="separator"></dxi-item>
36-
<dxi-item name="addTask"></dxi-item>
37-
<dxi-item name="deleteTask"></dxi-item>
36+
<dxi-item name="addTask" [options]="{ icon: 'add' }"></dxi-item>
37+
<dxi-item name="deleteTask" [options]="{ icon: 'trash' }"></dxi-item>
3838
<dxi-item name="separator"></dxi-item>
39-
<dxi-item name="zoomIn"></dxi-item>
40-
<dxi-item name="zoomOut"></dxi-item>
39+
<dxi-item name="zoomIn" [options]="{ icon: 'zoominoutline' }"></dxi-item>
40+
<dxi-item name="zoomOut" [options]="{ icon: 'zoomoutoutline' }"></dxi-item>
4141
</dxo-toolbar>
4242

4343
<dxo-validation [autoUpdateParentTasks]="true"></dxo-validation>

packages/react/src/components/library/task-list-gantt/TaskListGantt.tsx

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@ import { PlanningProps } from '../../../types/task';
66

77
import './TaskListGantt.scss';
88

9+
const toolbarItemOptions = {
10+
undo: { icon: 'revert' },
11+
redo: { icon: 'redo' },
12+
collapseAll: { icon: 'arrowdown' },
13+
expandAll: { icon: 'arrowup' },
14+
addTask: { icon: 'add' },
15+
deleteTask: { icon: 'trash' },
16+
zoomIn: { icon: 'zoominoutline' },
17+
zoomOut: { icon: 'zoomoutoutline' },
18+
};
19+
920
export const TaskListGantt = React.forwardRef<GanttRef, PlanningProps>(({ dataSource }, ref) => {
1021
/* eslint-disable @typescript-eslint/no-explicit-any */
1122
return (
@@ -17,17 +28,17 @@ export const TaskListGantt = React.forwardRef<GanttRef, PlanningProps>(({ dataSo
1728
<Column dataField='dueDate' caption='Due Date' dataType='date' />
1829

1930
<Toolbar>
20-
<Item name='undo' />
21-
<Item name='redo' />
31+
<Item name='undo' options={toolbarItemOptions.undo} />
32+
<Item name='redo' options={toolbarItemOptions.redo} />
2233
<Item name={'separator' as any} />
23-
<Item name='collapseAll' />
24-
<Item name='expandAll' />
34+
<Item name='collapseAll' options={toolbarItemOptions.collapseAll} />
35+
<Item name='expandAll' options={toolbarItemOptions.expandAll} />
2536
<Item name={'separator' as any} />
26-
<Item name='addTask' />
27-
<Item name='deleteTask' />
37+
<Item name='addTask' options={toolbarItemOptions.addTask} />
38+
<Item name='deleteTask' options={toolbarItemOptions.deleteTask} />
2839
<Item name={'separator' as any} />
29-
<Item name='zoomIn' />
30-
<Item name='zoomOut' />
40+
<Item name='zoomIn' options={toolbarItemOptions.zoomIn} />
41+
<Item name='zoomOut' options={toolbarItemOptions.zoomOut} />
3142
</Toolbar>
3243

3344
<Validation autoUpdateParentTasks />
-1.57 KB
Loading
-1.99 KB
Loading
-2.22 KB
Loading

packages/vue/src/components/library/task-list-gantt.vue

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,33 @@
3232
/>
3333

3434
<dx-gantt-toolbar>
35-
<dx-item name="undo" />
36-
<dx-item name="redo" />
35+
<dx-item name="undo"
36+
:options="toolbarItemOptions.undo"
37+
/>
38+
<dx-item name="redo"
39+
:options="toolbarItemOptions.redo"
40+
/>
3741
<dx-item name="separator" />
38-
<dx-item name="collapseAll" />
39-
<dx-item name="expandAll" />
42+
<dx-item name="collapseAll"
43+
:options="toolbarItemOptions.collapseAll"
44+
/>
45+
<dx-item name="expandAll"
46+
:options="toolbarItemOptions.expandAll"
47+
/>
4048
<dx-item name="separator" />
41-
<dx-item name="addTask" />
42-
<dx-item name="deleteTask" />
49+
<dx-item name="addTask"
50+
:options="toolbarItemOptions.addTask"
51+
/>
52+
<dx-item name="deleteTask"
53+
:options="toolbarItemOptions.deleteTask"
54+
/>
4355
<dx-item name="separator" />
44-
<dx-item name="zoomIn" />
45-
<dx-item name="zoomOut" />
56+
<dx-item name="zoomIn"
57+
:options="toolbarItemOptions.zoomIn"
58+
/>
59+
<dx-item name="zoomOut"
60+
:options="toolbarItemOptions.zoomOut"
61+
/>
4662
</dx-gantt-toolbar>
4763

4864
<dx-validation :auto-update-parent-tasks="true" />
@@ -95,6 +111,17 @@ const onTaskClick = (e: DxGanttTypes.TaskClickEvent) => {
95111
}
96112
};
97113
114+
const toolbarItemOptions = {
115+
undo: { icon: 'revert' },
116+
redo: { icon: 'redo' },
117+
collapseAll: { icon: 'arrowdown' },
118+
expandAll: { icon: 'arrowup' },
119+
addTask: { icon: 'add' },
120+
deleteTask: { icon: 'trash' },
121+
zoomIn: { icon: 'zoominoutline' },
122+
zoomOut: { icon: 'zoomoutoutline' },
123+
};
124+
98125
defineExpose({
99126
onExporting,
100127
});

0 commit comments

Comments
 (0)