Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
szse
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaochengxiang
szse
Commits
8ddc7b0a
Commit
8ddc7b0a
authored
Mar 27, 2024
by
zhaochengxiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
资产增加批量打标签
parent
97b620fe
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
146 additions
and
8 deletions
+146
-8
table.jsx
src/view/Manage/AssetBrowse/table.jsx
+37
-1
table.jsx
src/view/Manage/AssetManage/table.jsx
+35
-2
table.jsx
src/view/Manage/AssetResourceBrowse/table.jsx
+37
-1
table.jsx
src/view/Manage/AssetResourceManage/table.jsx
+36
-3
data-quality.jsx
src/view/QianKun/data-quality.jsx
+1
-1
No files found.
src/view/Manage/AssetBrowse/table.jsx
View file @
8ddc7b0a
...
@@ -19,7 +19,7 @@ import { FullScreenSvg, CancelFullScreenSvg } from '../AssetManage/Component/Ass
...
@@ -19,7 +19,7 @@ import { FullScreenSvg, CancelFullScreenSvg } from '../AssetManage/Component/Ass
import
FilterElement
from
'../AssetManage/Component/FilterElementModal'
import
FilterElement
from
'../AssetManage/Component/FilterElementModal'
import
FilterElementValue
from
'../AssetResourceManage/filter-element-value'
import
FilterElementValue
from
'../AssetResourceManage/filter-element-value'
import
{
AssetDirectorySubject
}
from
'../AssetManage/Component/AssetDirectory'
import
{
AssetDirectorySubject
}
from
'../AssetManage/Component/AssetDirectory'
import
TagCell
from
'../Model/Component/tag-help'
import
TagCell
,
{
TagSelectPopup
}
from
'../Model/Component/tag-help'
import
{
MetadataColumn
}
from
'../AssetResourceManage/table'
import
{
MetadataColumn
}
from
'../AssetResourceManage/table'
import
AssetDetailDrawer
from
'../AssetManage/Component/AssetDetailDrawer'
import
AssetDetailDrawer
from
'../AssetManage/Component/AssetDetailDrawer'
...
@@ -46,6 +46,7 @@ const FC = (props) => {
...
@@ -46,6 +46,7 @@ const FC = (props) => {
const
[
row
,
setRow
]
=
React
.
useState
()
const
[
row
,
setRow
]
=
React
.
useState
()
const
$keyword
=
React
.
useMemo
(()
=>
new
Subject
(),
[])
const
$keyword
=
React
.
useMemo
(()
=>
new
Subject
(),
[])
const
[
keyword
,
setKeyword
]
=
React
.
useState
()
const
[
keyword
,
setKeyword
]
=
React
.
useState
()
const
[
selectedRows
,
setSelectedRows
]
=
React
.
useState
([])
const
[
searchType
,
setSearchType
]
=
React
.
useState
(
'keyword'
)
const
[
searchType
,
setSearchType
]
=
React
.
useState
(
'keyword'
)
const
[
resoureTagMap
,
setResourceTagMap
]
=
React
.
useState
()
const
[
resoureTagMap
,
setResourceTagMap
]
=
React
.
useState
()
const
[
filterElementParams
,
setFilterElementParams
]
=
React
.
useState
({
const
[
filterElementParams
,
setFilterElementParams
]
=
React
.
useState
({
...
@@ -64,6 +65,10 @@ const FC = (props) => {
...
@@ -64,6 +65,10 @@ const FC = (props) => {
dirId
:
undefined
,
dirId
:
undefined
,
reference
:
undefined
,
reference
:
undefined
,
})
})
const
[
tagSelectPopupParams
,
setTagSelectPopupParams
]
=
React
.
useState
({
visible
:
false
,
items
:
undefined
})
const
[
page
,
setPage
]
=
usePage
()
const
[
page
,
setPage
]
=
usePage
()
const
[
modal
,
contextHolder
]
=
Modal
.
useModal
()
const
[
modal
,
contextHolder
]
=
Modal
.
useModal
()
...
@@ -124,6 +129,7 @@ const FC = (props) => {
...
@@ -124,6 +129,7 @@ const FC = (props) => {
React
.
useEffect
(()
=>
{
React
.
useEffect
(()
=>
{
if
(
node
)
{
if
(
node
)
{
setRow
()
setRow
()
setSelectedRows
([])
if
(
locationIdRef
.
current
&&
locationDidRef
.
current
)
{
if
(
locationIdRef
.
current
&&
locationDidRef
.
current
)
{
getDataAssetLocation
()
getDataAssetLocation
()
}
else
{
}
else
{
...
@@ -361,6 +367,13 @@ const FC = (props) => {
...
@@ -361,6 +367,13 @@ const FC = (props) => {
})
})
}
}
const
onBatchAddTagClick
=
()
=>
{
setTagSelectPopupParams
({
visible
:
true
,
items
:
(
selectedRows
??[]).
map
(
item
=>
({
resourceId
:
item
.
id
}))
})
}
const
classes
=
classNames
(
'asset-list'
,
{
const
classes
=
classNames
(
'asset-list'
,
{
'asset-list-fullscreen'
:
fullScreen
,
'asset-list-fullscreen'
:
fullScreen
,
});
});
...
@@ -376,6 +389,9 @@ const FC = (props) => {
...
@@ -376,6 +389,9 @@ const FC = (props) => {
}
}
}
}
>
>
<
Space
className=
'mr-3'
style=
{
{
flex
:
0
,
paddingBottom
:
15
}
}
>
<
Space
className=
'mr-3'
style=
{
{
flex
:
0
,
paddingBottom
:
15
}
}
>
<
Tooltip
title=
{
(
selectedRows
??[]).
length
===
0
?
'请先选择资产'
:
''
}
>
<
Button
disabled=
{
(
selectedRows
??[]).
length
===
0
}
onClick=
{
onBatchAddTagClick
}
>
批量标签
</
Button
>
</
Tooltip
>
<
Button
onClick=
{
onFilterElementClick
}
>
可见列设置
</
Button
>
<
Button
onClick=
{
onFilterElementClick
}
>
可见列设置
</
Button
>
</
Space
>
</
Space
>
<
div
className=
'flex'
style=
{
{
flex
:
1
,
overflow
:
'auto'
,
paddingBottom
:
15
}
}
>
<
div
className=
'flex'
style=
{
{
flex
:
1
,
overflow
:
'auto'
,
paddingBottom
:
15
}
}
>
...
@@ -461,9 +477,16 @@ const FC = (props) => {
...
@@ -461,9 +477,16 @@ const FC = (props) => {
reference
:
AssetBrowseReference
reference
:
AssetBrowseReference
})
})
}
}
}
}
rowSelection=
{
{
selectedRowKeys
:
(
selectedRows
??[]).
map
(
item
=>
item
.
id
),
onChange
:
(
selectedRowKeys
,
selectedRows
)
=>
{
setSelectedRows
(
selectedRows
)
},
}
}
rowClassName=
{
(
record
,
index
)
=>
(
record
?.
id
===
row
?.
id
)
?
'yy-table-select-row'
:
''
}
rowClassName=
{
(
record
,
index
)
=>
(
record
?.
id
===
row
?.
id
)
?
'yy-table-select-row'
:
''
}
onPaginate=
{
(
page
,
pageSize
)
=>
{
onPaginate=
{
(
page
,
pageSize
)
=>
{
setRow
()
setRow
()
setSelectedRows
([])
setPageAndArgs
({
pageNum
:
page
,
pageSize
})
setPageAndArgs
({
pageNum
:
page
,
pageSize
})
}
}
}
}
/>
/>
...
@@ -508,6 +531,19 @@ const FC = (props) => {
...
@@ -508,6 +531,19 @@ const FC = (props) => {
})
})
}
}
}
}
/>
/>
<
TagSelectPopup
{
...
tagSelectPopupParams
}
type=
'dataAsset'
onCancel=
{
()
=>
{
setTagSelectPopupParams
({
visible
:
false
,
items
:
undefined
})
}
}
onChange=
{
()
=>
{
getResourceTag
()
}
}
/>
{
contextHolder
}
{
contextHolder
}
</
div
>
</
div
>
)
)
...
...
src/view/Manage/AssetManage/table.jsx
View file @
8ddc7b0a
...
@@ -26,7 +26,7 @@ import FilterElementValue from '../AssetResourceManage/filter-element-value'
...
@@ -26,7 +26,7 @@ import FilterElementValue from '../AssetResourceManage/filter-element-value'
import
SelectBatchEditElements
from
'../AssetResourceManage/select-batch-edit-elements'
import
SelectBatchEditElements
from
'../AssetResourceManage/select-batch-edit-elements'
import
{
AssetDirectorySubject
}
from
'./Component/AssetDirectory'
import
{
AssetDirectorySubject
}
from
'./Component/AssetDirectory'
import
{
AssetActionSubject
}
from
'./Component/AssetAction'
import
{
AssetActionSubject
}
from
'./Component/AssetAction'
import
TagCell
from
'../Model/Component/tag-help'
import
TagCell
,
{
TagSelectPopup
}
from
'../Model/Component/tag-help'
import
'./table.less'
import
'./table.less'
import
{
MetadataColumn
}
from
'../AssetResourceManage/table'
import
{
MetadataColumn
}
from
'../AssetResourceManage/table'
...
@@ -101,6 +101,10 @@ const FC = (props) => {
...
@@ -101,6 +101,10 @@ const FC = (props) => {
visible
:
false
,
visible
:
false
,
type
:
undefined
type
:
undefined
})
})
const
[
tagSelectPopupParams
,
setTagSelectPopupParams
]
=
React
.
useState
({
visible
:
false
,
items
:
undefined
})
const
[
page
,
setPage
]
=
usePage
()
const
[
page
,
setPage
]
=
usePage
()
const
[
modal
,
contextHolder
]
=
Modal
.
useModal
()
const
[
modal
,
contextHolder
]
=
Modal
.
useModal
()
...
@@ -589,6 +593,13 @@ const FC = (props) => {
...
@@ -589,6 +593,13 @@ const FC = (props) => {
})
})
}
}
const onBatchAddTagClick = () => {
setTagSelectPopupParams({
visible: true,
items: (selectedRows??[]).map(item => ({ resourceId: item.id }))
})
}
const deleteAssets = () => {
const deleteAssets = () => {
setAssetDeleteParams({
setAssetDeleteParams({
visible: false
visible: false
...
@@ -671,6 +682,8 @@ const FC = (props) => {
...
@@ -671,6 +682,8 @@ const FC = (props) => {
onDeleteClick()
onDeleteClick()
} else if (key === 'colConfig') {
} else if (key === 'colConfig') {
onFilterElementClick()
onFilterElementClick()
} else if (key === 'batchAddTag') {
onBatchAddTagClick()
}
}
}
}
...
@@ -731,7 +744,14 @@ const FC = (props) => {
...
@@ -731,7 +744,14 @@ const FC = (props) => {
删除
删除
</div>
</div>
</PermissionMenuItem>
</PermissionMenuItem>
}
}
<Menu.Item key='batchAddTag' disabled={(selectedRows??[]).length===0}>
<Tooltip title={(selectedRows??[]).length===0?'请先选择资产':''}>
<div className='text-center'>
批量标签
</div>
</Tooltip>
</Menu.Item>
<Menu.Item key='colConfig'>
<Menu.Item key='colConfig'>
<div className='text-center'>
<div className='text-center'>
可见列设置
可见列设置
...
@@ -1010,6 +1030,19 @@ const FC = (props) => {
...
@@ -1010,6 +1030,19 @@ const FC = (props) => {
refresh && getAssets()
refresh && getAssets()
}}
}}
/>
/>
<TagSelectPopup
{...tagSelectPopupParams}
type='dataAsset'
onCancel={() => {
setTagSelectPopupParams({
visible: false,
items: undefined
})
}}
onChange={() => {
getResourceTag()
}}
/>
{contextHolder}
{contextHolder}
</div>
</div>
)
)
...
...
src/view/Manage/AssetResourceBrowse/table.jsx
View file @
8ddc7b0a
...
@@ -19,7 +19,7 @@ import { FullScreenSvg, CancelFullScreenSvg } from '../AssetManage/Component/Ass
...
@@ -19,7 +19,7 @@ import { FullScreenSvg, CancelFullScreenSvg } from '../AssetManage/Component/Ass
import
FilterElement
from
'../AssetManage/Component/FilterElementModal'
import
FilterElement
from
'../AssetManage/Component/FilterElementModal'
import
FilterElementValue
from
'../AssetResourceManage/filter-element-value'
import
FilterElementValue
from
'../AssetResourceManage/filter-element-value'
import
{
AssetDirectorySubject
}
from
'../AssetManage/Component/AssetDirectory'
import
{
AssetDirectorySubject
}
from
'../AssetManage/Component/AssetDirectory'
import
TagCell
from
'../Model/Component/tag-help'
import
TagCell
,
{
TagSelectPopup
}
from
'../Model/Component/tag-help'
import
{
MetadataColumn
}
from
'../AssetResourceManage/table'
import
{
MetadataColumn
}
from
'../AssetResourceManage/table'
import
AssetDetailDrawer
from
'../AssetManage/Component/AssetDetailDrawer'
import
AssetDetailDrawer
from
'../AssetManage/Component/AssetDetailDrawer'
...
@@ -46,6 +46,7 @@ const FC = (props) => {
...
@@ -46,6 +46,7 @@ const FC = (props) => {
const
[
row
,
setRow
]
=
React
.
useState
()
const
[
row
,
setRow
]
=
React
.
useState
()
const
$keyword
=
React
.
useMemo
(()
=>
new
Subject
(),
[])
const
$keyword
=
React
.
useMemo
(()
=>
new
Subject
(),
[])
const
[
keyword
,
setKeyword
]
=
React
.
useState
()
const
[
keyword
,
setKeyword
]
=
React
.
useState
()
const
[
selectedRows
,
setSelectedRows
]
=
React
.
useState
([])
const
[
searchType
,
setSearchType
]
=
React
.
useState
(
'keyword'
)
const
[
searchType
,
setSearchType
]
=
React
.
useState
(
'keyword'
)
const
[
resoureTagMap
,
setResourceTagMap
]
=
React
.
useState
()
const
[
resoureTagMap
,
setResourceTagMap
]
=
React
.
useState
()
const
[
filterElementParams
,
setFilterElementParams
]
=
React
.
useState
({
const
[
filterElementParams
,
setFilterElementParams
]
=
React
.
useState
({
...
@@ -64,6 +65,10 @@ const FC = (props) => {
...
@@ -64,6 +65,10 @@ const FC = (props) => {
dirId
:
undefined
,
dirId
:
undefined
,
reference
:
undefined
,
reference
:
undefined
,
})
})
const
[
tagSelectPopupParams
,
setTagSelectPopupParams
]
=
React
.
useState
({
visible
:
false
,
items
:
undefined
})
const
[
page
,
setPage
]
=
usePage
()
const
[
page
,
setPage
]
=
usePage
()
const
[
modal
,
contextHolder
]
=
Modal
.
useModal
()
const
[
modal
,
contextHolder
]
=
Modal
.
useModal
()
...
@@ -124,6 +129,7 @@ const FC = (props) => {
...
@@ -124,6 +129,7 @@ const FC = (props) => {
React
.
useEffect
(()
=>
{
React
.
useEffect
(()
=>
{
if
(
node
)
{
if
(
node
)
{
setRow
()
setRow
()
setSelectedRows
([])
if
(
locationIdRef
.
current
&&
locationDidRef
.
current
)
{
if
(
locationIdRef
.
current
&&
locationDidRef
.
current
)
{
getDataAssetLocation
()
getDataAssetLocation
()
}
else
{
}
else
{
...
@@ -361,6 +367,13 @@ const FC = (props) => {
...
@@ -361,6 +367,13 @@ const FC = (props) => {
})
})
}
}
const
onBatchAddTagClick
=
()
=>
{
setTagSelectPopupParams
({
visible
:
true
,
items
:
(
selectedRows
??[]).
map
(
item
=>
({
resourceId
:
item
.
id
}))
})
}
const
classes
=
classNames
(
'asset-list'
,
{
const
classes
=
classNames
(
'asset-list'
,
{
'asset-list-fullscreen'
:
fullScreen
,
'asset-list-fullscreen'
:
fullScreen
,
});
});
...
@@ -376,6 +389,9 @@ const FC = (props) => {
...
@@ -376,6 +389,9 @@ const FC = (props) => {
}
}
}
}
>
>
<
Space
className=
'mr-3'
style=
{
{
flex
:
0
,
paddingBottom
:
15
}
}
>
<
Space
className=
'mr-3'
style=
{
{
flex
:
0
,
paddingBottom
:
15
}
}
>
<
Tooltip
title=
{
(
selectedRows
??[]).
length
===
0
?
'请先选择资源'
:
''
}
>
<
Button
disabled=
{
(
selectedRows
??[]).
length
===
0
}
onClick=
{
onBatchAddTagClick
}
>
批量标签
</
Button
>
</
Tooltip
>
<
Button
onClick=
{
onFilterElementClick
}
>
可见列设置
</
Button
>
<
Button
onClick=
{
onFilterElementClick
}
>
可见列设置
</
Button
>
</
Space
>
</
Space
>
<
div
className=
'flex'
style=
{
{
flex
:
1
,
overflow
:
'auto'
,
paddingBottom
:
15
}
}
>
<
div
className=
'flex'
style=
{
{
flex
:
1
,
overflow
:
'auto'
,
paddingBottom
:
15
}
}
>
...
@@ -461,9 +477,16 @@ const FC = (props) => {
...
@@ -461,9 +477,16 @@ const FC = (props) => {
reference
:
ResourceBrowseReference
reference
:
ResourceBrowseReference
})
})
}
}
}
}
rowSelection=
{
{
selectedRowKeys
:
(
selectedRows
??[]).
map
(
item
=>
item
.
id
),
onChange
:
(
selectedRowKeys
,
selectedRows
)
=>
{
setSelectedRows
(
selectedRows
)
},
}
}
rowClassName=
{
(
record
,
index
)
=>
(
record
?.
id
===
row
?.
id
)
?
'yy-table-select-row'
:
''
}
rowClassName=
{
(
record
,
index
)
=>
(
record
?.
id
===
row
?.
id
)
?
'yy-table-select-row'
:
''
}
onPaginate=
{
(
page
,
pageSize
)
=>
{
onPaginate=
{
(
page
,
pageSize
)
=>
{
setRow
()
setRow
()
setSelectedRows
([])
setPageAndArgs
({
pageNum
:
page
,
pageSize
})
setPageAndArgs
({
pageNum
:
page
,
pageSize
})
}
}
}
}
/>
/>
...
@@ -508,6 +531,19 @@ const FC = (props) => {
...
@@ -508,6 +531,19 @@ const FC = (props) => {
})
})
}
}
}
}
/>
/>
<
TagSelectPopup
{
...
tagSelectPopupParams
}
type=
'dataAsset'
onCancel=
{
()
=>
{
setTagSelectPopupParams
({
visible
:
false
,
items
:
undefined
})
}
}
onChange=
{
()
=>
{
getResourceTag
()
}
}
/>
{
contextHolder
}
{
contextHolder
}
</
div
>
</
div
>
)
)
...
...
src/view/Manage/AssetResourceManage/table.jsx
View file @
8ddc7b0a
...
@@ -26,7 +26,7 @@ import FilterElementValue from './filter-element-value'
...
@@ -26,7 +26,7 @@ import FilterElementValue from './filter-element-value'
import
SelectBatchEditElements
from
'./select-batch-edit-elements'
import
SelectBatchEditElements
from
'./select-batch-edit-elements'
import
{
AssetDirectorySubject
}
from
'../AssetManage/Component/AssetDirectory'
import
{
AssetDirectorySubject
}
from
'../AssetManage/Component/AssetDirectory'
import
{
AssetActionSubject
}
from
'../AssetManage/Component/AssetAction'
import
{
AssetActionSubject
}
from
'../AssetManage/Component/AssetAction'
import
TagCell
from
'../Model/Component/tag-help'
import
TagCell
,
{
TagSelectPopup
}
from
'../Model/Component/tag-help'
import
DistributeTask
from
'./distribute-task'
import
DistributeTask
from
'./distribute-task'
import
RedistributeTask
from
'./redistribute-task'
import
RedistributeTask
from
'./redistribute-task'
import
AutoDistributeTask
from
'./auto-distribute-task'
import
AutoDistributeTask
from
'./auto-distribute-task'
...
@@ -132,7 +132,11 @@ const FC = (props) => {
...
@@ -132,7 +132,11 @@ const FC = (props) => {
type
:
undefined
,
type
:
undefined
,
items
:
undefined
items
:
undefined
})
})
const
[
tagSelectPopupParams
,
setTagSelectPopupParams
]
=
React
.
useState
({
visible
:
false
,
items
:
undefined
})
const
[
page
,
setPage
]
=
usePage
()
const
[
page
,
setPage
]
=
usePage
()
const
[
modal
,
contextHolder
]
=
Modal
.
useModal
()
const
[
modal
,
contextHolder
]
=
Modal
.
useModal
()
...
@@ -747,6 +751,13 @@ const FC = (props) => {
...
@@ -747,6 +751,13 @@ const FC = (props) => {
})
})
}
}
const onBatchAddTagClick = () => {
setTagSelectPopupParams({
visible: true,
items: (selectedRows??[]).map(item => ({ resourceId: item.id }))
})
}
const deleteAssets = () => {
const deleteAssets = () => {
setAssetDeleteParams({
setAssetDeleteParams({
visible: false
visible: false
...
@@ -931,6 +942,8 @@ const FC = (props) => {
...
@@ -931,6 +942,8 @@ const FC = (props) => {
onDeleteClick()
onDeleteClick()
} else if (key === 'colConfig') {
} else if (key === 'colConfig') {
onFilterElementClick()
onFilterElementClick()
} else if (key === 'batchAddTag') {
onBatchAddTagClick()
}
}
}
}
...
@@ -1042,7 +1055,14 @@ const FC = (props) => {
...
@@ -1042,7 +1055,14 @@ const FC = (props) => {
删除
删除
</div>
</div>
</PermissionMenuItem>
</PermissionMenuItem>
}
}
<Menu.Item key='batchAddTag' disabled={(selectedRows??[]).length===0}>
<Tooltip title={(selectedRows??[]).length===0?'请先选择资源':''}>
<div className='text-center'>
批量标签
</div>
</Tooltip>
</Menu.Item>
<Menu.Item key='colConfig'>
<Menu.Item key='colConfig'>
<div className='text-center'>
<div className='text-center'>
可见列设置
可见列设置
...
@@ -1453,6 +1473,19 @@ const FC = (props) => {
...
@@ -1453,6 +1473,19 @@ const FC = (props) => {
refresh && getAssets()
refresh && getAssets()
}}
}}
/>
/>
<TagSelectPopup
{...tagSelectPopupParams}
type='dataAsset'
onCancel={() => {
setTagSelectPopupParams({
visible: false,
items: undefined
})
}}
onChange={() => {
getResourceTag()
}}
/>
{contextHolder}
{contextHolder}
</div>
</div>
)
)
...
...
src/view/QianKun/data-quality.jsx
View file @
8ddc7b0a
...
@@ -18,9 +18,9 @@ const FC = ({ type, data, onChange }) => {
...
@@ -18,9 +18,9 @@ const FC = ({ type, data, onChange }) => {
entry
:
'/data-quality/'
,
entry
:
'/data-quality/'
,
container
:
containerRef
.
current
,
container
:
containerRef
.
current
,
props
:
{
props
:
{
...
app
||
{},
type
,
type
,
data
,
data
,
user
:
app
?.
user
,
onChange
onChange
},
},
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment