Commit 19eb2e38 by fanyj

修改标签查询异常问题

parent cddb0f88
...@@ -91,12 +91,8 @@ const AssetAction = React.forwardRef(function (props, ref) { ...@@ -91,12 +91,8 @@ const AssetAction = React.forwardRef(function (props, ref) {
const [form] = Form.useForm(); const [form] = Form.useForm();
useEffect(()=>{ useEffect(()=>{
console.log(assets)
if(assets?.metadataId) if(assets?.metadataId)
setSelectData({metadataId:assets.metadataId,metadataPath:assets.metadataPath}) setSelectData({metadataId:assets.metadataId,metadataPath:assets.metadataPath})
if(assets.length){
getResourceTag()
}
},[assets]) },[assets])
React.useImperativeHandle(ref, () => ({ React.useImperativeHandle(ref, () => ({
...@@ -193,7 +189,8 @@ const AssetAction = React.forwardRef(function (props, ref) { ...@@ -193,7 +189,8 @@ const AssetAction = React.forwardRef(function (props, ref) {
} }
const getResourceTag = () => { const getResourceTag = () => {
const ids = (assets??[]).map(item => item._id) const ids = (tableData??[]).map(item => item.id)
console.log('tableData',tableData)
if (ids.length > 0) { if (ids.length > 0) {
dispatch({ dispatch({
type: 'tag.getResourceTagIn', type: 'tag.getResourceTagIn',
...@@ -358,8 +355,6 @@ const getResourceTag = () => { ...@@ -358,8 +355,6 @@ const getResourceTag = () => {
const cols = useMemo(() => { const cols = useMemo(() => {
let newCols = [] let newCols = []
console.log('columns',columns)
console.log('businessColumns',businessColumns)
newCols = isStructured?[...columns]:[...businessColumns??[]] newCols = isStructured?[...columns]:[...businessColumns??[]]
if (!isStructured && currentAction!=='detail') { if (!isStructured && currentAction!=='detail') {
newCols.push(businessActionCol) newCols.push(businessActionCol)
...@@ -374,6 +369,13 @@ const getResourceTag = () => { ...@@ -374,6 +369,13 @@ const getResourceTag = () => {
return [paginate(currentMetadataColumnList, pageNum, pageSize), currentMetadataColumnList.length]; return [paginate(currentMetadataColumnList, pageNum, pageSize), currentMetadataColumnList.length];
}, [metadataColumnList, modifyMetadataColumnList, pagination, keyword, currentAction, assets]) }, [metadataColumnList, modifyMetadataColumnList, pagination, keyword, currentAction, assets])
useEffect(()=>{
if(tableData.length){
getResourceTag()
}
},[tableData])
const getPermission = () => { const getPermission = () => {
dispatch({ dispatch({
type: 'assetmanage.getPermission', type: 'assetmanage.getPermission',
......
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