Skip to content

Commit 4c29365

Browse files
committed
chore: release workflow add error log
1 parent 0d5b0e3 commit 4c29365

3 files changed

Lines changed: 18 additions & 35 deletions

File tree

packages/vtable-gantt/src/scenegraph/task-bar.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ export class TaskBar {
271271
//如果TaskShowMode是tasks_separate模式 这里的task_index其实是table中的bodyIndex;如果TaskShowMode是sub_tasks_***模式 task_index也是对应父节点任务条在table中的bodyIndex(但不会渲染父节点,只是渲染子节点)
272272
barGroupBox.task_index = index;
273273
//如果TaskShowMode是tasks_separate模式,不会赋值sub_task_index;如果TaskShowMode是sub_tasks_***模式 这里的sub_task_index是父节点下子元素的index
274-
barGroupBox.sub_task_index = Array.isArray(childIndex) ? childIndex[0] : childIndex ?? 0;
274+
barGroupBox.sub_task_index = childIndex as any;
275275
barGroupBox.record = taskRecord;
276276

277277
const barGroup = new Group({
@@ -374,7 +374,11 @@ export class TaskBar {
374374
? '...'
375375
: isValid(textOverflow)
376376
? textOverflow
377-
: undefined
377+
: undefined,
378+
poptip: {
379+
position: 'bottom'
380+
// dx: (taskBarSize - TASKBAR_HOVER_ICON_WIDTH) / 4
381+
}
378382
// dx: 12 + 4,
379383
// dy: this._scene._gantt.barLabelStyle.fontSize / 2
380384
} as any);

packages/vtable-gantt/src/state/gantt-table-sync.ts

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,9 @@ export function syncTableWidthFromTable(gantt: Gantt) {
122122
function _syncTableSize(gantt: Gantt) {
123123
const oldTaskTableWidth: number = gantt.taskTableWidth;
124124

125-
const allColsWidth = gantt.taskListTableInstance.getAllColsWidth();
126125
gantt.taskTableWidth =
127-
(Array.isArray(allColsWidth) ? allColsWidth.reduce((a, b) => a + b, 0) : allColsWidth) +
128-
gantt.parsedOptions.outerFrameStyle.borderLineWidth;
126+
gantt.taskListTableInstance.getAllColsWidth() + (gantt.parsedOptions.outerFrameStyle.borderLineWidth as number);
127+
129128
if (gantt.options?.taskListTable?.maxTableWidth) {
130129
gantt.taskTableWidth = Math.min(gantt.options?.taskListTable?.maxTableWidth, gantt.taskTableWidth);
131130
}
@@ -136,20 +135,10 @@ function _syncTableSize(gantt: Gantt) {
136135
return;
137136
}
138137
gantt.element.style.left = gantt.taskTableWidth ? `${gantt.taskTableWidth}px` : '0px';
139-
const tableHeightValue =
140-
typeof gantt.tableNoFrameHeight === 'number'
141-
? gantt.tableNoFrameHeight
142-
: Array.isArray(gantt.tableNoFrameHeight)
143-
? gantt.tableNoFrameHeight[0] ?? 0
144-
: Number(gantt.tableNoFrameHeight) || 0;
145-
const tableHeight: number = Number(tableHeightValue) || 0;
146-
const borderWidth =
147-
typeof gantt.parsedOptions.outerFrameStyle.borderLineWidth === 'number'
148-
? gantt.parsedOptions.outerFrameStyle.borderLineWidth
149-
: Array.isArray(gantt.parsedOptions.outerFrameStyle.borderLineWidth)
150-
? gantt.parsedOptions.outerFrameStyle.borderLineWidth[0] ?? 0
151-
: 0;
152-
gantt.taskListTableInstance.setCanvasSize(gantt.taskTableWidth, tableHeight + borderWidth * 2);
138+
gantt.taskListTableInstance.setCanvasSize(
139+
gantt.taskTableWidth,
140+
gantt.tableNoFrameHeight + (gantt.parsedOptions.outerFrameStyle.borderLineWidth as number) * 2
141+
);
153142
gantt._updateSize();
154143
updateSplitLineAndResizeLine(gantt);
155144

packages/vtable-gantt/src/state/state-manager.ts

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,25 +1075,15 @@ export class StateManager {
10751075
if (Math.abs(deltaX) >= 1) {
10761076
const startWidth = this._gantt.taskTableWidth;
10771077
let width = startWidth + deltaX;
1078-
const allColsWidth = this._gantt.taskListTableInstance.getAllColsWidth();
1079-
const colsWidth = Array.isArray(allColsWidth) ? allColsWidth.reduce((a, b) => a + b, 0) : allColsWidth;
10801078
const maxWidth = Math.min(
1081-
colsWidth + this._gantt.parsedOptions.outerFrameStyle.borderLineWidth,
1079+
this._gantt.taskListTableInstance.getAllColsWidth() +
1080+
(this._gantt.parsedOptions.outerFrameStyle.borderLineWidth as number),
10821081
this._gantt.options.taskListTable.maxTableWidth ?? 100000
10831082
);
1084-
const minTableWidth = this._gantt.options.taskListTable.minTableWidth;
1085-
const minWidthValue: number = Array.isArray(minTableWidth)
1086-
? minTableWidth[0] ?? 0
1087-
: typeof minTableWidth === 'number'
1088-
? minTableWidth
1089-
: 0;
1090-
const borderLineWidth =
1091-
typeof this._gantt.parsedOptions.outerFrameStyle.borderLineWidth === 'number'
1092-
? this._gantt.parsedOptions.outerFrameStyle.borderLineWidth
1093-
: Array.isArray(this._gantt.parsedOptions.outerFrameStyle.borderLineWidth)
1094-
? this._gantt.parsedOptions.outerFrameStyle.borderLineWidth[0] ?? 0
1095-
: 0;
1096-
const minWidth = Math.max(borderLineWidth, minWidthValue);
1083+
const minWidth = Math.max(
1084+
this._gantt.parsedOptions.outerFrameStyle.borderLineWidth as number,
1085+
this._gantt.options.taskListTable.minTableWidth ?? 0
1086+
);
10971087
if (deltaX > 0 && width > maxWidth) {
10981088
width = maxWidth;
10991089
}

0 commit comments

Comments
 (0)