Commit 52d5c1d6 by zhaochengxiang

非结构化字段

parent 1e8a3a93
...@@ -421,3 +421,7 @@ export function* fillRelationDisplayInfo(payload) { ...@@ -421,3 +421,7 @@ export function* fillRelationDisplayInfo(payload) {
export function* getBusinessColumns(payload) { export function* getBusinessColumns(payload) {
return yield call(service.getBusinessColumns, payload); return yield call(service.getBusinessColumns, payload);
} }
export function* saveBusinessColumns(payload) {
return yield call(service.saveBusinessColumns, payload);
}
\ No newline at end of file
...@@ -428,3 +428,7 @@ export function fillRelationDisplayInfo(payload) { ...@@ -428,3 +428,7 @@ export function fillRelationDisplayInfo(payload) {
export function getBusinessColumns(payload) { export function getBusinessColumns(payload) {
return GetJSON("/dataassetmanagertest/dataAssetColumnApi/listBusinessColumnsByDataAssetId", payload) return GetJSON("/dataassetmanagertest/dataAssetColumnApi/listBusinessColumnsByDataAssetId", payload)
} }
export function saveBusinessColumns(payload) {
return PostJSON("/dataassetmanagertest/dataAssetColumnApi/saveBusinessColumnsByDataAssetId", payload)
}
\ No newline at end of file
...@@ -71,14 +71,28 @@ const AssetAction = (props) => { ...@@ -71,14 +71,28 @@ const AssetAction = (props) => {
const app = useContext(AppContext); const app = useContext(AppContext);
const uploadRef = useRef(undefined); const uploadRef = useRef(undefined);
const [columnForm] = Form.useForm()
const relationAssetsRef = useRef(); const relationAssetsRef = useRef();
const businessCols = [ const businessCols = [
{ {
title: '英文名称', title: <span>
<span style={{
marginRight: 4,
color: '#ff4d4f',
}}>*</span>
英文名称
</span>,
dataIndex: 'enName', dataIndex: 'enName',
ellipsis: true, ellipsis: true,
render: (text, _, index) => <MetadataColumnEditableItem render: (text, record, index) => {
columnForm?.setFieldsValue({ [`column${index}`]: text })
return (
<Form.Item name={`column${index}`}
rules={[{ required: true, message: '请填写英文名称!' }]}
style={{ marginBottom: 0 }}
>
<MetadataColumnEditableItem
value={text} value={text}
isEdit={isMetadataEdit} isEdit={isMetadataEdit}
terms={terms} terms={terms}
...@@ -86,6 +100,9 @@ const AssetAction = (props) => { ...@@ -86,6 +100,9 @@ const AssetAction = (props) => {
onMetadataColumnEditableItemChange(e.target.value, 'enName', index) onMetadataColumnEditableItemChange(e.target.value, 'enName', index)
}} }}
/> />
</Form.Item>
)
}
}, },
{ {
title: '中文名称', title: '中文名称',
...@@ -149,6 +166,10 @@ const AssetAction = (props) => { ...@@ -149,6 +166,10 @@ const AssetAction = (props) => {
}, [assets]) }, [assets])
useEffect(() => { useEffect(() => {
getMetadataAttributes()
}, [assets])
useEffect(() => {
if (permissionId) { if (permissionId) {
getPermission(); getPermission();
} }
...@@ -382,8 +403,6 @@ const AssetAction = (props) => { ...@@ -382,8 +403,6 @@ const AssetAction = (props) => {
const metadataIndex = data?.elements?.findIndex(item => item.name === '资产项'); const metadataIndex = data?.elements?.findIndex(item => item.name === '资产项');
getMetadataAttributes();
setElements(data?.elements||[]); setElements(data?.elements||[]);
onElementsChange && onElementsChange(data?.elements||[]); onElementsChange && onElementsChange(data?.elements||[]);
...@@ -876,17 +895,31 @@ const AssetAction = (props) => { ...@@ -876,17 +895,31 @@ const AssetAction = (props) => {
}}> }}>
取消 取消
</Button> </Button>
<Button onClick={() => { <Button onClick={ async () => {
if ((modifyMetadataColumnList??[]).length === 0) { try {
setMetadataEdit(false) await columnForm?.validateFields()
return setModifyMetadataColumnList(prev => {
} return [{
}, ...prev]
})
} catch (errInfo) {
}
}}>
新增
</Button>
<Button onClick={async () => {
try {
await columnForm?.validateFields()
setLoadingMetadataColumnList(true) setLoadingMetadataColumnList(true)
dispatch({ dispatch({
type: 'assetmanage.batchUpdateAttributes', type: 'assetmanage.saveBusinessColumns',
payload: { payload: {
data: modifyMetadataColumnList params: {
dataAssetId: assets?.id,
},
data: modifyMetadataColumnList,
}, },
callback: () => { callback: () => {
setLoadingMetadataColumnList(false) setLoadingMetadataColumnList(false)
...@@ -897,6 +930,9 @@ const AssetAction = (props) => { ...@@ -897,6 +930,9 @@ const AssetAction = (props) => {
setLoadingMetadataColumnList(false) setLoadingMetadataColumnList(false)
} }
}) })
} catch (errInfo) {
}
}}> }}>
保存 保存
</Button> </Button>
...@@ -911,6 +947,7 @@ const AssetAction = (props) => { ...@@ -911,6 +947,7 @@ const AssetAction = (props) => {
} }
</Space> </Space>
<Form form={columnForm}>
<Table <Table
className='mt-3' className='mt-3'
loading={loadingMetadataColumnList} loading={loadingMetadataColumnList}
...@@ -933,6 +970,7 @@ const AssetAction = (props) => { ...@@ -933,6 +970,7 @@ const AssetAction = (props) => {
}, },
}} }}
/> />
</Form>
<div> <div>
<Divider orientation='left'>关联资产</Divider> <Divider orientation='left'>关联资产</Divider>
......
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