Commit b3348a7f by Natthaphat

แก้ปฏิทินซ้อน Modal

parent c4b09fef
...@@ -8,3 +8,23 @@ ...@@ -8,3 +8,23 @@
padding-left: 1rem; padding-left: 1rem;
padding-right: 1rem; padding-right: 1rem;
} }
::ng-deep [ngbDatepickerDayView].today {
background-color: #e0f2fe !important;
}
::ng-deep [ngbDatepickerDayView].bg-primary {
background-color: rgb(var(--primary)) !important;
color: #ffffff !important;
}
/* ให้ datepicker popup ทะลุ modal ได้ */
::ng-deep ngb-datepicker,
::ng-deep .ngb-datepicker-container {
z-index: 2000 !important;
}
/* เผื่อ modal มี overflow ซ่อนอยู่ */
::ng-deep .ti-modal-content {
overflow: visible !important;
}
\ No newline at end of file
...@@ -607,7 +607,7 @@ export class ExcelListComponent implements OnInit { ...@@ -607,7 +607,7 @@ export class ExcelListComponent implements OnInit {
openModalData(data: any) { openModalData(data: any) {
this.searchModal = '' this.searchModal = ''
this.page = 1 this.page = 0
this.pageSize = 10 this.pageSize = 10
this.valueDetail = data.valueDetail.map((x: any) => ({ id: x.id || '', tdesc: x.tdesc || '', edesc: x.edesc || '' })) this.valueDetail = data.valueDetail.map((x: any) => ({ id: x.id || '', tdesc: x.tdesc || '', edesc: x.edesc || '' }))
this.keySelect = data.key this.keySelect = data.key
...@@ -805,6 +805,10 @@ export class ExcelListComponent implements OnInit { ...@@ -805,6 +805,10 @@ export class ExcelListComponent implements OnInit {
}).subscribe(response => { }).subscribe(response => {
this.dataList = response.excelData as any this.dataList = response.excelData as any
this.loadingExcel = false this.loadingExcel = false
console.log('🟢 dataList:', this.dataList); // ตรวจสอบว่ามีข้อมูลไหม
console.log('🟢 pivotStr:', (response.excelPerspective as any).pivotStr); // ตรวจสอบ layout ที่ส่งมา
console.log('🟢 columns:', this.pivotColumns); // ดูว่า columns ถูกเซ็ตหรือยัง
if (type === 'grid') { if (type === 'grid') {
this.modalRefgridModal = this.modal.open(this.gridModal, { this.modalRefgridModal = this.modal.open(this.gridModal, {
width: '1000px', width: '1000px',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment