vxe-gantt 3.6.9 → 3.7.0
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 +54 -40
- package/es/gantt/src/gantt-view.js +4 -2
- package/es/gantt/src/gantt.js +14 -4
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/gantt/src/gantt-chart.js +49 -45
- package/lib/gantt/src/gantt-chart.min.js +1 -1
- package/lib/gantt/src/gantt-view.js +5 -2
- 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 +70 -53
- 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/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 +63 -43
- package/packages/gantt/src/gantt-view.ts +4 -2
- package/packages/gantt/src/gantt.ts +14 -4
package/lib/index.umd.js
CHANGED
|
@@ -8468,7 +8468,7 @@ var core_ = __webpack_require__(4345);
|
|
|
8468
8468
|
|
|
8469
8469
|
var setConfig = core_.VxeUI.setConfig,
|
|
8470
8470
|
setIcon = core_.VxeUI.setIcon;
|
|
8471
|
-
core_.VxeUI.ganttVersion = "3.
|
|
8471
|
+
core_.VxeUI.ganttVersion = "3.7.0";
|
|
8472
8472
|
var ymdFormat = 'yyyy-MM-dd';
|
|
8473
8473
|
var ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
|
|
8474
8474
|
setConfig({
|
|
@@ -8593,7 +8593,7 @@ var es_array_join = __webpack_require__(8598);
|
|
|
8593
8593
|
|
|
8594
8594
|
|
|
8595
8595
|
var log = core_.VxeUI.log;
|
|
8596
|
-
var ganttVersion = "gantt v".concat("3.
|
|
8596
|
+
var ganttVersion = "gantt v".concat("3.7.0");
|
|
8597
8597
|
function createComponentLog(name) {
|
|
8598
8598
|
var uiVersion = core_.VxeUI.uiVersion ? "ui v".concat(core_.VxeUI.uiVersion) : '';
|
|
8599
8599
|
var tableVersion = core_.VxeUI.tableVersion ? "table v".concat(core_.VxeUI.tableVersion) : '';
|
|
@@ -9617,8 +9617,13 @@ var gantt_chart_viewType = 'chart';
|
|
|
9617
9617
|
var scaleUnit = $xeGantt.computeScaleUnit;
|
|
9618
9618
|
var barParams = {
|
|
9619
9619
|
$gantt: $xeGantt,
|
|
9620
|
+
source: gantt_chart_sourceType,
|
|
9621
|
+
type: gantt_chart_viewType,
|
|
9622
|
+
scaleType: scaleUnit,
|
|
9620
9623
|
row: row,
|
|
9621
|
-
|
|
9624
|
+
$rowIndex: $rowIndex,
|
|
9625
|
+
rowIndex: rowIndex,
|
|
9626
|
+
_rowIndex: _rowIndex
|
|
9622
9627
|
};
|
|
9623
9628
|
var showProgress = taskBarOpts.showProgress,
|
|
9624
9629
|
showContent = taskBarOpts.showContent,
|
|
@@ -9626,37 +9631,29 @@ var gantt_chart_viewType = 'chart';
|
|
|
9626
9631
|
barStyle = taskBarOpts.barStyle,
|
|
9627
9632
|
moveable = taskBarOpts.moveable,
|
|
9628
9633
|
showTooltip = taskBarOpts.showTooltip;
|
|
9629
|
-
var
|
|
9630
|
-
var
|
|
9631
|
-
var
|
|
9634
|
+
var barStyObj = (barStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(barStyle) ? barStyle(barParams) : barStyle : {}) || {};
|
|
9635
|
+
var barRound = barStyObj.round;
|
|
9636
|
+
var barBgColor = barStyObj.bgColor;
|
|
9637
|
+
var barCompletedBgColor = barStyObj.completedBgColor;
|
|
9638
|
+
var barHtmlStyle = barStyObj.style;
|
|
9632
9639
|
var rowRest = fullAllDataRowIdData[rowid] || {};
|
|
9633
9640
|
var cellHeight = resizeHeightFlag ? getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight) : 0;
|
|
9634
9641
|
var title = getStringValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, titleField));
|
|
9635
9642
|
var progressValue = showProgress ? Math.min(100, Math.max(0, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, progressField)))) : 0;
|
|
9636
9643
|
var renderTaskType = getTaskType(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, typeField));
|
|
9637
|
-
var ctParams = {
|
|
9638
|
-
$gantt: $xeGantt,
|
|
9639
|
-
source: gantt_chart_sourceType,
|
|
9640
|
-
type: gantt_chart_viewType,
|
|
9641
|
-
scaleType: scaleUnit,
|
|
9642
|
-
row: row,
|
|
9643
|
-
$rowIndex: $rowIndex,
|
|
9644
|
-
rowIndex: rowIndex,
|
|
9645
|
-
_rowIndex: _rowIndex
|
|
9646
|
-
};
|
|
9644
|
+
var ctParams = _objectSpread2({}, barParams);
|
|
9647
9645
|
var vbStyle = {};
|
|
9648
9646
|
var vpStyle = {
|
|
9649
9647
|
width: "".concat(progressValue || 0, "%")
|
|
9650
9648
|
};
|
|
9651
|
-
if (
|
|
9652
|
-
|
|
9653
|
-
|
|
9654
|
-
|
|
9655
|
-
|
|
9656
|
-
|
|
9657
|
-
|
|
9658
|
-
|
|
9659
|
-
}
|
|
9649
|
+
if (barBgColor) {
|
|
9650
|
+
vbStyle.backgroundColor = barBgColor;
|
|
9651
|
+
}
|
|
9652
|
+
if (barCompletedBgColor) {
|
|
9653
|
+
vpStyle.backgroundColor = barCompletedBgColor;
|
|
9654
|
+
}
|
|
9655
|
+
if (barHtmlStyle) {
|
|
9656
|
+
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(vbStyle, barHtmlStyle);
|
|
9660
9657
|
}
|
|
9661
9658
|
var cbVNs = [];
|
|
9662
9659
|
if ($xeGantt.renderGanttTaskBarContent) {
|
|
@@ -9711,7 +9708,7 @@ var gantt_chart_viewType = 'chart';
|
|
|
9711
9708
|
},
|
|
9712
9709
|
class: ['vxe-gantt-view--chart-subview-row', {
|
|
9713
9710
|
'is--progress': showProgress,
|
|
9714
|
-
'is--round':
|
|
9711
|
+
'is--round': barRound,
|
|
9715
9712
|
'is--move': moveable
|
|
9716
9713
|
}]
|
|
9717
9714
|
}, [h('div', {
|
|
@@ -9733,11 +9730,19 @@ var gantt_chart_viewType = 'chart';
|
|
|
9733
9730
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rowChildren, function (childRow) {
|
|
9734
9731
|
var childBarParams = {
|
|
9735
9732
|
$gantt: $xeGantt,
|
|
9733
|
+
source: gantt_chart_sourceType,
|
|
9734
|
+
type: gantt_chart_viewType,
|
|
9735
|
+
scaleType: scaleUnit,
|
|
9736
9736
|
row: childRow,
|
|
9737
|
-
|
|
9737
|
+
$rowIndex: $xeTable.getRowIndex(childRow),
|
|
9738
|
+
rowIndex: $xeTable.getVMRowIndex(childRow),
|
|
9739
|
+
_rowIndex: $xeTable.getVTRowIndex(childRow)
|
|
9738
9740
|
};
|
|
9739
|
-
var childBarStyObj = (barStyle ?
|
|
9740
|
-
var
|
|
9741
|
+
var childBarStyObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign({}, (barStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(barStyle) ? barStyle(childBarParams) : barStyle : {}) || {}, (subBarStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(subBarStyle) ? subBarStyle(childBarParams) : subBarStyle : {}) || {});
|
|
9742
|
+
var childRound = childBarStyObj.round;
|
|
9743
|
+
var childBgColor = childBarStyObj.bgColor;
|
|
9744
|
+
var childCompletedBgColor = childBarStyObj.completedBgColor;
|
|
9745
|
+
var childBarHtmlStyle = childBarStyObj.style;
|
|
9741
9746
|
var childRowid = $xeTable.getRowid(childRow);
|
|
9742
9747
|
var childTitle = getStringValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(childRow, titleField));
|
|
9743
9748
|
var childProgressValue = showProgress ? Math.min(100, Math.max(0, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(childRow, progressField)))) : 0;
|
|
@@ -9750,22 +9755,21 @@ var gantt_chart_viewType = 'chart';
|
|
|
9750
9755
|
var childVpStyle = {
|
|
9751
9756
|
width: "".concat(childProgressValue || 0, "%")
|
|
9752
9757
|
};
|
|
9753
|
-
if (
|
|
9754
|
-
|
|
9755
|
-
_completedBgColor = childBarStyObj.completedBgColor;
|
|
9756
|
-
if (_bgColor) {
|
|
9757
|
-
childVbStyle.backgroundColor = _bgColor;
|
|
9758
|
-
}
|
|
9759
|
-
if (_completedBgColor) {
|
|
9760
|
-
childVpStyle.backgroundColor = _completedBgColor;
|
|
9761
|
-
}
|
|
9758
|
+
if (childBgColor) {
|
|
9759
|
+
childVbStyle.backgroundColor = childBgColor;
|
|
9762
9760
|
}
|
|
9763
|
-
|
|
9764
|
-
|
|
9765
|
-
|
|
9766
|
-
|
|
9767
|
-
|
|
9768
|
-
|
|
9761
|
+
if (childCompletedBgColor) {
|
|
9762
|
+
childVpStyle.backgroundColor = childCompletedBgColor;
|
|
9763
|
+
}
|
|
9764
|
+
// 已废弃
|
|
9765
|
+
if (childBarStyObj.top) {
|
|
9766
|
+
childVbStyle.top = childBarStyObj.top;
|
|
9767
|
+
}
|
|
9768
|
+
// 已废弃
|
|
9769
|
+
if (childBarHtmlStyle) {
|
|
9770
|
+
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(childVbStyle, childBarHtmlStyle);
|
|
9771
|
+
}
|
|
9772
|
+
var childCtParams = _objectSpread2({}, childBarParams);
|
|
9769
9773
|
if (contentMethod) {
|
|
9770
9774
|
childTitle = getStringValue(contentMethod({
|
|
9771
9775
|
row: childRow,
|
|
@@ -9780,7 +9784,7 @@ var gantt_chart_viewType = 'chart';
|
|
|
9780
9784
|
},
|
|
9781
9785
|
class: ['vxe-gantt-view--chart-subview-row', "is--".concat(childRenderTaskType), {
|
|
9782
9786
|
'is--progress': showProgress,
|
|
9783
|
-
'is--round':
|
|
9787
|
+
'is--round': childRound,
|
|
9784
9788
|
'is--move': moveable,
|
|
9785
9789
|
'row--pending': !!pendingRowFlag && !!pendingRowMaps[childRowid]
|
|
9786
9790
|
}]
|
|
@@ -9789,7 +9793,7 @@ var gantt_chart_viewType = 'chart';
|
|
|
9789
9793
|
rowid: childRowid
|
|
9790
9794
|
},
|
|
9791
9795
|
class: [taskBarSlot ? 'vxe-gantt-view--chart-subview-custom-bar' : 'vxe-gantt-view--chart-subview-bar', "is--".concat(childRenderTaskType)],
|
|
9792
|
-
style:
|
|
9796
|
+
style: childVbStyle,
|
|
9793
9797
|
on: {
|
|
9794
9798
|
click: function click(evnt) {
|
|
9795
9799
|
evnt.stopPropagation();
|
|
@@ -9876,7 +9880,7 @@ var gantt_chart_viewType = 'chart';
|
|
|
9876
9880
|
class: ['vxe-gantt-view--chart-row', "is--".concat(renderTaskType), {
|
|
9877
9881
|
'is--progress': showProgress,
|
|
9878
9882
|
'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid],
|
|
9879
|
-
'is--round':
|
|
9883
|
+
'is--round': barRound,
|
|
9880
9884
|
'is--move': moveable
|
|
9881
9885
|
}],
|
|
9882
9886
|
style: {
|
|
@@ -11646,7 +11650,7 @@ function updateStyle($xeGanttView) {
|
|
|
11646
11650
|
bodyTableElem.style.width = "".concat(vmTableWidth, "px");
|
|
11647
11651
|
}
|
|
11648
11652
|
reactData.scrollXWidth = viewTableWidth;
|
|
11649
|
-
return Promise.all([updateTaskChartStyle($xeGanttView), $xeGantt.
|
|
11653
|
+
return Promise.all([updateTaskChartStyle($xeGanttView), $xeGantt.handleUpTaskLinkStyle ? $xeGantt.handleUpTaskLinkStyle($xeGanttView) : null]);
|
|
11650
11654
|
}
|
|
11651
11655
|
function handleRecalculateStyle($xeGanttView) {
|
|
11652
11656
|
var internalData = $xeGanttView.internalData;
|
|
@@ -12210,11 +12214,14 @@ function syncTableScrollTop($xeGanttView, scrollTop) {
|
|
|
12210
12214
|
var nlLeft = 0;
|
|
12211
12215
|
if (showNowLine && minScale && minViewDate && maxViewDate && nowTime >= minViewDate.getTime() && nowTime <= maxViewDate.getTime()) {
|
|
12212
12216
|
var todayValue = todayDateMaps[minScale.type];
|
|
12217
|
+
var todayDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringDate(todayValue);
|
|
12213
12218
|
var currCol = null;
|
|
12214
12219
|
var nextCol = null;
|
|
12215
12220
|
for (var i = 0; i < visibleColumn.length; i++) {
|
|
12216
12221
|
var column = visibleColumn[i];
|
|
12217
|
-
|
|
12222
|
+
var startDateObj = column.startDateObj,
|
|
12223
|
+
endDateObj = column.endDateObj;
|
|
12224
|
+
if (startDateObj.date <= todayDate && endDateObj.date >= todayDate) {
|
|
12218
12225
|
currCol = column;
|
|
12219
12226
|
nlLeft = i * viewCellWidth;
|
|
12220
12227
|
nextCol = visibleColumn[i + 1];
|
|
@@ -13054,7 +13061,7 @@ function gantt_createReactData() {
|
|
|
13054
13061
|
stys['--vxe-ui-gantt-view-task-now-line-background-color'] = nlbgColor;
|
|
13055
13062
|
}
|
|
13056
13063
|
if (nlWidth) {
|
|
13057
|
-
stys['--vxe-ui-gantt-view-task-now-line-width'] = nlWidth;
|
|
13064
|
+
stys['--vxe-ui-gantt-view-task-now-line-width'] = toCssUnit(nlWidth);
|
|
13058
13065
|
}
|
|
13059
13066
|
if (viewStyle) {
|
|
13060
13067
|
var cellWidth = viewStyle.cellWidth;
|
|
@@ -13258,8 +13265,8 @@ function gantt_createReactData() {
|
|
|
13258
13265
|
},
|
|
13259
13266
|
computeTaskLinkStyle: function computeTaskLinkStyle() {
|
|
13260
13267
|
var $xeGantt = this;
|
|
13261
|
-
if ($xeGantt.
|
|
13262
|
-
$xeGantt.
|
|
13268
|
+
if ($xeGantt.handleUpTaskLinkData) {
|
|
13269
|
+
$xeGantt.handleUpTaskLinkData();
|
|
13263
13270
|
}
|
|
13264
13271
|
}
|
|
13265
13272
|
},
|
|
@@ -15503,6 +15510,16 @@ function gantt_createReactData() {
|
|
|
15503
15510
|
var $xeGantt = this;
|
|
15504
15511
|
var props = $xeGantt;
|
|
15505
15512
|
var proxyOpts = $xeGantt.computeProxyOpts;
|
|
15513
|
+
var taskBarSubviewOpts = $xeGantt.computeTaskBarSubviewOpts;
|
|
15514
|
+
var barStyle = taskBarSubviewOpts.barStyle;
|
|
15515
|
+
if (barStyle) {
|
|
15516
|
+
if (barStyle.top) {
|
|
15517
|
+
gantt_warnLog('vxe.error.delProp', ['task-bar-subview-config.barStyle.top', 'task-bar-subview-config.barStyle.style.top']);
|
|
15518
|
+
}
|
|
15519
|
+
if (barStyle.backgroundColor) {
|
|
15520
|
+
gantt_warnLog('vxe.error.delProp', ['task-bar-subview-config.barStyle.backgroundColor', 'task-bar-subview-config.barStyle.style.backgroundColor']);
|
|
15521
|
+
}
|
|
15522
|
+
}
|
|
15506
15523
|
if (props.toolbar) {
|
|
15507
15524
|
gantt_errLog('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config']);
|
|
15508
15525
|
}
|
|
@@ -15515,7 +15532,7 @@ function gantt_createReactData() {
|
|
|
15515
15532
|
if (props.expandConfig) {
|
|
15516
15533
|
gantt_warnLog('vxe.error.notProp', ['expand-config']);
|
|
15517
15534
|
}
|
|
15518
|
-
if (!$xeGantt.
|
|
15535
|
+
if (!$xeGantt.handleUpTaskLinkData) {
|
|
15519
15536
|
if (props.taskLinkConfig) {
|
|
15520
15537
|
gantt_warnLog('vxe.error.notProp', ['task-link-config']);
|
|
15521
15538
|
}
|