diff --git a/src/forge/DevOps/OpsDetailRightpanel.jsx b/src/forge/DevOps/OpsDetailRightpanel.jsx
index 3546312d9..ce38e6184 100644
--- a/src/forge/DevOps/OpsDetailRightpanel.jsx
+++ b/src/forge/DevOps/OpsDetailRightpanel.jsx
@@ -68,53 +68,55 @@ export default ({
}
}
return (
-
+
{
nav === "0" &&
-
- {data && data.status !== "error" ? (
-
-
- {step && step.name}
-
- {step && step.duration_time}
-
-
-
+
+
+ {data && data.status !== "error" ? (
- {coders && coders.length > 0 ? (
- coders.map((item, key) => {
- return (
-
-
{key + 1}
-
{item.out}
-
- );
- })
- ) : empty ? (
-
-
1
-
- {stage && stage.name} – {step && step.name}: Skipped
-
-
- ) : (
- ""
- )}
+
+ {step && step.name}
+
+ {step && step.duration_time}
+
+
+
+
+ {coders && coders.length > 0 ? (
+ coders.map((item, key) => {
+ return (
+
+
{key + 1}
+
{item.out}
+
+ );
+ })
+ ) : empty ? (
+
+
1
+
+ {stage && stage.name} – {step && step.name}: Skipped
+
+
+ ) : (
+ ""
+ )}
+
-
- ) : (
- error:{data && data.error}
- )}
-
+ ) : (
+
error:{data && data.error}
+ )}
+
+
}
{
nav === "1" &&
}
-
+
);
};
diff --git a/src/forge/DevOps/ssh/Index.jsx b/src/forge/DevOps/ssh/Index.jsx
index 64fb5b4ef..09e1805e2 100644
--- a/src/forge/DevOps/ssh/Index.jsx
+++ b/src/forge/DevOps/ssh/Index.jsx
@@ -1,14 +1,32 @@
-import React, { useState } from 'react';
-import XmlPanel from './XmlPanel';
-import mediator from './mediator';
+import React, { useState, useEffect } from "react";
+import XmlPanel from "./XmlPanel";
+import mediator from "./mediator";
-function Index(){
- const [ sshConfigData ,setSshConfigData ] = useState(undefined);
+function Index() {
+ const [sshConfigData, setSshConfigData] = useState(undefined);
- return(
-
-
-
- )
+ useEffect(() => {
+ if (!sshConfigData) {
+ init();
+ }
+ setTimeout(() => {
+ mediator.publish("create-socket", 1);
+ }, 300);
+ }, [sshConfigData]);
+
+ // 获取服务器连接信息
+ function init() {}
+ return (
+
+ );
}
-export default Index;
\ No newline at end of file
+export default Index;
diff --git a/src/forge/DevOps/ssh/XmlPanel.jsx b/src/forge/DevOps/ssh/XmlPanel.jsx
index 5e2a5f50a..ae642caa3 100644
--- a/src/forge/DevOps/ssh/XmlPanel.jsx
+++ b/src/forge/DevOps/ssh/XmlPanel.jsx
@@ -16,6 +16,7 @@ function getColsAndRows(width, height, term) {
function onLayout(term, el) {
const ro = new ResizeObserver(entries => {
+ console.log(entries);
for (let entry of entries) {
if (entry.target.offsetHeight > 0 || entry.target.offsetWidth > 0) {
const [cols, rows] = getColsAndRows(
@@ -48,7 +49,7 @@ const TimeTicket = 30000;
export default ({ sshConfigData, sid }) => {
const [term, setTerm] = useState(null);
- const { ws_url, password, port } = sshConfigData;
+ const { ws_url, password, port, secret } = sshConfigData;
const el = useRef();
const socket = useRef();
const isFirstConnected = useRef(false);
@@ -96,7 +97,7 @@ export default ({ sshConfigData, sid }) => {
tp: 'init',
data: {
...sshConfigData,
- secret: password,
+ secret: secret,
width,
height,
rows: term.rows,
@@ -108,7 +109,7 @@ export default ({ sshConfigData, sid }) => {
tp: 'init',
data: {
...sshConfigData,
- secret: password,
+ secret: secret,
width,
height,
rows: term.rows,
@@ -211,8 +212,8 @@ export default ({ sshConfigData, sid }) => {
}, [term, ws_url, port]);
return (
-
+
{!ws_url ?
正在连接命令行服务...
: null}
);
-};
+};
\ No newline at end of file
diff --git a/src/forge/DevOps/ssh/mediator.jsx b/src/forge/DevOps/ssh/mediator.jsx
index 652705799..70a4e30f8 100644
--- a/src/forge/DevOps/ssh/mediator.jsx
+++ b/src/forge/DevOps/ssh/mediator.jsx
@@ -43,4 +43,4 @@ function Mediator(obj) {
return obj ? Object.assign(obj, mediator) : mediator;
}
const mediator = new Mediator();
-export default mediator;
+export default mediator;
\ No newline at end of file