Commit 6e8a9751 by zhaochengxiang

bug fix

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