Compare commits

..

No commits in common. "e92eb525e72ce60af00ed18ca0136e960b34f9cc" and "74a6b9b0e17ba69d5cd9a73f690691e94d6d4d8e" have entirely different histories.

16 changed files with 13 additions and 278 deletions

View File

@ -591,12 +591,7 @@ func (b *browserService) GetKeyType(param types.KeySummaryParam) (resp types.JSR
} }
var data types.KeySummary var data types.KeySummary
switch keyType { data.Type = strings.ToLower(keyType)
case "ReJSON-RL":
data.Type = "JSON"
default:
data.Type = strings.ToLower(keyType)
}
resp.Success = true resp.Success = true
resp.Data = data resp.Data = data
@ -629,7 +624,7 @@ func (b *browserService) GetKeySummary(param types.KeySummaryParam) (resp types.
} }
size, _ := client.MemoryUsage(ctx, key, 0).Result() size, _ := client.MemoryUsage(ctx, key, 0).Result()
data := types.KeySummary{ data := types.KeySummary{
Type: typeVal.Val(), Type: strings.ToLower(typeVal.Val()),
Size: size, Size: size,
} }
if data.Type == "none" { if data.Type == "none" {
@ -660,9 +655,6 @@ func (b *browserService) GetKeySummary(param types.KeySummaryParam) (resp types.
data.Length, err = client.ZCard(ctx, key).Result() data.Length, err = client.ZCard(ctx, key).Result()
case "stream": case "stream":
data.Length, err = client.XLen(ctx, key).Result() data.Length, err = client.XLen(ctx, key).Result()
case "ReJSON-RL":
data.Type = "JSON"
data.Length = 0
default: default:
err = errors.New("unknown key type") err = errors.New("unknown key type")
} }
@ -1099,12 +1091,6 @@ func (b *browserService) GetKeyDetail(param types.KeyDetailParam) (resp types.JS
resp.Msg = err.Error() resp.Msg = err.Error()
return return
} }
case "rejson-rl":
var jsonStr string
data.KeyType = "JSON"
jsonStr, err = client.JSONGet(ctx, key).Result()
data.Value, data.Decode, data.Format = convutil.ConvertTo(jsonStr, types.DECODE_NONE, types.FORMAT_JSON, nil)
} }
if err != nil { if err != nil {
resp.Msg = err.Error() resp.Msg = err.Error()
@ -1249,11 +1235,6 @@ func (b *browserService) SetKeyValue(param types.SetKeyParam) (resp types.JSResp
} }
} }
} }
case "json":
err = client.JSONSet(ctx, key, ".", param.Value).Err()
if err == nil && expiration > 0 {
client.Expire(ctx, key, expiration)
}
} }
if err != nil { if err != nil {

View File

@ -144,6 +144,9 @@ func (c *connectionService) buildOption(config types.ConnectionConfig) (*redis.O
option.Addr = fmt.Sprintf("%s:%d", config.Addr, config.Port) option.Addr = fmt.Sprintf("%s:%d", config.Addr, config.Port)
} }
} }
if config.LastDB > 0 {
option.DB = config.LastDB
}
if sshClient != nil { if sshClient != nil {
option.Dialer = func(ctx context.Context, network, addr string) (net.Conn, error) { option.Dialer = func(ctx context.Context, network, addr string) (net.Conn, error) {
return sshClient.Dial(network, addr) return sshClient.Dial(network, addr)
@ -178,10 +181,6 @@ func (c *connectionService) createRedisClient(config types.ConnectionConfig) (re
option.Password = config.Sentinel.Password option.Password = config.Sentinel.Password
} }
if config.LastDB > 0 {
option.DB = config.LastDB
}
rdb := redis.NewClient(option) rdb := redis.NewClient(option)
if config.Cluster.Enable { if config.Cluster.Enable {
// connect to cluster // connect to cluster

View File

@ -21,7 +21,7 @@ type ConnectionConfig struct {
KeyView int `json:"keyView,omitempty" yaml:"key_view,omitempty"` KeyView int `json:"keyView,omitempty" yaml:"key_view,omitempty"`
LoadSize int `json:"loadSize,omitempty" yaml:"load_size,omitempty"` LoadSize int `json:"loadSize,omitempty" yaml:"load_size,omitempty"`
MarkColor string `json:"markColor,omitempty" yaml:"mark_color,omitempty"` MarkColor string `json:"markColor,omitempty" yaml:"mark_color,omitempty"`
RefreshInterval int `json:"refreshInterval,omitempty" yaml:"refresh_interval,omitempty"` RefreshInterval int `json:"refreshInterval,omitempty" yaml:"refreshInterval,omitempty"`
Alias map[int]string `json:"alias,omitempty" yaml:"alias,omitempty"` Alias map[int]string `json:"alias,omitempty" yaml:"alias,omitempty"`
SSL ConnectionSSL `json:"ssl,omitempty" yaml:"ssl,omitempty"` SSL ConnectionSSL `json:"ssl,omitempty" yaml:"ssl,omitempty"`
SSH ConnectionSSH `json:"ssh,omitempty" yaml:"ssh,omitempty"` SSH ConnectionSSH `json:"ssh,omitempty" yaml:"ssh,omitempty"`
@ -48,10 +48,10 @@ type ConnectionDB struct {
type ConnectionSSL struct { type ConnectionSSL struct {
Enable bool `json:"enable,omitempty" yaml:"enable,omitempty"` Enable bool `json:"enable,omitempty" yaml:"enable,omitempty"`
KeyFile string `json:"keyFile,omitempty" yaml:"keyfile,omitempty"` KeyFile string `json:"keyFile,omitempty" yaml:"keyFile,omitempty"`
CertFile string `json:"certFile,omitempty" yaml:"certfile,omitempty"` CertFile string `json:"certFile,omitempty" yaml:"certFile,omitempty"`
CAFile string `json:"caFile,omitempty" yaml:"cafile,omitempty"` CAFile string `json:"caFile,omitempty" yaml:"caFile,omitempty"`
AllowInsecure bool `json:"allowInsecure,omitempty" yaml:"allow_insecure,omitempty"` AllowInsecure bool `json:"allowInsecure,omitempty" yaml:"allowInsecure,omitempty"`
SNI string `json:"sni,omitempty" yaml:"sni,omitempty"` SNI string `json:"sni,omitempty" yaml:"sni,omitempty"`
} }

View File

@ -30,7 +30,6 @@ func NewPreferences() Preferences {
ShowLineNum: true, ShowLineNum: true,
ShowFolding: true, ShowFolding: true,
DropText: true, DropText: true,
Links: true,
}, },
Cli: PreferencesCli{ Cli: PreferencesCli{
FontSize: consts.DEFAULT_FONT_SIZE, FontSize: consts.DEFAULT_FONT_SIZE,
@ -70,7 +69,6 @@ type PreferencesEditor struct {
ShowLineNum bool `json:"showLineNum" yaml:"show_line_num"` ShowLineNum bool `json:"showLineNum" yaml:"show_line_num"`
ShowFolding bool `json:"showFolding" yaml:"show_folding"` ShowFolding bool `json:"showFolding" yaml:"show_folding"`
DropText bool `json:"dropText" yaml:"drop_text"` DropText bool `json:"dropText" yaml:"drop_text"`
Links bool `json:"links" yaml:"links"`
} }
type PreferencesCli struct { type PreferencesCli struct {

View File

@ -56,7 +56,6 @@ onMounted(async () => {
theme: pref.isDark ? 'rdm-dark' : 'rdm-light', theme: pref.isDark ? 'rdm-dark' : 'rdm-light',
language: props.language, language: props.language,
lineNumbers: pref.showLineNum ? 'on' : 'off', lineNumbers: pref.showLineNum ? 'on' : 'off',
links: pref.editorLinks,
readOnly: readonlyValue.value, readOnly: readonlyValue.value,
colorDecorators: true, colorDecorators: true,
accessibilitySupport: 'off', accessibilitySupport: 'off',
@ -146,7 +145,7 @@ watch(
watch( watch(
() => pref.editor, () => pref.editor,
({ showLineNum = true, showFolding = true, dropText = true, links = true }) => { ({ showLineNum = true, showFolding = true, dropText = true }) => {
if (editorNode != null) { if (editorNode != null) {
const { fontSize, fontFamily } = pref.editorFont const { fontSize, fontFamily } = pref.editorFont
editorNode.updateOptions({ editorNode.updateOptions({
@ -155,7 +154,6 @@ watch(
lineNumbers: showLineNum ? 'on' : 'off', lineNumbers: showLineNum ? 'on' : 'off',
folding: showFolding, folding: showFolding,
dragAndDrop: dropText, dragAndDrop: dropText,
links,
}) })
} }
}, },

View File

@ -1,177 +0,0 @@
<script setup>
import { computed, ref } from 'vue'
import { useI18n } from 'vue-i18n'
import Copy from '@/components/icons/Copy.vue'
import Save from '@/components/icons/Save.vue'
import { useThemeVars } from 'naive-ui'
import { types as redisTypes } from '@/consts/support_redis_type.js'
import { ClipboardSetText } from 'wailsjs/runtime/runtime.js'
import { isEmpty, toLower } from 'lodash'
import useBrowserStore from 'stores/browser.js'
import { decodeRedisKey } from '@/utils/key_convert.js'
import ContentEditor from '@/components/content_value/ContentEditor.vue'
import { decodeTypes, formatTypes } from '@/consts/value_view_type.js'
import { formatBytes } from '@/utils/byte_convert.js'
const props = defineProps({
name: String,
db: Number,
keyPath: String,
keyCode: {
type: Array,
default: null,
},
ttl: {
type: Number,
default: -1,
},
value: String,
size: Number,
length: Number,
loading: Boolean,
})
const i18n = useI18n()
const themeVars = useThemeVars()
/**
*
* @type {ComputedRef<string|number[]>}
*/
const keyName = computed(() => {
return !isEmpty(props.keyCode) ? props.keyCode : props.keyPath
})
const keyType = redisTypes.JSON
const editingContent = ref('')
const displayValue = computed(() => {
if (props.loading) {
return ''
}
return decodeRedisKey(props.value)
})
const enableSave = computed(() => {
return editingContent.value !== displayValue.value && !props.loading
})
const showMemoryUsage = computed(() => {
return !isNaN(props.size) && props.size > 0
})
/**
* Copy value
*/
const onCopyValue = () => {
ClipboardSetText(displayValue.value)
.then((succ) => {
if (succ) {
$message.success(i18n.t('interface.copy_succ'))
}
})
.catch((e) => {
$message.error(e.message)
})
}
/**
* Save value
*/
const browserStore = useBrowserStore()
const saving = ref(false)
const onInput = (content) => {
editingContent.value = content
}
const onSave = async () => {
saving.value = true
try {
const { success, msg } = await browserStore.setKey({
server: props.name,
db: props.db,
key: keyName.value,
keyType: toLower(keyType),
value: editingContent.value,
ttl: -1,
format: formatTypes.JSON,
decode: decodeTypes.NONE,
})
if (success) {
$message.success(i18n.t('interface.save_value_succ'))
} else {
$message.error(msg)
}
} catch (e) {
$message.error(e.message)
} finally {
saving.value = false
}
}
defineExpose({
reset: () => {
editingContent.value = ''
},
})
</script>
<template>
<div class="content-wrapper flex-box-v">
<slot name="toolbar" />
<div class="tb2 value-item-part flex-box-h">
<div class="flex-item-expand"></div>
<n-button-group>
<n-button :disabled="saving" :focusable="false" @click="onCopyValue">
<template #icon>
<n-icon :component="Copy" size="18" />
</template>
{{ $t('interface.copy_value') }}
</n-button>
<n-button
:disabled="!enableSave"
:loading="saving"
:secondary="enableSave"
:type="enableSave ? 'primary' : ''"
@click="onSave">
<template #icon>
<n-icon :component="Save" size="18" />
</template>
{{ $t('common.save') }}
</n-button>
</n-button-group>
</div>
<div class="value-wrapper value-item-part flex-item-expand flex-box-v">
<n-spin :show="props.loading" />
<content-editor
v-show="!props.loading"
:content="displayValue"
:loading="props.loading"
class="flex-item-expand"
language="json"
style="height: 100%"
@input="onInput"
@reset="onInput"
@save="onSave" />
</div>
<div class="value-footer flex-box-h">
<n-text v-if="showMemoryUsage">{{ $t('interface.memory_usage') }}: {{ formatBytes(props.size) }}</n-text>
<div class="flex-item-expand" />
</div>
</div>
</template>
<style lang="scss" scoped>
.value-wrapper {
//overflow: hidden;
border-top: v-bind('themeVars.borderColor') 1px solid;
padding: 5px;
}
.value-footer {
border-top: v-bind('themeVars.borderColor') 1px solid;
background-color: v-bind('themeVars.tableHeaderColor');
}
</style>

View File

@ -14,7 +14,6 @@ import useDialogStore from 'stores/dialog.js'
import { decodeTypes, formatTypes } from '@/consts/value_view_type.js' import { decodeTypes, formatTypes } from '@/consts/value_view_type.js'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import ContentToolbar from '@/components/content_value/ContentToolbar.vue' import ContentToolbar from '@/components/content_value/ContentToolbar.vue'
import ContentValueJson from '@/components/content_value/ContentValueJson.vue'
const themeVars = useThemeVars() const themeVars = useThemeVars()
const browserStore = useBrowserStore() const browserStore = useBrowserStore()
@ -67,7 +66,6 @@ const valueComponents = {
[redisTypes.SET]: ContentValueSet, [redisTypes.SET]: ContentValueSet,
[redisTypes.ZSET]: ContentValueZset, [redisTypes.ZSET]: ContentValueZset,
[redisTypes.STREAM]: ContentValueStream, [redisTypes.STREAM]: ContentValueStream,
[redisTypes.JSON]: ContentValueJson,
} }
const keyName = computed(() => { const keyName = computed(() => {

View File

@ -164,16 +164,6 @@ const onSaveConnection = async () => {
} }
}) })
// trim addr by network type
if (get(generalForm.value, 'network', 'tcp') === 'unix') {
generalForm.value.network = 'unix'
generalForm.value.addr = ''
generalForm.value.port = 0
} else {
generalForm.value.network = ''
generalForm.value.sock = ''
}
// trim advance data // trim advance data
if (get(generalForm.value, 'dbFilterType', 'none') === 'none') { if (get(generalForm.value, 'dbFilterType', 'none') === 'none') {
generalForm.value.dbFilterList = [] generalForm.value.dbFilterList = []

View File

@ -14,7 +14,6 @@ import useTabStore from 'stores/tab.js'
import NewStreamValue from '@/components/new_value/NewStreamValue.vue' import NewStreamValue from '@/components/new_value/NewStreamValue.vue'
import useBrowserStore from 'stores/browser.js' import useBrowserStore from 'stores/browser.js'
import Import from '@/components/icons/Import.vue' import Import from '@/components/icons/Import.vue'
import NewJsonValue from '@/components/new_value/NewJsonValue.vue'
const i18n = useI18n() const i18n = useI18n()
const newForm = reactive({ const newForm = reactive({
@ -55,7 +54,6 @@ const newValueComponent = {
[types.SET]: NewSetValue, [types.SET]: NewSetValue,
[types.ZSET]: NewZSetValue, [types.ZSET]: NewZSetValue,
[types.STREAM]: NewStreamValue, [types.STREAM]: NewStreamValue,
[types.JSON]: NewJsonValue,
} }
const defaultValue = { const defaultValue = {
[types.STRING]: '', [types.STRING]: '',
@ -64,7 +62,6 @@ const defaultValue = {
[types.SET]: [], [types.SET]: [],
[types.ZSET]: [], [types.ZSET]: [],
[types.STREAM]: [], [types.STREAM]: [],
[types.JSON]: '{}',
} }
const dialogStore = useDialog() const dialogStore = useDialog()

View File

@ -301,11 +301,6 @@ const onClose = () => {
{{ $t('preferences.editor.drop_text') }} {{ $t('preferences.editor.drop_text') }}
</n-checkbox> </n-checkbox>
</n-form-item-gi> </n-form-item-gi>
<n-form-item-gi :show-feedback="false" :show-label="false" :span="24">
<n-checkbox v-model:checked="prefStore.editor.links">
{{ $t('preferences.editor.links') }}
</n-checkbox>
</n-form-item-gi>
</n-grid> </n-grid>
</n-form> </n-form>
</n-tab-pane> </n-tab-pane>

View File

@ -1,20 +0,0 @@
<script setup>
const props = defineProps({
value: String,
})
const emit = defineEmits(['update:value'])
</script>
<template>
<n-form-item :label="$t('common.value')">
<n-input
:rows="6"
:value="props.value"
placeholder=""
type="textarea"
@input="(val) => emit('update:value', val)" />
</n-form-item>
</template>
<style lang="scss" scoped></style>

View File

@ -9,7 +9,6 @@ export const types = {
SET: 'SET', SET: 'SET',
ZSET: 'ZSET', ZSET: 'ZSET',
STREAM: 'STREAM', STREAM: 'STREAM',
JSON: 'JSON',
} }
export const typesShortName = { export const typesShortName = {
@ -19,7 +18,6 @@ export const typesShortName = {
SET: 'E', SET: 'E',
ZSET: 'Z', ZSET: 'Z',
STREAM: 'X', STREAM: 'X',
JSON: 'J',
} }
/** /**
@ -33,7 +31,6 @@ export const typesColor = {
[types.SET]: '#F59E0B', [types.SET]: '#F59E0B',
[types.ZSET]: '#EF4444', [types.ZSET]: '#EF4444',
[types.STREAM]: '#EC4899', [types.STREAM]: '#EC4899',
[types.JSON]: '#374254',
} }
/** /**
@ -47,7 +44,6 @@ export const typesBgColor = {
[types.SET]: '#FDF1DF', [types.SET]: '#FDF1DF',
[types.ZSET]: '#FAEAED', [types.ZSET]: '#FAEAED',
[types.STREAM]: '#FDE6F1', [types.STREAM]: '#FDE6F1',
[types.JSON]: '#C1C1D3',
} }
// export const typesName = Object.fromEntries(Object.entries(types).map(([key, value]) => [key, value.name])) // export const typesName = Object.fromEntries(Object.entries(types).map(([key, value]) => [key, value.name]))

View File

@ -55,8 +55,7 @@
"name": "Editor", "name": "Editor",
"show_linenum": "Show Line Numbers", "show_linenum": "Show Line Numbers",
"show_folding": "Enable Code Folding", "show_folding": "Enable Code Folding",
"drop_text": "Allow Drag and Drop Text", "drop_text": "Allow Drag and Drop Text"
"links": "Support links"
}, },
"cli": { "cli": {
"name": "Command Line", "name": "Command Line",

View File

@ -55,8 +55,7 @@
"name": "编辑器", "name": "编辑器",
"show_linenum": "显示行号", "show_linenum": "显示行号",
"show_folding": "启用代码折叠", "show_folding": "启用代码折叠",
"drop_text": "允许拖放文本", "drop_text": "允许拖放文本"
"links": "支持连接跳转"
}, },
"cli": { "cli": {
"name": "命令行", "name": "命令行",

View File

@ -59,7 +59,6 @@ const usePreferencesStore = defineStore('preferences', {
showLineNum: true, showLineNum: true,
showFolding: true, showFolding: true,
dropText: true, dropText: true,
links: true,
}, },
cli: { cli: {
fontFamily: [], fontFamily: [],
@ -260,10 +259,6 @@ const usePreferencesStore = defineStore('preferences', {
return get(this.editor, 'dropText', true) return get(this.editor, 'dropText', true)
}, },
editorLinks() {
return get(this.editor, 'links', true)
},
keyIconType() { keyIconType() {
return get(this.general, 'keyIconStyle', typesIconStyle.SHORT) return get(this.general, 'keyIconStyle', typesIconStyle.SHORT)
}, },
@ -297,10 +292,6 @@ const usePreferencesStore = defineStore('preferences', {
if (dropText === undefined) { if (dropText === undefined) {
set(data, 'editor.dropText', true) set(data, 'editor.dropText', true)
} }
const links = get(data, 'editor.links')
if (links === undefined) {
set(data, 'editor.links', true)
}
i18nGlobal.locale.value = this.currentLanguage i18nGlobal.locale.value = this.currentLanguage
} }
}, },

View File

@ -3,7 +3,6 @@ import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker'
import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker' import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'
import cssWorker from 'monaco-editor/esm/vs/language/css/css.worker?worker' import cssWorker from 'monaco-editor/esm/vs/language/css/css.worker?worker'
import htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker' import htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker'
import { BrowserOpenURL } from 'wailsjs/runtime/runtime.js'
export const setupMonaco = () => { export const setupMonaco = () => {
window.MonacoEnvironment = { window.MonacoEnvironment = {
@ -41,12 +40,4 @@ export const setupMonaco = () => {
rules: [], rules: [],
colors: {}, colors: {},
}) })
// register default link opening behavior
monaco.editor.registerLinkOpener({
open(resource) {
BrowserOpenURL(resource.toString())
return true
},
})
} }