diff --git a/frontend/src/views/ops/db/resource/index.ts b/frontend/src/views/ops/db/resource/index.ts index 08a7f5c5..b809268e 100644 --- a/frontend/src/views/ops/db/resource/index.ts +++ b/frontend/src/views/ops/db/resource/index.ts @@ -40,7 +40,7 @@ const SqlIcon = { }; const getDbOpTab = async (params: any) => { - const tabKey = `db.${params.instCode}.${params.dbCode}.${params.db}`; + const tabKey = `${params.instCode}.${params.dbCode}.${params.db}`; return await createResourceOpTab({ key: tabKey, name: `${params.name}/${params.db}`, @@ -85,7 +85,7 @@ export const NodeTypeDbInst = new NodeType(TagResourceTypeEnum.DbInstance.value) return dbInstances?.map((x: any) => { x.tagPath = tagPath; x.instCode = x.code; - return TagTreeNode.new(parentNode, `db.${x.code}`, x.name, NodeTypeDbConf).withParams(x).withNodeComponent(NodeDbInst); + return TagTreeNode.new(parentNode, `${x.code}`, x.name, NodeTypeDbConf).withParams(x).withNodeComponent(NodeDbInst); }); }); diff --git a/frontend/src/views/ops/docker/resource/index.ts b/frontend/src/views/ops/docker/resource/index.ts index 631c3d01..ab5dec3f 100644 --- a/frontend/src/views/ops/docker/resource/index.ts +++ b/frontend/src/views/ops/docker/resource/index.ts @@ -14,7 +14,7 @@ const Icon = { }; const getContainerOpTab = async (container: any) => { - const tabKey = `container.${container.code}`; + const tabKey = `${container.code}`; return await createResourceOpTab({ key: tabKey, name: container.name, @@ -33,7 +33,7 @@ export const NodeTypeContainerTag = new NodeType(TagTreeNode.TagPath).withLoadNo // 把list 根据name字段排序 return res?.list .sort((a: any, b: any) => a.name.localeCompare(b.name)) - .map((x: any) => TagTreeNode.new(node, `container.${x.code}`, x.name, NodeTypeContainer).withIsLeaf(true).withParams(x).withIcon(Icon)); + .map((x: any) => TagTreeNode.new(node, `${x.code}`, x.name, NodeTypeContainer).withIsLeaf(true).withParams(x).withIcon(Icon)); }); const NodeTypeContainer = new NodeType(11).withNodeClickFunc(async (node: TagTreeNode) => { diff --git a/frontend/src/views/ops/es/resource/index.ts b/frontend/src/views/ops/es/resource/index.ts index de4a2ecc..ba2fed91 100644 --- a/frontend/src/views/ops/es/resource/index.ts +++ b/frontend/src/views/ops/es/resource/index.ts @@ -27,14 +27,14 @@ const NodeTypeEsTag = new NodeType(TagTreeNode.TagPath).withLoadNodesFunc(async await sleep(100); return insts?.map((x: any) => { x.tagPath = parentNode.key; - return TagTreeNode.new(parentNode, `es.${x.code}`, x.name, NodeTypeInst).withNodeComponent(NodeEs).withIsLeaf(true).withParams(x); + return TagTreeNode.new(parentNode, `${x.code}`, x.name, NodeTypeInst).withNodeComponent(NodeEs).withIsLeaf(true).withParams(x); }); }); // 加载实例列表 const NodeTypeInst = new NodeType(1).withNodeClickFunc(async (nodeData: TagTreeNode) => { const inst = nodeData.params; - const tabKey = `es.${inst.code}`; + const tabKey = `${inst.code}`; createResourceOpTab({ key: tabKey, name: inst.name, diff --git a/frontend/src/views/ops/machine/resource/index.ts b/frontend/src/views/ops/machine/resource/index.ts index 4d54e8ec..97867716 100644 --- a/frontend/src/views/ops/machine/resource/index.ts +++ b/frontend/src/views/ops/machine/resource/index.ts @@ -31,7 +31,7 @@ export const NodeTypeMachineTag = new NodeType(TagTreeNode.TagPath).withLoadNode return res?.list .sort((a: any, b: any) => a.name.localeCompare(b.name)) .map((x: any) => - TagTreeNode.new(node, `machine.${x.code}`, x.name, NodeTypeMachine) + TagTreeNode.new(node, `${x.code}`, x.name, NodeTypeMachine) .withParams(x) .withDisabled(x.status == -1 && x.protocol == MachineProtocolEnum.Ssh.value) .withIcon(MachineIcon) @@ -107,7 +107,7 @@ export const NodeTypeAuthCert = new NodeType(12) .withNodeDblclickFunc(async (node: TagTreeNode) => { const m = node.params; - const key = `machine.${m.code}.${m.selectAuthCert.name}.${new Date().getTime()}`; + const key = `${m.code}.${m.selectAuthCert.name}.${new Date().getTime()}`; createResourceOpTab({ key, name: `${m.selectAuthCert.username}@${m.name}`, @@ -134,7 +134,7 @@ export const NodeTypeAuthCert = new NodeType(12) .withOnClick(async (node: TagTreeNode) => { const m = node.params; - const key = `machine.${m.code}.${m.selectAuthCert.name}.${new Date().getTime()}`; + const key = `${m.code}.${m.selectAuthCert.name}.${new Date().getTime()}`; createResourceOpTab({ key, name: `${m.selectAuthCert.username}@${m.name}`, @@ -188,7 +188,7 @@ export const NodeTypeAuthCert = new NodeType(12) const acName = m.selectAuthCert.name; // 直接打开文件管理 tab,FileTab 内部会处理配置选择 - const tabKey = `machine.${m.code}.${acName}`; + const tabKey = `${m.code}.${acName}`; createResourceOpTab({ key: tabKey, name: `${m.selectAuthCert.username}@${m.name}`, diff --git a/frontend/src/views/ops/machine/resource/tabs/TerminalTab.vue b/frontend/src/views/ops/machine/resource/tabs/TerminalTab.vue index 404e997b..e55f5128 100644 --- a/frontend/src/views/ops/machine/resource/tabs/TerminalTab.vue +++ b/frontend/src/views/ops/machine/resource/tabs/TerminalTab.vue @@ -108,6 +108,7 @@ const blur = () => { defineExpose({ onRefresh: handleReconnect, onActivate: focus, + onResize: fitTerminal, close, fitTerminal, focus, diff --git a/frontend/src/views/ops/mongo/resource/index.ts b/frontend/src/views/ops/mongo/resource/index.ts index 61bb6803..c9e449e6 100644 --- a/frontend/src/views/ops/mongo/resource/index.ts +++ b/frontend/src/views/ops/mongo/resource/index.ts @@ -18,7 +18,7 @@ const NodeMongo = defineAsyncComponent(() => import('./NodeMongo.vue')); const NodeMongoDb = defineAsyncComponent(() => import('./NodeMongoDb.vue')); const getMongoOpTab = async (inst: any) => { - const tabKey = `mongo.${inst.code}`; + const tabKey = `${inst.code}`; return await createResourceOpTab({ key: tabKey, name: inst.instName || inst.name, @@ -42,7 +42,7 @@ const NodeTypeMongoTag = new NodeType(TagTreeNode.TagPath).withLoadNodesFunc(asy await sleep(100); return mongoInfos?.map((x: any) => { x.tagPath = parentNode.key; - return TagTreeNode.new(parentNode, `mongo.${x.code}`, x.name, NodeTypeMongo).withParams(x).withNodeComponent(NodeMongo); + return TagTreeNode.new(parentNode, `${x.code}`, x.name, NodeTypeMongo).withParams(x).withNodeComponent(NodeMongo); }); }); diff --git a/frontend/src/views/ops/redis/resource/index.ts b/frontend/src/views/ops/redis/resource/index.ts index 43c5b178..52997d75 100644 --- a/frontend/src/views/ops/redis/resource/index.ts +++ b/frontend/src/views/ops/redis/resource/index.ts @@ -28,7 +28,7 @@ const NodeTypeRedisTag = new NodeType(TagTreeNode.TagPath).withLoadNodesFunc(asy await sleep(100); return redisInfos.map((x: any) => { x.tagPath = parentNode.key; - return TagTreeNode.new(parentNode, `redis.${x.code}`, x.name, NodeTypeRedis).withParams(x).withNodeComponent(NodeRedis); + return TagTreeNode.new(parentNode, `${x.code}`, x.name, NodeTypeRedis).withParams(x).withNodeComponent(NodeRedis); }); }); @@ -74,7 +74,7 @@ const NodeTypeRedis = new NodeType(2).withLoadNodesFunc(async (parentNode: TagTr const NodeTypeDb = new NodeType(21).withNodeClickFunc(async (node: TagTreeNode) => { const params = node.params; - const key = `redis.${params.code}`; + const key = `${params.code}`; const resourceOpTab = await createResourceOpTab({ key, name: `${params.redisName}`, diff --git a/frontend/src/views/ops/resource/ResourceOp.vue b/frontend/src/views/ops/resource/ResourceOp.vue index df9800f5..67dc80de 100644 --- a/frontend/src/views/ops/resource/ResourceOp.vue +++ b/frontend/src/views/ops/resource/ResourceOp.vue @@ -116,7 +116,7 @@