scheduler-node-models 1.0.160 → 1.0.162
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/package.json
CHANGED
|
@@ -724,20 +724,20 @@ class LeaveReport extends general_1.Report {
|
|
|
724
724
|
let row = 2;
|
|
725
725
|
this.workcodes.forEach(wc => {
|
|
726
726
|
if (wc.isLeave) {
|
|
727
|
-
if (col > 33) {
|
|
727
|
+
if (col + 6 > 33) {
|
|
728
728
|
col = 2;
|
|
729
729
|
row++;
|
|
730
730
|
}
|
|
731
731
|
style = {
|
|
732
732
|
fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: `ff${wc.backcolor}` } },
|
|
733
|
-
font: { bold: true, size:
|
|
733
|
+
font: { bold: true, size: 10, color: { argb: `ff${wc.textcolor}` } },
|
|
734
734
|
alignment: this.alignments.get('center'),
|
|
735
735
|
border: this.borders.get('blackthin')
|
|
736
736
|
};
|
|
737
737
|
this.setCell(sheet, this.getCellID(col, row), this.getCellID(col, row), style, '');
|
|
738
738
|
style = {
|
|
739
739
|
fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: `ffffffff` } },
|
|
740
|
-
font: { bold: true, size:
|
|
740
|
+
font: { bold: true, size: 10, color: { argb: `ff000000` } },
|
|
741
741
|
alignment: this.alignments.get('center'),
|
|
742
742
|
border: {
|
|
743
743
|
top: undefined,
|