From a3471b4f1db642a8aae3487289b4f0422bf8bef7 Mon Sep 17 00:00:00 2001 From: YY Date: Sun, 24 Jan 2021 17:51:37 +0800 Subject: [PATCH] Filter invalid time --- js/components/main.vue | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/js/components/main.vue b/js/components/main.vue index c0242d2..093ff93 100644 --- a/js/components/main.vue +++ b/js/components/main.vue @@ -133,20 +133,18 @@ var mainWindow = { } }, 'getTime': function (timeString) { - ans = [] - number = "" - for (var i of timeString) { - if (i >= "0" && i <= "9") { - number = i - } else if (i >= "a" && i <= "z") { - ans.push(number + i) - } - else { - ans.push(timeString) - break - } - } - return ans + let num; + const timeRegex = new RegExp(/^\d[\da-z]*[a-z]$/); + return timeRegex.test(timeString) + ? [...timeString].reduce((res, c) => { + if (Number.isInteger(+c)) { + num = c; + return res; + } else { + return [...res, num + c]; + } + }, []) + : []; }, 'select': function (department) { this.selectDepartment = department @@ -349,4 +347,4 @@ var mainWindow = { ` -} \ No newline at end of file +}