diff --git a/frontend/src/components/dialogs/NewKeyDialog.vue b/frontend/src/components/dialogs/NewKeyDialog.vue index 0c9af43..3e05f24 100644 --- a/frontend/src/components/dialogs/NewKeyDialog.vue +++ b/frontend/src/components/dialogs/NewKeyDialog.vue @@ -13,6 +13,7 @@ import { NSpace } from 'naive-ui' import useTabStore from 'stores/tab.js' import NewStreamValue from '@/components/new_value/NewStreamValue.vue' import useBrowserStore from 'stores/browser.js' +import Import from '@/components/icons/Import.vue' const i18n = useI18n() const newForm = reactive({ @@ -169,6 +170,11 @@ const onAdd = async () => { const onClose = () => { dialogStore.closeNewKeyDialog() } + +const onImport = () => { + dialogStore.closeNewKeyDialog() + dialogStore.openImportKeyDialog(newForm.server, newForm.db) +} @@ -177,17 +183,11 @@ const onClose = () => { :closable="false" :close-on-esc="false" :mask-closable="false" - :negative-button-props="{ size: 'medium' }" - :negative-text="$t('common.cancel')" - :positive-button-props="{ size: 'medium' }" - :positive-text="$t('common.confirm')" :show-icon="false" :title="$t('dialogue.key.new')" preset="dialog" style="width: 600px" - transform-origin="center" - @positive-click="onAdd" - @negative-click="onClose"> + transform-origin="center"> { + + + + + + + + {{ $t('interface.import_key') }} + + + + + {{ $t('common.cancel') }} + + + {{ $t('common.confirm') }} + + + diff --git a/frontend/src/components/sidebar/BrowserPane.vue b/frontend/src/components/sidebar/BrowserPane.vue index 4c73c89..6244a5e 100644 --- a/frontend/src/components/sidebar/BrowserPane.vue +++ b/frontend/src/components/sidebar/BrowserPane.vue @@ -25,7 +25,6 @@ import More from '@/components/icons/More.vue' import Export from '@/components/icons/Export.vue' import { ConnectionType } from '@/consts/connection_type.js' import Import from '@/components/icons/Import.vue' -import Down from '@/components/icons/Down.vue' import Checkbox from '@/components/icons/Checkbox.vue' import Timer from '@/components/icons/Timer.vue' @@ -65,12 +64,8 @@ const dbSelectOptions = computed(() => { }) }) -const addOptions = computed(() => [ - { key: 'import', label: i18n.t('interface.import_key'), icon: render.renderIcon(Import, { strokeWidth: 3.5 }) }, -]) - const moreOptions = computed(() => [ - // { key: 'import', label: i18n.t('interface.import_key'), icon: render.renderIcon(Import, { strokeWidth: 3.5 }) }, + { key: 'import', label: i18n.t('interface.import_key'), icon: render.renderIcon(Import, { strokeWidth: 3.5 }) }, { key: 'flush', label: i18n.t('interface.flush_db'), icon: render.renderIcon(Delete, { strokeWidth: 3.5 }) }, { key: 'divider', type: 'divider' }, { @@ -271,16 +266,16 @@ watch( - + - - - - - - - diff --git a/frontend/src/langs/en-us.json b/frontend/src/langs/en-us.json index bcbb947..148f3a3 100644 --- a/frontend/src/langs/en-us.json +++ b/frontend/src/langs/en-us.json @@ -79,7 +79,7 @@ "rename_key": "Rename Key", "delete_key": "Delete Key", "batch_delete_key": "Batch Delete Keys", - "import_key": "Import Key", + "import_key": "Import Key(s)", "flush_db": "Flush Database", "check_mode": "Check Mode", "quit_check_mode": "Quit Check Mode",