File tree Expand file tree Collapse file tree 2 files changed +14
-13
lines changed
frontend/components/advanced-tools Expand file tree Collapse file tree 2 files changed +14
-13
lines changed Original file line number Diff line number Diff line change @@ -64,15 +64,15 @@ const modifyData = (data) => {
6464 data . isLocal = isLocal ? true : false ;
6565 data . isGlobal = ! isLocal ? true : false ;
6666 data . isUnicast = ! isMulticast ? true : false ;
67- data . macPrefix = data . macPrefix ? data . macPrefix : 'N/A' ;
68- data . company = data . company ? data . company : 'N/A' ;
69- data . country = data . country ? data . country : 'N/A' ;
70- data . address = data . address ? data . address : 'N/A' ;
71- data . updated = data . updated ? data . updated : 'N/A' ;
72- data . blockStart = data . blockStart ? data . blockStart : 'N/A' ;
73- data . blockEnd = data . blockEnd ? data . blockEnd : 'N/A' ;
74- data . blockSize = data . blockSize ? data . blockSize : 'N/A' ;
75- data . blockType = data . blockType ? data . blockType : 'N/A' ;
67+ data . macPrefix = data . macPrefix ? data . macPrefix . match ( / . { 1 , 2 } / g ) . join ( ':' ) : 'N/A' ;
68+ data . company = data . company ? data . company : 'N/A' ;
69+ data . country = data . country ? data . country : 'N/A' ;
70+ data . address = data . address ? data . address : 'N/A' ;
71+ data . updated = data . updated ? data . updated : 'N/A' ;
72+ data . blockStart = data . blockStart ? data . blockStart . match ( / . { 1 , 2 } / g ) . join ( ':' ) : 'N/A' ;
73+ data . blockEnd = data . blockEnd ? data . blockEnd . match ( / . { 1 , 2 } / g ) . join ( ':' ) : 'N/A' ;
74+ data . blockSize = data . blockSize ? data . blockSize : 'N/A' ;
75+ data . blockType = data . blockType ? data . blockType : 'N/A' ;
7676
7777 return data ;
7878}
Original file line number Diff line number Diff line change 3737
3838 <div id =" macCheckResult" class =" row" v-if =" macCheckResult.success" >
3939 <div class =" col-lg-8 col-md-8 col-12 mb-4" >
40- <div class =" card jn-card " :class =" { 'dark-mode dark-mode-border': isDarkMode }" >
40+ <div class =" card h-100 " :class =" { 'dark-mode dark-mode-border': isDarkMode }" >
4141 <div class =" card-body row" >
4242 <h3 class =" mb-4" >{{ t('macchecker.manufacturer') }}</h3 >
4343 <div class =" col-lg-6 col-md-6 col-12" >
8484 </div >
8585
8686 <div class =" col-lg-4 col-md-4 col-12 mb-4" >
87- <div class =" card jn-card " :class =" { 'dark-mode dark-mode-border': isDarkMode}" >
87+ <div class =" card h-100 " :class =" { 'dark-mode dark-mode-border': isDarkMode}" >
8888 <div class =" card-body" >
8989 <h3 class =" mb-4" >{{ t('macchecker.property') }}</h3 >
9090 <div class =" table-responsive text-nowrap" >
@@ -162,8 +162,9 @@ const tableItems = computed(() => {
162162// 检查 MAC 是否有效
163163const validateInput = (input ) => {
164164 if (! input) return null ;
165- // 清理所有的分隔符
166- const normalizedInput = input .replace (/ [:-] / g , ' ' );
165+ // 清理所有的分隔符和空格
166+ const normalizedInput = input .replace (/ [:-] / g , ' ' )
167+ .replace (/ \s + / g , ' ' );
167168 // 检查长度和格式
168169 if (normalizedInput .length < 6 || normalizedInput .length > 12 || ! / ^ [0-9A-Fa-f ] + $ / .test (normalizedInput)) {
169170 errorMsg .value = t (' macchecker.invalidMAC' );
You can’t perform that action at this time.
0 commit comments