Merge branch 'main' of https://github.com/Heavrnl/nexus-terminal
This commit is contained in:
Baobhan Sith
@@ -1,5 +1,5 @@
|
||||
<script setup lang="ts">
|
||||
import { ref, Teleport, nextTick } from 'vue';
|
||||
import { ref, Teleport, nextTick, type Ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { ConnectionInfo } from '../stores/connections.store'; // Keep ConnectionInfo type
|
||||
import { useAddConnectionForm } from '../composables/useAddConnectionForm';
|
||||
@@ -34,10 +34,14 @@ const {
|
||||
submitButtonText,
|
||||
proxies,
|
||||
tags,
|
||||
connections,
|
||||
isProxyLoading,
|
||||
proxyStoreError,
|
||||
isTagLoading,
|
||||
tagStoreError,
|
||||
advancedConnectionMode,
|
||||
addJumpHost,
|
||||
removeJumpHost,
|
||||
handleSubmit,
|
||||
handleDeleteConnection,
|
||||
handleTestConnection,
|
||||
@@ -47,6 +51,10 @@ const {
|
||||
testButtonText,
|
||||
} = useAddConnectionForm(props, emit);
|
||||
|
||||
const handleAdvancedConnectionModeUpdate = (newMode: 'proxy' | 'jump') => {
|
||||
advancedConnectionMode.value = newMode;
|
||||
};
|
||||
|
||||
// Tooltip state and refs - Kept in component as it's purely view-related
|
||||
const showHostTooltip = ref(false);
|
||||
const hostTooltipStyle = ref({});
|
||||
@@ -104,14 +112,19 @@ const handleHostIconMouseLeave = () => {
|
||||
:form-data="formData"
|
||||
:proxies="proxies"
|
||||
:tags="tags"
|
||||
:connections="connections"
|
||||
:is-proxy-loading="isProxyLoading"
|
||||
:proxy-store-error="proxyStoreError"
|
||||
:is-tag-loading="isTagLoading"
|
||||
:tag-store-error="tagStoreError"
|
||||
:advanced-connection-mode="advancedConnectionMode"
|
||||
@update:advancedConnectionMode="handleAdvancedConnectionModeUpdate"
|
||||
:add-jump-host="addJumpHost"
|
||||
:remove-jump-host="removeJumpHost"
|
||||
@create-tag="handleCreateTag"
|
||||
@delete-tag="handleDeleteTag"
|
||||
/>
|
||||
</template> <!-- End of v-if="!isScriptModeActive" -->
|
||||
</template>
|
||||
|
||||
<!-- Script Mode Section Toggle -->
|
||||
<div v-if="!isEditMode" class="space-y-4 p-4 border border-border rounded-md bg-header/30 mt-6">
|
||||
|
||||
@@ -1,33 +1,48 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, watch, type Ref, type PropType } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import TagInput from './TagInput.vue'; // Assuming TagInput is used here
|
||||
import type { ProxyInfo } from '../stores/proxies.store'; // Corrected Proxy to ProxyInfo
|
||||
import type { TagInfo } from '../stores/tags.store'; // Corrected Tag to TagInfo
|
||||
import TagInput from './TagInput.vue';
|
||||
import type { ProxyInfo } from '../stores/proxies.store';
|
||||
import type { TagInfo } from '../stores/tags.store';
|
||||
import type { ConnectionInfo } from '../stores/connections.store';
|
||||
|
||||
// Define Props.
|
||||
const props = defineProps<{
|
||||
// Define Props
|
||||
const props = defineProps({
|
||||
formData: {
|
||||
type: 'SSH' | 'RDP' | 'VNC'; // Needed to conditionally show proxy selector
|
||||
proxy_id: number | null;
|
||||
tag_ids: number[];
|
||||
notes: string;
|
||||
};
|
||||
proxies: ProxyInfo[]; // List of available proxies
|
||||
tags: TagInfo[]; // List of available tags
|
||||
isProxyLoading: boolean;
|
||||
proxyStoreError: string | null;
|
||||
isTagLoading: boolean;
|
||||
tagStoreError: string | null;
|
||||
}>();
|
||||
type: Object as PropType<{
|
||||
id?: number;
|
||||
type: 'SSH' | 'RDP' | 'VNC';
|
||||
proxy_id: number | null;
|
||||
jump_chain: Array<number | null> | null;
|
||||
proxy_type?: 'proxy' | 'jump' | null;
|
||||
tag_ids: number[];
|
||||
notes: string;
|
||||
}>,
|
||||
required: true
|
||||
},
|
||||
proxies: { type: Array as PropType<ProxyInfo[]>, required: true },
|
||||
connections: { type: Array as PropType<ConnectionInfo[]>, required: true },
|
||||
tags: { type: Array as PropType<TagInfo[]>, required: true },
|
||||
isProxyLoading: { type: Boolean, required: true },
|
||||
proxyStoreError: { type: String as PropType<string | null>, required: false, default: null },
|
||||
isTagLoading: { type: Boolean, required: true },
|
||||
tagStoreError: { type: String as PropType<string | null>, required: false, default: null },
|
||||
advancedConnectionMode: { type: String as PropType<'proxy' | 'jump'>, required: true },
|
||||
addJumpHost: { type: Function as PropType<() => void>, required: true },
|
||||
removeJumpHost: { type: Function as PropType<(index: number) => void>, required: true },
|
||||
isEditMode: { type: Boolean, default: false }
|
||||
});
|
||||
|
||||
// Define Emits for tag creation and deletion
|
||||
// Define Emits
|
||||
const emit = defineEmits<{
|
||||
(e: 'create-tag', tagName: string): void;
|
||||
(e: 'delete-tag', tagId: number): void;
|
||||
(e: 'update:advancedConnectionMode', mode: 'proxy' | 'jump'): void;
|
||||
}>();
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
|
||||
const handleCreateTagEvent = (tagName: string) => {
|
||||
emit('create-tag', tagName);
|
||||
};
|
||||
@@ -35,6 +50,23 @@ const handleCreateTagEvent = (tagName: string) => {
|
||||
const handleDeleteTagEvent = (tagId: number) => {
|
||||
emit('delete-tag', tagId);
|
||||
};
|
||||
|
||||
const setConnectionMode = (mode: 'proxy' | 'jump') => {
|
||||
if (props.advancedConnectionMode === mode) return; // Access directly
|
||||
emit('update:advancedConnectionMode', mode);
|
||||
|
||||
};
|
||||
|
||||
|
||||
const getAvailableJumpHostsForIndex = (currentIndex: number): ConnectionInfo[] => {
|
||||
return props.connections.filter(conn => {
|
||||
if (conn.type !== 'SSH') return false;
|
||||
if (props.isEditMode && props.formData.id === conn.id) return false;
|
||||
return !props.formData.jump_chain?.some((jumpHostId, index) => {
|
||||
return index !== currentIndex && jumpHostId === conn.id;
|
||||
});
|
||||
});
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@@ -42,8 +74,31 @@ const handleDeleteTagEvent = (tagId: number) => {
|
||||
<div class="space-y-4 p-4 border border-border rounded-md bg-header/30">
|
||||
<h4 class="text-base font-semibold mb-3 pb-2 border-b border-border/50">{{ t('connections.form.sectionAdvanced', '高级选项') }}</h4>
|
||||
|
||||
<!-- Proxy Select - Show only for SSH -->
|
||||
<!-- Connection Mode Switcher (Only for SSH) -->
|
||||
<div v-if="props.formData.type === 'SSH'">
|
||||
<label class="block text-sm font-medium text-text-secondary mb-1">{{ t('connections.form.connectionMode', '连接方式') }}</label>
|
||||
<div class="flex rounded-md shadow-sm mb-4">
|
||||
<button
|
||||
type="button"
|
||||
@click="setConnectionMode('proxy')"
|
||||
:class="['flex-1 px-3 py-2 border border-border text-sm font-medium focus:outline-none rounded-l-md',
|
||||
props.advancedConnectionMode === 'proxy' ? 'bg-primary text-white' : 'bg-background text-foreground hover:bg-border']"
|
||||
>
|
||||
{{ t('connections.form.connectionModeProxy', '代理') }}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
@click="setConnectionMode('jump')"
|
||||
:class="['flex-1 px-3 py-2 border-t border-b border-r border-border text-sm font-medium focus:outline-none -ml-px rounded-r-md',
|
||||
props.advancedConnectionMode === 'jump' ? 'bg-primary text-white' : 'bg-background text-foreground hover:bg-border']"
|
||||
>
|
||||
{{ t('connections.form.connectionModeJumpHost', '跳板机') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Proxy Select - Show only for SSH and if 'proxy' mode is selected -->
|
||||
<div v-if="props.formData.type === 'SSH' && props.advancedConnectionMode === 'proxy'">
|
||||
<label for="conn-proxy" class="block text-sm font-medium text-text-secondary mb-1">{{ t('connections.form.proxy') }} ({{ t('connections.form.optional') }})</label>
|
||||
<select id="conn-proxy" v-model="props.formData.proxy_id"
|
||||
class="w-full px-3 py-2 border border-border rounded-md shadow-sm bg-background text-foreground focus:outline-none focus:ring-1 focus:ring-primary focus:border-primary appearance-none bg-no-repeat bg-right pr-8"
|
||||
@@ -57,6 +112,39 @@ const handleDeleteTagEvent = (tagId: number) => {
|
||||
<div v-if="props.proxyStoreError" class="mt-1 text-xs text-error">{{ t('proxies.error', { error: props.proxyStoreError }) }}</div>
|
||||
</div>
|
||||
|
||||
<!-- Jump Host Configuration - Show only for SSH and if 'jump' mode is selected -->
|
||||
<div v-if="props.formData.type === 'SSH' && props.advancedConnectionMode === 'jump'" class="space-y-3">
|
||||
<label class="block text-sm font-medium text-text-secondary mb-1">{{ t('connections.form.jumpHostsTitle', '跳板机链配置') }}</label>
|
||||
<div v-if="!props.formData.jump_chain || props.formData.jump_chain.length === 0" class="text-sm text-muted-foreground italic">
|
||||
</div>
|
||||
<template v-if="props.formData.jump_chain">
|
||||
<div v-for="(jumpHostId, index) in props.formData.jump_chain" :key="index" class="flex items-center space-x-2 p-2 border border-border rounded-md bg-background/50">
|
||||
<span class="text-sm font-medium text-text-secondary whitespace-nowrap">{{ t('connections.form.jumpHostLabel', '跳板机') }} {{ index + 1 }}:</span>
|
||||
<select v-model="props.formData.jump_chain[index]"
|
||||
class="flex-grow px-3 py-1.5 border border-border rounded-md shadow-sm bg-background text-foreground focus:outline-none focus:ring-1 focus:ring-primary focus:border-primary appearance-none bg-no-repeat bg-right pr-8"
|
||||
style="background-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'0 0 16 16\'%3e%3cpath fill=\'none\' stroke=\'%236c757d\' stroke-linecap=\'round\' stroke-linejoin=\'round\' stroke-width=\'2\' d=\'M2 5l6 6 6-6\'/%3e%3c/svg%3e'); background-position: right 0.75rem center; background-size: 16px 12px;">
|
||||
<option :value="null">{{ t('connections.form.selectJumpHost', '请选择跳板机') }}</option>
|
||||
<option v-for="host in getAvailableJumpHostsForIndex(index)" :key="host.id" :value="host.id">
|
||||
{{ host.name }}
|
||||
</option>
|
||||
</select>
|
||||
<button type="button" @click="props.removeJumpHost(index)"
|
||||
class="p-1.5 text-destructive hover:text-destructive/80 focus:outline-none focus:ring-1 focus:ring-destructive rounded-md"
|
||||
:title="t('connections.form.removeJumpHostTitle', '移除此跳板机')">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="1.1em" height="1.1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"></line><line x1="6" y1="6" x2="18" y2="18"></line></svg>
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
<button type="button" @click="props.addJumpHost()"
|
||||
class="w-full flex items-center justify-center space-x-2 px-3 py-2 border border-dashed border-primary text-primary rounded-md hover:bg-primary/10 focus:outline-none focus:ring-1 focus:ring-primary">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="12" y1="5" x2="12" y2="19"></line><line x1="5" y1="12" x2="19" y2="12"></line></svg>
|
||||
<span>{{ t('connections.form.addJumpHost', '添加跳板机') }}</span>
|
||||
</button>
|
||||
<div v-if="props.connections.filter(c => c.type === 'SSH' && (!props.isEditMode || c.id !== props.formData.id)).length === 0" class="text-xs text-warning-foreground p-2 bg-warning/20 rounded-md">
|
||||
{{ t('connections.form.noAvailableSshConnectionsForJump', '没有可用的SSH连接作为跳板机。请先创建一些SSH连接。') }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-text-secondary mb-1">{{ t('connections.form.tags') }} ({{ t('connections.form.optional') }})</label>
|
||||
<TagInput
|
||||
|
||||
Reference in New Issue
Block a user