fix(useWriteDataCheckNParse.ts): fix that always displaying validate …

…error message
emqx · Dec 12, 2023 · c3ee5b5 · c3ee5b5
1 parent 205f3bb
commit c3ee5b5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/composables/data/useWriteDataCheckNParse.ts b/src/composables/data/useWriteDataCheckNParse.ts
@@ -21,7 +21,7 @@ STRING    15  string
 
 import { TagType } from '@/types/enums'
 import { HEXADECIMAL_PREFIX } from '@/utils/constants'
-import { BYTES_REGEX, FLOAT_REGEX, BIT_REGEX, INT_REGEX } from '@/utils/regexps'
+import { HEXADECIMAL_REGEX, BYTES_REGEX, FLOAT_REGEX, BIT_REGEX, INT_REGEX } from '@/utils/regexps'
 import {
   transFloatNumberToHex,
   transNegativeNumberToHex,
@@ -190,7 +190,7 @@ export default (isWriteValue = true) => {
       value.slice(0, HEXADECIMAL_PREFIX.length).toLowerCase() === HEXADECIMAL_PREFIX
         ? value
         : HEXADECIMAL_PREFIX + value
-    return checkByte(str)
+    return HEXADECIMAL_REGEX.test(str)
   }
   const transToDecimal = async (tagData: TagDataInTable) => {
     const { value, type } = tagData
@@ -199,7 +199,7 @@ export default (isWriteValue = true) => {
         ? value
         : HEXADECIMAL_PREFIX + value
     try {
-      await checkByte(str)
+      await HEXADECIMAL_REGEX.test(str)
       const hexStr = str.slice(HEXADECIMAL_PREFIX.length)
       if (type === TagType.FLOAT || type === TagType.DOUBLE) {
         return transFloatHexToDecimalNum(hexStr, type)

diff --git a/src/views/monitoring/components/WriteDialog.vue b/src/views/monitoring/components/WriteDialog.vue
@@ -18,7 +18,7 @@
           </div>
         </template>
         <emqx-input
-          v-if="tag.type !== TagType.BOOL"
+          v-if="tag?.type !== TagType.BOOL"
           v-model="inputValue"
           :type="isBYTESType ? 'textarea' : 'text'"
           :placeholder="isBYTESType ? '[0,0,0,0]' : ''"
@@ -99,6 +99,9 @@ watch(showDialog, (val) => {
     isUseHexadecimal.value = false
   }
 })
+watch(inputValue, () => {
+  inputErrorMsg.value = ''
+})
 const submitData = async () => {
   await submit()
   emit('updated')