Commit 32d3e94d authored by wuyongsheng's avatar wuyongsheng

feat: bug修改

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