From a2ad85627ee3d513ea8d67e851c43e86bf2027ab Mon Sep 17 00:00:00 2001
From: tiny-craft <137850705+tiny-craft@users.noreply.github.com>
Date: Fri, 10 Nov 2023 23:24:01 +0800
Subject: [PATCH] fix: edit state does not revert when switching keys

fix: some digits are incorrectly recognized as base64-encoded text
---
 backend/utils/string/convert.go                        | 10 ++++++----
 .../src/components/content_value/ContentValueHash.vue  | 10 +++++++---
 .../src/components/content_value/ContentValueList.vue  |  9 ++++++---
 .../src/components/content_value/ContentValueSet.vue   | 10 +++++++---
 .../components/content_value/ContentValueString.vue    |  6 ++++++
 .../src/components/content_value/ContentValueZSet.vue  | 10 +++++++---
 6 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/backend/utils/string/convert.go b/backend/utils/string/convert.go
index ff2f293..62a4602 100644
--- a/backend/utils/string/convert.go
+++ b/backend/utils/string/convert.go
@@ -12,10 +12,10 @@ import (
 	"github.com/klauspost/compress/gzip"
 	"github.com/klauspost/compress/zstd"
 	"io"
+	"regexp"
 	"strconv"
 	"strings"
 	"tinyrdm/backend/types"
-	"unicode/utf8"
 )
 
 // ConvertTo convert string to specified type
@@ -215,9 +215,11 @@ func decodeJson(str string) (string, bool) {
 }
 
 func decodeBase64(str string) (string, bool) {
-	if decodedStr, err := base64.StdEncoding.DecodeString(str); err == nil {
-		if s := string(decodedStr); utf8.ValidString(s) {
-			return s, true
+	if match, _ := regexp.MatchString(`^\d+$`, str); !match {
+		if decodedStr, err := base64.StdEncoding.DecodeString(str); err == nil {
+			if s := string(decodedStr); !containsBinary(s) {
+				return s, true
+			}
 		}
 	}
 	return str, false
diff --git a/frontend/src/components/content_value/ContentValueHash.vue b/frontend/src/components/content_value/ContentValueHash.vue
index 9d91a23..aec8370 100644
--- a/frontend/src/components/content_value/ContentValueHash.vue
+++ b/frontend/src/components/content_value/ContentValueHash.vue
@@ -131,6 +131,11 @@ const valueColumn = reactive({
         }
     },
 })
+
+const cancelEdit = () => {
+    currentEditRow.value.no = 0
+}
+
 const actionColumn = {
     key: 'action',
     title: i18n.t('interface.action'),
@@ -185,9 +190,7 @@ const actionColumn = {
                     currentEditRow.value.no = 0
                 }
             },
-            onCancel: () => {
-                currentEditRow.value.no = 0
-            },
+            onCancel: cancelEdit,
         })
     },
 }
@@ -265,6 +268,7 @@ const onUpdateFilter = (filters, sourceColumn) => {
 defineExpose({
     reset: () => {
         clearFilter()
+        cancelEdit()
     },
 })
 </script>
diff --git a/frontend/src/components/content_value/ContentValueList.vue b/frontend/src/components/content_value/ContentValueList.vue
index 58dcc7a..97d1247 100644
--- a/frontend/src/components/content_value/ContentValueList.vue
+++ b/frontend/src/components/content_value/ContentValueList.vue
@@ -89,6 +89,10 @@ const valueColumn = reactive({
     },
 })
 
+const cancelEdit = () => {
+    currentEditRow.value.no = 0
+}
+
 const actionColumn = {
     key: 'action',
     title: i18n.t('interface.action'),
@@ -141,9 +145,7 @@ const actionColumn = {
                     currentEditRow.value.no = 0
                 }
             },
-            onCancel: () => {
-                currentEditRow.value.no = 0
-            },
+            onCancel: cancelEdit,
         })
     },
 }
@@ -198,6 +200,7 @@ const onUpdateFilter = (filters, sourceColumn) => {
 defineExpose({
     reset: () => {
         clearFilter()
+        cancelEdit()
     },
 })
 </script>
diff --git a/frontend/src/components/content_value/ContentValueSet.vue b/frontend/src/components/content_value/ContentValueSet.vue
index 5ae6c91..3eb9c0e 100644
--- a/frontend/src/components/content_value/ContentValueSet.vue
+++ b/frontend/src/components/content_value/ContentValueSet.vue
@@ -89,6 +89,11 @@ const valueColumn = reactive({
         }
     },
 })
+
+const cancelEdit = () => {
+    currentEditRow.value.no = 0
+}
+
 const actionColumn = {
     key: 'action',
     title: i18n.t('interface.action'),
@@ -142,9 +147,7 @@ const actionColumn = {
                     currentEditRow.value.no = 0
                 }
             },
-            onCancel: () => {
-                currentEditRow.value.no = 0
-            },
+            onCancel: cancelEdit,
         })
     },
 }
@@ -199,6 +202,7 @@ const onUpdateFilter = (filters, sourceColumn) => {
 defineExpose({
     reset: () => {
         clearFilter()
+        cancelEdit()
     },
 })
 </script>
diff --git a/frontend/src/components/content_value/ContentValueString.vue b/frontend/src/components/content_value/ContentValueString.vue
index 9bb69b8..e2bedbf 100644
--- a/frontend/src/components/content_value/ContentValueString.vue
+++ b/frontend/src/components/content_value/ContentValueString.vue
@@ -143,6 +143,12 @@ const onSaveValue = async () => {
         saving.value = false
     }
 }
+
+defineExpose({
+    reset: () => {
+        inEdit.value = false
+    },
+})
 </script>
 
 <template>
diff --git a/frontend/src/components/content_value/ContentValueZSet.vue b/frontend/src/components/content_value/ContentValueZSet.vue
index b61e983..f551c67 100644
--- a/frontend/src/components/content_value/ContentValueZSet.vue
+++ b/frontend/src/components/content_value/ContentValueZSet.vue
@@ -160,6 +160,11 @@ const valueColumn = reactive({
         }
     },
 })
+
+const cancelEdit = () => {
+    currentEditRow.value.no = 0
+}
+
 const actionColumn = {
     key: 'action',
     title: i18n.t('interface.action'),
@@ -219,9 +224,7 @@ const actionColumn = {
                     currentEditRow.value.no = 0
                 }
             },
-            onCancel: () => {
-                currentEditRow.value.no = 0
-            },
+            onCancel: cancelEdit,
         })
     },
 }
@@ -303,6 +306,7 @@ const onUpdateFilter = (filters, sourceColumn) => {
 defineExpose({
     reset: () => {
         clearFilter()
+        cancelEdit()
     },
 })
 </script>