Skip to content

S
szse
Commit 71991c73 by zhaochengxiang
Options

去掉checkCodeIsExist

parent 52d5c1d6
Showing with 105 additions and 123 deletions
src/view/Manage/AssetManage/Component/AddAssetModel.jsx
...@@ -40,43 +40,27 @@ const AddAssetModel = (props) => { ...@@ -40,43 +40,27 @@ const AddAssetModel = (props) => {
setWaiting(true); setWaiting(true);
dispatch({ dispatch({
type: 'assetmanage.checkCodeIsExist', type: 'assetmanage.checkIsNeedSaveAsDraft',
payload: { callback: (data) => {
data: { elements: newElements } const needSaveAsDraft = (data==='true')?true:false
},
callback: isExist => { dispatch({
if (isExist === 'true') { type: needSaveAsDraft?'assetmanage.saveAsDraft':'assetmanage.addOrUpdateDataAsset',
setWaiting(false); payload: {
showMessage('warn', '已存在相同的资产目录编号,请重新输入'); params: {
} else { dirId: nodeId,
dispatch({ operation: 'release',
type: 'assetmanage.checkIsNeedSaveAsDraft',
callback: (data) => {
const needSaveAsDraft = (data==='true')?true:false
dispatch({
type: needSaveAsDraft?'assetmanage.saveAsDraft':'assetmanage.addOrUpdateDataAsset',
payload: {
params: {
dirId: nodeId,
operation: 'release',
},
data: { elements: newElements, templateType: getTemplateType(), ...postRelations }
},
callback: () => {
showMessage("success","新增成功");
close(true)
},
error: () => {
setWaiting(false);
}
})
}, },
error: () => { data: { elements: newElements, templateType: getTemplateType(), ...postRelations }
setWaiting(false); },
} callback: () => {
}) showMessage("success","新增成功");
} close(true)
},
error: () => {
setWaiting(false);
}
})
}, },
error: () => { error: () => {
setWaiting(false); setWaiting(false);
......
src/view/Manage/AssetManage/Component/AssetAction.jsx
...@@ -132,6 +132,28 @@ const AssetAction = (props) => { ...@@ -132,6 +132,28 @@ const AssetAction = (props) => {
}, },
]; ];
const businessActionCol = {
title: '操作',
dataIndex: 'action',
width: 80,
fixed: 'right',
render: (_, record, index) => {
return <Button
size='small'
onClick={() => {
setModifyMetadataColumnList(prev => {
const newModifyList = [...prev]
newModifyList.splice(index, 1)
return newModifyList
})
}}
>
删除
</Button>
}
}
useEffect(() => { useEffect(() => {
if (!readonly) { if (!readonly) {
getSystems(); getSystems();
...@@ -196,10 +218,19 @@ const AssetAction = (props) => { ...@@ -196,10 +218,19 @@ const AssetAction = (props) => {
return []; return [];
}, [currentDomainGroup, currentBussinessDomain, treeDataMap]) }, [currentDomainGroup, currentBussinessDomain, treeDataMap])
const tableData = useMemo(() => { const cols = useMemo(() => {
let newCols = [...businessCols]
if (isMetadataEdit) {
newCols.push(businessActionCol)
}
return newCols
}, [isMetadataEdit, modifyMetadataColumnList])
const [tableData, total] = useMemo(() => {
let currentMetadataColumnList = isMetadataEdit ? [...modifyMetadataColumnList||[]] : [...metadataColumnList||[]] let currentMetadataColumnList = isMetadataEdit ? [...modifyMetadataColumnList||[]] : [...metadataColumnList||[]]
return paginate(currentMetadataColumnList, pageNum, pageSize); return [paginate(currentMetadataColumnList, pageNum, pageSize), currentMetadataColumnList.length];
}, [metadataColumnList, modifyMetadataColumnList, pagination, keyword, isMetadataEdit, assets]) }, [metadataColumnList, modifyMetadataColumnList, pagination, keyword, isMetadataEdit, assets])
const getPermission = () => { const getPermission = () => {
...@@ -563,44 +594,28 @@ const AssetAction = (props) => { ...@@ -563,44 +594,28 @@ const AssetAction = (props) => {
} }
}) })
} else { } else {
let params = {
dirId,
metadataId: metadataId??'',
operation: 'change',
}
let data = action==='add' ? { elements: newElements } : { ...assets, elements: newElements }
data = {...data, businessRelations: relationAssetsRef.current?.assets}
dispatch({ dispatch({
type: 'assetmanage.checkCodeIsExist', type: needSaveAsDraft?'assetmanage.saveAsDraft':'assetmanage.addOrUpdateDataAsset',
payload: { payload: {
data: action==='add' ? { elements: newElements } : { ...assets, elements: newElements } params,
data,
}, },
callback: isExist => { callback: () => {
if (isExist === 'true') { setConfirmLoading(false);
setConfirmLoading(false); setCurrentAction('detail');
showMessage('warn', '已存在相同的资产目录编号,请重新输入'); getAsset();
} else { showMessage("success",(action==='add')?"新增成功":"修改成功");
let params = { onChange && onChange();
dirId,
metadataId: metadataId??'',
operation: 'change',
}
let data = action==='add' ? { elements: newElements } : { ...assets, elements: newElements }
data = {...data, businessRelations: relationAssetsRef.current?.assets}
dispatch({
type: needSaveAsDraft?'assetmanage.saveAsDraft':'assetmanage.addOrUpdateDataAsset',
payload: {
params,
data,
},
callback: () => {
setConfirmLoading(false);
setCurrentAction('detail');
getAsset();
showMessage("success",(action==='add')?"新增成功":"修改成功");
onChange && onChange();
},
error: () => {
setConfirmLoading(false);
}
})
}
}, },
error: () => { error: () => {
setConfirmLoading(false); setConfirmLoading(false);
...@@ -765,13 +780,13 @@ const AssetAction = (props) => { ...@@ -765,13 +780,13 @@ const AssetAction = (props) => {
<Button onClick={onActionButtonClick}>{(reference===AssetDraftReference||!needSaveAsDraft)?'保存':'保存草稿'}</Button> <Button onClick={onActionButtonClick}>{(reference===AssetDraftReference||!needSaveAsDraft)?'保存':'保存草稿'}</Button>
</React.Fragment> </React.Fragment>
} }
{ {/* {
(reference!==AssetDraftReference&&!isPostAsset(assets?.templateType)) && <Button onClick={onAuthorizationButtonClick}>授权</Button> (reference!==AssetDraftReference&&!isPostAsset(assets?.templateType)) && <Button onClick={onAuthorizationButtonClick}>授权</Button>
} } */}
</React.Fragment> </React.Fragment>
} }
{ {/* {
reference !== AssetRecycleReference && <Button onClick={shareAsset}>分享</Button> reference !== AssetRecycleReference && <Button onClick={shareAsset}>分享</Button>
} }
{ {
...@@ -801,7 +816,7 @@ const AssetAction = (props) => { ...@@ -801,7 +816,7 @@ const AssetAction = (props) => {
</Space> </Space>
</Button> </Button>
</Dropdown> </Dropdown>
} } */}
</Space> </Space>
} }
</div> </div>
...@@ -951,13 +966,12 @@ const AssetAction = (props) => { ...@@ -951,13 +966,12 @@ const AssetAction = (props) => {
<Table <Table
className='mt-3' className='mt-3'
loading={loadingMetadataColumnList} loading={loadingMetadataColumnList}
columns={businessCols??[]} columns={cols??[]}
rowKey='_id' rowKey='_id'
dataSource={tableData||[]} dataSource={tableData||[]}
pagination={{ pagination={{
position: ['bottomLeft'], position: ['bottomCenter'],
size: 'small', total,
total: (metadataColumnList||[]).length,
showTotal: (total) => `共${total}项`, showTotal: (total) => `共${total}项`,
showSizeChanger: true, showSizeChanger: true,
current: pageNum, current: pageNum,
......
src/view/Manage/AssetManage/Component/AssetTagModal.jsx
...@@ -151,51 +151,35 @@ const AssetTagModal = (props) => { ...@@ -151,51 +151,35 @@ const AssetTagModal = (props) => {
setConfirmLoading(true); setConfirmLoading(true);
dispatch({ dispatch({
type: 'assetmanage.checkCodeIsExist', type: 'assetmanage.addOrUpdateDataAsset',
payload: { payload: {
data: { ...asset, elements: newElements } params,
data: { ...asset, elements: newElements }
}, },
callback: isExist => { callback: data => {
if (isExist === 'true') { const ids = [id];
setConfirmLoading(false); if (data && ((data?.id||'')!=='') && (data?.id!==id)) {
showMessage('warn', '已存在相同的资产目录编号,请重新输入'); ids.push(data?.id);
} else {
dispatch({
type: 'assetmanage.addOrUpdateDataAsset',
payload: {
params,
data: { ...asset, elements: newElements }
},
callback: data => {
const ids = [id];
if (data && ((data?.id||'')!=='') && (data?.id!==id)) {
ids.push(data?.id);
}
dispatch({
type: 'tag.batchAddTagResourceByTagList',
payload: {
params: {
tagIds: tag?.tagId,
resourceIds: ids.join(','),
type: 'dataAsset',
creator
}
},
callback: () => {
reset();
onCancel && onCancel(true);
},
error: () => {
setConfirmLoading(false);
}
})
},
error: () => {
setConfirmLoading(false);
}
})
} }
dispatch({
type: 'tag.batchAddTagResourceByTagList',
payload: {
params: {
tagIds: tag?.tagId,
resourceIds: ids.join(','),
type: 'dataAsset',
creator
}
},
callback: () => {
reset();
onCancel && onCancel(true);
},
error: () => {
setConfirmLoading(false);
}
})
}, },
error: () => { error: () => {
setConfirmLoading(false); setConfirmLoading(false);
......
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