Commit 6e8a9751 by zhaochengxiang

bug fix

parent 713389c3
...@@ -483,7 +483,7 @@ const ModelRangeItem = ({ value, onChange }) => { ...@@ -483,7 +483,7 @@ const ModelRangeItem = ({ value, onChange }) => {
loading={loading} loading={loading}
dropdownStyle={{ maxHeight: 400, overflow: 'auto' }} dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
treeData={treeData1} treeData={treeData1}
selectedRowKeys={treeSelectedKey?[treeSelectedKey]:undefined} value={treeSelectedKey?[treeSelectedKey]:undefined}
onSelect={onTreeSelect} onSelect={onTreeSelect}
placeholder="请选择模型范围" placeholder="请选择模型范围"
/> />
...@@ -597,7 +597,6 @@ const MetadataRangeItem = ({ value, onChange }) => { ...@@ -597,7 +597,6 @@ const MetadataRangeItem = ({ value, onChange }) => {
for (let child of item.scopes??[]) { for (let child of item.scopes??[]) {
child.key = `${item.catalogId}-${child.scopeId}` child.key = `${item.catalogId}-${child.scopeId}`
child.title = child.scopeName child.title = child.scopeName
child.catalogId = item.catalogId
child.value = `${item.catalogId}-${child.scopeId}` child.value = `${item.catalogId}-${child.scopeId}`
child.idStr = `${child.scopeId}` child.idStr = `${child.scopeId}`
child.disabled = true child.disabled = true
...@@ -617,6 +616,7 @@ const MetadataRangeItem = ({ value, onChange }) => { ...@@ -617,6 +616,7 @@ const MetadataRangeItem = ({ value, onChange }) => {
const onDomainChange = (val) => { const onDomainChange = (val) => {
setCurrentDomainId(val) setCurrentDomainId(val)
setTreeData() setTreeData()
setTreeSelectedKey()
} }
const onTreeSelect = (selectedKeys) => { const onTreeSelect = (selectedKeys) => {
...@@ -652,7 +652,7 @@ const MetadataRangeItem = ({ value, onChange }) => { ...@@ -652,7 +652,7 @@ const MetadataRangeItem = ({ value, onChange }) => {
dispatch({ dispatch({
type: 'datamodel.getChildByParentId', type: 'datamodel.getChildByParentId',
payload: { payload: {
catalog: node?.catalogId, catalog: currentDomainId,
system: node?.scopeId, system: node?.scopeId,
parentId: node?._id, parentId: node?._id,
}, },
...@@ -661,7 +661,6 @@ const MetadataRangeItem = ({ value, onChange }) => { ...@@ -661,7 +661,6 @@ const MetadataRangeItem = ({ value, onChange }) => {
key: item._id, key: item._id,
title: item.name, title: item.name,
value: item._id, value: item._id,
catalogId: node?.catalogId,
scopeId: node?.scopeId, scopeId: node?.scopeId,
idStr: item._id, idStr: item._id,
isLeaf: true, isLeaf: true,
...@@ -680,7 +679,7 @@ const MetadataRangeItem = ({ value, onChange }) => { ...@@ -680,7 +679,7 @@ const MetadataRangeItem = ({ value, onChange }) => {
dispatch({ dispatch({
type: 'datamodel.getChildBySystem', type: 'datamodel.getChildBySystem',
payload: { payload: {
catalog: node?.catalogId, catalog: currentDomainId,
system: node?.scopeId, system: node?.scopeId,
}, },
callback: (data) => { callback: (data) => {
...@@ -688,7 +687,6 @@ const MetadataRangeItem = ({ value, onChange }) => { ...@@ -688,7 +687,6 @@ const MetadataRangeItem = ({ value, onChange }) => {
key: item._id, key: item._id,
title: item.name, title: item.name,
value: item._id, value: item._id,
catalogId: node?.catalogId,
scopeId: node?.scopeId, scopeId: node?.scopeId,
idStr: item._id, idStr: item._id,
...item ...item
...@@ -704,6 +702,8 @@ const MetadataRangeItem = ({ value, onChange }) => { ...@@ -704,6 +702,8 @@ const MetadataRangeItem = ({ value, onChange }) => {
} }
}); });
console.log('treeSelectedKey', treeSelectedKey)
return ( return (
<Row gutter={15}> <Row gutter={15}>
<Col span={6}> <Col span={6}>
...@@ -719,7 +719,7 @@ const MetadataRangeItem = ({ value, onChange }) => { ...@@ -719,7 +719,7 @@ const MetadataRangeItem = ({ value, onChange }) => {
<Col span={18}> <Col span={18}>
<TreeSelect <TreeSelect
loading={loadingTreeData} loading={loadingTreeData}
selectedRowKeys={treeSelectedKey?[treeSelectedKey]:undefined} value={treeSelectedKey?[treeSelectedKey]:undefined}
onSelect={onTreeSelect} onSelect={onTreeSelect}
dropdownStyle={{ maxHeight: 400, overflow: 'auto' }} dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
treeData={treeData} treeData={treeData}
...@@ -832,8 +832,8 @@ const Range = React.forwardRef(function ({ type, task }, ref) { ...@@ -832,8 +832,8 @@ const Range = React.forwardRef(function ({ type, task }, ref) {
{ {
(ranges??[]).map((item, index) => { (ranges??[]).map((item, index) => {
return ( return (
<Row className='mb-1' key={generateUUID()} align='middle' gutter={15}> <Row className={type==='detail'?'mb-2':'mb-1'} key={generateUUID()} align='middle' gutter={15}>
<Col span={12}> <Col span={type==='detail'?24:12}>
{`【模型】${(item.modelCatalogNameList??[]).join('/')} -【元数据】${(item.metadataCatalogNameList??[]).join('/')}`} {`【模型】${(item.modelCatalogNameList??[]).join('/')} -【元数据】${(item.metadataCatalogNameList??[]).join('/')}`}
</Col> </Col>
{ {
......
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