Commit 8ccc055f authored by barnettZQG's avatar barnettZQG
Browse files

[FIX] fix multiple app advanced settings bug

parent 2afafe34
Showing with 23 additions and 9 deletions
+23 -9
......@@ -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}
......
......@@ -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>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment