windy/airport-chengdu-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

基础数据之城市修改优化

Browse Source
This commit is contained in:
zhouyuejun
2019-02-20 16:22:52 +08:00
parent 209f14d3d6
commit 931c2d6be3
3 changed files with 358 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/basic-data/city/city.component.html
+33 -27
View File
@@ -1,11 +1,12 @@
<div class="main-page">
<div class="page-content">
<div class="search-filter mb-3">
<div class="page-content" #pageContent>
<div class="search-filter mb-3" #searchFilter>
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
<select class="mr-4 form-control" [(ngModel)]="SEL_COL" name="" id="">
<select class="mr-4 form-control" [(ngModel)]="SEL_COL" (ngModelChange)="resetPositionArray()" name=""
id="">
<option value="">选择列名</option>
<option *ngFor="let col of col_lists" [value]="col.col_code">{{col.col_chn}}</option>
<option *ngFor="let col of render_col_lists" [value]="col.COL_CODE">{{col.COL_CN}}</option>
</select>
<label class="radio-inline custom-radio nowrap mr-4">
<input type="radio" [(ngModel)]="FLT_POS" [value]="1" name="filter-position">
@@ -15,14 +16,16 @@
<input type="radio" [(ngModel)]="FLT_POS" [value]="2" name="filter-position">
<span>查找定位</span>
</label>
<input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter)="inputEnter()" id="inputerInfo">
<input class="form-control" [(ngModel)]="SEARCH" (ngModelChange)="resetPositionArray()" type="text"
(keyup.enter)="inputEnter()" id="inputerInfo">
</div>
</div>
<div class="second-condition mb-3 row">
<div class="input-container mr-4">
<label for="countryId">国家：&nbsp;&nbsp;</label>
<select class="form-control" [(ngModel)]="filterItems.countryId" (ngModelChange)="selectChange()" id="citry">
<select class="form-control" [(ngModel)]="filterItems.countryId" (ngModelChange)="selectChange()"
id="citry">
<option value=""></option>
<option *ngFor="let item of countrys" [value]="item.countryId">{{item.countryNameChn}}</option>
</select>
@@ -31,27 +34,30 @@
</div>
<div class="airline-table">
<div id="table-container" class="table-container">
<table id="table" class="table table-bordered table-striped">
<thead>
<tr>
<th>序号</th>
<th>城市代码</th>
<th>城市中文名</th>
<th>城市英文名</th>
<th>所在国家</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let city of render_data;let i = index" (click)="selectRow(city)" [ngClass]="{'selected':row_state===city}">
<td>{{i+1}}</td>
<td>{{city.cityCode}}</td>
<td>{{city.cityNameChn}}</td>
<td>{{city.cityNameEng}}</td>
<td>{{city.countryNameChn}}</td>
</tr>
</tbody>
</table>
<div #tableContainer id="table-container" class="table-container">
<div class="table-head" #tableHead>
<table class="table">
<thead>
<tr>
<th style="min-width:55px">序号</th>
<th *ngFor="let col of render_col_lists" [ngStyle]="{'min-width':col.COL_WIDTH}">{{col.COL_CN}}</th>
</tr>
</thead>
</table>
</div>
<div class="table-body" #tableBody (scroll)="handleScroll($event)">
<div class="list-view-phantom" [ngStyle]="{ 'height': wait_render_data.length * 42 + 'px' }"></div>
<table #tableContent id="table" class="table table-striped">
<tbody>
<ng-container *ngFor="let city of render_data;last as isLast;index as i">
<tr *ngIf="setWidth(isLast)" (click)="selectRow(city)" [ngClass]="{'selected':getSelectedRow(city)}">
<td style="min-width:55px">{{start+i+1}}</td>
<td *ngFor="let col of render_col_lists" [ngStyle]="{'min-width':col.COL_WIDTH}">{{city[col.COL_CODE]}}</td>
</tr>
</ng-container>
</tbody>
</table>
</div>
</div>
</div>
</div>
src/app/pages/basic-data/city/city.component.scss
-59
View File
@@ -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;
// }
// }
src/app/pages/basic-data/city/city.component.ts
+325 -109
View File
@@ -1,107 +1,203 @@
import { Component, OnInit } from '@angular/core';
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-city',
templateUrl: './city.component.html',
styleUrls: ['./city.component.scss']
styleUrls: ['../basic.scss']
})
export class CityComponent implements OnInit {
constructor(
private renderer2: Renderer2,
private basicDataService: BasicDataService,
private changeDetectorRef: ChangeDetectorRef
) { }
private operateSpinServiceService: OperateSpinServiceService,
) {
this.operateSpinServiceService.showSpin();
}
public col_lists = [
{ col_code: 'cityCode', col_chn: '城市代码' },
{ col_code: 'cityNameChn', col_chn: '城市中文名' },
{ col_code: 'cityNameEng', col_chn: '城市英文名' },
{ col_code: 'countryNameChn', col_chn: '所在国家' },
public render_col_lists = [
{ COL_CODE: 'cityCode', COL_CN: '城市代码', COL_WIDTH: "120px" },
{ COL_CODE: 'cityNameChn', COL_CN: '城市中文名', COL_WIDTH: "120px" },
{ COL_CODE: 'cityNameEng', COL_CN: '城市英文名', COL_WIDTH: "120px" },
{ COL_CODE: 'countryNameChn', COL_CN: '所在国家', COL_WIDTH: "120px" },
];
// 搜索条件
SEARCH = ''; //手动输入条件
LASTSEARCH = '';
FLT_POS = 1; //过滤还是定位
SEL_COL = ''; //选择列名
LAST_SEL_COL = '';
//下拉框
public filterItems = {
countryId: '',
}
countrys: Array<any>; //国家
citys: Array<any>;
public row_state: any = { renderFlight: {} };
public countrys: Array<any>; //国家
public citys: Array<any>;
public wait_render_data: Array<object> = [];
public render_data: Array<object> = []; //显示数据，即需要显示的数据
public selectedFilterData: Array<object> = [];
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() {
this.countrys = this.basicDataService.country;
window.onresize = function () {
this.calcVisibleCount();
}.bind(this)
this.citys = this.basicDataService.city;
this.render_data = this.basicDataService.city;
this.basicDataService.city_subject.subscribe(
data => {
this.citys = data;
this.render_data = data;
}
)
this.basicDataService.country_subject.subscribe(
data => {
this.countrys = data
if(this.countrys && this.countrys.length > 0){//国家列表数据转换
this.basicDataTransHandle();
this.countrys = this.basicDataService.country;
if (this.countrys && Array.isArray(this.countrys)) {
this.dataTransfer();
} else {
this.basicDataService.city_subject.subscribe(
data => {
this.citys = data;
}
}
)
if(this.render_data){
//国家列表数据转换
this.basicDataTransHandle();
)
this.basicDataService.country_subject.subscribe(
data => {
this.countrys = data
this.dataTransfer();
}
)
}
/**
* 固定表头
*/
var tableCont = document.querySelector('#table-container');
function scrollHandle() {
var scrollTop = this.scrollTop;
this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)';
}
tableCont.addEventListener('scroll', scrollHandle);
}
//国家数据转换处理
basicDataTransHandle() {
this.render_data.forEach(item => {
let countryLinkIndex = this.countrys.findIndex(val => val.countryId === item['countryId']);
if(this.countrys[countryLinkIndex]){
item['countryNameChn'] = this.countrys[countryLinkIndex].countryNameChn;
}
})
//国家数据转换处理
countrysTransHandle(item) {
let countryLinkIndex = this.countrys.findIndex(val => val.countryId === item['countryId']);
if (this.countrys[countryLinkIndex]) {
item['countryNameChn'] = this.countrys[countryLinkIndex].countryNameChn;
}
}
/**
* 数据转换显示统一处理
*/
dataTransfer() {
this.citys.forEach(item => {
this.countrysTransHandle(item);
})
this.wait_render_data = this.citys;
this.selectedFilterData = this.citys;
this.calcVisibleCount();
//默认选中第一条
if (this.render_data.length > 0) {
this.row_state = this.render_data[0];
}
this.operateSpinServiceService.hideSpin();
}
/**
* 设置动态设置单元格的宽度
* @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).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 i
* @param city
*/
selectRow(i) {
this.row_state = i;
selectRow(city) {
this.row_state = city;
}
/**
* 判断当前行是否是选中的行,是则高亮
* @param city
*/
getSelectedRow(city) {
if (city.cityCode === this.row_state.cityCode) {
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.render_data = this.citys.filter(item => {
this.operateSpinServiceService.showSpin();
this.positionedArray = [];
this.positionArrayIndex = 0;
let filter_data = this.citys.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]) {
if (item[key] === this.filterItems[key]) {
is_satis = true;
continue;
} else {
@@ -112,35 +208,54 @@ export class CityComponent implements OnInit {
}
return is_satis;
})
this.selectedFilterData = filter_data;
if (this.FLT_POS === 1) {
this.inputFilter(this.render_data);
this.inputFilter(filter_data);
} else {
this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
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 city = this.wait_render_data[i];
if (city['cityCode'] === this.row_state.cityCode) {
this.row_state = city;
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 {
@@ -155,73 +270,174 @@ export class CityComponent 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 city = this.wait_render_data[i];
if (city['cityCode'] === this.row_state.cityCode) {
this.row_state = city;
hasSelectedRow = true;
break;
}
}
if (!hasSelectedRow) {
if (this.render_data.length > 0) {
this.row_state = this.render_data[0];
}
}
this.operateSpinServiceService.hideSpin();
}
positionArray: Array<any> = [];
positionedArray: Array<any> = [];
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.cityCode === fliterElement.cityCode);
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.cityCode === fliterElement.cityCode);
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.cityCode === filterElement.cityCode);
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.cityCode === filterElement.cityCode);
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;
}
}