Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Rainbond Ui
Commits
8ccc055f
Commit
8ccc055f
authored
6 years ago
by
barnettZQG
Browse files
Options
Download
Email Patches
Plain Diff
[FIX] fix multiple app advanced settings bug
parent
2afafe34
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/AppCreateSetting/index.js
+21
-7
src/components/AppCreateSetting/index.js
src/routes/Create/create-compose-setting.js
+2
-2
src/routes/Create/create-compose-setting.js
with
23 additions
and
9 deletions
+23
-9
src/components/AppCreateSetting/index.js
+
21
-
7
View file @
8ccc055f
...
...
@@ -290,7 +290,6 @@ class JAVA extends PureComponent {
const
runtimeInfo
=
this
.
props
.
runtimeInfo
||
{};
const
language
=
this
.
props
.
language
;
var
res
=
false
;
if
((
language
===
'
java-jar
'
||
language
===
'
java-war
'
)
&&
runtimeInfo
.
runtimes
===
false
)
{
return
true
;
}
...
...
@@ -299,16 +298,15 @@ class JAVA extends PureComponent {
return
true
;
}
return
res
;
return
false
;
}
isShowService
=
()
=>
{
const
runtimeInfo
=
this
.
props
.
runtimeInfo
||
{};
const
language
=
this
.
props
.
language
;
var
res
=
false
;
if
((
language
===
'
java-jar
'
||
language
===
'
java-war
'
)
&&
runtimeInfo
.
procfile
===
false
)
{
return
true
;
}
return
res
;
return
false
;
}
getDefaultRuntime
=
()
=>
{
return
'
1.8
'
...
...
@@ -670,6 +668,18 @@ class BaseInfo extends PureComponent {
super
(
props
);
this
.
state
=
{
memoryList
:
[
{
text
:
'
64M
'
,
value
:
64
},
{
text
:
'
128M
'
,
value
:
128
},
{
text
:
'
256M
'
,
value
:
256
},
{
text
:
'
512M
'
,
value
:
512
...
...
@@ -685,6 +695,9 @@ class BaseInfo extends PureComponent {
},
{
text
:
'
8G
'
,
value
:
1024
*
8
},
{
text
:
'
16G
'
,
value
:
1024
*
8
}
]
}
...
...
@@ -754,8 +767,8 @@ class BaseInfo extends PureComponent {
{
minMemory
<
list
[
0
].
value
?
<
RadioButton
value
=
{
minMemory
}
>
{
minMemory
}
M
<
/RadioButton
>
:
null
}
{
list
.
map
((
item
)
=>
{
return
<
RadioButton
value
=
{
item
.
value
}
>
{
item
.
text
}
<
/RadioButton
>
{
list
.
map
((
item
,
index
)
=>
{
return
<
RadioButton
key
=
{
index
}
value
=
{
item
.
value
}
>
{
item
.
text
}
<
/RadioButton
>
})
}
<
/RadioGroup
>
...
...
@@ -1224,7 +1237,7 @@ class Relation extends PureComponent {
dataIndex
:
'
group_name
'
},
{
title
:
'
应用说明
'
,
dataIndex
:
'
var
'
,
dataIndex
:
'
describe
'
,
render
:
(
val
,
data
)
=>
{}
},
{
title
:
'
操作
'
,
...
...
@@ -1630,6 +1643,7 @@ class Ports extends PureComponent {
<
div
className
=
{
styles
.
ports
}
>
{
ports
.
map
((
port
)
=>
{
return
<
Port
key
=
{
port
.
ID
}
showOuterUrl
=
{
false
}
showDomain
=
{
false
}
port
=
{
port
}
...
...
This diff is collapsed.
Click to expand it.
src/routes/Create/create-compose-setting.js
+
2
-
2
View file @
8ccc055f
...
...
@@ -150,8 +150,8 @@ export default class Index extends PureComponent {
}}
>
<
Tabs
defaultActiveKey
=
"
0
"
>
{
apps
.
map
((
app
,
index
)
=>
{
return
<
TabPane
tab
=
{
app
.
service
.
service_cname
}
key
=
{
index
}
>
<
AppCreateSetting
appDetail
=
{
app
}
/></
TabPane
>
return
<
TabPane
tab
=
{
app
.
service
.
service_cname
}
key
=
{
index
}
>
<
AppCreateSetting
updateDetail
=
{
this
.
loadDetail
}
appDetail
=
{
app
}
/></
TabPane
>
})
}
<
/Tabs
>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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