vxe-gantt 3.6.10 → 3.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/gantt/src/gantt-chart.js +56 -37
- package/es/gantt/src/gantt-view.js +1 -1
- package/es/gantt/src/gantt.js +14 -4
- package/es/ui/index.js +1 -1
- package/es/ui/src/dom.js +7 -1
- package/es/ui/src/log.js +1 -1
- package/lib/gantt/src/gantt-chart.js +51 -42
- package/lib/gantt/src/gantt-chart.min.js +1 -1
- package/lib/gantt/src/gantt-view.js +1 -1
- package/lib/gantt/src/gantt-view.min.js +1 -1
- package/lib/gantt/src/gantt.js +14 -4
- package/lib/gantt/src/gantt.min.js +1 -1
- package/lib/index.umd.js +75 -50
- package/lib/index.umd.min.js +1 -1
- package/lib/ui/index.js +1 -1
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/dom.js +7 -1
- package/lib/ui/src/dom.min.js +1 -1
- package/lib/ui/src/log.js +1 -1
- package/lib/ui/src/log.min.js +1 -1
- package/package.json +2 -2
- package/packages/gantt/src/gantt-chart.ts +66 -40
- package/packages/gantt/src/gantt-view.ts +1 -1
- package/packages/gantt/src/gantt.ts +14 -4
- package/packages/ui/src/dom.ts +7 -1
|
@@ -53,17 +53,7 @@ export default defineVxeComponent({
|
|
|
53
53
|
const taskBarSubviewOpts = $xeGantt.computeTaskBarSubviewOpts;
|
|
54
54
|
const { showOverview, barStyle: subBarStyle } = taskBarSubviewOpts;
|
|
55
55
|
const scaleUnit = $xeGantt.computeScaleUnit;
|
|
56
|
-
const barParams = {
|
|
57
|
-
const { showProgress, showContent, contentMethod, barStyle, moveable, showTooltip } = taskBarOpts;
|
|
58
|
-
const isBarRowStyle = XEUtils.isFunction(barStyle);
|
|
59
|
-
const barStyObj = (barStyle ? (isBarRowStyle ? barStyle(barParams) : barStyle) : {}) || {};
|
|
60
|
-
const { round } = barStyObj;
|
|
61
|
-
const rowRest = fullAllDataRowIdData[rowid] || {};
|
|
62
|
-
const cellHeight = resizeHeightFlag ? getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight) : 0;
|
|
63
|
-
let title = getStringValue(XEUtils.get(row, titleField));
|
|
64
|
-
const progressValue = showProgress ? Math.min(100, Math.max(0, XEUtils.toNumber(XEUtils.get(row, progressField)))) : 0;
|
|
65
|
-
const renderTaskType = getTaskType(XEUtils.get(row, typeField));
|
|
66
|
-
const ctParams = {
|
|
56
|
+
const barParams = {
|
|
67
57
|
$gantt: $xeGantt,
|
|
68
58
|
source: sourceType,
|
|
69
59
|
type: viewType,
|
|
@@ -73,19 +63,34 @@ export default defineVxeComponent({
|
|
|
73
63
|
rowIndex,
|
|
74
64
|
_rowIndex
|
|
75
65
|
};
|
|
66
|
+
const { showProgress, showContent, contentMethod, barStyle, moveable, showTooltip } = taskBarOpts;
|
|
67
|
+
const barStyObj = (barStyle ? (XEUtils.isFunction(barStyle) ? barStyle(barParams) : barStyle) : {}) || {};
|
|
68
|
+
const barRound = barStyObj.round;
|
|
69
|
+
const barBgColor = barStyObj.bgColor;
|
|
70
|
+
const barCompletedBgColor = barStyObj.completedBgColor;
|
|
71
|
+
const barHtmlStyle = barStyObj.style;
|
|
72
|
+
const rowRest = fullAllDataRowIdData[rowid] || {};
|
|
73
|
+
const cellHeight = resizeHeightFlag ? getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight) : 0;
|
|
74
|
+
let title = getStringValue(XEUtils.get(row, titleField));
|
|
75
|
+
const progressValue = showProgress ? Math.min(100, Math.max(0, XEUtils.toNumber(XEUtils.get(row, progressField)))) : 0;
|
|
76
|
+
const renderTaskType = getTaskType(XEUtils.get(row, typeField));
|
|
77
|
+
const isMilestone = !!(hasEnableConf(taskBarMilestoneConfig, taskBarMilestoneOpts) && hasMilestoneTask(renderTaskType));
|
|
78
|
+
const ctParams = Object.assign({}, barParams);
|
|
76
79
|
const vbStyle = {};
|
|
77
80
|
const vpStyle = {
|
|
78
81
|
width: `${progressValue || 0}%`
|
|
79
82
|
};
|
|
80
|
-
if (
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
vbStyle.backgroundColor = bgColor;
|
|
83
|
+
if (!isMilestone) {
|
|
84
|
+
if (barBgColor) {
|
|
85
|
+
vbStyle.backgroundColor = barBgColor;
|
|
84
86
|
}
|
|
85
|
-
if (
|
|
86
|
-
vpStyle.backgroundColor =
|
|
87
|
+
if (barCompletedBgColor) {
|
|
88
|
+
vpStyle.backgroundColor = barCompletedBgColor;
|
|
87
89
|
}
|
|
88
90
|
}
|
|
91
|
+
if (barHtmlStyle) {
|
|
92
|
+
XEUtils.assign(vbStyle, barHtmlStyle);
|
|
93
|
+
}
|
|
89
94
|
let cbVNs = [];
|
|
90
95
|
if ($xeGantt.renderGanttTaskBarContent) {
|
|
91
96
|
cbVNs = $xeGantt.renderGanttTaskBarContent(h, ctParams, {
|
|
@@ -95,7 +100,6 @@ export default defineVxeComponent({
|
|
|
95
100
|
});
|
|
96
101
|
}
|
|
97
102
|
else {
|
|
98
|
-
const isMilestone = !!(hasEnableConf(taskBarMilestoneConfig, taskBarMilestoneOpts) && hasMilestoneTask(renderTaskType));
|
|
99
103
|
const isSubview = !!(hasEnableConf(taskBarSubviewConfig, taskBarSubviewOpts) && hasSubviewTask(renderTaskType));
|
|
100
104
|
if (contentMethod) {
|
|
101
105
|
title = getStringValue(contentMethod({ row, title, scaleType: scaleUnit }));
|
|
@@ -133,7 +137,7 @@ export default defineVxeComponent({
|
|
|
133
137
|
},
|
|
134
138
|
class: ['vxe-gantt-view--chart-subview-row', {
|
|
135
139
|
'is--progress': showProgress,
|
|
136
|
-
'is--round':
|
|
140
|
+
'is--round': barRound,
|
|
137
141
|
'is--move': moveable
|
|
138
142
|
}]
|
|
139
143
|
}, [
|
|
@@ -165,13 +169,26 @@ export default defineVxeComponent({
|
|
|
165
169
|
else {
|
|
166
170
|
const cbcVNs = [];
|
|
167
171
|
XEUtils.eachTree(rowChildren, childRow => {
|
|
168
|
-
const childBarParams = {
|
|
169
|
-
|
|
170
|
-
|
|
172
|
+
const childBarParams = {
|
|
173
|
+
$gantt: $xeGantt,
|
|
174
|
+
source: sourceType,
|
|
175
|
+
type: viewType,
|
|
176
|
+
scaleType: scaleUnit,
|
|
177
|
+
row: childRow,
|
|
178
|
+
$rowIndex: $xeTable.getRowIndex(childRow),
|
|
179
|
+
rowIndex: $xeTable.getVMRowIndex(childRow),
|
|
180
|
+
_rowIndex: $xeTable.getVTRowIndex(childRow)
|
|
181
|
+
};
|
|
182
|
+
const childBarStyObj = XEUtils.assign({}, (barStyle ? (XEUtils.isFunction(barStyle) ? barStyle(childBarParams) : barStyle) : {}) || {}, (subBarStyle ? (XEUtils.isFunction(subBarStyle) ? subBarStyle(childBarParams) : subBarStyle) : {}) || {});
|
|
183
|
+
const childRound = childBarStyObj.round;
|
|
184
|
+
const childBgColor = childBarStyObj.bgColor;
|
|
185
|
+
const childCompletedBgColor = childBarStyObj.completedBgColor;
|
|
186
|
+
const childBarHtmlStyle = childBarStyObj.style;
|
|
171
187
|
const childRowid = $xeTable.getRowid(childRow);
|
|
172
188
|
let childTitle = getStringValue(XEUtils.get(childRow, titleField));
|
|
173
189
|
const childProgressValue = showProgress ? Math.min(100, Math.max(0, XEUtils.toNumber(XEUtils.get(childRow, progressField)))) : 0;
|
|
174
190
|
const childRenderTaskType = getTaskType(XEUtils.get(childRow, typeField));
|
|
191
|
+
const isChildMilestone = !!(hasEnableConf(taskBarMilestoneConfig, taskBarMilestoneOpts) && hasMilestoneTask(childRenderTaskType));
|
|
175
192
|
const isChildSubview = !!(hasEnableConf(taskBarSubviewConfig, taskBarSubviewOpts) && hasSubviewTask(childRenderTaskType));
|
|
176
193
|
if (isChildSubview) {
|
|
177
194
|
return;
|
|
@@ -180,21 +197,23 @@ export default defineVxeComponent({
|
|
|
180
197
|
const childVpStyle = {
|
|
181
198
|
width: `${childProgressValue || 0}%`
|
|
182
199
|
};
|
|
183
|
-
if (
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
childVbStyle.backgroundColor = bgColor;
|
|
200
|
+
if (!isChildMilestone) {
|
|
201
|
+
if (childBgColor) {
|
|
202
|
+
childVbStyle.backgroundColor = childBgColor;
|
|
187
203
|
}
|
|
188
|
-
if (
|
|
189
|
-
childVpStyle.backgroundColor =
|
|
204
|
+
if (childCompletedBgColor) {
|
|
205
|
+
childVpStyle.backgroundColor = childCompletedBgColor;
|
|
190
206
|
}
|
|
191
207
|
}
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
208
|
+
// 已废弃
|
|
209
|
+
if (childBarStyObj.top) {
|
|
210
|
+
childVbStyle.top = childBarStyObj.top;
|
|
211
|
+
}
|
|
212
|
+
// 已废弃
|
|
213
|
+
if (childBarHtmlStyle) {
|
|
214
|
+
XEUtils.assign(childVbStyle, childBarHtmlStyle);
|
|
215
|
+
}
|
|
216
|
+
const childCtParams = Object.assign({}, childBarParams);
|
|
198
217
|
if (contentMethod) {
|
|
199
218
|
childTitle = getStringValue(contentMethod({ row: childRow, title: childTitle, scaleType: scaleUnit }));
|
|
200
219
|
}
|
|
@@ -205,7 +224,7 @@ export default defineVxeComponent({
|
|
|
205
224
|
},
|
|
206
225
|
class: ['vxe-gantt-view--chart-subview-row', `is--${childRenderTaskType}`, {
|
|
207
226
|
'is--progress': showProgress,
|
|
208
|
-
'is--round':
|
|
227
|
+
'is--round': childRound,
|
|
209
228
|
'is--move': moveable,
|
|
210
229
|
'row--pending': !!pendingRowFlag && !!pendingRowMaps[childRowid]
|
|
211
230
|
}]
|
|
@@ -215,7 +234,7 @@ export default defineVxeComponent({
|
|
|
215
234
|
rowid: childRowid
|
|
216
235
|
},
|
|
217
236
|
class: [taskBarSlot ? 'vxe-gantt-view--chart-subview-custom-bar' : 'vxe-gantt-view--chart-subview-bar', `is--${childRenderTaskType}`],
|
|
218
|
-
style:
|
|
237
|
+
style: childVbStyle,
|
|
219
238
|
on: {
|
|
220
239
|
click(evnt) {
|
|
221
240
|
evnt.stopPropagation();
|
|
@@ -324,7 +343,7 @@ export default defineVxeComponent({
|
|
|
324
343
|
class: ['vxe-gantt-view--chart-row', `is--${renderTaskType}`, {
|
|
325
344
|
'is--progress': showProgress,
|
|
326
345
|
'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid],
|
|
327
|
-
'is--round':
|
|
346
|
+
'is--round': barRound,
|
|
328
347
|
'is--move': moveable
|
|
329
348
|
}],
|
|
330
349
|
style: {
|
|
@@ -1112,7 +1112,7 @@ function updateStyle($xeGanttView) {
|
|
|
1112
1112
|
reactData.scrollXWidth = viewTableWidth;
|
|
1113
1113
|
return Promise.all([
|
|
1114
1114
|
updateTaskChartStyle($xeGanttView),
|
|
1115
|
-
$xeGantt.
|
|
1115
|
+
$xeGantt.handleUpTaskLinkStyle ? $xeGantt.handleUpTaskLinkStyle($xeGanttView) : null
|
|
1116
1116
|
]);
|
|
1117
1117
|
}
|
|
1118
1118
|
function handleRecalculateStyle($xeGanttView) {
|
package/es/gantt/src/gantt.js
CHANGED
|
@@ -380,7 +380,7 @@ export default {
|
|
|
380
380
|
stys['--vxe-ui-gantt-view-task-now-line-background-color'] = nlbgColor;
|
|
381
381
|
}
|
|
382
382
|
if (nlWidth) {
|
|
383
|
-
stys['--vxe-ui-gantt-view-task-now-line-width'] = nlWidth;
|
|
383
|
+
stys['--vxe-ui-gantt-view-task-now-line-width'] = toCssUnit(nlWidth);
|
|
384
384
|
}
|
|
385
385
|
if (viewStyle) {
|
|
386
386
|
const { cellWidth } = viewStyle;
|
|
@@ -576,8 +576,8 @@ export default {
|
|
|
576
576
|
},
|
|
577
577
|
computeTaskLinkStyle() {
|
|
578
578
|
const $xeGantt = this;
|
|
579
|
-
if ($xeGantt.
|
|
580
|
-
$xeGantt.
|
|
579
|
+
if ($xeGantt.handleUpTaskLinkData) {
|
|
580
|
+
$xeGantt.handleUpTaskLinkData();
|
|
581
581
|
}
|
|
582
582
|
}
|
|
583
583
|
},
|
|
@@ -2692,6 +2692,16 @@ export default {
|
|
|
2692
2692
|
const $xeGantt = this;
|
|
2693
2693
|
const props = $xeGantt;
|
|
2694
2694
|
const proxyOpts = $xeGantt.computeProxyOpts;
|
|
2695
|
+
const taskBarSubviewOpts = $xeGantt.computeTaskBarSubviewOpts;
|
|
2696
|
+
const { barStyle } = taskBarSubviewOpts;
|
|
2697
|
+
if (barStyle) {
|
|
2698
|
+
if (barStyle.top) {
|
|
2699
|
+
warnLog('vxe.error.delProp', ['task-bar-subview-config.barStyle.top', 'task-bar-subview-config.barStyle.style.top']);
|
|
2700
|
+
}
|
|
2701
|
+
if (barStyle.backgroundColor) {
|
|
2702
|
+
warnLog('vxe.error.delProp', ['task-bar-subview-config.barStyle.backgroundColor', 'task-bar-subview-config.barStyle.style.backgroundColor']);
|
|
2703
|
+
}
|
|
2704
|
+
}
|
|
2695
2705
|
if (props.toolbar) {
|
|
2696
2706
|
errLog('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config']);
|
|
2697
2707
|
}
|
|
@@ -2704,7 +2714,7 @@ export default {
|
|
|
2704
2714
|
if (props.expandConfig) {
|
|
2705
2715
|
warnLog('vxe.error.notProp', ['expand-config']);
|
|
2706
2716
|
}
|
|
2707
|
-
if (!$xeGantt.
|
|
2717
|
+
if (!$xeGantt.handleUpTaskLinkData) {
|
|
2708
2718
|
if (props.taskLinkConfig) {
|
|
2709
2719
|
warnLog('vxe.error.notProp', ['task-link-config']);
|
|
2710
2720
|
}
|
package/es/ui/index.js
CHANGED
package/es/ui/src/dom.js
CHANGED
|
@@ -45,7 +45,13 @@ export function isScale(val) {
|
|
|
45
45
|
return val && /^\d+(\.\d+)?%$/.test(val);
|
|
46
46
|
}
|
|
47
47
|
export function hasClass(elem, cls) {
|
|
48
|
-
|
|
48
|
+
if (elem) {
|
|
49
|
+
if (elem.classList) {
|
|
50
|
+
return elem.classList.contains(cls);
|
|
51
|
+
}
|
|
52
|
+
return !!(elem.className && elem.className.match && elem.className.match(getClsRE(cls)));
|
|
53
|
+
}
|
|
54
|
+
return false;
|
|
49
55
|
}
|
|
50
56
|
export function removeClass(elem, cls) {
|
|
51
57
|
if (elem && hasClass(elem, cls)) {
|
package/es/ui/src/log.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { VxeUI } from '@vxe-ui/core';
|
|
2
2
|
const { log } = VxeUI;
|
|
3
|
-
const ganttVersion = `gantt v${"3.
|
|
3
|
+
const ganttVersion = `gantt v${"3.7.1"}`;
|
|
4
4
|
export function createComponentLog(name) {
|
|
5
5
|
const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
|
|
6
6
|
const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
|
|
@@ -75,8 +75,13 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
|
|
|
75
75
|
var scaleUnit = $xeGantt.computeScaleUnit;
|
|
76
76
|
var barParams = {
|
|
77
77
|
$gantt: $xeGantt,
|
|
78
|
+
source: sourceType,
|
|
79
|
+
type: viewType,
|
|
80
|
+
scaleType: scaleUnit,
|
|
78
81
|
row: row,
|
|
79
|
-
|
|
82
|
+
$rowIndex: $rowIndex,
|
|
83
|
+
rowIndex: rowIndex,
|
|
84
|
+
_rowIndex: _rowIndex
|
|
80
85
|
};
|
|
81
86
|
var showProgress = taskBarOpts.showProgress,
|
|
82
87
|
showContent = taskBarOpts.showContent,
|
|
@@ -84,38 +89,33 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
|
|
|
84
89
|
barStyle = taskBarOpts.barStyle,
|
|
85
90
|
moveable = taskBarOpts.moveable,
|
|
86
91
|
showTooltip = taskBarOpts.showTooltip;
|
|
87
|
-
var
|
|
88
|
-
var
|
|
89
|
-
var
|
|
92
|
+
var barStyObj = (barStyle ? _xeUtils.default.isFunction(barStyle) ? barStyle(barParams) : barStyle : {}) || {};
|
|
93
|
+
var barRound = barStyObj.round;
|
|
94
|
+
var barBgColor = barStyObj.bgColor;
|
|
95
|
+
var barCompletedBgColor = barStyObj.completedBgColor;
|
|
96
|
+
var barHtmlStyle = barStyObj.style;
|
|
90
97
|
var rowRest = fullAllDataRowIdData[rowid] || {};
|
|
91
98
|
var cellHeight = resizeHeightFlag ? (0, _util.getCellRestHeight)(rowRest, cellOpts, rowOpts, defaultRowHeight) : 0;
|
|
92
99
|
var title = (0, _utils.getStringValue)(_xeUtils.default.get(row, titleField));
|
|
93
100
|
var progressValue = showProgress ? Math.min(100, Math.max(0, _xeUtils.default.toNumber(_xeUtils.default.get(row, progressField)))) : 0;
|
|
94
101
|
var renderTaskType = (0, _util.getTaskType)(_xeUtils.default.get(row, typeField));
|
|
95
|
-
var
|
|
96
|
-
|
|
97
|
-
source: sourceType,
|
|
98
|
-
type: viewType,
|
|
99
|
-
scaleType: scaleUnit,
|
|
100
|
-
row: row,
|
|
101
|
-
$rowIndex: $rowIndex,
|
|
102
|
-
rowIndex: rowIndex,
|
|
103
|
-
_rowIndex: _rowIndex
|
|
104
|
-
};
|
|
102
|
+
var isMilestone = !!((0, _utils.hasEnableConf)(taskBarMilestoneConfig, taskBarMilestoneOpts) && (0, _util.hasMilestoneTask)(renderTaskType));
|
|
103
|
+
var ctParams = Object.assign({}, barParams);
|
|
105
104
|
var vbStyle = {};
|
|
106
105
|
var vpStyle = {
|
|
107
106
|
width: "".concat(progressValue || 0, "%")
|
|
108
107
|
};
|
|
109
|
-
if (
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
if (bgColor) {
|
|
113
|
-
vbStyle.backgroundColor = bgColor;
|
|
108
|
+
if (!isMilestone) {
|
|
109
|
+
if (barBgColor) {
|
|
110
|
+
vbStyle.backgroundColor = barBgColor;
|
|
114
111
|
}
|
|
115
|
-
if (
|
|
116
|
-
vpStyle.backgroundColor =
|
|
112
|
+
if (barCompletedBgColor) {
|
|
113
|
+
vpStyle.backgroundColor = barCompletedBgColor;
|
|
117
114
|
}
|
|
118
115
|
}
|
|
116
|
+
if (barHtmlStyle) {
|
|
117
|
+
_xeUtils.default.assign(vbStyle, barHtmlStyle);
|
|
118
|
+
}
|
|
119
119
|
var cbVNs = [];
|
|
120
120
|
if ($xeGantt.renderGanttTaskBarContent) {
|
|
121
121
|
cbVNs = $xeGantt.renderGanttTaskBarContent(h, ctParams, {
|
|
@@ -124,7 +124,6 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
|
|
|
124
124
|
rowid: rowid
|
|
125
125
|
});
|
|
126
126
|
} else {
|
|
127
|
-
var isMilestone = !!((0, _utils.hasEnableConf)(taskBarMilestoneConfig, taskBarMilestoneOpts) && (0, _util.hasMilestoneTask)(renderTaskType));
|
|
128
127
|
var isSubview = !!((0, _utils.hasEnableConf)(taskBarSubviewConfig, taskBarSubviewOpts) && (0, _util.hasSubviewTask)(renderTaskType));
|
|
129
128
|
if (contentMethod) {
|
|
130
129
|
title = (0, _utils.getStringValue)(contentMethod({
|
|
@@ -169,7 +168,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
|
|
|
169
168
|
},
|
|
170
169
|
class: ['vxe-gantt-view--chart-subview-row', {
|
|
171
170
|
'is--progress': showProgress,
|
|
172
|
-
'is--round':
|
|
171
|
+
'is--round': barRound,
|
|
173
172
|
'is--move': moveable
|
|
174
173
|
}]
|
|
175
174
|
}, [h('div', {
|
|
@@ -191,15 +190,24 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
|
|
|
191
190
|
_xeUtils.default.eachTree(rowChildren, function (childRow) {
|
|
192
191
|
var childBarParams = {
|
|
193
192
|
$gantt: $xeGantt,
|
|
193
|
+
source: sourceType,
|
|
194
|
+
type: viewType,
|
|
195
|
+
scaleType: scaleUnit,
|
|
194
196
|
row: childRow,
|
|
195
|
-
|
|
197
|
+
$rowIndex: $xeTable.getRowIndex(childRow),
|
|
198
|
+
rowIndex: $xeTable.getVMRowIndex(childRow),
|
|
199
|
+
_rowIndex: $xeTable.getVTRowIndex(childRow)
|
|
196
200
|
};
|
|
197
|
-
var childBarStyObj = (barStyle ?
|
|
198
|
-
var
|
|
201
|
+
var childBarStyObj = _xeUtils.default.assign({}, (barStyle ? _xeUtils.default.isFunction(barStyle) ? barStyle(childBarParams) : barStyle : {}) || {}, (subBarStyle ? _xeUtils.default.isFunction(subBarStyle) ? subBarStyle(childBarParams) : subBarStyle : {}) || {});
|
|
202
|
+
var childRound = childBarStyObj.round;
|
|
203
|
+
var childBgColor = childBarStyObj.bgColor;
|
|
204
|
+
var childCompletedBgColor = childBarStyObj.completedBgColor;
|
|
205
|
+
var childBarHtmlStyle = childBarStyObj.style;
|
|
199
206
|
var childRowid = $xeTable.getRowid(childRow);
|
|
200
207
|
var childTitle = (0, _utils.getStringValue)(_xeUtils.default.get(childRow, titleField));
|
|
201
208
|
var childProgressValue = showProgress ? Math.min(100, Math.max(0, _xeUtils.default.toNumber(_xeUtils.default.get(childRow, progressField)))) : 0;
|
|
202
209
|
var childRenderTaskType = (0, _util.getTaskType)(_xeUtils.default.get(childRow, typeField));
|
|
210
|
+
var isChildMilestone = !!((0, _utils.hasEnableConf)(taskBarMilestoneConfig, taskBarMilestoneOpts) && (0, _util.hasMilestoneTask)(childRenderTaskType));
|
|
203
211
|
var isChildSubview = !!((0, _utils.hasEnableConf)(taskBarSubviewConfig, taskBarSubviewOpts) && (0, _util.hasSubviewTask)(childRenderTaskType));
|
|
204
212
|
if (isChildSubview) {
|
|
205
213
|
return;
|
|
@@ -208,22 +216,23 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
|
|
|
208
216
|
var childVpStyle = {
|
|
209
217
|
width: "".concat(childProgressValue || 0, "%")
|
|
210
218
|
};
|
|
211
|
-
if (
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
if (_bgColor) {
|
|
215
|
-
childVbStyle.backgroundColor = _bgColor;
|
|
219
|
+
if (!isChildMilestone) {
|
|
220
|
+
if (childBgColor) {
|
|
221
|
+
childVbStyle.backgroundColor = childBgColor;
|
|
216
222
|
}
|
|
217
|
-
if (
|
|
218
|
-
childVpStyle.backgroundColor =
|
|
223
|
+
if (childCompletedBgColor) {
|
|
224
|
+
childVpStyle.backgroundColor = childCompletedBgColor;
|
|
219
225
|
}
|
|
220
226
|
}
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
+
// 已废弃
|
|
228
|
+
if (childBarStyObj.top) {
|
|
229
|
+
childVbStyle.top = childBarStyObj.top;
|
|
230
|
+
}
|
|
231
|
+
// 已废弃
|
|
232
|
+
if (childBarHtmlStyle) {
|
|
233
|
+
_xeUtils.default.assign(childVbStyle, childBarHtmlStyle);
|
|
234
|
+
}
|
|
235
|
+
var childCtParams = Object.assign({}, childBarParams);
|
|
227
236
|
if (contentMethod) {
|
|
228
237
|
childTitle = (0, _utils.getStringValue)(contentMethod({
|
|
229
238
|
row: childRow,
|
|
@@ -238,7 +247,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
|
|
|
238
247
|
},
|
|
239
248
|
class: ['vxe-gantt-view--chart-subview-row', "is--".concat(childRenderTaskType), {
|
|
240
249
|
'is--progress': showProgress,
|
|
241
|
-
'is--round':
|
|
250
|
+
'is--round': childRound,
|
|
242
251
|
'is--move': moveable,
|
|
243
252
|
'row--pending': !!pendingRowFlag && !!pendingRowMaps[childRowid]
|
|
244
253
|
}]
|
|
@@ -247,7 +256,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
|
|
|
247
256
|
rowid: childRowid
|
|
248
257
|
},
|
|
249
258
|
class: [taskBarSlot ? 'vxe-gantt-view--chart-subview-custom-bar' : 'vxe-gantt-view--chart-subview-bar', "is--".concat(childRenderTaskType)],
|
|
250
|
-
style:
|
|
259
|
+
style: childVbStyle,
|
|
251
260
|
on: {
|
|
252
261
|
click: function click(evnt) {
|
|
253
262
|
evnt.stopPropagation();
|
|
@@ -334,7 +343,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
|
|
|
334
343
|
class: ['vxe-gantt-view--chart-row', "is--".concat(renderTaskType), {
|
|
335
344
|
'is--progress': showProgress,
|
|
336
345
|
'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid],
|
|
337
|
-
'is--round':
|
|
346
|
+
'is--round': barRound,
|
|
338
347
|
'is--move': moveable
|
|
339
348
|
}],
|
|
340
349
|
style: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_core=require("@vxe-ui/core"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("./util"),_utils=require("../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){var r;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(r="Object"===(r={}.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,a=Array(t);r<t;r++)a[r]=e[r];return a}var getIcon=_core.VxeUI.getIcon,renderEmptyElement=_core.VxeUI.renderEmptyElement,sourceType="gantt",viewType="chart",_default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewChart",inject:{$xeGantt:{default:null},$xeGanttView:{default:null}},props:{},data:function(){return{}},computed:Object.assign({},{}),methods:{renderTaskBar:function(l,c,e,t,r,a,n,o,V){var u,d,v=this.$xeGantt,O=c.resizeHeightFlag,G=c.pendingRowFlag,i=c.fullAllDataRowIdData,L=c.pendingRowMaps,s=c.computeCellOpts,p=c.computeRowOpts,w=c.computeDefaultRowHeight,g=c.computeTreeOpts,g=g.children||g.childrenField,h=v.reactData,f=v.internalData,m=v.$scopedSlots,b=m.taskBar||m["task-bar"],m=m.taskBarOverview||m["task-bar-overview"],F=v.treeConfig,x=v.taskBarMilestoneConfig,N=v.taskBarSubviewConfig,k=h.activeLink,h=h.activeBarRowid,W=v.computeTitleField,j=v.computeProgressField,q=v.computeTypeField,y=v.computeTaskBarOpts,T=v.computeTaskBarMilestoneOpts,_=v.computeTaskBarSubviewOpts,H=_.showOverview,E=_.barStyle,C=v.computeScaleUnit,B={$gantt:v,row:e,scaleType:C},S=y.showProgress,A=y.showContent,I=y.contentMethod,$=y.barStyle,R=y.moveable,y=y.showTooltip,D=_xeUtils.default.isFunction($),U=($?D?$(B):$:{})||{},P=U.round,i=i[t]||{},O=O?(0,_util.getCellRestHeight)(i,s,p,w):0,i=(0,_utils.getStringValue)(_xeUtils.default.get(e,W)),s=S?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(e,j)))):0,p=(0,_util.getTaskType)(_xeUtils.default.get(e,q)),M={$gantt:v,source:sourceType,type:viewType,scaleType:C,row:e,$rowIndex:a,rowIndex:r,_rowIndex:n},w={},a={width:"".concat(s||0,"%")},s=(D&&(r=U.bgColor,n=U.completedBgColor,r&&(w.backgroundColor=r),n)&&(a.backgroundColor=n),[]);return v.renderGanttTaskBarContent?s=v.renderGanttTaskBarContent(l,M,{$gantt:v,$table:c,rowid:t}):(U=!(!(0,_utils.hasEnableConf)(x,T)||!(0,_util.hasMilestoneTask)(p)),r=!(!(0,_utils.hasEnableConf)(N,_)||!(0,_util.hasSubviewTask)(p)),I&&(i=(0,_utils.getStringValue)(I({row:e,title:i,scaleType:C}))),u={},y&&(u.mouseover=function(e){var t=f.dragBarRow,r=Object.assign({$event:e},M);t||v.triggerTaskBarTooltipEvent(e,r),v.dispatchEvent("task-bar-mouseenter",r,e)},u.mouseleave=function(e){var t=f.dragBarRow,r=Object.assign({$event:e},M);t||v.handleTaskBarTooltipLeaveEvent(e,r),v.dispatchEvent("task-bar-mouseleave",r,e)}),r&&F&&o&&o.length?V?H&&s.push(l("div",{key:"vcso",class:"vxe-gantt-view--chart-subview-wrapper is--overview"},[l("div",{key:t,attrs:{rowid:t},class:["vxe-gantt-view--chart-subview-row",{"is--progress":S,"is--round":P,"is--move":R}]},[l("div",{attrs:{rowid:t},class:[m?"vxe-gantt-view--chart-subview-custom-bar":"vxe-gantt-view--chart-subview-bar","is--".concat(p)]},[m?l("div",{key:"cbc",class:"vxe-gantt-view--chart-subview-custom-bar-content-wrapper"},v.callSlot(m,B,l)):l("div",{class:"vxe-gantt-view--chart-subview-bar-content-wrapper"},[A?l("div",{class:"vxe-gantt-view--chart-content"},i):renderEmptyElement(v)])])])])):(d=[],_xeUtils.default.eachTree(o,function(e){var t,r=($?D?$({$gantt:v,row:e,scaleType:C}):$:{})||{},a=r.round,n=c.getRowid(e),o=(0,_utils.getStringValue)(_xeUtils.default.get(e,W)),i=S?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(e,j)))):0,s=(0,_util.getTaskType)(_xeUtils.default.get(e,q));(!(0,_utils.hasEnableConf)(N,_)||!(0,_util.hasSubviewTask)(s))&&(i={width:"".concat(i||0,"%")},D&&(r.bgColor,r=r.completedBgColor)&&(i.backgroundColor=r),t=_xeUtils.default.assign({},M,{row:e,rowIndex:c.getRowIndex(e),$rowIndex:c.getVMRowIndex(e),_rowIndex:c.getVTRowIndex(e)}),I&&(o=(0,_utils.getStringValue)(I({row:e,title:o,scaleType:C}))),d.push(l("div",{key:n,attrs:{rowid:n},class:["vxe-gantt-view--chart-subview-row","is--".concat(s),{"is--progress":S,"is--round":a,"is--move":R,"row--pending":!!G&&!!L[n]}]},[l("div",{attrs:{rowid:n},class:[b?"vxe-gantt-view--chart-subview-custom-bar":"vxe-gantt-view--chart-subview-bar","is--".concat(s)],style:E?_xeUtils.default.isFunction(E)?E(t)||void 0:E:void 0,on:{click:function(e){e.stopPropagation(),v.handleTaskBarClickEvent(e,t)},dblclick:function(e){e.stopPropagation(),v.handleTaskBarDblclickEvent(e,t)},mousedown:function(e){e.stopPropagation(),v.handleTaskBarMousedownEvent&&v.handleTaskBarMousedownEvent(e,t)}}},[b?l("div",{key:"cbc",class:"vxe-gantt-view--chart-subview-custom-bar-content-wrapper",on:u},v.callSlot(b,t,l)):l("div",{class:"vxe-gantt-view--chart-subview-bar-content-wrapper",on:u},[S?l("div",{class:"vxe-gantt-view--chart-progress",style:i}):renderEmptyElement(v),A?l("div",{class:"vxe-gantt-view--chart-content"},o):renderEmptyElement(v)])])])))},{children:g}),s.push(l("div",{key:"vcsc",class:"vxe-gantt-view--chart-subview-wrapper is--inline"},d))):b?s.push(l("div",{key:"cbc",class:"vxe-gantt-view--chart-custom-bar-content-wrapper",on:u},v.callSlot(b,B,l))):U?(n=T.icon,x=T.iconStatus,y=T.iconStyle,r={$gantt:v,row:e},s.push(l("div",{key:"vcm",class:"vxe-gantt-view--chart-milestone-wrapper",on:u},[l("div",{class:["vxe-gantt-view--chart-milestone-icon",x?"theme--".concat(_xeUtils.default.isFunction(x)?x(r):x):""],style:y?Object.assign({},_xeUtils.default.isFunction(y)?y(r):y):void 0},[l("i",{class:(n?_xeUtils.default.isFunction(n)?n(r):n:"")||getIcon().GANTT_VIEW_TASK_MILESTONE})]),A?l("div",{class:"vxe-gantt-view--chart-milestone-content"},i):renderEmptyElement(v)]))):s.push(l("div",{key:"vbc",class:"vxe-gantt-view--chart-bar-content-wrapper",on:u},[S?l("div",{class:"vxe-gantt-view--chart-progress",style:a}):renderEmptyElement(v),A?l("div",{class:"vxe-gantt-view--chart-content"},i):renderEmptyElement(v)]))),l("div",{key:t,attrs:{rowid:t},class:["vxe-gantt-view--chart-row","is--".concat(p),{"is--progress":S,"row--pending":!!G&&!!L[t],"is--round":P,"is--move":R}],style:{height:"".concat(O,"px")},on:{onDragstart:function(e){f.dragBarRow&&e.preventDefault()},contextmenu:function(e){v.handleTaskBarContextmenuEvent(e,M)}}},[l("div",{class:[b?"vxe-gantt-view--chart-custom-bar":"vxe-gantt-view--chart-bar","is--".concat(p),{"is--active":h===t,"active--link":k&&(t==="".concat(k.from)||t==="".concat(k.to))}],style:w,attrs:{rowid:t},on:{click:function(e){v.handleTaskBarClickEvent(e,B)},dblclick:function(e){v.handleTaskBarDblclickEvent(e,B)},mousedown:function(e){v.handleTaskBarMousedownEvent&&v.handleTaskBarMousedownEvent(e,B)}}},s)])},renderTaskRows:function(s,l,e){var c=this,t=c.$xeGanttView.reactData,u=l.treeConfig,d=l.treeExpandedFlag,v=l.fullAllDataRowIdData,p=l.treeExpandedMaps,r=l.computeTreeOpts,w=r.transform,g=r.children||r.childrenField,h=t.scrollYLoad,f=[];return e.forEach(function(e,t){var r=l.getRowid(e),a=v[r]||{},n=t,o=-1,a=(a&&(n=a.index,o=a._index),!1),i=[];u&&(i=e[g],a=!!d&&i&&0<i.length&&!!p[r]),f.push(c.renderTaskBar(s,l,e,r,n,t,o,i,a)),u&&a&&!h&&!w&&f.push.apply(f,_toConsumableArray(c.renderTaskRows(s,l,i)))}),f},renderVN:function(e){var t=this.$xeGantt,r=this.$xeGanttView,a=t.reactData,n=r.internalData.xeTable,o=t.$scopedSlots,a=a.dragLinkFromStore,i=r.reactData.tableData,s=t.computeTaskLinkOpts,r=r.computeNowLineLeft,l=s.isCurrent,c=s.isHover,u=t.computeTaskBarOpts.linkCreatable,o=o.taskNowLine||o["task-now-line"];return e("div",{ref:"refElem",class:["vxe-gantt-view--chart-wrapper",{"is--cl-drag":a.rowid}]},[0<r?e("div",{ref:"refNowLineElem",class:"vxe-gantt-view--chart-now-line",style:{left:r+"px"}},o?o({}):[]):renderEmptyElement(t),t.renderGanttTaskChartBefores?e("div",{ref:"refChartBeforeWrapperElem",class:["vxe-gantt-view--chart-before-wrapper",{"link--current":l,"link--hover":c}]},n&&(0,_utils.isEnableConf)(s)?t.renderGanttTaskChartBefores(e):[]):renderEmptyElement(t),e("div",{ref:"refTaskWrapperElem",class:["vxe-gantt-view--chart-task-wrapper",{"link--current":l,"link--create":u}]},n?this.renderTaskRows(e,n,i):[]),t.renderGanttTaskChartAfters?e("div",{ref:"refChartAfterWrapperElem",class:"vxe-gantt-view--chart-after-wrapper"},n&&(0,_utils.isEnableConf)(s)?t.renderGanttTaskChartAfters(e):[]):renderEmptyElement(t)])}},mounted:function(){var e=this,t=e.$xeGanttView.internalData.elemStore,r="main-chart-";t["".concat(r,"now-line")]=e.$refs.refNowLineElem,t["".concat(r,"task-wrapper")]=e.$refs.refTaskWrapperElem,t["".concat(r,"before-wrapper")]=e.$refs.refChartBeforeWrapperElem,t["".concat(r,"after-wrapper")]=e.$refs.refChartAfterWrapperElem},destroyed:function(){var e=this.$xeGanttView.internalData.elemStore,t="main-chart-";e["".concat(t,"now-line")]=null,e["".concat(t,"task-wrapper")]=null,e["".concat(t,"before-wrapper")]=null,e["".concat(t,"after-wrapper")]=null},render:function(e){return this.renderVN(e)}});
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_core=require("@vxe-ui/core"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("./util"),_utils=require("../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){var a;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(a="Object"===(a={}.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:a)||"Set"===a?Array.from(e):"Arguments"===a||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(a)?_arrayLikeToArray(e,t):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var a=0,r=Array(t);a<t;a++)r[a]=e[a];return r}var getIcon=_core.VxeUI.getIcon,renderEmptyElement=_core.VxeUI.renderEmptyElement,sourceType="gantt",viewType="chart",_default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewChart",inject:{$xeGantt:{default:null},$xeGanttView:{default:null}},props:{},data:function(){return{}},computed:Object.assign({},{}),methods:{renderTaskBar:function(w,g,e,t,a,r,n,o,O){var f,h,m=this.$xeGantt,V=g.resizeHeightFlag,G=g.pendingRowFlag,i=g.fullAllDataRowIdData,F=g.pendingRowMaps,s=g.computeCellOpts,l=g.computeRowOpts,c=g.computeDefaultRowHeight,u=g.computeTreeOpts,u=u.children||u.childrenField,d=m.reactData,p=m.internalData,v=m.$scopedSlots,b=v.taskBar||v["task-bar"],v=v.taskBarOverview||v["task-bar-overview"],x=m.treeConfig,L=m.taskBarMilestoneConfig,j=m.taskBarSubviewConfig,k=d.activeLink,d=d.activeBarRowid,N=m.computeTitleField,W=m.computeProgressField,q=m.computeTypeField,y=m.computeTaskBarOpts,T=m.computeTaskBarMilestoneOpts,_=m.computeTaskBarSubviewOpts,H=_.showOverview,E=_.barStyle,C=m.computeScaleUnit,B={$gantt:m,source:sourceType,type:viewType,scaleType:C,row:e,$rowIndex:r,rowIndex:a,_rowIndex:n},S=y.showProgress,A=y.showContent,I=y.contentMethod,$=y.barStyle,U=y.moveable,r=y.showTooltip,a=($?_xeUtils.default.isFunction($)?$(B):$:{})||{},n=a.round,y=a.bgColor,R=a.completedBgColor,a=a.style,i=i[t]||{},V=V?(0,_util.getCellRestHeight)(i,s,l,c):0,i=(0,_utils.getStringValue)(_xeUtils.default.get(e,N)),s=S?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(e,W)))):0,l=(0,_util.getTaskType)(_xeUtils.default.get(e,q)),c=!(!(0,_utils.hasEnableConf)(L,T)||!(0,_util.hasMilestoneTask)(l)),D=Object.assign({},B),M={},s={width:"".concat(s||0,"%")},y=(c||(y&&(M.backgroundColor=y),R&&(s.backgroundColor=R)),a&&_xeUtils.default.assign(M,a),[]);return m.renderGanttTaskBarContent?y=m.renderGanttTaskBarContent(w,D,{$gantt:m,$table:g,rowid:t}):(R=!(!(0,_utils.hasEnableConf)(j,_)||!(0,_util.hasSubviewTask)(l)),I&&(i=(0,_utils.getStringValue)(I({row:e,title:i,scaleType:C}))),f={},r&&(f.mouseover=function(e){var t=p.dragBarRow,a=Object.assign({$event:e},D);t||m.triggerTaskBarTooltipEvent(e,a),m.dispatchEvent("task-bar-mouseenter",a,e)},f.mouseleave=function(e){var t=p.dragBarRow,a=Object.assign({$event:e},D);t||m.handleTaskBarTooltipLeaveEvent(e,a),m.dispatchEvent("task-bar-mouseleave",a,e)}),R&&x&&o&&o.length?O?H&&y.push(w("div",{key:"vcso",class:"vxe-gantt-view--chart-subview-wrapper is--overview"},[w("div",{key:t,attrs:{rowid:t},class:["vxe-gantt-view--chart-subview-row",{"is--progress":S,"is--round":n,"is--move":U}]},[w("div",{attrs:{rowid:t},class:[v?"vxe-gantt-view--chart-subview-custom-bar":"vxe-gantt-view--chart-subview-bar","is--".concat(l)]},[v?w("div",{key:"cbc",class:"vxe-gantt-view--chart-subview-custom-bar-content-wrapper"},m.callSlot(v,B,w)):w("div",{class:"vxe-gantt-view--chart-subview-bar-content-wrapper"},[A?w("div",{class:"vxe-gantt-view--chart-content"},i):renderEmptyElement(m)])])])])):(h=[],_xeUtils.default.eachTree(o,function(e){var t,a,r={$gantt:m,source:sourceType,type:viewType,scaleType:C,row:e,$rowIndex:g.getRowIndex(e),rowIndex:g.getVMRowIndex(e),_rowIndex:g.getVTRowIndex(e)},n=_xeUtils.default.assign({},($?_xeUtils.default.isFunction($)?$(r):$:{})||{},(E?_xeUtils.default.isFunction(E)?E(r):E:{})||{}),o=n.round,i=n.bgColor,s=n.completedBgColor,l=n.style,c=g.getRowid(e),u=(0,_utils.getStringValue)(_xeUtils.default.get(e,N)),d=S?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(e,W)))):0,p=(0,_util.getTaskType)(_xeUtils.default.get(e,q)),v=!(!(0,_utils.hasEnableConf)(L,T)||!(0,_util.hasMilestoneTask)(p));(!(0,_utils.hasEnableConf)(j,_)||!(0,_util.hasSubviewTask)(p))&&(t={},d={width:"".concat(d||0,"%")},v||(i&&(t.backgroundColor=i),s&&(d.backgroundColor=s)),n.top&&(t.top=n.top),l&&_xeUtils.default.assign(t,l),a=Object.assign({},r),I&&(u=(0,_utils.getStringValue)(I({row:e,title:u,scaleType:C}))),h.push(w("div",{key:c,attrs:{rowid:c},class:["vxe-gantt-view--chart-subview-row","is--".concat(p),{"is--progress":S,"is--round":o,"is--move":U,"row--pending":!!G&&!!F[c]}]},[w("div",{attrs:{rowid:c},class:[b?"vxe-gantt-view--chart-subview-custom-bar":"vxe-gantt-view--chart-subview-bar","is--".concat(p)],style:t,on:{click:function(e){e.stopPropagation(),m.handleTaskBarClickEvent(e,a)},dblclick:function(e){e.stopPropagation(),m.handleTaskBarDblclickEvent(e,a)},mousedown:function(e){e.stopPropagation(),m.handleTaskBarMousedownEvent&&m.handleTaskBarMousedownEvent(e,a)}}},[b?w("div",{key:"cbc",class:"vxe-gantt-view--chart-subview-custom-bar-content-wrapper",on:f},m.callSlot(b,a,w)):w("div",{class:"vxe-gantt-view--chart-subview-bar-content-wrapper",on:f},[S?w("div",{class:"vxe-gantt-view--chart-progress",style:d}):renderEmptyElement(m),A?w("div",{class:"vxe-gantt-view--chart-content"},u):renderEmptyElement(m)])])])))},{children:u}),y.push(w("div",{key:"vcsc",class:"vxe-gantt-view--chart-subview-wrapper is--inline"},h))):b?y.push(w("div",{key:"cbc",class:"vxe-gantt-view--chart-custom-bar-content-wrapper",on:f},m.callSlot(b,B,w))):c?(a=T.icon,r=T.iconStatus,R=T.iconStyle,x={$gantt:m,row:e},y.push(w("div",{key:"vcm",class:"vxe-gantt-view--chart-milestone-wrapper",on:f},[w("div",{class:["vxe-gantt-view--chart-milestone-icon",r?"theme--".concat(_xeUtils.default.isFunction(r)?r(x):r):""],style:R?Object.assign({},_xeUtils.default.isFunction(R)?R(x):R):void 0},[w("i",{class:(a?_xeUtils.default.isFunction(a)?a(x):a:"")||getIcon().GANTT_VIEW_TASK_MILESTONE})]),A?w("div",{class:"vxe-gantt-view--chart-milestone-content"},i):renderEmptyElement(m)]))):y.push(w("div",{key:"vbc",class:"vxe-gantt-view--chart-bar-content-wrapper",on:f},[S?w("div",{class:"vxe-gantt-view--chart-progress",style:s}):renderEmptyElement(m),A?w("div",{class:"vxe-gantt-view--chart-content"},i):renderEmptyElement(m)]))),w("div",{key:t,attrs:{rowid:t},class:["vxe-gantt-view--chart-row","is--".concat(l),{"is--progress":S,"row--pending":!!G&&!!F[t],"is--round":n,"is--move":U}],style:{height:"".concat(V,"px")},on:{onDragstart:function(e){p.dragBarRow&&e.preventDefault()},contextmenu:function(e){m.handleTaskBarContextmenuEvent(e,D)}}},[w("div",{class:[b?"vxe-gantt-view--chart-custom-bar":"vxe-gantt-view--chart-bar","is--".concat(l),{"is--active":d===t,"active--link":k&&(t==="".concat(k.from)||t==="".concat(k.to))}],style:M,attrs:{rowid:t},on:{click:function(e){m.handleTaskBarClickEvent(e,B)},dblclick:function(e){m.handleTaskBarDblclickEvent(e,B)},mousedown:function(e){m.handleTaskBarMousedownEvent&&m.handleTaskBarMousedownEvent(e,B)}}},y)])},renderTaskRows:function(s,l,e){var c=this,t=c.$xeGanttView.reactData,u=l.treeConfig,d=l.treeExpandedFlag,p=l.fullAllDataRowIdData,v=l.treeExpandedMaps,a=l.computeTreeOpts,w=a.transform,g=a.children||a.childrenField,f=t.scrollYLoad,h=[];return e.forEach(function(e,t){var a=l.getRowid(e),r=p[a]||{},n=t,o=-1,r=(r&&(n=r.index,o=r._index),!1),i=[];u&&(i=e[g],r=!!d&&i&&0<i.length&&!!v[a]),h.push(c.renderTaskBar(s,l,e,a,n,t,o,i,r)),u&&r&&!f&&!w&&h.push.apply(h,_toConsumableArray(c.renderTaskRows(s,l,i)))}),h},renderVN:function(e){var t=this.$xeGantt,a=this.$xeGanttView,r=t.reactData,n=a.internalData.xeTable,o=t.$scopedSlots,r=r.dragLinkFromStore,i=a.reactData.tableData,s=t.computeTaskLinkOpts,a=a.computeNowLineLeft,l=s.isCurrent,c=s.isHover,u=t.computeTaskBarOpts.linkCreatable,o=o.taskNowLine||o["task-now-line"];return e("div",{ref:"refElem",class:["vxe-gantt-view--chart-wrapper",{"is--cl-drag":r.rowid}]},[0<a?e("div",{ref:"refNowLineElem",class:"vxe-gantt-view--chart-now-line",style:{left:a+"px"}},o?o({}):[]):renderEmptyElement(t),t.renderGanttTaskChartBefores?e("div",{ref:"refChartBeforeWrapperElem",class:["vxe-gantt-view--chart-before-wrapper",{"link--current":l,"link--hover":c}]},n&&(0,_utils.isEnableConf)(s)?t.renderGanttTaskChartBefores(e):[]):renderEmptyElement(t),e("div",{ref:"refTaskWrapperElem",class:["vxe-gantt-view--chart-task-wrapper",{"link--current":l,"link--create":u}]},n?this.renderTaskRows(e,n,i):[]),t.renderGanttTaskChartAfters?e("div",{ref:"refChartAfterWrapperElem",class:"vxe-gantt-view--chart-after-wrapper"},n&&(0,_utils.isEnableConf)(s)?t.renderGanttTaskChartAfters(e):[]):renderEmptyElement(t)])}},mounted:function(){var e=this,t=e.$xeGanttView.internalData.elemStore,a="main-chart-";t["".concat(a,"now-line")]=e.$refs.refNowLineElem,t["".concat(a,"task-wrapper")]=e.$refs.refTaskWrapperElem,t["".concat(a,"before-wrapper")]=e.$refs.refChartBeforeWrapperElem,t["".concat(a,"after-wrapper")]=e.$refs.refChartAfterWrapperElem},destroyed:function(){var e=this.$xeGanttView.internalData.elemStore,t="main-chart-";e["".concat(t,"now-line")]=null,e["".concat(t,"task-wrapper")]=null,e["".concat(t,"before-wrapper")]=null,e["".concat(t,"after-wrapper")]=null},render:function(e){return this.renderVN(e)}});
|
|
@@ -1213,7 +1213,7 @@ function updateStyle($xeGanttView) {
|
|
|
1213
1213
|
bodyTableElem.style.width = "".concat(vmTableWidth, "px");
|
|
1214
1214
|
}
|
|
1215
1215
|
reactData.scrollXWidth = viewTableWidth;
|
|
1216
|
-
return Promise.all([updateTaskChartStyle($xeGanttView), $xeGantt.
|
|
1216
|
+
return Promise.all([updateTaskChartStyle($xeGanttView), $xeGantt.handleUpTaskLinkStyle ? $xeGantt.handleUpTaskLinkStyle($xeGanttView) : null]);
|
|
1217
1217
|
}
|
|
1218
1218
|
function handleRecalculateStyle($xeGanttView) {
|
|
1219
1219
|
var internalData = $xeGanttView.internalData;
|