Commit 32d3e94d authored by wuyongsheng's avatar wuyongsheng

feat: bug修改

parent d393bff1
......@@ -2,7 +2,7 @@
* @Author: 吴永生 15770852798@163.com
* @Date: 2022-10-19 17:09:23
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-10-31 11:22:34
* @LastEditTime: 2022-12-13 14:02:56
* @FilePath: /bkunyun/src/api/resourceCenter.ts
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -107,7 +107,7 @@ const getActorEnvOptions = (params: {type: string}) => {
};
// 获取工作流模板
const getWorkflowspecList = (params: {productId?: string, title?: string}) => {
const getWorkflowspecList = (params: {productId?: string, title?: string, page: number, size: number}) => {
return request({
// url:`${Api.API_WORKFLOWSPEC_LIST}/${params.productId}`,
url:`${Api.API_WORKFLOWSPEC_LIST}`,
......
......@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-07-05 14:00:37
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-08-08 16:34:52
* @LastEditTime: 2022-12-13 14:21:36
* @FilePath: /bkunyun/src/api/workbench_api.ts
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -27,6 +27,8 @@ function menu() {
type workflowspecTemplateParams = {
projectId: string;
title?: string;
page: number;
size: number;
};
// 查询项目下工作流模板列表
......
......@@ -79,7 +79,7 @@ const VrituallyCardTable = (props: IVrituallyCardTableProps) => {
<div
style={{
display: "flex",
justifyContent: "space-between",
justifyContent: "flex-start",
alignItems: "center",
boxSizing: "border-box",
height: "100%",
......
......@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-21 20:03:56
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-12-12 18:11:38
* @LastEditTime: 2022-12-13 14:12:44
* @FilePath: /bkunyun/src/views/Project/ProjectSubmitWork/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -551,8 +551,12 @@ const ProjectSubmitWork = observer(() => {
{statusMap[overviewInfo?.status as IStatus]}
</div>
</div>
{workFlowJobInfo?.outputs &&
Object.keys(workFlowJobInfo?.outputs).length > 0 && (
{ renderOutputs1?.length ?
<>
<div className={styles.title}>
任务结果
<span className={styles.taskResultsNum}>{renderOutputs1.length}</span>
</div>
<div className={styles.taskResults}>
{renderOutputs1.map((item, index) => {
return (
......@@ -590,7 +594,9 @@ const ProjectSubmitWork = observer(() => {
);
})}
</div>
)}
</> :
null}
</div>
......
......@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-05-31 10:18:13
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-12-13 10:41:08
* @LastEditTime: 2022-12-13 14:22:05
* @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -67,6 +67,8 @@ const ProjectMembers = observer(() => {
onSuccess: (result: any) => {
setOpenDialog(false);
getTemplateInfo({
page: 0,
size: 999,
projectId: currentProjectStore.currentProjectInfo.id as string,
title: templateName,
});
......@@ -75,6 +77,8 @@ const ProjectMembers = observer(() => {
useEffect(() => {
getTemplateInfo({
page: 0,
size: 999,
projectId: currentProjectStore.currentProjectInfo.id as string,
});
}, [currentProjectStore.currentProjectInfo.id, getTemplateInfo]);
......@@ -106,6 +110,8 @@ const ProjectMembers = observer(() => {
useEffect(() => {
setTimeout(() => {
getTemplateInfo({
page: 0,
size: 999,
projectId: projectIdData as string,
title: templateName,
});
......@@ -264,6 +270,8 @@ const ProjectMembers = observer(() => {
setShowAddTemplate={() => {
setShowAddTemplate(false);
getTemplateInfo({
page: 0,
size: 999,
projectId: projectIdData as string,
title: templateName,
});
......
......@@ -16,6 +16,8 @@ import TemplateDetail from "./TemplateDetail";
import style from "./index.module.css";
import TemplateItem from "./TemplateItem";
import NoData from "@/components/BusinessComponents/NoData";
// import VrituallyCardTable from "@/components/CommonComponents/VrituallyCardTable";
const UserResourcesTemplate = observer(() => {
const [title, setTitle] = useState("");
......@@ -81,13 +83,15 @@ const UserResourcesTemplate = observer(() => {
// 获取模板列表
const { run } = useMyRequest(getWorkflowspecList, {
onSuccess: (result: any) => {
setList(result.data);
setList(result.data.content);
},
});
useEffect(() => {
if (!showAddTemplate) {
run({
page:0,
size: 999,
productId: product === "all" ? "" : product,
title,
});
......@@ -99,6 +103,8 @@ const UserResourcesTemplate = observer(() => {
Message.success("删除成功");
setShowDeleteDialog(false);
run({
page: 0,
size: 999,
productId: product === "all" ? "" : product,
title,
});
......@@ -146,7 +152,13 @@ const UserResourcesTemplate = observer(() => {
data={list}
renderItem={renderItem}
itemMinWidth={377}
></CardTable>
/>
{/* <VrituallyCardTable
data={list}
renderItem={renderItem}
itemMinWidth={377}
rowHeight={220}
></VrituallyCardTable> */}
</div>
{showAddTemplate && (
<WorkFlowEdit
......
Markdown is supported
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