vxe-gantt 3.1.13 → 3.1.14
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-view.js +11 -2
- package/es/gantt/src/util.js +4 -4
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/gantt/src/gantt-view.js +9 -0
- package/lib/gantt/src/gantt-view.min.js +1 -1
- package/lib/gantt/src/util.js +4 -4
- package/lib/gantt/src/util.min.js +1 -1
- package/lib/index.umd.js +15 -6
- 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 +1 -1
- package/packages/gantt/src/gantt-view.ts +11 -2
- package/packages/gantt/src/util.ts +4 -5
package/lib/ui/index.js
CHANGED
|
@@ -13,7 +13,7 @@ exports.default = void 0;
|
|
|
13
13
|
var _core = require("@vxe-ui/core");
|
|
14
14
|
var setConfig = _core.VxeUI.setConfig,
|
|
15
15
|
setIcon = _core.VxeUI.setIcon;
|
|
16
|
-
_core.VxeUI.ganttVersion = "3.1.
|
|
16
|
+
_core.VxeUI.ganttVersion = "3.1.14";
|
|
17
17
|
var ymdFormat = 'yyyy-MM-dd';
|
|
18
18
|
var ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
|
|
19
19
|
setConfig({
|
package/lib/ui/index.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.default=void 0;var _core=require("@vxe-ui/core"),setConfig=_core.VxeUI.setConfig,setIcon=_core.VxeUI.setIcon,ymdFormat=(_core.VxeUI.ganttVersion="3.1.
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.default=void 0;var _core=require("@vxe-ui/core"),setConfig=_core.VxeUI.setConfig,setIcon=_core.VxeUI.setIcon,ymdFormat=(_core.VxeUI.ganttVersion="3.1.14","yyyy-MM-dd"),ymdhmsFormat="yyyy-MM-dd HH:mm:ss",iconPrefix=(setConfig({gantt:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:null,result:"result",total:"page.total",message:"message"}},taskBarTooltipConfig:{enterable:!0},taskLinkConfig:{enabled:!0,showArrow:!0},taskViewScaleConfig:{year:{valueFormat:ymdFormat},quarter:{valueFormat:ymdFormat},month:{valueFormat:ymdFormat},week:{startDay:1,valueFormat:ymdFormat},day:{valueFormat:ymdFormat},date:{valueFormat:ymdFormat},hour:{valueFormat:ymdhmsFormat},minute:{valueFormat:ymdhmsFormat},second:{valueFormat:ymdhmsFormat}},taskViewConfig:{showNowLine:!0,gridding:{leftSpacing:1,rightSpacing:1}},taskSplitConfig:{enabled:!0,resize:!0,showCollapseTableButton:!0,showCollapseTaskButton:!0}}}),"vxe-icon-"),_default=(setIcon({GANTT_VIEW_LEFT_OPEN:iconPrefix+"arrow-left",GANTT_VIEW_LEFT_CLOSE:iconPrefix+"arrow-right",GANTT_VIEW_RIGHT_OPEN:iconPrefix+"arrow-right",GANTT_VIEW_RIGHT_CLOSE:iconPrefix+"arrow-left",GANTT_VIEW_TASK_MILESTONE:iconPrefix+"square-fill rotate45"}),exports.default=_core.VxeUI);
|
package/lib/ui/src/log.js
CHANGED
|
@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.warnLog = exports.errLog = void 0;
|
|
7
7
|
var _core = require("@vxe-ui/core");
|
|
8
8
|
var log = _core.VxeUI.log;
|
|
9
|
-
var version = "gantt v".concat("3.1.
|
|
9
|
+
var version = "gantt v".concat("3.1.14");
|
|
10
10
|
var warnLog = exports.warnLog = log.create('warn', version);
|
|
11
11
|
var errLog = exports.errLog = log.create('error', version);
|
package/lib/ui/src/log.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core"),log=_core.VxeUI.log,version="gantt v".concat("3.1.
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core"),log=_core.VxeUI.log,version="gantt v".concat("3.1.14"),warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
|
package/package.json
CHANGED
|
@@ -534,6 +534,7 @@ function handleUpdateData ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewP
|
|
|
534
534
|
if ($xeTable) {
|
|
535
535
|
const startField = $xeGantt.computeStartField
|
|
536
536
|
const endField = $xeGantt.computeEndField
|
|
537
|
+
const typeField = $xeGantt.computeTypeField
|
|
537
538
|
const tableReactData = $xeTable as unknown as TableReactData
|
|
538
539
|
const { isRowGroupStatus } = tableReactData
|
|
539
540
|
const tableInternalData = $xeTable as unknown as TableInternalData
|
|
@@ -544,8 +545,16 @@ function handleUpdateData ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewP
|
|
|
544
545
|
const childrenField = treeOpts.children || treeOpts.childrenField
|
|
545
546
|
|
|
546
547
|
const handleMinMaxData = (row: any) => {
|
|
547
|
-
|
|
548
|
-
|
|
548
|
+
let startValue = XEUtils.get(row, startField)
|
|
549
|
+
let endValue = XEUtils.get(row, endField)
|
|
550
|
+
const typeValue = XEUtils.get(row, typeField)
|
|
551
|
+
const isMilestone = hasMilestoneTask(typeValue)
|
|
552
|
+
if (!startValue) {
|
|
553
|
+
startValue = endValue
|
|
554
|
+
}
|
|
555
|
+
if (isMilestone || !endValue) {
|
|
556
|
+
endValue = startValue
|
|
557
|
+
}
|
|
549
558
|
if (startValue) {
|
|
550
559
|
const startDate = parseStringDate($xeGanttView, startValue)
|
|
551
560
|
if (!minDate || minDate.getTime() > startDate.getTime()) {
|
|
@@ -36,12 +36,11 @@ export function getTaskLinkKey (from: string | number, to: string | number) {
|
|
|
36
36
|
return `${from}_${to}`
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
const taskTypeMaps: Record<string, boolean> = {
|
|
40
|
+
milestone: true
|
|
41
41
|
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
milestone: 1
|
|
42
|
+
export function hasMilestoneTask (type: string) {
|
|
43
|
+
return taskTypeMaps[type]
|
|
45
44
|
}
|
|
46
45
|
export function gettaskType (type: string) {
|
|
47
46
|
return taskTypeMaps[type] ? type : 'default'
|