lingling
/
tiny-rdm
mirror of https://github.com/tiny-craft/tiny-rdm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: unable to decode json string with prefix or suffix contains space or line break

This commit is contained in:
tiny-craft 2023-11-02 16:27:55 +08:00
parent 37e31b1636
commit 67666f4edf
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/utils/string/convert.go
View File

@ -117,10 +117,11 @@ func autoDecode(str string) (value, resultDecode string) {
return return
} }
if value, ok = decodeDeflate(str); ok { // FIXME: skip decompress with deflate due to incorrect format checking
resultDecode = types.DECODE_DEFLATE //if value, ok = decodeDeflate(str); ok {
return // resultDecode = types.DECODE_DEFLATE
} // return
//}
if value, ok = decodeZStd(str); ok { if value, ok = decodeZStd(str); ok {
resultDecode = types.DECODE_ZSTD resultDecode = types.DECODE_ZSTD
@ -202,6 +203,7 @@ func autoViewAs(str string) (value, resultFormat string) {
} }
func decodeJson(str string) (string, bool) { func decodeJson(str string) (string, bool) {
str = strings.TrimSpace(str)
if (strings.HasPrefix(str, "{") && strings.HasSuffix(str, "}")) || if (strings.HasPrefix(str, "{") && strings.HasSuffix(str, "}")) ||
(strings.HasPrefix(str, "[") && strings.HasSuffix(str, "]")) { (strings.HasPrefix(str, "[") && strings.HasSuffix(str, "]")) {
var out bytes.Buffer var out bytes.Buffer

16
frontend/src/components/content_value/DropdownSelector.vue
View File

@ -91,4 +91,18 @@ const onDropdownShow = (show) => {
</n-dropdown> </n-dropdown>
</template> </template>
<style lang="scss" scoped></style> <style lang="scss">
.type-selector-header {
height: 30px;
line-height: 30px;
font-size: 15px;
font-weight: bold;
text-align: center;
padding: 0 10px;
}
.type-selector-item {
min-width: 100px;
text-align: center;
}
</style>

13
frontend/src/styles/style.scss
View File

@ -121,19 +121,6 @@ body {
padding-right: 10px; padding-right: 10px;
} }
.type-selector-header {
height: 30px;
line-height: 30px;
font-size: 15px;
font-weight: bold;
text-align: center;
}
.type-selector-item {
min-width: 100px;
text-align: center;
}
.nav-pane-container { .nav-pane-container {
overflow: hidden; overflow: hidden;