diff --git a/src/app/pages/basic-data/gate/gate.component.scss b/src/app/pages/basic-data/basic.scss similarity index 98% rename from src/app/pages/basic-data/gate/gate.component.scss rename to src/app/pages/basic-data/basic.scss index 1f9f019..fb818bb 100644 --- a/src/app/pages/basic-data/gate/gate.component.scss +++ b/src/app/pages/basic-data/basic.scss @@ -35,6 +35,7 @@ margin: 0; width: max-content; th { + border: 1px solid #ddd; border-bottom: none; background-color: #ddd; text-align: center; diff --git a/src/app/pages/basic-data/checkin-group/checkin-group.component.scss b/src/app/pages/basic-data/checkin-group/checkin-group.component.scss deleted file mode 100644 index 84ffb13..0000000 --- a/src/app/pages/basic-data/checkin-group/checkin-group.component.scss +++ /dev/null @@ -1,97 +0,0 @@ -.main-page { - position: relative; - width: 100%; - height: 100%; - overflow-y: auto; - padding: 15px 10px; - background-color: #fff; - .page-content { - border: 1px solid #ccc; - height: 100%; - padding: 10px 20px; - .search-filter { - padding: 0 15px; - .input-container { - padding: 0; - > .form-control { - width: 180px; - display: inline-block; - } - } - } - .airline-table{ - .table-container { - display: inline-block; - // position: relative; - width: 100%; - // overflow-x: auto; - overflow-y: hidden; - box-shadow: 0 0 1px 0.5px #ddd; - .table-head { - overflow: hidden; - overflow-y: auto; - height: 42px; - table { - margin: 0; - width: max-content; - th { - border-bottom: none; - background-color: #ddd; - text-align: center; - color: rgb(0, 0, 255); - } - } - &::-webkit-scrollbar { - width: 15px; - height: 15px; - } - } - - .table-body { - position: relative; - // height: 600px; - overflow: auto; - width: 100%; - .list-view-phantom { - position: absolute; - left: 0; - top: 0; - right: 0; - z-index: -1; - } - table { - left: 0; - right: 0; - top: 0; - position: absolute; - width: max-content; - tr { - cursor: pointer; - height: 42px; - &.selected { - background: rgb(181, 215, 255); - } - } - td { - border: 1px solid #dee2e6; - text-align: center - } - } - &::-webkit-scrollbar { - width: 15px; - height: 15px; - } - &::-webkit-scrollbar-thumb { - /*滚动条里面小方块*/ - background: rgba(165, 207, 222, 1); - border-radius: 10px; - } - &::-webkit-scrollbar-track { - background: rgba(0, 0, 0, 0.06); - border-radius: 10px; - } - } - } - } - } -} diff --git a/src/app/pages/basic-data/checkin-group/checkin-group.component.ts b/src/app/pages/basic-data/checkin-group/checkin-group.component.ts index 3e11d4b..324eec2 100644 --- a/src/app/pages/basic-data/checkin-group/checkin-group.component.ts +++ b/src/app/pages/basic-data/checkin-group/checkin-group.component.ts @@ -6,7 +6,7 @@ import * as $ from 'jquery'; @Component({ selector: 'app-checkin-group', templateUrl: './checkin-group.component.html', - styleUrls: ['./checkin-group.component.scss'] + styleUrls: ['../basic.scss'] }) export class CheckinGroupComponent implements OnInit { @@ -38,7 +38,6 @@ export class CheckinGroupComponent implements OnInit { @ViewChild('pageContent') pageContent; @ViewChild('searchFilter') searchFilter; @ViewChild('tableContainer') tableContainer; - @ViewChild('tabContainer') tabContainer; @ViewChild('tableHead') tableHead; @ViewChild('tableBody') tableBody; @ViewChild('tableContent') tableContent; @@ -145,7 +144,7 @@ export class CheckinGroupComponent implements OnInit { this.operateSpinServiceService.showSpin(); this.inputFilter(this.checkinGroups); } else { - this.inputPosition(this.render_data) + this.inputPosition(this.wait_render_data) } } diff --git a/src/app/pages/basic-data/gate/gate.component.ts b/src/app/pages/basic-data/gate/gate.component.ts index 42df982..446b5dd 100644 --- a/src/app/pages/basic-data/gate/gate.component.ts +++ b/src/app/pages/basic-data/gate/gate.component.ts @@ -5,7 +5,7 @@ import * as $ from 'jquery'; @Component({ selector: 'app-gate', templateUrl: './gate.component.html', - styleUrls: ['./gate.component.scss'] + styleUrls: ['../basic.scss'] }) export class GateComponent implements OnInit { diff --git a/src/app/pages/basic-data/terminal/terminal.component.html b/src/app/pages/basic-data/terminal/terminal.component.html index ea59d66..b549c45 100644 --- a/src/app/pages/basic-data/terminal/terminal.component.html +++ b/src/app/pages/basic-data/terminal/terminal.component.html @@ -1,45 +1,51 @@
-
-
-
-
- -
+
-
-
- - - - - - - - - - - - - - - -
序号航站楼代码航站楼名称
{{i+1}}{{terminal.terminalCode}}{{terminal.terminalName}}
-
-
-
+
+
+
+ + + + + + + +
序号{{col.COL_CN}}
+
+
+
+ + + + + + + + + +
{{start+i+1}}{{ternimal[col.COL_CODE]}}
+
+
+
+
\ No newline at end of file diff --git a/src/app/pages/basic-data/terminal/terminal.component.scss b/src/app/pages/basic-data/terminal/terminal.component.scss deleted file mode 100644 index 2804efa..0000000 --- a/src/app/pages/basic-data/terminal/terminal.component.scss +++ /dev/null @@ -1,59 +0,0 @@ -.main-page { - width: 100%; - height: 100%; - overflow-y: scroll; - padding: 15px 10px; - background-color: #fff; - .page-content { - border: 1px solid #ccc; - padding: 10px 20px; - .search-filter { - padding: 0 15px; - .input-container { - padding: 0; - > .form-control { - width: 180px; - display: inline-block; - } - } - } - .airline-table{ - .table-container{ - // border: 1px solid #ccc; - width: 100%; - height: 700px; - overflow: auto; - box-shadow: 0 0 1px .5px #ddd; - table{ - width: max-content; - tr{ - cursor: pointer; - &.selected{ - background: rgb(181, 215, 255); - } - } - th{ - background-color: #ddd; - color: rgb(0, 0, 255); - } - th,td{ - // border: none; - text-align: center; - } - } - } - } - } -} - -@media screen and (max-width: 991px) { - .line-operator-right { - text-align: left !important; - } -} - -// @media screen and (min-width: 1200px){ -// .line-operator-right{ -// text-align: left; -// } -// } diff --git a/src/app/pages/basic-data/terminal/terminal.component.ts b/src/app/pages/basic-data/terminal/terminal.component.ts index 1f301e1..4dd5b37 100644 --- a/src/app/pages/basic-data/terminal/terminal.component.ts +++ b/src/app/pages/basic-data/terminal/terminal.component.ts @@ -1,23 +1,26 @@ -import { Component, OnInit } from '@angular/core'; -import { BasicDataService } from '../../../services/basic-data-service' -import { ChangeDetectorRef } from '@angular/core'; +import { Component, OnInit, ViewChild, Renderer2 } from '@angular/core'; +import { BasicDataService } from '../../../services/basic-data-service'; +import { OperateSpinServiceService } from '../../../services/operate-spin-service.service'; import * as $ from 'jquery'; @Component({ selector: 'app-terminal', templateUrl: './terminal.component.html', - styleUrls: ['./terminal.component.scss'] + styleUrls: ['../basic.scss'] }) export class TerminalComponent implements OnInit { constructor( + private renderer2: Renderer2, private basicDataService: BasicDataService, - private changeDetectorRef: ChangeDetectorRef - ) { } + private operateSpinServiceService: OperateSpinServiceService, + ) { + this.operateSpinServiceService.showSpin(); + } - public col_lists = [ - { col_code: 'terminalCode', col_chn: '航站楼代码' }, - { col_code: 'terminalName', col_chn: '航站楼名称' } + public render_col_lists = [ + { COL_CODE: 'terminalCode', COL_CN: '航站楼代码', COL_WIDTH: "125px" }, + { COL_CODE: 'terminalName', COL_CN: '航站楼名称', COL_WIDTH: "125px" } ] // 搜索条件 @@ -25,44 +28,123 @@ export class TerminalComponent implements OnInit { FLT_POS = 1; //过滤还是定位 SEL_COL = ''; //选择列名 - terminals: Array; - public row_state: any = { renderFlight: {} }; + public terminals: Array; + + public wait_render_data: Array = []; public render_data: Array = []; //显示数据，即需要显示的数据 + public row_state: any = { }; + + @ViewChild('pageContent') pageContent; + @ViewChild('searchFilter') searchFilter; + @ViewChild('tableContainer') tableContainer; + @ViewChild('tableHead') tableHead; + @ViewChild('tableBody') tableBody; + @ViewChild('tableContent') tableContent; + + trItemHeight: number = 42; + start: number = 0; + end: number = 0; + visibleCount: number = 0; + scrollTop: number = 0; + ngOnInit() { + window.onresize = function () { + this.calcVisibleCount(); + }.bind(this) + this.terminals = this.basicDataService.terminal; - this.render_data = this.basicDataService.terminal; - this.basicDataService.terminal_subject.subscribe( - data => { - this.terminals = data; - this.render_data = data; - } - ) - /** - * 固定表头 - */ - var tableCont = document.querySelector('#table-container'); - function scrollHandle() { - var scrollTop = this.scrollTop; - this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)'; + if(this.terminals&&Array.isArray(this.terminals)){ + this.wait_render_data = this.terminals; + this.operateSpinServiceService.hideSpin(); + this.calcVisibleCount(); + }else{ + this.basicDataService.terminal_subject.subscribe( + data => { + this.terminals = data; + this.wait_render_data = data; + this.operateSpinServiceService.hideSpin(); + this.calcVisibleCount(); + } + ) } - tableCont.addEventListener('scroll', scrollHandle); } /** * 选中某行 - * @param i + * @param terminal */ - selectRow(i) { - this.row_state = i; + selectRow(terminal) { + this.row_state = terminal; } + /** + * 设置动态设置单元格的宽度 + * @param isLast + */ + setWidth(isLast) { + if (isLast) { + $(".table-body tbody>tr").eq(0).find('td').each((index, element) => { + $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).innerWidth() + 'px'); + }) + if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { + this.tableHead.nativeElement.style.overflowY = 'auto'; + } else { + this.tableHead.nativeElement.style.overflowY = 'scroll'; + } + } + return true; + } + + /** + * 纵向滚动条滚动渲染数据 + */ + handleScroll() { + const scrollTop = this.tableBody.nativeElement.scrollTop; + $(".table-head").scrollLeft($('.table-body').scrollLeft()); + const fixedScrollTop = scrollTop - scrollTop % this.trItemHeight; + this.tableContent.nativeElement.style.webkitTransform = `translateY(${fixedScrollTop}px)`; + this.start = Math.floor(scrollTop / this.trItemHeight); + this.end = this.start + this.visibleCount; + this.render_data = this.wait_render_data.slice(this.start, this.end); + } + + /** + * 计算可视区域数据的渲染 + */ + calcVisibleCount() { + this.renderer2.setStyle(this.tableContainer.nativeElement, 'height', this.pageContent.nativeElement.offsetHeight - this.searchFilter.nativeElement.offsetHeight - 35 + 'px'); + this.renderer2.setStyle(this.tableBody.nativeElement, 'height', this.tableContainer.nativeElement.offsetHeight - this.tableHead.nativeElement.offsetHeight + 'px'); + this.visibleCount = Math.ceil(this.tableBody.nativeElement.clientHeight / this.trItemHeight); + const scrollTop = this.tableBody.nativeElement.scrollTop; + const fixedScrollTop = scrollTop - scrollTop % this.trItemHeight; + this.tableContent.nativeElement.style.transform = `translateY(${fixedScrollTop}px)`; + + this.start = Math.floor(scrollTop / this.trItemHeight); + this.end = this.start + this.visibleCount; + this.render_data = this.wait_render_data.slice(this.start, this.end); + } + + /** + * 判断当前行是否是选中的行,是则高亮 + * @param terminal + */ + getSelectedRow(terminal) { + if (terminal.terminalCode === this.row_state.terminalCode) { + return true; + } else { + return false; + } + } + + //输入框回车事件 inputEnter() { if (this.FLT_POS === 1) { - this.inputFilter(this.terminals) + this.operateSpinServiceService.showSpin(); + this.inputFilter(this.terminals); } else { - this.inputPosition(this.render_data) + this.inputPosition(this.wait_render_data) } } @@ -72,7 +154,7 @@ export class TerminalComponent implements OnInit { if (this.SEARCH) { if (this.SEL_COL) { let sel_col = this.SEL_COL; - this.render_data = filterData.filter(item => { + filterData = filterData.filter(item => { if (item[sel_col]) { if (item[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) { return true; @@ -81,14 +163,13 @@ export class TerminalComponent implements OnInit { return false; } }) - } else { - this.render_data = filterData.filter(item => { + filterData = filterData.filter(item => { let is_satis = false; - let cols = this.col_lists; + let cols = this.render_col_lists; for (let i = 0; i < cols.length; i++) { - if (item[cols[i].col_code]) { - if (item[cols[i].col_code].toString().match(new RegExp(this.SEARCH, 'i'))) { + if (item[cols[i]['COL_CODE']]) { + if (item[cols[i]['COL_CODE']].toString().match(new RegExp(this.SEARCH, 'i'))) { is_satis = true; break; } else { @@ -103,72 +184,174 @@ export class TerminalComponent implements OnInit { return is_satis; }) } - } else { - this.render_data = filterData; } + this.wait_render_data = filterData; + this.render_data = this.wait_render_data.slice(this.start, this.end); + + let hasSelectedRow: boolean = false; + for (let i = 0; i < this.wait_render_data.length; i++) { + let ternimal = this.wait_render_data[i]; + if (ternimal['terminalCode'] === this.row_state.terminalCode) { + this.row_state = ternimal; + hasSelectedRow = true; + break; + } + } + if (!hasSelectedRow) { + if (this.render_data.length > 0) { + this.row_state = this.render_data[0]; + } + } + this.operateSpinServiceService.hideSpin(); } - positionArray: Array = []; + positionedArray: Array = []; positionArrayIndex: number = 0; //输入框定位 inputPosition(filterData) { - let transArray = [] + let hasSearchData: boolean = false; + let hasPositionedEle: boolean = false; if (this.SEL_COL) { let sel_col = this.SEL_COL; - filterData.forEach(element => { - if (element[sel_col]) { - if (element[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) { - transArray.push(element) + for (let i = 0; i < filterData.length; i++) { + if (i === filterData.length - 1) { + this.positionedArray = []; + this.positionArrayIndex = 0; + } + let fliterElement = filterData[i]; + if (fliterElement[sel_col]) { + if (fliterElement[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) { + let hasThisEle: boolean = false; + hasSearchData = true; + for (let k = 0; k < this.positionedArray.length; k++) { + let positionedElement = this.positionedArray[k]; + let diffResult = (positionedElement.terminalCode === fliterElement.terminalCode); + if (diffResult) { + hasThisEle = true; + break; + } else { + continue; + } + }; + if (!hasThisEle) { + hasPositionedEle = true; + this.row_state = fliterElement; + this.positionArrayIndex = i; + this.positionedArray.push(fliterElement); + break; + } + } else { + continue; } } else { if (!this.SEARCH) { - transArray.push(element) + let hasThisEle: boolean = false; + hasSearchData = true; + for (let k = 0; k < this.positionedArray.length; k++) { + let positionedElement = this.positionedArray[k]; + let diffResult = (positionedElement.terminalCode === fliterElement.terminalCode); + if (diffResult) { + hasThisEle = true; + break; + } else { + continue; + } + }; + if (!hasThisEle) { + hasPositionedEle = true; + this.row_state = fliterElement; + this.positionArrayIndex = i; + this.positionedArray.push(fliterElement); + break; + } + } else { + continue; } } - }); + } } else { - filterData.forEach(element => { - let cols = this.col_lists; - for (let i = 0; i < cols.length; i++) { - if (element[cols[i].col_code]) { - if (element[cols[i].col_code].toString().match(new RegExp(this.SEARCH, 'i'))) { - transArray.push(element) + let cols = this.render_col_lists; + for (let i = 0; i < filterData.length; i++) { + if (i === filterData.length - 1) { + this.positionedArray = []; + this.positionArrayIndex = 0; + } + let positionIsOk: boolean = false; + let filterElement = filterData[i]; + for (let j = 0; j < cols.length; j++) { + let elementCol = cols[j]; + if (filterElement[elementCol['COL_CODE']]) { + if (filterElement[elementCol['COL_CODE']].toString().match(new RegExp(this.SEARCH, 'i'))) { + let hasThisEle: boolean = false; + hasSearchData = true; + for (let k = 0; k < this.positionedArray.length; k++) { + let positionedElement = this.positionedArray[k]; + let diffResult = (positionedElement.terminalCode === filterElement.terminalCode); + if (diffResult) { + hasThisEle = true; + break; + } else { + continue; + } + }; + if (!hasThisEle) { + hasPositionedEle = true; + positionIsOk = true; + this.row_state = filterElement; + this.positionArrayIndex = i; + this.positionedArray.push(filterElement); + } break; } else { continue; } } else { - if (this.SEARCH) { - continue; - } else { - transArray.push(element) + if (!this.SEARCH) { + let hasThisEle: boolean = false; + hasSearchData = true; + for (let k = 0; k < this.positionedArray.length; k++) { + let positionedElement = this.positionedArray[k]; + let diffResult = (positionedElement.terminalCode === filterElement.terminalCode); + if (diffResult) { + hasThisEle = true; + break; + } else { + continue; + } + }; + if (!hasThisEle) { + hasPositionedEle = true; + positionIsOk = true; + this.row_state = filterElement; + this.positionArrayIndex = i; + this.positionedArray.push(filterElement); + } break; + } else { + continue; } } } - }); + if (positionIsOk) { + break; + } + } } - if (transArray.length > 0) { - if (transArray.toString() == this.positionArray.toString()) { - this.positionArrayIndex++; - if (this.positionArrayIndex === this.positionArray.length) { - this.positionArrayIndex = 0; - } - this.row_state = this.positionArray[this.positionArrayIndex]; - } else { - this.positionArray = transArray; - this.positionArrayIndex = 0; - this.row_state = this.positionArray[this.positionArrayIndex]; - } - } else { - alert('没有搜索到相关数据'); + if (!hasSearchData) { + alert("没有搜索到相关数据"); } - this.changeDetectorRef.detectChanges(); - let tr = $(".selected"); - let objTr = tr[0]; - if (objTr) { - $("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow"); + if (hasPositionedEle) { + const scrollTop = this.positionArrayIndex * this.trItemHeight + this.tableBody.nativeElement.scrollTop = scrollTop; } } + + /** + * 重置定位数组 + */ + resetPositionArray() { + this.positionedArray = []; + this.positionArrayIndex = 0; + } }