Commit 771ca97e authored by oyhk's avatar oyhk
Browse files

[opt] 1.修复项目管理页面请求404 2.优化发布loading按钮

parent 83867596
Showing with 44 additions and 98 deletions
+44 -98
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -491,80 +491,6 @@ const ProjectForm: React.FC<ProjectPageProps> = ({ project, isCreate, dispatch }
</div>);
}}
</Form.List>
<div>
<Row style={{ marginBottom: '24px' }}>
<Col xl={4} style={{ textAlign: 'right' }}>
<h4>插件应用:</h4>
</Col>
</Row>
<Form.List name={[projectEnvListField.name, 'projectEnvPluginList']}>
{(projectEnvPluginListFields) => {
projectEnvPluginListFields.forEach((projectEnvPluginListField, projectEnvPluginIndex) => {
projectEnvPluginListField.record = projectState?.projectEnvList[projectEnvListIndex]?.projectEnvPluginList[projectEnvPluginIndex];
});
return (
<div>
{projectEnvPluginListFields.map(projectEnvPluginListField => {
return (
<div key={uuid()}>
<Row style={{ marginBottom: '24px' }}>
<Col xl={4} style={{ textAlign: 'right' }}>
<h4>{projectEnvPluginListField.record.pluginName}</h4>
</Col>
</Row>
<Form.Item
name={[projectEnvPluginListField.name, 'projectId']}
noStyle>
<Input type='hidden'/>
</Form.Item>
<Form.Item
name={[projectEnvPluginListField.name, 'envId']}
noStyle>
<Input type='hidden'/>
</Form.Item>
<Form.Item
name={[projectEnvPluginListField.name, 'pluginName']}
noStyle>
<Input type='hidden'/>
</Form.Item>
{
projectEnvPluginListField?.record?.pluginName === 'Eureka' ?
<div>
<Form.Item
name={[projectEnvPluginListField.name, 'eurekaUrl']}
label='请求地址'>
<Input placeholder='Eureka URL'/>
</Form.Item>
< Form.Item
name={[projectEnvPluginListField.name, 'eurekaAuthType']}
label='认证方式'>
<Radio.Group>
<Radio value='none'></Radio>
<Radio value='Basic'>Basic</Radio>
</Radio.Group>
</Form.Item>
<Form.Item
name={[projectEnvPluginListField.name, 'eurekaUsername']}
label='用户名'>
<Input placeholder='Eureka Username'/>
</Form.Item>
<Form.Item
name={[projectEnvPluginListField.name, 'eurekaPassword']}
label='密码'>
<Input placeholder='Eureka Password'/>
</Form.Item>
</div> : ''
}
</div>
);
})}
</div>
);
}}
</Form.List>
</div>
</div>
))}
</div>
......
......@@ -40,6 +40,7 @@ export default () => {
});
}
},
fetchKey: (payload) => payload.id,
manual: true,
refreshOnWindowFocus: false,
});
......@@ -56,6 +57,7 @@ export default () => {
});
}
},
fetchKey: (payload) => payload.id,
manual: true,
refreshOnWindowFocus: false,
});
......@@ -71,6 +73,7 @@ export default () => {
});
}
},
fetchKey: (payload) => `${payload.id}${payload.projectEnvServerId}`,
manual: true,
refreshOnWindowFocus: false,
});
......@@ -86,6 +89,7 @@ export default () => {
});
}
},
fetchKey: (payload) => `${payload.id}${payload.projectEnvServerId}`,
manual: true,
refreshOnWindowFocus: false,
});
......@@ -196,25 +200,35 @@ export default () => {
projectEnvServerList ? projectEnvServerList.map((pes) => (
<div className={styles.ipRow} key={uuid()}>
{
pes.isPublish ? <Button type='primary' size='small' onClick={() => {
const payload = {
id: pes.projectId,
name: pes.projectName,
projectEnvServerId: pes.id,
};
console.log('build payload', payload);
buildUseRequest.run(payload);
}}>发布</Button> : <Button danger size='small' onClick={() => {
const payload = {
id: pes.projectId,
name: pes.projectName,
projectEnvServerId: pes.id,
};
console.log('sync payload', payload);
syncUseRequest.run(payload);
}}>从服务器同步</Button>
pes.isPublish ?
<Button
type='primary'
size='small'
onClick={() => {
const payload = {
id: pes.projectId,
name: pes.projectName,
projectEnvServerId: pes.id,
};
console.log('build payload', payload);
buildUseRequest.run(payload);
}}
loading={buildUseRequest.fetches[`${pes.projectId}${pes.id}`]?.loading}
>发布</Button> :
<Button
danger
size='small'
onClick={() => {
const payload = {
id: pes.projectId,
name: pes.projectName,
projectEnvServerId: pes.id,
};
console.log('sync payload', payload);
syncUseRequest.run(payload);
}}
loading={syncUseRequest.fetches[`${pes.projectId}${pes.id}`]?.loading}
>从服务器同步</Button>
}
</div>
)) : <div/>
......
......@@ -3,7 +3,12 @@ import routes from '@/routes';
import { ProjectDto } from '@/services/dto/ProjectDto';
export async function page(payload: ProjectDto) {
return get({ url: `${routes.apiRoutes.projectPage}?pageNo=0&pageSize=10000` });
return get({
url: `${routes.apiRoutes.projectPage({
pageNo: 0,
pageSize: 10000,
})}`,
});
}
export async function info(payload: ProjectDto) {
......@@ -17,6 +22,7 @@ export async function save(payload: ProjectDto, successCallback?: Function, fail
export async function update(payload: ProjectDto, successCallback?: Function, failCallback?: Function) {
return put({ url: `${routes.apiRoutes.projectUpdate}`, payload: payload, successCallback, failCallback });
}
export async function deleted(payload: ProjectDto, successCallback?: Function, failCallback?: Function) {
return post({ url: `${routes.apiRoutes.projectDeleted}`, payload: payload, successCallback, failCallback });
}
......
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