Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dlink
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaowei
dlink
Commits
4714b27e
Unverified
Commit
4714b27e
authored
Sep 03, 2022
by
zhu-mingye
Committed by
GitHub
Sep 03, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
optimization Some problems in front-end (#986)
parent
2cde200a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
55 additions
and
53 deletions
+55
-53
index.tsx
dlink-web/src/components/Studio/StudioTree/index.tsx
+2
-2
index.tsx
dlink-web/src/pages/DevOps/JobInfo/Config/index.tsx
+48
-46
index.tsx
dlink-web/src/pages/DevOps/JobInfo/Exception/index.tsx
+1
-1
index.tsx
dlink-web/src/pages/DevOps/JobInfo/index.tsx
+4
-4
No files found.
dlink-web/src/components/Studio/StudioTree/index.tsx
View file @
4714b27e
...
@@ -525,8 +525,8 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
...
@@ -525,8 +525,8 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
toOpen(e.node);
toOpen(e.node);
}
}
let taskIds = [];
let taskIds = [];
for (let i = 0; i < e.selectedNodes.length; i++) {
for (let i = 0; i < e.selectedNodes
?
.length; i++) {
if
(e.selectedNodes[i].isLeaf)
{
if
(e.selectedNodes[i].isLeaf)
{
taskIds.push(e.selectedNodes[i].taskId);
taskIds.push(e.selectedNodes[i].taskId);
}
}
}
}
...
...
dlink-web/src/pages/DevOps/JobInfo/Config/index.tsx
View file @
4714b27e
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
*/
*/
import
{
Descriptions
,
Tag
,
Typography
}
from
'antd'
;
import
{
Descriptions
,
Divider
,
Tag
,
Typography
}
from
'antd'
;
import
{
RocketOutlined
}
from
'@ant-design/icons'
;
import
{
RocketOutlined
}
from
'@ant-design/icons'
;
const
{
Text
,
Link
}
=
Typography
;
const
{
Text
,
Link
}
=
Typography
;
...
@@ -26,9 +26,10 @@ const {Text, Link} = Typography;
...
@@ -26,9 +26,10 @@ const {Text, Link} = Typography;
const
Config
=
(
props
:
any
)
=>
{
const
Config
=
(
props
:
any
)
=>
{
const
{
job
}
=
props
;
const
{
job
}
=
props
;
return
(
<>
return
<>
<>
<>
<
Descriptions
bordered
size=
"small"
title=
{
"Dinky Job Configuration"
}
>
<
Divider
children=
{
"Dinky Job Configuration"
}
orientation=
{
"left"
}
/>
<
Descriptions
bordered
size=
"small"
>
<
Descriptions
.
Item
label=
"执行模式"
>
{
job
?.
history
?.
type
?
(
<
Descriptions
.
Item
label=
"执行模式"
>
{
job
?.
history
?.
type
?
(
<
Tag
color=
"blue"
key=
{
job
?.
history
?.
type
}
>
<
Tag
color=
"blue"
key=
{
job
?.
history
?.
type
}
>
<
RocketOutlined
/>
{
job
?.
history
?.
type
}
<
RocketOutlined
/>
{
job
?.
history
?.
type
}
...
@@ -63,10 +64,12 @@ const Config = (props: any) => {
...
@@ -63,10 +64,12 @@ const Config = (props: any) => {
</>
:
undefined
}
</>
:
undefined
}
</
Descriptions
>
</
Descriptions
>
</>
</>
<
br
/><
br
/>
<>
<>
{
(
!
JSON
.
stringify
(
job
?.
jobHistory
?.
config
).
includes
(
"errors"
)
&&
!
job
?.
jobHistory
?.
config
)
&&
{
(
!
JSON
.
stringify
(
job
?.
jobHistory
?.
config
).
includes
(
"errors"
)
&&
job
?.
jobHistory
?.
config
)
&&
<
Descriptions
bordered
size=
"small"
title=
{
"Flink Job Configuration"
}
>
<>
<
br
/>
<
Divider
children=
{
"Flink Job Configuration"
}
orientation=
{
"left"
}
/>
<
Descriptions
bordered
size=
"small"
>
<
Descriptions
.
Item
label=
"Execution Mode"
>
<
Descriptions
.
Item
label=
"Execution Mode"
>
<
Tag
color=
"blue"
title=
{
"Execution Mode"
}
>
<
Tag
color=
"blue"
title=
{
"Execution Mode"
}
>
{
job
?.
jobHistory
?.
config
[
'execution-config'
][
'execution-mode'
]
}
{
job
?.
jobHistory
?.
config
[
'execution-config'
][
'execution-mode'
]
}
...
@@ -94,11 +97,10 @@ const Config = (props: any) => {
...
@@ -94,11 +97,10 @@ const Config = (props: any) => {
<
Text
<
Text
code
>
{
JSON
.
stringify
(
job
?.
jobHistory
?.
config
[
'execution-config'
][
'user-config'
])
}
</
Text
>
code
>
{
JSON
.
stringify
(
job
?.
jobHistory
?.
config
[
'execution-config'
][
'user-config'
])
}
</
Text
>
</
Descriptions
.
Item
>
</
Descriptions
.
Item
>
</
Descriptions
>
</
Descriptions
>
</>
}
}
</>
</>
</>
</>
)
};
};
export
default
Config
;
export
default
Config
;
dlink-web/src/pages/DevOps/JobInfo/Exception/index.tsx
View file @
4714b27e
...
@@ -36,7 +36,7 @@ const Exception = (props: any) => {
...
@@ -36,7 +36,7 @@ const Exception = (props: any) => {
<
CodeShow
code=
{
job
.
jobHistory
?.
exceptions
[
'root-exception'
]
as
string
}
language=
'java'
height=
'500px'
/>
<
CodeShow
code=
{
job
.
jobHistory
?.
exceptions
[
'root-exception'
]
as
string
}
language=
'java'
height=
'500px'
/>
</
TabPane
>
</
TabPane
>
<
TabPane
tab=
{
<
span
>
Exception History
</
span
>
}
key=
"ExceptionHistory"
>
<
TabPane
tab=
{
<
span
>
Exception History
</
span
>
}
key=
"ExceptionHistory"
>
<
Empty
image=
{
Empty
.
PRESENTED_IMAGE_SIMPLE
}
/>
<
Empty
image=
{
Empty
.
PRESENTED_IMAGE_SIMPLE
}
description=
{
"敬请期待"
}
/>
</
TabPane
>
</
TabPane
>
</
Tabs
>
}
</
Tabs
>
}
</>)
</>)
...
...
dlink-web/src/pages/DevOps/JobInfo/index.tsx
View file @
4714b27e
...
@@ -281,12 +281,12 @@ const JobInfo = (props: any) => {
...
@@ -281,12 +281,12 @@ const JobInfo = (props: any) => {
{
tabKey
===
'cluster'
?
<
FlinkClusterInfo
job=
{
job
}
/>
:
undefined
}
{
tabKey
===
'cluster'
?
<
FlinkClusterInfo
job=
{
job
}
/>
:
undefined
}
{
tabKey
===
'snapshot'
?
<
CheckPoints
job=
{
job
}
/>
:
undefined
}
{
tabKey
===
'snapshot'
?
<
CheckPoints
job=
{
job
}
/>
:
undefined
}
{
tabKey
===
'exception'
?
<
Exception
job=
{
job
}
/>
:
undefined
}
{
tabKey
===
'exception'
?
<
Exception
job=
{
job
}
/>
:
undefined
}
{
tabKey
===
'log'
?
<
Empty
image=
{
Empty
.
PRESENTED_IMAGE_SIMPLE
}
/>
:
undefined
}
{
tabKey
===
'log'
?
<
Empty
image=
{
Empty
.
PRESENTED_IMAGE_SIMPLE
}
description=
{
"敬请期待"
}
/>
:
undefined
}
{
tabKey
===
'optimize'
?
<
Empty
image=
{
Empty
.
PRESENTED_IMAGE_SIMPLE
}
/>
:
undefined
}
{
tabKey
===
'optimize'
?
<
Empty
image=
{
Empty
.
PRESENTED_IMAGE_SIMPLE
}
description=
{
"敬请期待"
}
/>
:
undefined
}
{
tabKey
===
'flinksql'
?
<
FlinkSQL
job=
{
job
}
/>
:
undefined
}
{
tabKey
===
'flinksql'
?
<
FlinkSQL
job=
{
job
}
/>
:
undefined
}
{
tabKey
===
'datamap'
?
<
DataMap
job=
{
job
}
/>
:
undefined
}
{
tabKey
===
'datamap'
?
<
DataMap
job=
{
job
}
/>
:
undefined
}
{
tabKey
===
'olap'
?
<
Empty
image=
{
Empty
.
PRESENTED_IMAGE_SIMPLE
}
/>
:
undefined
}
{
tabKey
===
'olap'
?
<
Empty
image=
{
Empty
.
PRESENTED_IMAGE_SIMPLE
}
description=
{
"敬请期待"
}
/>
:
undefined
}
{
tabKey
===
'version'
?
<
TaskVersionInfo
job=
{
job
}
/>
:
undefined
}
{
tabKey
===
'version'
?
<
TaskVersionInfo
job=
{
job
}
/>
:
undefined
}
{
tabKey
===
'alert'
?
<
Alert
job=
{
job
}
/>
:
undefined
}
{
tabKey
===
'alert'
?
<
Alert
job=
{
job
}
/>
:
undefined
}
</
ProCard
>
</
ProCard
>
</
PageContainer
>
</
PageContainer
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment