Commit f5273c38 by zhaochengxiang

bug fix

parent e8c9ebc0
...@@ -5,6 +5,7 @@ import ResizeObserver from 'rc-resize-observer' ...@@ -5,6 +5,7 @@ import ResizeObserver from 'rc-resize-observer'
import { debounceTime, Subject } from 'rxjs' import { debounceTime, Subject } from 'rxjs'
import { DownOutlined, UpOutlined } from "@ant-design/icons" import { DownOutlined, UpOutlined } from "@ant-design/icons"
import LocalStorage from 'local-storage' import LocalStorage from 'local-storage'
import produce from 'immer'
import { defaultPage, usePage } from '../../../util/hooks/page' import { defaultPage, usePage } from '../../../util/hooks/page'
import Table from '../../../util/Component/Table' import Table from '../../../util/Component/Table'
...@@ -154,7 +155,14 @@ const FC = (props) => { ...@@ -154,7 +155,14 @@ const FC = (props) => {
id={record.id} id={record.id}
did={record.dirId} did={record.dirId}
type='dataAsset' type='dataAsset'
tags={resoureTagMap?.[`${record.id}`]} tags={resoureTagMap?.[record.id]}
onChange={(val) => {
setResourceTagMap((prevResourceTagMap) => {
return produce(prevResourceTagMap||{}, (draft) => {
draft[record.id] = val
})
})
}}
/> />
</div> </div>
} }
......
...@@ -5,6 +5,7 @@ import ResizeObserver from 'rc-resize-observer' ...@@ -5,6 +5,7 @@ import ResizeObserver from 'rc-resize-observer'
import { debounceTime, Subject } from 'rxjs' import { debounceTime, Subject } from 'rxjs'
import { DownOutlined, UpOutlined } from "@ant-design/icons" import { DownOutlined, UpOutlined } from "@ant-design/icons"
import LocalStorage from 'local-storage' import LocalStorage from 'local-storage'
import produce from 'immer'
import { defaultPage, usePage } from '../../../util/hooks/page' import { defaultPage, usePage } from '../../../util/hooks/page'
import Table from '../../../util/Component/Table' import Table from '../../../util/Component/Table'
...@@ -276,7 +277,14 @@ const FC = (props) => { ...@@ -276,7 +277,14 @@ const FC = (props) => {
id={record.id} id={record.id}
did={record.dirId} did={record.dirId}
type='dataAsset' type='dataAsset'
tags={resoureTagMap?.[`${record.id}`]} tags={resoureTagMap?.[record.id]}
onChange={(val) => {
setResourceTagMap((prevResourceTagMap) => {
return produce(prevResourceTagMap||{}, (draft) => {
draft[record.id] = val
})
})
}}
/> />
} }
] ]
......
...@@ -5,6 +5,7 @@ import ResizeObserver from 'rc-resize-observer' ...@@ -5,6 +5,7 @@ import ResizeObserver from 'rc-resize-observer'
import { debounceTime, Subject } from 'rxjs' import { debounceTime, Subject } from 'rxjs'
import { DownOutlined, UpOutlined } from "@ant-design/icons" import { DownOutlined, UpOutlined } from "@ant-design/icons"
import LocalStorage from 'local-storage' import LocalStorage from 'local-storage'
import produce from 'immer'
import { defaultPage, usePage } from '../../../util/hooks/page' import { defaultPage, usePage } from '../../../util/hooks/page'
import Table from '../../../util/Component/Table' import Table from '../../../util/Component/Table'
...@@ -121,7 +122,14 @@ const FC = () => { ...@@ -121,7 +122,14 @@ const FC = () => {
id={record.id} id={record.id}
did={record.dirId} did={record.dirId}
type='dataAsset' type='dataAsset'
tags={resoureTagMap?.[`${record.id}`]} tags={resoureTagMap?.[record.id]}
onChange={(val) => {
setResourceTagMap((prevResourceTagMap) => {
return produce(prevResourceTagMap||{}, (draft) => {
draft[record.id] = val
})
})
}}
/> />
</div> </div>
} }
......
...@@ -5,6 +5,7 @@ import ResizeObserver from 'rc-resize-observer' ...@@ -5,6 +5,7 @@ import ResizeObserver from 'rc-resize-observer'
import { debounceTime, Subject } from 'rxjs' import { debounceTime, Subject } from 'rxjs'
import { DownOutlined, UpOutlined } from "@ant-design/icons" import { DownOutlined, UpOutlined } from "@ant-design/icons"
import LocalStorage from 'local-storage' import LocalStorage from 'local-storage'
import produce from 'immer'
import { defaultPage, usePage } from '../../../util/hooks/page' import { defaultPage, usePage } from '../../../util/hooks/page'
import Table from '../../../util/Component/Table' import Table from '../../../util/Component/Table'
...@@ -154,7 +155,14 @@ const FC = (props) => { ...@@ -154,7 +155,14 @@ const FC = (props) => {
id={record.id} id={record.id}
did={record.dirId} did={record.dirId}
type='dataAsset' type='dataAsset'
tags={resoureTagMap?.[`${record.id}`]} tags={resoureTagMap?.[record.id]}
onChange={(val) => {
setResourceTagMap((prevResourceTagMap) => {
return produce(prevResourceTagMap||{}, (draft) => {
draft[record.id] = val
})
})
}}
/> />
</div> </div>
} }
......
...@@ -5,6 +5,7 @@ import ResizeObserver from 'rc-resize-observer' ...@@ -5,6 +5,7 @@ import ResizeObserver from 'rc-resize-observer'
import { debounceTime, Subject } from 'rxjs' import { debounceTime, Subject } from 'rxjs'
import { DownOutlined, UpOutlined } from "@ant-design/icons" import { DownOutlined, UpOutlined } from "@ant-design/icons"
import LocalStorage from 'local-storage' import LocalStorage from 'local-storage'
import produce from 'immer'
import { defaultPage, usePage } from '../../../util/hooks/page' import { defaultPage, usePage } from '../../../util/hooks/page'
import Table from '../../../util/Component/Table' import Table from '../../../util/Component/Table'
...@@ -364,7 +365,14 @@ const FC = (props) => { ...@@ -364,7 +365,14 @@ const FC = (props) => {
id={record.id} id={record.id}
did={record.dirId} did={record.dirId}
type='dataAsset' type='dataAsset'
tags={resoureTagMap?.[`${record.id}`]} tags={resoureTagMap?.[record.id]}
onChange={(val) => {
setResourceTagMap((prevResourceTagMap) => {
return produce(prevResourceTagMap||{}, (draft) => {
draft[record.id] = val
})
})
}}
/> />
} }
] ]
......
...@@ -13,6 +13,7 @@ import TagCell from './tag-help'; ...@@ -13,6 +13,7 @@ import TagCell from './tag-help';
import './ModelTable.less'; import './ModelTable.less';
import 'react-contexify/dist/ReactContexify.css'; import 'react-contexify/dist/ReactContexify.css';
import produce from "immer";
const { Paragraph, Text } = Typography; const { Paragraph, Text } = Typography;
...@@ -266,7 +267,14 @@ const ModelTable = (props) => { ...@@ -266,7 +267,14 @@ const ModelTable = (props) => {
props.row?.state?.id === '4' ? <TagCell props.row?.state?.id === '4' ? <TagCell
id={props.row?.id} id={props.row?.id}
type='model' type='model'
tags={resoureTagMap?.[`${props.row?.id}`]} tags={resoureTagMap?.[props.row?.id]}
onChange={(val) => {
setResourceTagMap((prevResourceTagMap) => {
return produce(prevResourceTagMap||{}, (draft) => {
draft[props.row?.id] = val
})
})
}}
/> : null /> : null
) )
} }
......
...@@ -11,7 +11,7 @@ import { showMessage } from '../../../../util' ...@@ -11,7 +11,7 @@ import { showMessage } from '../../../../util'
import { dispatch } from '../../../../model' import { dispatch } from '../../../../model'
import { AppContext } from '../../../../App' import { AppContext } from '../../../../App'
const FC = ({ type, id, did, tags }) => { const FC = ({ type, id, did, tags, onChange }) => {
const [data, setData] = React.useState([]) const [data, setData] = React.useState([])
const [tagSelectPopupParams, setTagSelectPopupParams] = React.useState({ const [tagSelectPopupParams, setTagSelectPopupParams] = React.useState({
visible: false, visible: false,
...@@ -48,6 +48,7 @@ const FC = ({ type, id, did, tags }) => { ...@@ -48,6 +48,7 @@ const FC = ({ type, id, did, tags }) => {
}, },
callback: data => { callback: data => {
setData(data?.data?.[`${id}`]); setData(data?.data?.[`${id}`]);
onChange?.(data?.data?.[`${id}`]);
} }
}); });
} }
......
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