Commit f3eaaa27 by 放生的三文鱼

恢复进度

parent 6dea8232
...@@ -386,4 +386,7 @@ export function updateDraftDataAsset(payload) { ...@@ -386,4 +386,7 @@ export function updateDraftDataAsset(payload) {
return PostJSON('/dataassetmanager/draftApi/updateDraft', payload); return PostJSON('/dataassetmanager/draftApi/updateDraft', payload);
} }
// /flowApi/startDataAssetFlow
export function startDataAssetFlow(payload) {
return PostJSON("/dataassetmanager/flowApi/startDataAssetFlow", payload)
}
...@@ -44,6 +44,7 @@ const AssetManagementTable = () => { ...@@ -44,6 +44,7 @@ const AssetManagementTable = () => {
setSelectedRowKeys, setSelectedRowKeys,
batchDelete, batchDelete,
batchPublish, batchPublish,
setApplyReason,
} = useGetAssetDraft({ setDraftParams }); } = useGetAssetDraft({ setDraftParams });
const [modal, contextHolder] = Modal.useModal(); const [modal, contextHolder] = Modal.useModal();
const changeTemplate = (value) => { const changeTemplate = (value) => {
...@@ -80,16 +81,23 @@ const AssetManagementTable = () => { ...@@ -80,16 +81,23 @@ const AssetManagementTable = () => {
}, },
}; };
const showConfirm = (type) => { const startDataAssetFlow = () => {
const confirmed = modal.confirm({
title: "请输入送审原因",
content: <Input onChange={(e) => setApplyReason(e.target.value)} />,
onOk: () => {
batchPublish();
confirmed.destroy();
},
});
};
const showConfirm = () => {
const confirmed = modal.confirm({ const confirmed = modal.confirm({
title: "提示", title: "提示",
content: `确认${type}选中的草稿吗?`, content: `确认删除选中的草稿吗?`,
onOk: () => { onOk: () => {
if (type === "删除") { batchDelete();
batchDelete();
} else if (type === "送审") {
batchPublish();
}
confirmed.destroy(); confirmed.destroy();
}, },
}); });
...@@ -145,7 +153,7 @@ const AssetManagementTable = () => { ...@@ -145,7 +153,7 @@ const AssetManagementTable = () => {
disabled={hasItems} disabled={hasItems}
type="primary" type="primary"
onClick={() => { onClick={() => {
showConfirm("送审"); startDataAssetFlow();
}} }}
> >
送审 送审
...@@ -154,7 +162,7 @@ const AssetManagementTable = () => { ...@@ -154,7 +162,7 @@ const AssetManagementTable = () => {
disabled={hasItems} disabled={hasItems}
danger danger
onClick={() => { onClick={() => {
showConfirm("删除"); showConfirm();
}} }}
> >
删除 删除
......
...@@ -6,6 +6,7 @@ import { ...@@ -6,6 +6,7 @@ import {
listFilterElementsGroupByType, listFilterElementsGroupByType,
deleteDraftDataAsset, deleteDraftDataAsset,
auditDraftDataAsset, auditDraftDataAsset,
startDataAssetFlow,
} from "../../../../service/dataassetmanager"; } from "../../../../service/dataassetmanager";
import { AssetItem } from "../../AssetManage/Component/AssetTable"; import { AssetItem } from "../../AssetManage/Component/AssetTable";
import { showMessage, showErrorNotifaction } from "../../../../util"; import { showMessage, showErrorNotifaction } from "../../../../util";
...@@ -30,7 +31,7 @@ export function useGetAssetDraft({ setDraftParams }) { ...@@ -30,7 +31,7 @@ export function useGetAssetDraft({ setDraftParams }) {
const [dataLoading, setDataLoading] = useState(false); const [dataLoading, setDataLoading] = useState(false);
const [draftData, setDraftData] = useState(); const [draftData, setDraftData] = useState();
const [selectedRowKeys, setSelectedRowKeys] = useState([]); const [selectedRowKeys, setSelectedRowKeys] = useState([]);
const [applyReason, setApplyReason] = useState("");
// 批量删除 // 批量删除
const batchDelete = async (id = "") => { const batchDelete = async (id = "") => {
try { try {
...@@ -48,9 +49,12 @@ export function useGetAssetDraft({ setDraftParams }) { ...@@ -48,9 +49,12 @@ export function useGetAssetDraft({ setDraftParams }) {
}; };
// 批量送审 // 批量送审
const batchPublish = async (id = "") => { const batchPublish = async (id = "") => {
console.log('batchPublish',applyReason);
try { try {
await auditDraftDataAsset({ await startDataAssetFlow({
draftIds: id ? id : selectedRowKeys, params: { applyReason },
data: id ? id : selectedRowKeys,
}); });
showMessage("success", "送审成功"); showMessage("success", "送审成功");
setSelectedRowKeys([]); setSelectedRowKeys([]);
...@@ -254,7 +258,7 @@ export function useGetAssetDraft({ setDraftParams }) { ...@@ -254,7 +258,7 @@ export function useGetAssetDraft({ setDraftParams }) {
<Popconfirm <Popconfirm
title="确认删除草稿?" title="确认删除草稿?"
onConfirm={() => { onConfirm={() => {
batchPublish([record?.id]); batchPublish([record?.id]);
}} }}
> >
<Button disabled={disabled} size="small" type="link" danger> <Button disabled={disabled} size="small" type="link" danger>
...@@ -346,5 +350,6 @@ export function useGetAssetDraft({ setDraftParams }) { ...@@ -346,5 +350,6 @@ export function useGetAssetDraft({ setDraftParams }) {
setSelectedRowKeys, setSelectedRowKeys,
batchDelete, batchDelete,
batchPublish, batchPublish,
setApplyReason,
}; };
} }
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