Skip to content

Commit d38813b

Browse files
authored
Merge pull request #424 from weibaohui/main
update
2 parents e3c0c2c + b0ef774 commit d38813b

2 files changed

Lines changed: 295 additions & 102 deletions

File tree

ui/src/components/Amis/custom/FileExplorer/FileExplorer.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React, { useEffect, useState } from 'react';
22
import { Modal, Splitter } from 'antd';
3-
import XTermComponent from '@/components/Amis/custom/XTerm';
43
import { EventDataNode } from 'antd/es/tree';
54
import MonacoEditorWithForm from '@/components/Amis/custom/MonacoEditorWithForm';
65
import FileTree, { FileNode } from '@/components/Amis/custom/FileExplorer/components/FileTree';
76
import ContextMenu from '@/components/Amis/custom/FileExplorer/components/ContextMenu';
87
import ContainerSelector from '@/components/Amis/custom/FileExplorer/components/ContainerSelector';
98
import { FileOperations } from '@/components/Amis/custom/FileExplorer/components/FileOperations';
9+
import XTermComponent from '@/components/Amis/custom/XTerm';
1010

1111
interface FileExplorerProps {
1212
data: Record<string, any>
@@ -212,7 +212,7 @@ const FileExplorerComponent = React.forwardRef<HTMLDivElement, FileExplorerProps
212212
containers={containerOptions}
213213
onContainerChange={setSelectedContainer}
214214
/>
215-
<span style={{ marginLeft: '8px',fontSize: '12px', color: '#888' }}>
215+
<span style={{ marginLeft: '8px', fontSize: '12px', color: '#888' }}>
216216
鼠标右键管理文件
217217
</span>
218218
<div style={{ height: 'calc(100vh - 150px)', overflowY: 'auto' }}>
@@ -235,6 +235,7 @@ const FileExplorerComponent = React.forwardRef<HTMLDivElement, FileExplorerProps
235235
</Splitter.Panel>
236236
<Splitter.Panel >
237237
{selectedContainer && (
238+
238239
<XTermComponent
239240
url={`/k8s/pod/xterm/ns/${namespace}/pod_name/${podName}`}
240241
params={{
@@ -243,7 +244,7 @@ const FileExplorerComponent = React.forwardRef<HTMLDivElement, FileExplorerProps
243244
}}
244245
data={{ data }}
245246
height='calc(100vh - 100px)'
246-
width='96%'
247+
width='100%'
247248
/>
248249
)}
249250
</Splitter.Panel>
@@ -253,4 +254,4 @@ const FileExplorerComponent = React.forwardRef<HTMLDivElement, FileExplorerProps
253254
}
254255
);
255256

256-
export default FileExplorerComponent;
257+
export default FileExplorerComponent;

0 commit comments

Comments
 (0)