From ba238b941619e04fc0e93ec7b5788ede448b4218 Mon Sep 17 00:00:00 2001 From: zhouyuejun <505127606@qq.com> Date: Tue, 15 Jan 2019 19:17:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=9C=BA=E4=BD=8D=E3=80=81?= =?UTF-8?q?=E9=A3=9E=E6=9C=BA=E5=8F=B7=E5=8F=98=E6=9B=B4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/pages/main/main.component.ts | 5 +-- src/app/utils/transfer-render-handle.ts | 58 +++++++++++++++---------- src/app/utils/web-worker-handle.ts | 22 ++++++++-- src/assets/web-worker-handle.js | 22 ++++++++-- 4 files changed, 74 insertions(+), 33 deletions(-) diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts index 06b5d94..1c9d2a8 100644 --- a/src/app/pages/main/main.component.ts +++ b/src/app/pages/main/main.component.ts @@ -873,11 +873,11 @@ export class MainComponent implements OnInit { filterData.forEach(element => { if (element['renderFlight'][sel_col]) { if (element['renderFlight'][sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) { - transArray.push(element) + transArray.push(element); } } else { if (!this.SEARCH) { - transArray.push(element) + transArray.push(element); } } }); @@ -925,7 +925,6 @@ export class MainComponent implements OnInit { if (objTr) { $("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow"); } - } /** diff --git a/src/app/utils/transfer-render-handle.ts b/src/app/utils/transfer-render-handle.ts index 1a4fdd7..71d0b48 100644 --- a/src/app/utils/transfer-render-handle.ts +++ b/src/app/utils/transfer-render-handle.ts @@ -1,17 +1,21 @@ import timeFormatter from './time-formatter'; import dateWithNotimeFormatter from './date-with-notime-formatter'; export class TransferRenderHandle { - public renoFormatter(flight){ - if(flight['RENO']){ - if(flight['LRENO']){ - return flight['RENO'] + '(' + flight['LRENO'] + ')'; - }else{ + public renoFormatter(flight) { + if (flight['RENO']) { + if (flight['LRENO']) { + if (flight['RENO'] == flight['LRENO']) { + return flight['RENO']; + } else { + return flight['RENO'] + '(' + flight['LRENO'] + ')'; + } + } else { return flight['RENO']; } - }else{ - if(flight['LRENO']){ + } else { + if (flight['LRENO']) { return '(' + flight['LRENO'] + ')'; - }else{ + } else { return ''; } } @@ -242,29 +246,39 @@ export class TransferRenderHandle { psst.push(flight['PSDT'][i]['PSST']); } let set = new Set(psst); - if(flight['LPSDT']){ - return Array.from(set).join(',') + '(' + flight['LPSDT'] + ')'; - }else{ - return Array.from(set).join(','); + let joinedPsst = Array.from(set).join(',') + if (flight['LPSDT']) { + if (joinedPsst == flight['LPSDT']) { + return joinedPsst; + } else { + return joinedPsst + '(' + flight['LPSDT'] + ')'; + } + } else { + return joinedPsst; } } else if (Object.prototype.toString.call(flight['PSDT']) === '[object Object]') { - if(flight['LPSDT']){ - return flight['PSDT']['PSST'] + '(' + flight['LPSDT'] + ')'; - }else{ - return flight['PSDT']['PSST']; + if (flight['LPSDT']) { + if (flight['PSDT']['PSST'] == flight['LPSDT']) { + return flight['PSDT']['PSST']; + } else { + return flight['PSDT']['PSST'] + '(' + flight['LPSDT'] + ')'; + } + + } else { + return flight['PSDT']['PSST']; } } else { - if(flight['LPSDT']){ + if (flight['LPSDT']) { return '(' + flight['LPSDT'] + ')'; - }else{ - return ''; + } else { + return ''; } } } else { - if(flight['LPSDT']){ + if (flight['LPSDT']) { return '(' + flight['LPSDT'] + ')'; - }else{ - return ''; + } else { + return ''; } } } diff --git a/src/app/utils/web-worker-handle.ts b/src/app/utils/web-worker-handle.ts index 246a949..3886d2f 100644 --- a/src/app/utils/web-worker-handle.ts +++ b/src/app/utils/web-worker-handle.ts @@ -155,7 +155,11 @@ export default function (dynamicData) { 'RENO': function renoFormatter(flight) { if (flight['RENO']) { if (flight['LRENO']) { - return flight['RENO'] + '(' + flight['LRENO'] + ')'; + if (flight['RENO'] == flight['LRENO']) { + return flight['RENO']; + } else { + return flight['RENO'] + '(' + flight['LRENO'] + ')'; + } } else { return flight['RENO']; } @@ -393,14 +397,24 @@ export default function (dynamicData) { psst.push(flight['PSDT'][i]['PSST']); } let set = new Set(psst); + let joinedPsst = Array.from(set).join(',') if (flight['LPSDT']) { - return Array.from(set).join(',') + '(' + flight['LPSDT'] + ')'; + if (joinedPsst == flight['LPSDT']) { + return joinedPsst; + } else { + return joinedPsst + '(' + flight['LPSDT'] + ')'; + } } else { - return Array.from(set).join(','); + return joinedPsst; } } else if (Object.prototype.toString.call(flight['PSDT']) === '[object Object]') { if (flight['LPSDT']) { - return flight['PSDT']['PSST'] + '(' + flight['LPSDT'] + ')'; + if (flight['PSDT']['PSST'] == flight['LPSDT']) { + return flight['PSDT']['PSST']; + } else { + return flight['PSDT']['PSST'] + '(' + flight['LPSDT'] + ')'; + } + } else { return flight['PSDT']['PSST']; } diff --git a/src/assets/web-worker-handle.js b/src/assets/web-worker-handle.js index 2c428f9..04a47cd 100644 --- a/src/assets/web-worker-handle.js +++ b/src/assets/web-worker-handle.js @@ -155,7 +155,11 @@ onmessage = function (dynamicData) { 'RENO': function renoFormatter(flight) { if (flight['RENO']) { if (flight['LRENO']) { - return flight['RENO'] + '(' + flight['LRENO'] + ')'; + if (flight['RENO'] == flight['LRENO']) { + return flight['RENO']; + } else { + return flight['RENO'] + '(' + flight['LRENO'] + ')'; + } } else { return flight['RENO']; } @@ -393,14 +397,24 @@ onmessage = function (dynamicData) { psst.push(flight['PSDT'][i]['PSST']); } let set = new Set(psst); + let joinedPsst = Array.from(set).join(',') if (flight['LPSDT']) { - return Array.from(set).join(',') + '(' + flight['LPSDT'] + ')'; + if (joinedPsst == flight['LPSDT']) { + return joinedPsst; + } else { + return joinedPsst + '(' + flight['LPSDT'] + ')'; + } } else { - return Array.from(set).join(','); + return joinedPsst; } } else if (Object.prototype.toString.call(flight['PSDT']) === '[object Object]') { if (flight['LPSDT']) { - return flight['PSDT']['PSST'] + '(' + flight['LPSDT'] + ')'; + if (flight['PSDT']['PSST'] == flight['LPSDT']) { + return flight['PSDT']['PSST']; + } else { + return flight['PSDT']['PSST'] + '(' + flight['LPSDT'] + ')'; + } + } else { return flight['PSDT']['PSST']; }