From 543a7e82ce8a2cb0cef2eaf513814ee905c7f59f Mon Sep 17 00:00:00 2001 From: zhouyuejun <505127606@qq.com> Date: Wed, 20 Feb 2019 17:36:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E4=B9=8B?= =?UTF-8?q?=E9=A3=9E=E6=9C=BA=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aircraft/aircraft.component.html | 104 ++-- .../aircraft/aircraft.component.scss | 59 --- .../basic-data/aircraft/aircraft.component.ts | 474 ++++++++++++------ 3 files changed, 383 insertions(+), 254 deletions(-) delete mode 100644 src/app/pages/basic-data/aircraft/aircraft.component.scss diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.html b/src/app/pages/basic-data/aircraft/aircraft.component.html index 2fde0ab..2683d2d 100644 --- a/src/app/pages/basic-data/aircraft/aircraft.component.html +++ b/src/app/pages/basic-data/aircraft/aircraft.component.html @@ -1,74 +1,72 @@
-
-
+
+
- - + - +
- +
-
- - +
+ + +
+
+ + +
-
- - -
-
- +
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
序号飞机号最大乘客数最大货物重量最大起飞重量最大廊桥数机主航空公司航空公司机型
{{i+1}}{{aircraft.aircraftNumber}}{{aircraft.maxPassengers}}{{aircraft.maxFreightWeight}}{{aircraft.maxTakeoffWeight}}{{aircraft.maxAirbridges}}{{aircraft.airlineOwnerName}}{{aircraft.airlineName}}{{aircraft.aircraftTypeName}}
+
+
+ + + + + + + +
序号{{col.COL_CN}}
+
+
+
+ + + + + + + + + +
{{start+i+1}}{{aircraft[col.COL_CODE]}}
+
-
\ No newline at end of file +
\ No newline at end of file diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.scss b/src/app/pages/basic-data/aircraft/aircraft.component.scss deleted file mode 100644 index 2804efa..0000000 --- a/src/app/pages/basic-data/aircraft/aircraft.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/aircraft/aircraft.component.ts b/src/app/pages/basic-data/aircraft/aircraft.component.ts index 78beb46..95076d5 100644 --- a/src/app/pages/basic-data/aircraft/aircraft.component.ts +++ b/src/app/pages/basic-data/aircraft/aircraft.component.ts @@ -1,106 +1,113 @@ -import { Component, OnInit, 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-aircraft', templateUrl: './aircraft.component.html', - styleUrls: ['./aircraft.component.scss'] + styleUrls: ['../basic.scss'] }) export class AircraftComponent implements OnInit { constructor( + private renderer2: Renderer2, private basicDataService: BasicDataService, - private changeDetectorRef: ChangeDetectorRef, private operateSpinServiceService: OperateSpinServiceService ) { this.operateSpinServiceService.showSpin(); - this.changeDetectorRef.detach(); } - public col_lists = [ - { col_code: 'aircraftNumber', col_chn: '飞机号' }, - { col_code: 'maxPassengers', col_chn: '最大乘客数' }, - { col_code: 'maxFreightWeight', col_chn: '最大货物重量' }, - { col_code: 'maxTakeoffWeight', col_chn: '最大起飞重量' }, - { col_code: 'maxAirbridges', col_chn: '最大廊桥数' }, - { col_code: 'aircraftOwnerCode', col_chn: '机主航空公司' }, - { col_code: 'airlineName', col_chn: '航空公司' }, - { col_code: 'aircraftTypeName', col_chn: '机型' } + public render_col_lists = [ + { COL_CODE: 'aircraftNumber', COL_CN: '飞机号', COL_WIDTH: "85px" }, + { COL_CODE: 'maxPassengers', COL_CN: '最大乘客数', COL_WIDTH: "120px" }, + { COL_CODE: 'maxFreightWeight', COL_CN: '最大货物重量', COL_WIDTH: "120px" }, + { COL_CODE: 'maxTakeoffWeight', COL_CN: '最大起飞重量', COL_WIDTH: "120px" }, + { COL_CODE: 'maxAirbridges', COL_CN: '最大廊桥数', COL_WIDTH: "120px" }, + { COL_CODE: 'airlineOwnerName', COL_CN: '机主航空公司', COL_WIDTH: "120px" }, + { COL_CODE: 'airlineName', COL_CN: '航空公司', COL_WIDTH: "120px" }, + { COL_CODE: 'aircraftTypeName', COL_CN: '机型', COL_WIDTH: "120px" } ] // 搜索条件 SEARCH = ''; //手动输入条件 + LASTSEARCH = ''; FLT_POS = 1; //过滤还是定位 SEL_COL = ''; //选择列名 + LAST_SEL_COL = ''; //下拉框 public filterItems = { airlineCode: '', aircraftTypeCode: '', } - airlines: Array; //航空公司 - aircraftTypes: Array; //机型 - aircrafts: Array; - public row_state: any = { renderFlight: {} }; + public airlines: Array; //航空公司 + public aircraftTypes: Array; //机型 + public aircrafts: Array; + + public wait_render_data: Array = []; public render_data: Array = []; //显示数据，即需要显示的数据 - public combined_data:Array = []; + public selectedFilterData: 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() { - setTimeout(()=>{ - this.airlines = this.basicDataService.airline; - this.aircraftTypes = this.basicDataService.aircraft_type; - this.aircrafts = this.basicDataService.aircraft; - - if (this.aircrafts && this.aircrafts.length > 0) { - this.dataTransfer(); - } else { - this.basicDataService.aircraft_type_subject.subscribe( - data => { - this.aircraftTypes = data; - } - ) - this.basicDataService.aircraft_subject.subscribe( - data => { - this.aircrafts = data; - } - ) - this.basicDataService.airline_subject.subscribe( - data => { - this.airlines = data; - this.dataTransfer(); - } - ) - } - },10) + window.onresize = function () { + this.calcVisibleCount(); + }.bind(this) - /** - * 固定表头 - */ - var tableCont = document.querySelector('#table-container'); - function scrollHandle() { - var scrollTop = this.scrollTop; - this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)'; + this.aircraftTypes = this.basicDataService.aircraft_type; + this.aircrafts = this.basicDataService.aircraft; + this.airlines = this.basicDataService.airline; + + if (this.airlines && Array.isArray(this.airlines)) { + this.dataTransfer(); + } else { + this.basicDataService.aircraft_type_subject.subscribe( + data => { + this.aircraftTypes = data; + } + ) + this.basicDataService.aircraft_subject.subscribe( + data => { + this.aircrafts = data; + } + ) + this.basicDataService.airline_subject.subscribe( + data => { + this.airlines = data; + this.dataTransfer(); + } + ) } - tableCont.addEventListener('scroll', scrollHandle); } //航空公司数据转换处理 - airlinesHandle(item) { + airlinesTransHandle(item) { let airlinesLinkIndex = this.airlines.findIndex(val => val.airlineCode === item['airlineCode']); if (airlinesLinkIndex > -1) { item['airlineName'] = this.airlines[airlinesLinkIndex].airlineName; } - return item; } //机主航空公司数据转换出来 - airlineOwnerHandle(item) { + airlineOwnerTransHandle(item) { let airlinesLinkIndex = this.airlines.findIndex(val => val.airlineCode === item['aircraftOwnerCode']); if (airlinesLinkIndex > -1) { item['airlineOwnerName'] = this.airlines[airlinesLinkIndex].airlineName; } - return item; } //机型数据转换处理 @@ -109,92 +116,174 @@ export class AircraftComponent implements OnInit { if (aircraftTypesLinkIndex > -1) { item['aircraftTypeName'] = this.aircraftTypes[aircraftTypesLinkIndex].aircraftTypeName; } - return item; } //数据转换统一处理 dataTransfer() { this.aircrafts.forEach(item => { - let aircraft = Object.assign({}, item); - aircraft = this.airlinesHandle(aircraft); - aircraft = this.airlineOwnerHandle(aircraft); - aircraft = this.aircraftTypeHandle(aircraft); - this.combined_data.push(aircraft); + this.airlinesTransHandle(item); + this.airlineOwnerTransHandle(item); + this.aircraftTypeHandle(item); }) - this.render_data = this.combined_data; - this.changeDetectorRef.detectChanges(); + + this.wait_render_data = this.aircrafts; + this.selectedFilterData = this.aircrafts; + this.calcVisibleCount(); + + //默认选中第一条 + if (this.render_data.length > 0) { + this.row_state = this.render_data[0]; + } this.operateSpinServiceService.hideSpin(); } /** - * 选中某行 - * @param i + * 设置动态设置单元格的宽度 + * @param isLast */ - selectRow(i) { - this.row_state = i; - this.changeDetectorRef.detectChanges(); + 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).outerWidth() + '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 aircraft + */ + selectRow(aircraft) { + this.row_state = aircraft; + } + + /** + * 判断当前行是否是选中的行,是则高亮 + * @param aircraft + */ + getSelectedRow(aircraft) { + if (aircraft.aircraftId === this.row_state.aircraftId) { + return true; + } else { + return false; + } } //输入框回车事件 inputEnter() { if (this.FLT_POS === 1) { - this.selectChange() + this.LAST_SEL_COL = this.SEL_COL; + this.LASTSEARCH = this.SEARCH; + this.operateSpinServiceService.showSpin(); + this.inputFilter(this.selectedFilterData); } else { - this.inputPosition(this.render_data) + this.inputPosition(this.wait_render_data) } } //下拉框选择筛选 selectChange() { this.operateSpinServiceService.showSpin(); - setTimeout(() => { - this.render_data = this.combined_data.filter(item => { - let is_satis = true; - for (const key in this.filterItems) { - if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) { - if (item[key] == this.filterItems[key]) { - is_satis = true; - continue; - } else { - is_satis = false; - break; - } + this.positionedArray = []; + this.positionArrayIndex = 0; + let filter_data = this.aircrafts.filter(item => { + let is_satis = true; + for (const key in this.filterItems) { + if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) { + if (item[key] === this.filterItems[key]) { + is_satis = true; + continue; + } else { + is_satis = false; + break; } } - return is_satis; - }) - if (this.FLT_POS === 1) { - this.inputFilter(this.render_data); - } else { - this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} }; - this.changeDetectorRef.detectChanges(); - this.operateSpinServiceService.hideSpin(); } - }, 10) + return is_satis; + }) + this.selectedFilterData = filter_data; + + + if (this.FLT_POS === 1) { + this.inputFilter(filter_data); + } else { + this.wait_render_data = filter_data; + 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 aircraft = this.wait_render_data[i]; + if (aircraft['aircraftId'] === this.row_state.aircraftId) { + this.row_state = aircraft; + hasSelectedRow = true; + break; + } + } + if (!hasSelectedRow) { + if (this.render_data.length > 0) { + this.row_state = this.render_data[0]; + } + } + this.operateSpinServiceService.hideSpin(); + } } //输入框筛选 inputFilter(filterData) { - if (this.SEARCH) { - if (this.SEL_COL) { - let sel_col = this.SEL_COL; - this.render_data = filterData.filter(item => { + if (this.LASTSEARCH) { + if (this.LAST_SEL_COL) { + let sel_col = this.LAST_SEL_COL; + filterData = filterData.filter(item => { if (item[sel_col]) { - if (item[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) { + if (item[sel_col].toString().match(new RegExp(this.LASTSEARCH, 'i'))) { return true; } } else { 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.LASTSEARCH, 'i'))) { is_satis = true; break; } else { @@ -210,72 +299,173 @@ export class AircraftComponent implements OnInit { }) } } - this.changeDetectorRef.detectChanges(); + 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 aircraft = this.wait_render_data[i]; + if (aircraft['aircraftId'] === this.row_state.aircraftId) { + this.row_state = aircraft; + 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.aircraftId === fliterElement.aircraftId); + 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.aircraftId === fliterElement.aircraftId); + 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.aircraftId === filterElement.aircraftId); + 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.aircraftId === filterElement.aircraftId); + 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 (transArray.length > 0) { - if (transArray.toString() == this.positionArray.toString()) { - this.positionArrayIndex++; - if (this.positionArrayIndex === this.positionArray.length) { - this.positionArrayIndex = 0; + if (positionIsOk) { + break; } - this.row_state = this.positionArray[this.positionArrayIndex]; - } else { - this.positionArray = transArray; - this.positionArrayIndex = 0; - this.row_state = this.positionArray[this.positionArrayIndex]; } - } else { - alert('没有搜索到相关数据'); - } - this.changeDetectorRef.detectChanges(); - let tr = $(".selected"); - let objTr = tr[0]; - if (objTr) { - $("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow"); } + if (!hasSearchData) { + alert("没有搜索到相关数据"); + } + if (hasPositionedEle) { + const scrollTop = this.positionArrayIndex * this.trItemHeight + this.tableBody.nativeElement.scrollTop = scrollTop; + } + } + + /** + * 重置定位数组 + */ + resetPositionArray() { + this.positionedArray = []; + this.positionArrayIndex = 0; } }