Compare commits
No commits in common. "f8ef25a3235625a35a5ccaf981804e9c2abb78b1" and "3a799b7b4adc3e77c43a9b902809799d10ad1844" have entirely different histories.
f8ef25a323
...
3a799b7b4a
|
@ -3,7 +3,6 @@ package convutil
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"strconv"
|
|
||||||
"strings"
|
"strings"
|
||||||
"unicode"
|
"unicode"
|
||||||
"unicode/utf16"
|
"unicode/utf16"
|
||||||
|
@ -22,7 +21,7 @@ func (UnicodeJsonConvert) Decode(str string) (string, bool) {
|
||||||
(strings.HasPrefix(trimedStr, "[") && strings.HasSuffix(trimedStr, "]")) {
|
(strings.HasPrefix(trimedStr, "[") && strings.HasSuffix(trimedStr, "]")) {
|
||||||
var out bytes.Buffer
|
var out bytes.Buffer
|
||||||
if err := json.Indent(&out, []byte(trimedStr), "", " "); err == nil {
|
if err := json.Indent(&out, []byte(trimedStr), "", " "); err == nil {
|
||||||
if quoteStr, ok := UnquoteUnicodeJson(out.Bytes()); ok {
|
if quoteStr, ok := UnquoteUnicodeJson([]byte(trimedStr)); ok {
|
||||||
return string(quoteStr), true
|
return string(quoteStr), true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -51,7 +50,9 @@ func UnquoteUnicodeJson(s []byte) ([]byte, bool) {
|
||||||
if s[r+offset] == '"' && s[r+offset-1] != '\\' {
|
if s[r+offset] == '"' && s[r+offset-1] != '\\' {
|
||||||
offset += 1
|
offset += 1
|
||||||
if ub, ok := unquoteBytes(s[r : r+offset]); ok {
|
if ub, ok := unquoteBytes(s[r : r+offset]); ok {
|
||||||
unquoted.WriteString(strconv.Quote(string(ub)))
|
unquoted.WriteByte('"')
|
||||||
|
unquoted.Write(ub)
|
||||||
|
unquoted.WriteByte('"')
|
||||||
} else {
|
} else {
|
||||||
return nil, false
|
return nil, false
|
||||||
}
|
}
|
||||||
|
|
|
@ -652,11 +652,7 @@ const clientTableColumns = computed(() => {
|
||||||
:label="$t('status.connected_clients')"
|
:label="$t('status.connected_clients')"
|
||||||
:value="get(serverInfo, 'Clients.connected_clients', '0')">
|
:value="get(serverInfo, 'Clients.connected_clients', '0')">
|
||||||
<template #suffix>
|
<template #suffix>
|
||||||
<n-tooltip
|
<n-tooltip trigger="click" width="70vw" @update-show="onShowClients">
|
||||||
:content-style="{ backgroundColor: themeVars.tableColor }"
|
|
||||||
trigger="click"
|
|
||||||
width="70vw"
|
|
||||||
@update-show="onShowClients">
|
|
||||||
<template #trigger>
|
<template #trigger>
|
||||||
<n-button :bordered="false" size="small">↘</n-button>
|
<n-button :bordered="false" size="small">↘</n-button>
|
||||||
</template>
|
</template>
|
||||||
|
|
Loading…
Reference in New Issue