Skip to content

Commit 6996421

Browse files
committed
fix: can not save scan size less than default value in preference
fix: incorrect delete pattern when flush database with any key selected
1 parent 5a29a34 commit 6996421

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

backend/storage/preferences.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ func (p *PreferencesStorage) GetPreferences() (ret types.Preferences) {
4646
defer p.mutex.Unlock()
4747

4848
ret = p.getPreferences()
49-
ret.General.ScanSize = max(ret.General.ScanSize, consts.DEFAULT_SCAN_SIZE)
49+
if ret.General.ScanSize <= 0 {
50+
ret.General.ScanSize = consts.DEFAULT_SCAN_SIZE
51+
}
5052
ret.Behavior.AsideWidth = max(ret.Behavior.AsideWidth, consts.DEFAULT_ASIDE_WIDTH)
5153
ret.Behavior.WindowWidth = max(ret.Behavior.WindowWidth, consts.MIN_WINDOW_WIDTH)
5254
ret.Behavior.WindowHeight = max(ret.Behavior.WindowHeight, consts.MIN_WINDOW_HEIGHT)

frontend/src/components/sidebar/BrowserTree.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,9 @@ const handleSelectContextMenu = (key) => {
259259
resetExpandKey(props.server, db, true)
260260
connectionStore.closeDatabase(props.server, db)
261261
break
262+
case 'db_flush':
263+
dialogStore.openDeleteKeyDialog(props.server, db, '*')
264+
break
262265
case 'db_newkey':
263266
case 'key_newkey':
264267
dialogStore.openNewKeyDialog(redisKey, props.server, db)
@@ -548,7 +551,7 @@ const getDatabaseMenu = (opened, loading, end) => {
548551
tTooltip: 'interface.batch_delete',
549552
icon: Delete,
550553
disabled: loading === true,
551-
onClick: () => handleSelectContextMenu('key_remove'),
554+
onClick: () => handleSelectContextMenu('db_flush'),
552555
}),
553556
// h(IconButton, {
554557
// tTooltip: 'interface.more_action',

0 commit comments

Comments
 (0)