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