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
6cdc9fe2
Commit
6cdc9fe2
authored
Jun 15, 2022
by
zhu-mingye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix all alias is null
parent
03de2a8a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
index.tsx
...c/components/Studio/StudioConsole/StudioProcess/index.tsx
+1
-1
SessionForm.tsx
...StudioLeftTool/StudioConnector/components/SessionForm.tsx
+1
-1
index.tsx
...ponents/Studio/StudioRightTool/StudioJarSetting/index.tsx
+3
-3
index.tsx
...components/Studio/StudioRightTool/StudioSetting/index.tsx
+2
-2
ClusterConfigurationForm.tsx
...sterConfiguration/components/ClusterConfigurationForm.tsx
+2
-2
No files found.
dlink-web/src/components/Studio/StudioConsole/StudioProcess/index.tsx
View file @
6cdc9fe2
...
@@ -164,7 +164,7 @@ const StudioProcess = (props: any) => {
...
@@ -164,7 +164,7 @@ const StudioProcess = (props: any) => {
const
getClusterOptions
=
()
=>
{
const
getClusterOptions
=
()
=>
{
let
itemList
=
[];
let
itemList
=
[];
for
(
let
item
of
cluster
)
{
for
(
let
item
of
cluster
)
{
let
tag
=
(<><
Tag
color=
{
item
.
enabled
?
"processing"
:
"error"
}
>
{
item
.
type
}
</
Tag
>
{
item
.
alias
}
</>);
let
tag
=
(<><
Tag
color=
{
item
.
enabled
?
"processing"
:
"error"
}
>
{
item
.
type
}
</
Tag
>
{
item
.
alias
===
""
?
item
.
name
:
item
.
alias
}
</>);
itemList
.
push
(<
Option
value=
{
item
.
id
}
label=
{
tag
}
>
itemList
.
push
(<
Option
value=
{
item
.
id
}
label=
{
tag
}
>
{
tag
}
{
tag
}
</
Option
>)
</
Option
>)
...
...
dlink-web/src/components/Studio/StudioLeftTool/StudioConnector/components/SessionForm.tsx
View file @
6cdc9fe2
...
@@ -51,7 +51,7 @@ const SessionForm: React.FC<UpdateFormProps> = (props) => {
...
@@ -51,7 +51,7 @@ const SessionForm: React.FC<UpdateFormProps> = (props) => {
本地环境
本地环境
</
Option
>)];
</
Option
>)];
for
(
let
item
of
cluster
){
for
(
let
item
of
cluster
){
let
tag
=
(<><
Tag
color=
{
item
.
enabled
?
"processing"
:
"error"
}
>
{
item
.
type
}
</
Tag
>
{
item
.
alias
}
</>);
let
tag
=
(<><
Tag
color=
{
item
.
enabled
?
"processing"
:
"error"
}
>
{
item
.
type
}
</
Tag
>
{
item
.
alias
===
""
?
item
.
name
:
item
.
alias
}
</>);
itemList
.
push
(<
Option
value=
{
item
.
id
}
label=
{
tag
}
>
itemList
.
push
(<
Option
value=
{
item
.
id
}
label=
{
tag
}
>
{
tag
}
{
tag
}
</
Option
>)
</
Option
>)
...
...
dlink-web/src/components/Studio/StudioRightTool/StudioJarSetting/index.tsx
View file @
6cdc9fe2
...
@@ -17,7 +17,7 @@ const StudioJarSetting = (props: any) => {
...
@@ -17,7 +17,7 @@ const StudioJarSetting = (props: any) => {
const
getClusterConfigurationOptions
=
()
=>
{
const
getClusterConfigurationOptions
=
()
=>
{
const
itemList
=
[];
const
itemList
=
[];
for
(
const
item
of
clusterConfiguration
)
{
for
(
const
item
of
clusterConfiguration
)
{
const
tag
=
(<><
Tag
color=
{
item
.
enabled
?
"processing"
:
"error"
}
>
{
item
.
type
}
</
Tag
>
{
item
.
alias
}
</>);
const
tag
=
(<><
Tag
color=
{
item
.
enabled
?
"processing"
:
"error"
}
>
{
item
.
type
}
</
Tag
>
{
item
.
alias
===
""
?
item
.
name
:
item
.
alias
}
</>);
itemList
.
push
(<
Option
key=
{
item
.
id
}
value=
{
item
.
id
}
label=
{
tag
}
>
itemList
.
push
(<
Option
key=
{
item
.
id
}
value=
{
item
.
id
}
label=
{
tag
}
>
{
tag
}
{
tag
}
</
Option
>)
</
Option
>)
...
@@ -28,14 +28,14 @@ const StudioJarSetting = (props: any) => {
...
@@ -28,14 +28,14 @@ const StudioJarSetting = (props: any) => {
const
getJarOptions
=
()
=>
{
const
getJarOptions
=
()
=>
{
const
itemList
=
[];
const
itemList
=
[];
for
(
const
item
of
jars
)
{
for
(
const
item
of
jars
)
{
const
tag
=
(<><
Tag
color=
{
item
.
enabled
?
"processing"
:
"error"
}
>
{
item
.
type
}
</
Tag
>
{
item
.
alias
}
</>);
const
tag
=
(<><
Tag
color=
{
item
.
enabled
?
"processing"
:
"error"
}
>
{
item
.
type
}
</
Tag
>
{
item
.
alias
===
""
?
item
.
name
:
item
.
alias
}
</>);
itemList
.
push
(<
Option
key=
{
item
.
id
}
value=
{
item
.
id
}
label=
{
tag
}
>
itemList
.
push
(<
Option
key=
{
item
.
id
}
value=
{
item
.
id
}
label=
{
tag
}
>
{
tag
}
{
tag
}
</
Option
>)
</
Option
>)
}
}
return
itemList
;
return
itemList
;
};
};
useEffect
(()
=>
{
useEffect
(()
=>
{
form
.
setFieldsValue
(
current
.
task
);
form
.
setFieldsValue
(
current
.
task
);
},
[
current
.
task
]);
},
[
current
.
task
]);
...
...
dlink-web/src/components/Studio/StudioRightTool/StudioSetting/index.tsx
View file @
6cdc9fe2
...
@@ -20,7 +20,7 @@ const StudioSetting = (props: any) => {
...
@@ -20,7 +20,7 @@ const StudioSetting = (props: any) => {
const
getClusterOptions
=
()
=>
{
const
getClusterOptions
=
()
=>
{
const
itemList
=
[];
const
itemList
=
[];
for
(
const
item
of
sessionCluster
)
{
for
(
const
item
of
sessionCluster
)
{
const
tag
=
(<><
Tag
color=
{
item
.
enabled
?
"processing"
:
"error"
}
>
{
item
.
type
}
</
Tag
>
{
item
.
alias
}
</>);
const
tag
=
(<><
Tag
color=
{
item
.
enabled
?
"processing"
:
"error"
}
>
{
item
.
type
}
</
Tag
>
{
item
.
alias
===
""
?
item
.
name
:
item
.
alias
}
</>);
itemList
.
push
(<
Option
key=
{
item
.
id
}
value=
{
item
.
id
}
label=
{
tag
}
>
itemList
.
push
(<
Option
key=
{
item
.
id
}
value=
{
item
.
id
}
label=
{
tag
}
>
{
tag
}
{
tag
}
</
Option
>)
</
Option
>)
...
@@ -31,7 +31,7 @@ const StudioSetting = (props: any) => {
...
@@ -31,7 +31,7 @@ const StudioSetting = (props: any) => {
const
getClusterConfigurationOptions
=
()
=>
{
const
getClusterConfigurationOptions
=
()
=>
{
const
itemList
=
[];
const
itemList
=
[];
for
(
const
item
of
clusterConfiguration
)
{
for
(
const
item
of
clusterConfiguration
)
{
const
tag
=
(<><
Tag
color=
{
item
.
enabled
?
"processing"
:
"error"
}
>
{
item
.
type
}
</
Tag
>
{
item
.
alias
}
</>);
const
tag
=
(<><
Tag
color=
{
item
.
enabled
?
"processing"
:
"error"
}
>
{
item
.
type
}
</
Tag
>
{
item
.
alias
===
""
?
item
.
name
:
item
.
alias
}
</>);
itemList
.
push
(<
Option
key=
{
item
.
id
}
value=
{
item
.
id
}
label=
{
tag
}
>
itemList
.
push
(<
Option
key=
{
item
.
id
}
value=
{
item
.
id
}
label=
{
tag
}
>
{
tag
}
{
tag
}
</
Option
>)
</
Option
>)
...
...
dlink-web/src/pages/ClusterConfiguration/components/ClusterConfigurationForm.tsx
View file @
6cdc9fe2
...
@@ -182,9 +182,9 @@ const ClusterConfigurationForm: React.FC<ClusterConfigurationFormProps> = (props
...
@@ -182,9 +182,9 @@ const ClusterConfigurationForm: React.FC<ClusterConfigurationFormProps> = (props
name=
"flinkConfigPath"
name=
"flinkConfigPath"
label=
"配置文件路径"
label=
"配置文件路径"
rules=
{
[{
required
:
true
,
message
:
'请输入 flink-conf.yaml 路径!'
}]
}
rules=
{
[{
required
:
true
,
message
:
'请输入 flink-conf.yaml 路径!'
}]
}
help=
"指定 flink-conf.yaml 的
具体路径
"
help=
"指定 flink-conf.yaml 的
路径(末尾无/)
"
>
>
<
Input
placeholder=
"值如 /usr/local/dlink/conf
/flink-conf.yaml
"
/>
<
Input
placeholder=
"值如 /usr/local/dlink/conf"
/>
</
Form
.
Item
>
</
Form
.
Item
>
<
Divider
orientation=
"left"
plain
>
自定义配置(高优先级)
</
Divider
>
<
Divider
orientation=
"left"
plain
>
自定义配置(高优先级)
</
Divider
>
{
buildConfig
(
FLINK_CONFIG_LIST
)
}
{
buildConfig
(
FLINK_CONFIG_LIST
)
}
...
...
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