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

refactor: move selectedKey to tab store 

perf: add redis type color in new key type selection
perf: update selection after add new key
This commit is contained in:
tiny-craft 2023-07-21 11:14:40 +08:00
parent 9d897894b6
commit 7d3f5b9d9a
9 changed files with 447 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
backend/services/connection_service.go
View File

@ -5,7 +5,6 @@ import (
"errors"
"fmt"
"github.com/redis/go-redis/v9"
"log"
"strconv"
"strings"
"sync"
@ -548,61 +547,48 @@ func (c *connectionService) SetKeyValue(connName string, db int, key, keyType st
resp.Msg = "invalid hash value"
return
} else {
_, err = rdb.Pipelined(ctx, func(pipe redis.Pipeliner) error {
if len(strs) > 1 {
for i := 0; i < len(strs); i += 2 {
pipe.HSetNX(ctx, key, strs[i].(string), strs[i+1])
}
} else {
pipe.HSet(ctx, key)
if len(strs) > 1 {
kvs := map[string]any{}
for i := 0; i < len(strs); i += 2 {
kvs[strs[i].(string)] = strs[i+1]
}
if expiration > 0 {
pipe.Expire(ctx, key, expiration)
err = rdb.HSet(ctx, key, kvs).Err()
if err == nil && expiration > 0 {
rdb.Expire(ctx, key, expiration)
}
return nil
})
}
}
case "set":
if strs, ok := value.([]any); !ok || len(strs) <= 0 {
resp.Msg = "invalid set value"
return
} else {
_, err = rdb.Pipelined(ctx, func(pipe redis.Pipeliner) error {
for _, str := range strs {
pipe.SAdd(ctx, key, str.(string))
if len(strs) > 0 {
err = rdb.SAdd(ctx, key, strs...).Err()
if err == nil && expiration > 0 {
rdb.Expire(ctx, key, expiration)
}
if expiration > 0 {
pipe.Expire(ctx, key, expiration)
}
return nil
})
}
}
case "zset":
if strs, ok := value.([]any); !ok || len(strs) <= 0 {
resp.Msg = "invalid zset value"
return
} else {
log.Println(strs)
_, err = rdb.Pipelined(ctx, func(pipe redis.Pipeliner) error {
if len(strs) > 1 {
var members []redis.Z
for i := 0; i < len(strs); i += 2 {
score, _ := strconv.ParseFloat(strs[i].(string), 64)
score, _ := strconv.ParseFloat(strs[i+1].(string), 64)
members = append(members, redis.Z{
Score: score,
Member: strs[i+1],
Member: strs[i],
})
}
if len(members) > 0 {
pipe.ZAdd(ctx, key, members...)
} else {
pipe.ZAdd(ctx, key)
err = rdb.ZAdd(ctx, key, members...).Err()
if err == nil && expiration > 0 {
rdb.Expire(ctx, key, expiration)
}
if expiration > 0 {
pipe.Expire(ctx, key, expiration)
}
return nil
})
}
}
}

652
frontend/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

10
frontend/package.json
View File

@ -13,17 +13,17 @@
"highlight.js": "^11.8.0",
"lodash": "^4.17.21",
"pinia": "^2.1.4",
"sass": "^1.63.6",
"sass": "^1.64.0",
"vue": "^3.3.4",
"vue-i18n": "^9.2.2"
},
"devDependencies": {
"@vitejs/plugin-vue": "^4.2.3",
"naive-ui": "^2.34.4",
"prettier": "^2.8.8",
"unplugin-auto-import": "^0.16.4",
"unplugin-icons": "^0.16.3",
"prettier": "^3.0.0",
"unplugin-auto-import": "^0.16.6",
"unplugin-icons": "^0.16.5",
"unplugin-vue-components": "^0.25.1",
"vite": "^4.3.9"
"vite": "^4.4.4"
}
}

2
frontend/package.json.md5
View File

@ -1 +1 @@
5f51299692e0fa4f59808fc597b869bc
a78b05ffa1b32562b864c79d62d5fc2e

44
frontend/src/components/dialogs/NewKeyDialog.vue
View File

@ -1,6 +1,6 @@
<script setup>
import { computed, reactive, ref, watch } from 'vue'
import { types } from '../../consts/support_redis_type'
import { computed, h, reactive, ref, watch } from 'vue'
import { types, typesColor } from '../../consts/support_redis_type'
import useDialog from '../../stores/dialog'
import { isEmpty, keys, map } from 'lodash'
import NewStringValue from '../new_value/NewStringValue.vue'
@ -10,7 +10,8 @@ import NewZSetValue from '../new_value/NewZSetValue.vue'
import NewSetValue from '../new_value/NewSetValue.vue'
import { useI18n } from 'vue-i18n'
import useConnectionStore from '../../stores/connections.js'
import { useMessage } from 'naive-ui'
import { NSpace, useMessage } from 'naive-ui'
import useTabStore from '../../stores/tab.js'
const i18n = useI18n()
const newForm = reactive({
@ -33,7 +34,7 @@ const dbOptions = computed(() =>
map(keys(connectionStore.databases[newForm.server]), (key) => ({
label: key,
value: parseInt(key),
}))
})),
)
const newFormRef = ref(null)
const subFormRef = ref(null)
@ -73,10 +74,32 @@ watch(
newForm.ttl = -1
newForm.value = null
}
}
},
)
const renderTypeLabel = (option) => {
return h(
NSpace,
{ align: 'center', inline: true, size: 3 },
{
default: () => [
h('div', {
style: {
borderRadius: '50%',
backgroundColor: typesColor[option.value],
width: '13px',
height: '13px',
border: '2px solid white',
},
}),
option.value,
],
},
)
}
const connectionStore = useConnectionStore()
const tabStore = useTabStore()
const message = useMessage()
const onAdd = async () => {
await newFormRef.value?.validate().catch((err) => {
@ -92,7 +115,14 @@ const onAdd = async () => {
if (value == null) {
value = defaultValue[type]
}
await connectionStore.setKey(server, db, key, type, value, ttl)
const { success, msg, nodeKey } = await connectionStore.setKey(server, db, key, type, value, ttl)
if (success) {
// select current key
tabStore.setSelectedKeys(server, nodeKey)
connectionStore.loadKeyValue(server, db, key).then(() => {})
} else if (!isEmpty(msg)) {
message.error(msg)
}
dialogStore.closeNewKeyDialog()
} catch (e) {}
}
@ -138,7 +168,7 @@ const onClose = () => {
<n-select v-model:value="newForm.db" :options="dbOptions" />
</n-form-item>
<n-form-item :label="$t('type')" path="type" required>
<n-select v-model:value="newForm.type" :options="options" />
<n-select v-model:value="newForm.type" :options="options" :render-label="renderTypeLabel" />
</n-form-item>
<n-form-item :label="$t('ttl')" required>
<n-input-group>

2
frontend/src/components/new_value/NewZSetValue.vue
View File

@ -29,7 +29,7 @@ const onUpdate = () => {
const val = reject(zset.value, (v) => v == null || isEmpty(v.value))
emit(
'update:value',
flatMap(val, (item) => [item.value, item.score.toString()])
flatMap(val, (item) => [item.value, item.score.toString()]),
)
}

37
frontend/src/components/sidebar/BrowserTree.vue
View File

@ -4,7 +4,7 @@ import { ConnectionType } from '../../consts/connection_type.js'
import { NIcon, NSpace, NTag, useDialog, useMessage } from 'naive-ui'
import Key from '../icons/Key.vue'
import ToggleDb from '../icons/ToggleDb.vue'
import { get, indexOf, isEmpty, remove } from 'lodash'
import { find, get, indexOf, isEmpty, remove } from 'lodash'
import { useI18n } from 'vue-i18n'
import Refresh from '../icons/Refresh.vue'
import CopyLink from '../icons/CopyLink.vue'
@ -21,6 +21,7 @@ import Unlink from '../icons/Unlink.vue'
import Filter from '../icons/Filter.vue'
import Close from '../icons/Close.vue'
import { typesBgColor, typesColor } from '../../consts/support_redis_type.js'
import useTabStore from '../../stores/tab.js'
const props = defineProps({
server: String,
@ -30,10 +31,22 @@ const i18n = useI18n()
const loading = ref(false)
const loadingConnections = ref(false)
const expandedKeys = ref([props.server])
const selectedKeys = ref([props.server])
const connectionStore = useConnectionStore()
const tabStore = useTabStore()
const dialogStore = useDialogStore()
/**
*
* @type {ComputedRef<string[]>}
*/
const selectedKeys = computed(() => {
const tab = find(tabStore.tabList, { name: props.server })
if (tab != null) {
return get(tab, 'selectedKeys', [props.server])
}
return [props.server]
})
const data = computed(() => {
const dbs = get(connectionStore.databases, props.server, [])
return [
@ -233,7 +246,7 @@ const onUpdateSelectedKeys = (keys, options) => {
connectionStore.loadKeyValue(props.server, 0)
}
} finally {
selectedKeys.value = keys
tabStore.setSelectedKeys(props.server, keys)
}
}
@ -245,7 +258,7 @@ const renderPrefix = ({ option }) => {
{ size: 20 },
{
default: () => h(ToggleServer, { modelValue: false }),
}
},
)
case ConnectionType.RedisDB:
return h(
@ -253,7 +266,7 @@ const renderPrefix = ({ option }) => {
{ size: 20 },
{
default: () => h(ToggleDb, { modelValue: option.opened === true }),
}
},
)
case ConnectionType.RedisKey:
return h(
@ -261,7 +274,7 @@ const renderPrefix = ({ option }) => {
{ size: 20 },
{
default: () => h(Layer),
}
},
)
case ConnectionType.RedisValue:
return h(
@ -269,7 +282,7 @@ const renderPrefix = ({ option }) => {
{ size: 20 },
{
default: () => h(Key),
}
},
)
}
}
@ -309,8 +322,8 @@ const renderSuffix = ({ option }) => {
connectionStore.reopenDatabase(server, db)
},
},
{ default: () => typeFilter }
)
{ default: () => typeFilter },
),
)
}
// match pattern tag
@ -328,8 +341,8 @@ const renderSuffix = ({ option }) => {
connectionStore.reopenDatabase(server, db)
},
},
{ default: () => matchPattern }
)
{ default: () => matchPattern },
),
)
}
if (filterNodes.length > 0) {
@ -362,7 +375,7 @@ const nodeProps = ({ option }) => {
contextMenuParam.x = e.clientX
contextMenuParam.y = e.clientY
contextMenuParam.show = true
selectedKeys.value = [option.key]
tabStore.setSelectedKeys(props.server, option.key)
})
},
// onMouseover() {

7
frontend/src/stores/connections.js
View File

@ -525,6 +525,9 @@ const useConnectionStore = defineStore('connections', {
value,
})
return
} else {
// key not exists, remove this key
await this.deleteKey(server, db, key)
}
}
@ -798,7 +801,7 @@ const useConnectionStore = defineStore('connections', {
* @param {string} keyType
* @param {any} value
* @param {number} ttl
* @returns {Promise<{[msg]: string, success: boolean}>}
* @returns {Promise<{[msg]: string, success: boolean, [nodeKey]: {string}}>}
*/
async setKey(connName, db, key, keyType, value, ttl) {
try {
@ -809,7 +812,7 @@ const useConnectionStore = defineStore('connections', {
if (newKey > 0) {
this._tidyNode(connName, db, key)
}
return { success }
return { success, nodeKey: `${connName}/db${db}#${ConnectionType.RedisValue}/${key}` }
} else {
return { success, msg }
}

35
frontend/src/stores/tab.js
View File

@ -7,7 +7,8 @@ const useTabStore = defineStore('tab', {
* @property {string} name connection name
* @property {boolean} blank is blank tab
* @property {string} [title] tab title
* @property {string} [icon] tab title
* @property {string} [icon] tab icon
* @property {string[]} selectedKeys
* @property {string} [type] key type
* @property {Object|Array} [value] key value
* @property {string} [server] server name
@ -51,20 +52,13 @@ const useTabStore = defineStore('tab', {
// }
// return current
},
currentSelectedKeys() {
const tab = this.currentTab()
return get(tab, 'selectedKeys', [])
},
},
actions: {
/**
* create new blank tab to tail
*/
newBlankTab() {
this.tabList.push({
name: Date.now().toString(),
title: 'new tab',
blank: true,
})
this._setActivatedIndex(size(this.tabList) - 1)
},
/**
*
* @param idx
@ -208,6 +202,21 @@ const useTabStore = defineStore('tab', {
this.tabList = []
this._setActivatedIndex(-1, false)
},
/**
*
* @param {string} server
* @param {string|string[]} keys
*/
setSelectedKeys(server, keys) {
if (typeof keys === 'string') {
keys = [keys]
}
let tab = find(this.tabList, { name: server })
if (tab != null) {
tab.selectedKeys = keys
}
},
},
})