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
be3f3004
Commit
be3f3004
authored
Feb 19, 2025
by
fanyj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改字眼
parent
df078d53
Show whitespace changes
Inline
Side-by-side
Showing
42 changed files
with
119 additions
and
119 deletions
+119
-119
FullSearch.js
src/layout/FullSearch.js
+1
-1
routes.js
src/routes.js
+5
-5
constant.js
src/util/constant.js
+1
-1
RelationContainer.jsx
src/view/Manage/AssetBrowse/Component/RelationContainer.jsx
+1
-1
draft.jsx
src/view/Manage/AssetDraft/draft.jsx
+9
-9
import.jsx
src/view/Manage/AssetDraft/import.jsx
+1
-1
recycle.jsx
src/view/Manage/AssetDraft/recycle.jsx
+7
-7
review.jsx
src/view/Manage/AssetDraft/review.jsx
+2
-2
start-flow.jsx
src/view/Manage/AssetDraft/start-flow.jsx
+1
-1
add.jsx
src/view/Manage/AssetEvaluate/add.jsx
+3
-3
index.jsx
src/view/Manage/AssetEvaluate/index.jsx
+1
-1
AddAssetModel.jsx
src/view/Manage/AssetManage/Component/AddAssetModel.jsx
+1
-1
AssetAction.jsx
src/view/Manage/AssetManage/Component/AssetAction.jsx
+10
-10
AssetDeleteModal.jsx
src/view/Manage/AssetManage/Component/AssetDeleteModal.jsx
+6
-6
AssetDetailDrawer.jsx
src/view/Manage/AssetManage/Component/AssetDetailDrawer.jsx
+3
-3
AssetDetailPage.jsx
src/view/Manage/AssetManage/Component/AssetDetailPage.jsx
+3
-3
AssetDirectory.jsx
src/view/Manage/AssetManage/Component/AssetDirectory.jsx
+6
-6
AssetItem.jsx
src/view/Manage/AssetManage/Component/AssetItem.jsx
+1
-1
AssetManageTree.jsx
src/view/Manage/AssetManage/Component/AssetManageTree.jsx
+1
-1
AssetTable.jsx
src/view/Manage/AssetManage/Component/AssetTable.jsx
+17
-17
AssetTagModal.jsx
src/view/Manage/AssetManage/Component/AssetTagModal.jsx
+4
-4
AssetTree.jsx
src/view/Manage/AssetManage/Component/AssetTree.jsx
+1
-1
AttributeMaintain.jsx
src/view/Manage/AssetManage/Component/AttributeMaintain.jsx
+3
-3
AttributeRelationModal.jsx
...w/Manage/AssetManage/Component/AttributeRelationModal.jsx
+1
-1
CustomDirectoryModal.jsx
...iew/Manage/AssetManage/Component/CustomDirectoryModal.jsx
+3
-3
FilterElementModal.jsx
src/view/Manage/AssetManage/Component/FilterElementModal.jsx
+1
-1
ImportAssetDrawer.jsx
src/view/Manage/AssetManage/Component/ImportAssetDrawer.jsx
+1
-1
ImportElement.jsx
src/view/Manage/AssetManage/Component/ImportElement.jsx
+1
-1
StartFlow.jsx
src/view/Manage/AssetManage/Component/StartFlow.jsx
+3
-3
UpdateDirectoryModal.jsx
...iew/Manage/AssetManage/Component/UpdateDirectoryModal.jsx
+1
-1
add-asset.jsx
src/view/Manage/AssetManage/Component/add-asset.jsx
+1
-1
asset-relation-assets.jsx
...ew/Manage/AssetManage/Component/asset-relation-assets.jsx
+2
-2
post-relation.jsx
src/view/Manage/AssetManage/Component/post-relation.jsx
+5
-5
select-asset.jsx
src/view/Manage/AssetManage/Component/select-asset.jsx
+2
-2
select-data-service.jsx
...view/Manage/AssetManage/Component/select-data-service.jsx
+1
-1
select-resource.jsx
src/view/Manage/AssetManage/Component/select-resource.jsx
+2
-2
tag-help.jsx
src/view/Manage/AssetManage/Component/tag-help.jsx
+1
-1
AssetMount.jsx
src/view/Manage/AssetRecycle/Component/AssetMount.jsx
+1
-1
TaskDetail.jsx
src/view/Manage/AssetTask/TaskDetail.jsx
+1
-1
UpdateTask.jsx
src/view/Manage/AssetTask/UpdateTask.jsx
+2
-2
index.jsx
src/view/Manage/AssetTask/index.jsx
+1
-1
GrantedList.jsx
src/view/Manage/Pdata/Component/GrantedList.jsx
+1
-1
No files found.
src/layout/FullSearch.js
View file @
be3f3004
...
@@ -34,7 +34,7 @@ const modes = [
...
@@ -34,7 +34,7 @@ const modes = [
key
:
'data-model'
,
key
:
'data-model'
,
},
},
{
{
title
:
'数据资
产
'
,
title
:
'数据资
源
'
,
shortTitle
:
'资'
,
shortTitle
:
'资'
,
key
:
'data-asset'
,
key
:
'data-asset'
,
},
},
...
...
src/routes.js
View file @
be3f3004
...
@@ -29,23 +29,23 @@ export const routes = [
...
@@ -29,23 +29,23 @@ export const routes = [
},
},
{
{
name
:
'asset-draft'
,
name
:
'asset-draft'
,
text
:
'资
产
草稿'
,
text
:
'资
源
草稿'
,
},
},
{
{
name
:
'asset-manage'
,
name
:
'asset-manage'
,
text
:
'资
产
管理'
,
text
:
'资
源
管理'
,
},
},
{
{
name
:
'asset-browse'
,
name
:
'asset-browse'
,
text
:
'资
产
浏览'
text
:
'资
源
浏览'
},
},
{
{
name
:
'asset-task'
,
name
:
'asset-task'
,
text
:
'资
产
盘点任务'
,
text
:
'资
源
盘点任务'
,
},
},
{
{
name
:
'asset-evaluate'
,
name
:
'asset-evaluate'
,
text
:
'资
产
评估'
,
text
:
'资
源
评估'
,
},
},
]
]
}
}
...
...
src/util/constant.js
View file @
be3f3004
...
@@ -25,7 +25,7 @@ export const DataModelerRoleAdmin = 'admin';
...
@@ -25,7 +25,7 @@ export const DataModelerRoleAdmin = 'admin';
export
const
DataModelerRoleUser
=
'user'
;
export
const
DataModelerRoleUser
=
'user'
;
export
const
DataModelerRoleReader
=
'reader'
;
export
const
DataModelerRoleReader
=
'reader'
;
//资
产
//资
源
export
const
ResourceManageReference
=
'resource-manage'
;
export
const
ResourceManageReference
=
'resource-manage'
;
export
const
AssetManageReference
=
'asset-manage'
;
export
const
AssetManageReference
=
'asset-manage'
;
export
const
AssetBrowseReference
=
'asset-browse'
;
export
const
AssetBrowseReference
=
'asset-browse'
;
...
...
src/view/Manage/AssetBrowse/Component/RelationContainer.jsx
View file @
be3f3004
...
@@ -133,7 +133,7 @@ const RelationContainer = (props) => {
...
@@ -133,7 +133,7 @@ const RelationContainer = (props) => {
// const _index = (dirs||[]).findIndex(dir => dir.nodeId === rootNode.id);
// const _index = (dirs||[]).findIndex(dir => dir.nodeId === rootNode.id);
// if (_index !== -1) {
// if (_index !== -1) {
// if (reference === AssetBrowseReference) {
// if (reference === AssetBrowseReference) {
// newRelationData = {text: '资
产
', show: true, simple: false, virtual: true, children: [newRelationData]};
// newRelationData = {text: '资
源
', show: true, simple: false, virtual: true, children: [newRelationData]};
// } else if (reference === ResourceBrowseReference) {
// } else if (reference === ResourceBrowseReference) {
// newRelationData = {text: '资源', show: true, simple: false, virtual: true, children: [newRelationData]};
// newRelationData = {text: '资源', show: true, simple: false, virtual: true, children: [newRelationData]};
// }
// }
...
...
src/view/Manage/AssetDraft/draft.jsx
View file @
be3f3004
...
@@ -237,7 +237,7 @@ const FC = (props) => {
...
@@ -237,7 +237,7 @@ const FC = (props) => {
column
.
width
=
isSzseEnv
?
230
:
160
column
.
width
=
isSzseEnv
?
230
:
160
}
else
if
(
name
===
'英文名称'
||
name
===
'岗位英文名'
)
{
}
else
if
(
name
===
'英文名称'
||
name
===
'岗位英文名'
)
{
column
.
width
=
isSzseEnv
?
224
:
160
column
.
width
=
isSzseEnv
?
224
:
160
}
else
if
(
name
===
'资
产
项'
)
{
}
else
if
(
name
===
'资
源
项'
)
{
column
.
width
=
isSzseEnv
?
250
:
120
column
.
width
=
isSzseEnv
?
250
:
120
column
.
render
=
(
text
)
=>
{
column
.
render
=
(
text
)
=>
{
let
metadata
=
null
let
metadata
=
null
...
@@ -424,7 +424,7 @@ const FC = (props) => {
...
@@ -424,7 +424,7 @@ const FC = (props) => {
const onPublishClick = () => {
const onPublishClick = () => {
if (isAdmin) {
if (isAdmin) {
modal.confirm({
modal.confirm({
title: '是否确认发布选中的资
产
',
title: '是否确认发布选中的资
源
',
onOk: () => {
onOk: () => {
dispatch({
dispatch({
type: 'assetmanage.publishDrafts',
type: 'assetmanage.publishDrafts',
...
@@ -449,7 +449,7 @@ const FC = (props) => {
...
@@ -449,7 +449,7 @@ const FC = (props) => {
const onDeletesClick = () => {
const onDeletesClick = () => {
modal.confirm({
modal.confirm({
title: '是否确认删除选中的资
产
目录',
title: '是否确认删除选中的资
源
目录',
onOk: () => {
onOk: () => {
dispatch({
dispatch({
type: 'assetmanage.deleteDrafts',
type: 'assetmanage.deleteDrafts',
...
@@ -507,7 +507,7 @@ const FC = (props) => {
...
@@ -507,7 +507,7 @@ const FC = (props) => {
const onRightSubmitClick = () => {
const onRightSubmitClick = () => {
modal.confirm({
modal.confirm({
title: '提示',
title: '提示',
content: '是否确认提交选中的资
产
?',
content: '是否确认提交选中的资
源
?',
onOk: () => {
onOk: () => {
dispatch({
dispatch({
type: 'assetmanage.submitDraft',
type: 'assetmanage.submitDraft',
...
@@ -526,7 +526,7 @@ const FC = (props) => {
...
@@ -526,7 +526,7 @@ const FC = (props) => {
const onRightChangeToPendingSubmitClick = () => {
const onRightChangeToPendingSubmitClick = () => {
modal.confirm({
modal.confirm({
title: '提示',
title: '提示',
content: '是否确认转为待提交选中的资
产
?',
content: '是否确认转为待提交选中的资
源
?',
onOk: () => {
onOk: () => {
dispatch({
dispatch({
type: 'assetmanage.changeToPendingSubmitDraft',
type: 'assetmanage.changeToPendingSubmitDraft',
...
@@ -580,7 +580,7 @@ const FC = (props) => {
...
@@ -580,7 +580,7 @@ const FC = (props) => {
<PermissionButton
<PermissionButton
defaultPermission={canExport}
defaultPermission={canExport}
tip={(selectedRows||[]).length===0?'请先选择资
产
':''}
tip={(selectedRows||[]).length===0?'请先选择资
源
':''}
onClick={onExportClick}
onClick={onExportClick}
disabled={(selectedRows||[]).length===0}
disabled={(selectedRows||[]).length===0}
>
>
...
@@ -589,7 +589,7 @@ const FC = (props) => {
...
@@ -589,7 +589,7 @@ const FC = (props) => {
<PermissionButton
<PermissionButton
defaultPermission={canFlow}
defaultPermission={canFlow}
tip={(selectedRows||[]).length===0?'请先选择资
产
':''}
tip={(selectedRows||[]).length===0?'请先选择资
源
':''}
onClick={onFlowClick}
onClick={onFlowClick}
disabled={(selectedRows||[]).length===0}
disabled={(selectedRows||[]).length===0}
>
>
...
@@ -598,7 +598,7 @@ const FC = (props) => {
...
@@ -598,7 +598,7 @@ const FC = (props) => {
<PermissionButton
<PermissionButton
defaultPermission={canPublish}
defaultPermission={canPublish}
tip={(selectedRows||[]).length===0?'请先选择资
产
':''}
tip={(selectedRows||[]).length===0?'请先选择资
源
':''}
onClick={onPublishClick}
onClick={onPublishClick}
disabled={(selectedRows||[]).length===0}
disabled={(selectedRows||[]).length===0}
>
>
...
@@ -607,7 +607,7 @@ const FC = (props) => {
...
@@ -607,7 +607,7 @@ const FC = (props) => {
<PermissionButton
<PermissionButton
defaultPermission={canDelete}
defaultPermission={canDelete}
tip={(selectedRows||[]).length===0?'请先选择资
产
':''}
tip={(selectedRows||[]).length===0?'请先选择资
源
':''}
onClick={onDeletesClick}
onClick={onDeletesClick}
disabled={(selectedRows||[]).length===0}
disabled={(selectedRows||[]).length===0}
>
>
...
...
src/view/Manage/AssetDraft/import.jsx
View file @
be3f3004
...
@@ -179,7 +179,7 @@ const FC = (props) => {
...
@@ -179,7 +179,7 @@ const FC = (props) => {
<Drawer
<Drawer
forceRender
forceRender
visible={ visible }
visible={ visible }
title='资
产
目录草稿批量修改'
title='资
源
目录草稿批量修改'
width={900}
width={900}
placement="right"
placement="right"
closable={ true }
closable={ true }
...
...
src/view/Manage/AssetDraft/recycle.jsx
View file @
be3f3004
...
@@ -94,7 +94,7 @@ const FC = (props) => {
...
@@ -94,7 +94,7 @@ const FC = (props) => {
column
.
width
=
isSzseEnv
?
230
:
160
column
.
width
=
isSzseEnv
?
230
:
160
}
else
if
(
name
===
'英文名称'
||
name
===
'岗位英文名'
)
{
}
else
if
(
name
===
'英文名称'
||
name
===
'岗位英文名'
)
{
column
.
width
=
isSzseEnv
?
224
:
160
column
.
width
=
isSzseEnv
?
224
:
160
}
else
if
(
name
===
'资
产
项'
)
{
}
else
if
(
name
===
'资
源
项'
)
{
column
.
width
=
isSzseEnv
?
250
:
120
column
.
width
=
isSzseEnv
?
250
:
120
column
.
render
=
(
text
)
=>
{
column
.
render
=
(
text
)
=>
{
let
metadata
=
null
let
metadata
=
null
...
@@ -175,7 +175,7 @@ const FC = (props) => {
...
@@ -175,7 +175,7 @@ const FC = (props) => {
type
:
'assetmanage.getTemplates'
,
type
:
'assetmanage.getTemplates'
,
callback
:
data
=>
{
callback
:
data
=>
{
setLoadingTemplates
(
false
)
setLoadingTemplates
(
false
)
//未挂载资
产
屏蔽岗位
//未挂载资
源
屏蔽岗位
setTemplates
((
data
??[]).
filter
(
item
=>
item
.
type
!==
'post'
))
setTemplates
((
data
??[]).
filter
(
item
=>
item
.
type
!==
'post'
))
if
((
data
??[]).
length
>
0
)
{
if
((
data
??[]).
length
>
0
)
{
LocalStorage
.
set
(
`templateType-
${
appId
}
`
,
data
[
0
].
type
)
LocalStorage
.
set
(
`templateType-
${
appId
}
`
,
data
[
0
].
type
)
...
@@ -241,7 +241,7 @@ const FC = (props) => {
...
@@ -241,7 +241,7 @@ const FC = (props) => {
const onRecoverClick = () => {
const onRecoverClick = () => {
modal.confirm({
modal.confirm({
title: '提示',
title: '提示',
content: '是否恢复选中的资
产
?',
content: '是否恢复选中的资
源
?',
onOk: () => {
onOk: () => {
dispatch({
dispatch({
type: 'assetmanage.recoverDataAssetsFromRecycleBin',
type: 'assetmanage.recoverDataAssetsFromRecycleBin',
...
@@ -261,7 +261,7 @@ const FC = (props) => {
...
@@ -261,7 +261,7 @@ const FC = (props) => {
const onDeleteClick = () => {
const onDeleteClick = () => {
modal.confirm({
modal.confirm({
title: '提示',
title: '提示',
content: '是否删除选中的资
产
?',
content: '是否删除选中的资
源
?',
onOk: () => {
onOk: () => {
dispatch({
dispatch({
type: 'assetmanage.deleteDataAssets',
type: 'assetmanage.deleteDataAssets',
...
@@ -312,7 +312,7 @@ const FC = (props) => {
...
@@ -312,7 +312,7 @@ const FC = (props) => {
</Select>
</Select>
<PermissionButton
<PermissionButton
defaultPermission={canExport}
defaultPermission={canExport}
tip={(selectedRows||[]).length===0?'请先选择资
产
':''}
tip={(selectedRows||[]).length===0?'请先选择资
源
':''}
onClick={onExportClick}
onClick={onExportClick}
disabled={(selectedRows||[]).length===0}
disabled={(selectedRows||[]).length===0}
>
>
...
@@ -320,7 +320,7 @@ const FC = (props) => {
...
@@ -320,7 +320,7 @@ const FC = (props) => {
</PermissionButton>
</PermissionButton>
<PermissionButton
<PermissionButton
defaultPermission={canRecover}
defaultPermission={canRecover}
tip={(selectedRows||[]).length===0?'请先选择资
产
':''}
tip={(selectedRows||[]).length===0?'请先选择资
源
':''}
onClick={onRecoverClick}
onClick={onRecoverClick}
disabled={(selectedRows||[]).length===0}
disabled={(selectedRows||[]).length===0}
>
>
...
@@ -328,7 +328,7 @@ const FC = (props) => {
...
@@ -328,7 +328,7 @@ const FC = (props) => {
</PermissionButton>
</PermissionButton>
<PermissionButton
<PermissionButton
defaultPermission={canDelete}
defaultPermission={canDelete}
tip={(selectedRows||[]).length===0?'请先选择资
产
':''}
tip={(selectedRows||[]).length===0?'请先选择资
源
':''}
onClick={onDeleteClick}
onClick={onDeleteClick}
disabled={(selectedRows||[]).length===0}
disabled={(selectedRows||[]).length===0}
>
>
...
...
src/view/Manage/AssetDraft/review.jsx
View file @
be3f3004
...
@@ -90,7 +90,7 @@ const FC = (props) => {
...
@@ -90,7 +90,7 @@ const FC = (props) => {
}
}
<
div
>
<
div
>
<
div
className=
'flex my-3'
style=
{
{
justifyContent
:
'center'
}
}
>
<
div
className=
'flex my-3'
style=
{
{
justifyContent
:
'center'
}
}
>
<
h3
>
资
产
评审流程
</
h3
>
<
h3
>
资
源
评审流程
</
h3
>
</
div
>
</
div
>
<
Descriptions
bordered
size=
'small'
column=
{
2
}
>
<
Descriptions
bordered
size=
'small'
column=
{
2
}
>
<
Descriptions
.
Item
label=
"流程名称"
>
{
data
?.
applyUser
?.
userName
?
`${data?.applyUser?.userDisplayName}(${data?.applyUser?.userName})发起的物理模型评审流程`
:
''
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"流程名称"
>
{
data
?.
applyUser
?.
userName
?
`${data?.applyUser?.userDisplayName}(${data?.applyUser?.userName})发起的物理模型评审流程`
:
''
}
</
Descriptions
.
Item
>
...
@@ -170,7 +170,7 @@ const List = React.forwardRef(function ({data}, ref) {
...
@@ -170,7 +170,7 @@ const List = React.forwardRef(function ({data}, ref) {
render
:(
_
,
__
,
index
)
=>
(
index
+
1
)
render
:(
_
,
__
,
index
)
=>
(
index
+
1
)
},
},
{
{
title
:
'资
产
名称'
,
title
:
'资
源
名称'
,
dataIndex
:
'enName'
,
dataIndex
:
'enName'
,
width
:
160
,
width
:
160
,
ellipsis
:
false
,
ellipsis
:
false
,
...
...
src/view/Manage/AssetDraft/start-flow.jsx
View file @
be3f3004
...
@@ -232,7 +232,7 @@ const List = React.forwardRef(function ({ items }, ref) {
...
@@ -232,7 +232,7 @@ const List = React.forwardRef(function ({ items }, ref) {
render
:(
_
,
__
,
index
)
=>
(
index
+
1
)
render
:(
_
,
__
,
index
)
=>
(
index
+
1
)
},
},
{
{
title
:
'资
产
名称'
,
title
:
'资
源
名称'
,
dataIndex
:
'enName'
,
dataIndex
:
'enName'
,
width
:
160
,
width
:
160
,
render
:
(
text
,
record
)
=>
(
render
:
(
text
,
record
)
=>
(
...
...
src/view/Manage/AssetEvaluate/add.jsx
View file @
be3f3004
...
@@ -119,8 +119,8 @@ const Basic = React.forwardRef(function ({ item, elements }, ref) {
...
@@ -119,8 +119,8 @@ const Basic = React.forwardRef(function ({ item, elements }, ref) {
</
Form
.
Item
>
</
Form
.
Item
>
<
Form
.
Item
<
Form
.
Item
name=
'dirs'
name=
'dirs'
label=
'资
产
目录'
label=
'资
源
目录'
rules=
{
[{
required
:
true
,
message
:
'请选择资
产
目录!'
}]
}
rules=
{
[{
required
:
true
,
message
:
'请选择资
源
目录!'
}]
}
>
>
<
AssetCatalogItem
/>
<
AssetCatalogItem
/>
</
Form
.
Item
>
</
Form
.
Item
>
...
@@ -210,7 +210,7 @@ const AssetCatalogItem = ({ value, onChange }) => {
...
@@ -210,7 +210,7 @@ const AssetCatalogItem = ({ value, onChange }) => {
loading=
{
loadingTreeData
}
loading=
{
loadingTreeData
}
dropdownStyle=
{
{
maxHeight
:
400
,
overflow
:
'auto'
}
}
dropdownStyle=
{
{
maxHeight
:
400
,
overflow
:
'auto'
}
}
treeData=
{
treeData1
}
treeData=
{
treeData1
}
placeholder=
"请选择资
产
目录"
placeholder=
"请选择资
源
目录"
treeDefaultExpandAll
treeDefaultExpandAll
treeCheckable=
{
true
}
treeCheckable=
{
true
}
treeCheckStrictly=
{
true
}
treeCheckStrictly=
{
true
}
...
...
src/view/Manage/AssetEvaluate/index.jsx
View file @
be3f3004
...
@@ -119,7 +119,7 @@ const FC = (props) => {
...
@@ -119,7 +119,7 @@ const FC = (props) => {
ellipsis
:
true
,
ellipsis
:
true
,
},
},
{
{
title
:
'资
产
总数'
,
title
:
'资
源
总数'
,
dataIndex
:
'dataAssetTotalNum'
,
dataIndex
:
'dataAssetTotalNum'
,
ellipsis
:
true
,
ellipsis
:
true
,
},
},
...
...
src/view/Manage/AssetManage/Component/AddAssetModel.jsx
View file @
be3f3004
...
@@ -77,7 +77,7 @@ const AddAssetModel = (props) => {
...
@@ -77,7 +77,7 @@ const AddAssetModel = (props) => {
<
Modal
<
Modal
destroyOnClose
destroyOnClose
className=
'asset-add'
className=
'asset-add'
title=
'新增资
产
目录信息'
title=
'新增资
源
目录信息'
visible=
{
visible
}
visible=
{
visible
}
centered
centered
width=
'80%'
width=
'80%'
...
...
src/view/Manage/AssetManage/Component/AssetAction.jsx
View file @
be3f3004
...
@@ -508,13 +508,13 @@ const AssetAction = React.forwardRef(function (props, ref) {
...
@@ -508,13 +508,13 @@ const AssetAction = React.forwardRef(function (props, ref) {
callback
:
data
=>
{
callback
:
data
=>
{
setLoading
(
false
);
setLoading
(
false
);
//资
产
草稿版本比对
//资
源
草稿版本比对
if
(
reference
===
AssetDraftReference
&&
data
?.
dataAssetId
&&
(
data
?.
dirIds
??[]).
length
>
0
)
{
if
(
reference
===
AssetDraftReference
&&
data
?.
dataAssetId
&&
(
data
?.
dirIds
??[]).
length
>
0
)
{
getPublishedAssetPaths
(
data
?.
dataAssetId
)
getPublishedAssetPaths
(
data
?.
dataAssetId
)
getPublishedAsset
(
data
?.
dataAssetId
,
data
?.
dirIds
[
0
])
getPublishedAsset
(
data
?.
dataAssetId
,
data
?.
dirIds
[
0
])
}
}
const
metadataIndex
=
data
?.
elements
?.
findIndex
(
item
=>
item
.
name
===
'资
产
项'
);
const
metadataIndex
=
data
?.
elements
?.
findIndex
(
item
=>
item
.
name
===
'资
源
项'
);
setElements
(
data
?.
elements
||
[]);
setElements
(
data
?.
elements
||
[]);
...
@@ -596,7 +596,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
...
@@ -596,7 +596,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
} else if (item.resourceType==='dataAsset') {
} else if (item.resourceType==='dataAsset') {
window.open(`
/
center
-
home
/
menu
/
asset
-
browse
?
$
{
AnchorId
}
=
$
{
item
?.
dataAssetId
??
''
}
&
$
{
AnchorDirId
}
=
$
{
item
?.
dirId
??
''
}
&
templateType
=
$
{
assets
?.
templateType
}
&
timestamp
=
$
{
timestamp
}
`);
window.open(`
/
center
-
home
/
menu
/
asset
-
browse
?
$
{
AnchorId
}
=
$
{
item
?.
dataAssetId
??
''
}
&
$
{
AnchorDirId
}
=
$
{
item
?.
dirId
??
''
}
&
templateType
=
$
{
assets
?.
templateType
}
&
timestamp
=
$
{
timestamp
}
`);
} else {
} else {
showMessage('warn', '资
产目录类型不是资源也不是资产
!');
showMessage('warn', '资
源目录类型不是资源也不是资源
!');
}
}
}
}
...
@@ -670,7 +670,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
...
@@ -670,7 +670,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
}
}
} catch (errInfo) {
} catch (errInfo) {
console.log('Validate Failed:', errInfo);
console.log('Validate Failed:', errInfo);
showMessage('warn', '请完成资
产
必填项')
showMessage('warn', '请完成资
源
必填项')
}
}
}
}
...
@@ -781,7 +781,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
...
@@ -781,7 +781,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
<div className='mb-3'>
<div className='mb-3'>
<Row gutter={10}>
<Row gutter={10}>
<Col flex='1 1 0' style={{ overflow: 'hidden' }}>
<Col flex='1 1 0' style={{ overflow: 'hidden' }}>
<span>资
产
目录路径: </span>
<span>资
源
目录路径: </span>
<span>
<span>
{
{
(assetPaths??[]).length > 0 && (
(assetPaths??[]).length > 0 && (
...
@@ -820,7 +820,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
...
@@ -820,7 +820,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
{
{
(!readonly && (reference===AssetManageReference||canEdit)) && <React.Fragment>
(!readonly && (reference===AssetManageReference||canEdit)) && <React.Fragment>
{
{
currentAction==='detail' ? <Tooltip title={(assets?.existDraft)?'资
产
存在草稿箱中,不允许编辑':''}>
currentAction==='detail' ? <Tooltip title={(assets?.existDraft)?'资
源
存在草稿箱中,不允许编辑':''}>
<Button onClick={onActionButtonClick} disabled={assets?.existDraft}>编辑</Button>
<Button onClick={onActionButtonClick} disabled={assets?.existDraft}>编辑</Button>
</Tooltip> : <React.Fragment>
</Tooltip> : <React.Fragment>
<Button onClick={onCancelButtonClick}>取消</Button>
<Button onClick={onCancelButtonClick}>取消</Button>
...
@@ -845,7 +845,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
...
@@ -845,7 +845,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
data: { id: metadata?.metadataTableId, type: key }
data: { id: metadata?.metadataTableId, type: key }
})
})
} else {
} else {
showMessage("warn","该资
产
目录没有关联元数据信息");
showMessage("warn","该资
源
目录没有关联元数据信息");
}
}
}}>
}}>
<Menu.Item key="lineage">血缘分析</Menu.Item>
<Menu.Item key="lineage">血缘分析</Menu.Item>
...
@@ -870,7 +870,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
...
@@ -870,7 +870,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
<Descriptions column={1} bordered>
<Descriptions column={1} bordered>
{
{
elements?.map((element, index) => {
elements?.map((element, index) => {
if (element.type!==attribute || element.name === '资
产
项') return null;
if (element.type!==attribute || element.name === '资
源
项') return null;
const _index = (publishedAsset?.elements??[]).findIndex(item => item.name===element.name)
const _index = (publishedAsset?.elements??[]).findIndex(item => item.name===element.name)
let publishedElement = null;
let publishedElement = null;
...
@@ -942,7 +942,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
...
@@ -942,7 +942,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
</Spin>
</Spin>
<div>
<div>
<Divider orientation='left'>字段级资
产
目录信息</Divider>
<Divider orientation='left'>字段级资
源
目录信息</Divider>
{
{
isStructured ? <Table
isStructured ? <Table
className='mt-3'
className='mt-3'
...
@@ -1007,7 +1007,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
...
@@ -1007,7 +1007,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
</Form>
</Form>
<div>
<div>
<Divider orientation='left'>关联资
产
</Divider>
<Divider orientation='left'>关联资
源
</Divider>
<RelationAssets
<RelationAssets
ref={relationAssetsRef}
ref={relationAssetsRef}
reference={reference}
reference={reference}
...
...
src/view/Manage/AssetManage/Component/AssetDeleteModal.jsx
View file @
be3f3004
...
@@ -13,7 +13,7 @@ const AssetDeleteModal = (props) => {
...
@@ -13,7 +13,7 @@ const AssetDeleteModal = (props) => {
return
(
return
(
<
Modal
<
Modal
title=
"删除资
产
目录"
title=
"删除资
源
目录"
visible=
{
visible
}
visible=
{
visible
}
width=
{
530
}
width=
{
530
}
onCancel=
{
onCancel=
{
...
@@ -33,12 +33,12 @@ const AssetDeleteModal = (props) => {
...
@@ -33,12 +33,12 @@ const AssetDeleteModal = (props) => {
>
>
<
Radio
.
Group
onChange=
{
onChange
}
value=
{
value
}
>
<
Radio
.
Group
onChange=
{
onChange
}
value=
{
value
}
>
<
Radio
value=
{
1
}
>
<
Radio
value=
{
1
}
>
<
span
>
删除本目录下的资
产
目录
</
span
>
<
span
>
删除本目录下的资
源
目录
</
span
>
<
Popover
content=
{
<
Popover
content=
{
<
span
>
<
span
>
当要删除的资
产目录,只存在一个目录时,删除该资产目录并且设置为未分类资产
目录;
<
br
/>
当要删除的资
源目录,只存在一个目录时,删除该资源目录并且设置为未分类资源
目录;
<
br
/>
存在多个目录时,只删除该目录下的这项资
产目录,不会设置为未分类资产
目录
存在多个目录时,只删除该目录下的这项资
源目录,不会设置为未分类资源
目录
</
span
>
</
span
>
}
}
>
>
...
@@ -46,9 +46,9 @@ const AssetDeleteModal = (props) => {
...
@@ -46,9 +46,9 @@ const AssetDeleteModal = (props) => {
</
Popover
>
</
Popover
>
</
Radio
>
</
Radio
>
<
Radio
value=
{
2
}
>
<
Radio
value=
{
2
}
>
<
span
>
删除该资
产目录(所有目录下的资产
目录均删除)
</
span
>
<
span
>
删除该资
源目录(所有目录下的资源
目录均删除)
</
span
>
<
Popover
content=
'该资
产目录所在的目录内,均删除该项资产目录,并设置为未分类资产
目录'
>
<
Popover
content=
'该资
源目录所在的目录内,均删除该项资源目录,并设置为未分类资源
目录'
>
<
QuestionCircleOutlined
className=
'pointer'
/>
<
QuestionCircleOutlined
className=
'pointer'
/>
</
Popover
>
</
Popover
>
</
Radio
>
</
Radio
>
...
...
src/view/Manage/AssetManage/Component/AssetDetailDrawer.jsx
View file @
be3f3004
...
@@ -23,10 +23,10 @@ const AssetDetailDrawer = (props) => {
...
@@ -23,10 +23,10 @@ const AssetDetailDrawer = (props) => {
},
[
visible
])
},
[
visible
])
const
title
=
React
.
useMemo
(()
=>
{
const
title
=
React
.
useMemo
(()
=>
{
if
(
draftAsset
?.
state
===
'draft'
)
return
'资
产
目录详情(待提交)'
if
(
draftAsset
?.
state
===
'draft'
)
return
'资
源
目录详情(待提交)'
if
(
draftAsset
?.
state
===
'auditing'
)
return
'资
产
目录详情(审批中)'
if
(
draftAsset
?.
state
===
'auditing'
)
return
'资
源
目录详情(审批中)'
return
'资
产
目录详情'
return
'资
源
目录详情'
},
[
draftAsset
])
},
[
draftAsset
])
const
getDraft
=
()
=>
{
const
getDraft
=
()
=>
{
...
...
src/view/Manage/AssetManage/Component/AssetDetailPage.jsx
View file @
be3f3004
...
@@ -34,10 +34,10 @@ const AssetDetailPage = (props)=>{
...
@@ -34,10 +34,10 @@ const AssetDetailPage = (props)=>{
},
[])
},
[])
const
title
=
React
.
useMemo
(()
=>
{
const
title
=
React
.
useMemo
(()
=>
{
if
(
draftAsset
?.
state
===
'draft'
)
return
'资
产
目录详情(待提交)'
if
(
draftAsset
?.
state
===
'draft'
)
return
'资
源
目录详情(待提交)'
if
(
draftAsset
?.
state
===
'auditing'
)
return
'资
产
目录详情(审批中)'
if
(
draftAsset
?.
state
===
'auditing'
)
return
'资
源
目录详情(审批中)'
return
'资
产
目录详情'
return
'资
源
目录详情'
},
[
draftAsset
])
},
[
draftAsset
])
const
getDataAssetDetail
=
()
=>
{
const
getDataAssetDetail
=
()
=>
{
...
...
src/view/Manage/AssetManage/Component/AssetDirectory.jsx
View file @
be3f3004
...
@@ -133,22 +133,22 @@ const AssetDirectory = (props) => {
...
@@ -133,22 +133,22 @@ const AssetDirectory = (props) => {
<
Menu
>
<
Menu
>
<
Menu
.
Item
>
<
Menu
.
Item
>
<
div
className=
'text-center'
onClick=
{
onImportElementBtnClick
}
>
<
div
className=
'text-center'
onClick=
{
onImportElementBtnClick
}
>
导入资
产
目录属性
导入资
源
目录属性
</
div
>
</
div
>
</
Menu
.
Item
>
</
Menu
.
Item
>
<
Menu
.
Item
>
<
Menu
.
Item
>
<
div
className=
'text-center'
onClick=
{
onExportElementBtnClick
}
>
<
div
className=
'text-center'
onClick=
{
onExportElementBtnClick
}
>
导出资
产
目录属性
导出资
源
目录属性
</
div
>
</
div
>
</
Menu
.
Item
>
</
Menu
.
Item
>
<
Menu
.
Item
>
<
Menu
.
Item
>
<
div
className=
'text-center'
onClick=
{
onFilterElementClick
}
>
<
div
className=
'text-center'
onClick=
{
onFilterElementClick
}
>
资
产
目录浏览管理
资
源
目录浏览管理
</
div
>
</
div
>
</
Menu
.
Item
>
</
Menu
.
Item
>
<
Menu
.
Item
>
<
Menu
.
Item
>
<
div
className=
'text-center'
onClick=
{
onAttributeRelationBtnClick
}
>
<
div
className=
'text-center'
onClick=
{
onAttributeRelationBtnClick
}
>
资
产
目录属性关联
资
源
目录属性关联
</
div
>
</
div
>
</
Menu
.
Item
>
</
Menu
.
Item
>
</
Menu
>
</
Menu
>
...
@@ -212,7 +212,7 @@ const AssetDirectory = (props) => {
...
@@ -212,7 +212,7 @@ const AssetDirectory = (props) => {
<Paragraph style={{ flex: 1, overflow: 'hidden' }}>
<Paragraph style={{ flex: 1, overflow: 'hidden' }}>
<Tooltip title={resourceState?.relatedAsset}>
<Tooltip title={resourceState?.relatedAsset}>
<Text className='title-color' ellipsis={true}>
<Text className='title-color' ellipsis={true}>
资
产
化数量:
资
源
化数量:
<Text className='text-color'>{resourceState?.relatedAsset}</Text>
<Text className='text-color'>{resourceState?.relatedAsset}</Text>
</Text>
</Text>
</Tooltip>
</Tooltip>
...
@@ -221,7 +221,7 @@ const AssetDirectory = (props) => {
...
@@ -221,7 +221,7 @@ const AssetDirectory = (props) => {
<Paragraph style={{ flex: 1, overflow: 'hidden' }}>
<Paragraph style={{ flex: 1, overflow: 'hidden' }}>
<Tooltip title={resourceState?.notRelatedAsset}>
<Tooltip title={resourceState?.notRelatedAsset}>
<Text className='title-color' ellipsis={true}>
<Text className='title-color' ellipsis={true}>
非资
产
数量:
非资
源
数量:
<Text className='text-color'>{resourceState?.notRelatedAsset}</Text>
<Text className='text-color'>{resourceState?.notRelatedAsset}</Text>
</Text>
</Text>
</Tooltip>
</Tooltip>
...
...
src/view/Manage/AssetManage/Component/AssetItem.jsx
View file @
be3f3004
...
@@ -27,7 +27,7 @@ const AssetItem = (props) => {
...
@@ -27,7 +27,7 @@ const AssetItem = (props) => {
<
Col
className=
'mb-3'
key=
{
_index
}
md=
{
8
}
>
<
Col
className=
'mb-3'
key=
{
_index
}
md=
{
8
}
>
<
Typography
.
Paragraph
title=
{
`${element.name||''}: ${element.value||''}`
}
style=
{
{
color
:
'#464646'
}
}
ellipsis
>
<
Typography
.
Paragraph
title=
{
`${element.name||''}: ${element.value||''}`
}
style=
{
{
color
:
'#464646'
}
}
ellipsis
>
{
`${element.name||''}: `
}
{
`${element.name||''}: `
}
{
element
.
name
===
'资
产
项'
?<
MetadataInfo
config=
{
false
}
value=
{
element
.
value
||
''
}
/>:
`${element.value||''}`
}
{
element
.
name
===
'资
源
项'
?<
MetadataInfo
config=
{
false
}
value=
{
element
.
value
||
''
}
/>:
`${element.value||''}`
}
</
Typography
.
Paragraph
>
</
Typography
.
Paragraph
>
</
Col
>
</
Col
>
);
);
...
...
src/view/Manage/AssetManage/Component/AssetManageTree.jsx
View file @
be3f3004
...
@@ -542,7 +542,7 @@ const AssetManageTree = (props) => {
...
@@ -542,7 +542,7 @@ const AssetManageTree = (props) => {
}
}
})
})
}
else
{
}
else
{
showMessage
(
"warn"
,
"目录下有资
产
目录信息,不允许删除!"
);
showMessage
(
"warn"
,
"目录下有资
源
目录信息,不允许删除!"
);
}
}
}
}
})
})
...
...
src/view/Manage/AssetManage/Component/AssetTable.jsx
View file @
be3f3004
...
@@ -41,7 +41,7 @@ const operationMap = {
...
@@ -41,7 +41,7 @@ const operationMap = {
historyVersion
:
'历史版本'
,
historyVersion
:
'历史版本'
,
}
}
//资
产
项
//资
源
项
export
const
AssetItem
=
(
props
)
=>
{
export
const
AssetItem
=
(
props
)
=>
{
const
{
metadata
,
terms
}
=
props
;
const
{
metadata
,
terms
}
=
props
;
...
@@ -594,7 +594,7 @@ const AssetTable = (props) => {
...
@@ -594,7 +594,7 @@ const AssetTable = (props) => {
// </Tooltip>
// </Tooltip>
// );
// );
// }
// }
}
else
if
(
name
===
'资
产
项'
)
{
}
else
if
(
name
===
'资
源
项'
)
{
params
.
width
=
isSzseEnv
?
250
:
120
;
params
.
width
=
isSzseEnv
?
250
:
120
;
params
.
render
=
(
metadata
,
_
)
=>
{
params
.
render
=
(
metadata
,
_
)
=>
{
...
@@ -604,7 +604,7 @@ const AssetTable = (props) => {
...
@@ -604,7 +604,7 @@ const AssetTable = (props) => {
}
}
_metadataIndex
=
`element
${
index
}
`
;
_metadataIndex
=
`element
${
index
}
`
;
}
else
if
(
name
===
'资
产
目录路径'
)
{
}
else
if
(
name
===
'资
源
目录路径'
)
{
params
.
render
=
(
text
,
record
)
=>
{
params
.
render
=
(
text
,
record
)
=>
{
return
(
return
(
<
Tooltip
title=
{
text
||
''
}
>
<
Tooltip
title=
{
text
||
''
}
>
...
@@ -657,7 +657,7 @@ const AssetTable = (props) => {
...
@@ -657,7 +657,7 @@ const AssetTable = (props) => {
if
(
reference
!==
AssetRecycleReference
)
{
if
(
reference
!==
AssetRecycleReference
)
{
params
.
recursive
=
recursive
;
params
.
recursive
=
recursive
;
//全局搜索资
产
//全局搜索资
源
if
(
fullSearch
)
{
if
(
fullSearch
)
{
params
.
dirId
=
''
;
params
.
dirId
=
''
;
}
}
...
@@ -814,7 +814,7 @@ const AssetTable = (props) => {
...
@@ -814,7 +814,7 @@ const AssetTable = (props) => {
if
((
checkedKeys
||
[]).
length
===
0
)
{
if
((
checkedKeys
||
[]).
length
===
0
)
{
modal
.
confirm
({
modal
.
confirm
({
title
:
'提示'
,
title
:
'提示'
,
content
:
'是否导出所有资
产
目录?'
,
content
:
'是否导出所有资
源
目录?'
,
onOk
:
()
=>
{
onOk
:
()
=>
{
window
.
open
(
`/api/dataassetmanager/dataAssetApi/exportByDataAssetIds?exportAll=true&templateType=
${
getTemplateType
()}
&queryElementId=
${
currentElementId
??
''
}
&
keyword
=
$
{
encodeURIComponent
(
keyword
??
''
)}
`);
window
.
open
(
`/api/dataassetmanager/dataAssetApi/exportByDataAssetIds?exportAll=true&templateType=
${
getTemplateType
()}
&queryElementId=
${
currentElementId
??
''
}
&
keyword
=
$
{
encodeURIComponent
(
keyword
??
''
)}
`);
}
}
...
@@ -829,7 +829,7 @@ const AssetTable = (props) => {
...
@@ -829,7 +829,7 @@ const AssetTable = (props) => {
modal.confirm({
modal.confirm({
title: '提示',
title: '提示',
content: '是否确认收藏选中的资
产
目录?',
content: '是否确认收藏选中的资
源
目录?',
onOk: () => {
onOk: () => {
dispatch({
dispatch({
type: 'assetmanage.addSubscribe',
type: 'assetmanage.addSubscribe',
...
@@ -862,7 +862,7 @@ const AssetTable = (props) => {
...
@@ -862,7 +862,7 @@ const AssetTable = (props) => {
modal.confirm({
modal.confirm({
title: '提示',
title: '提示',
content: '是否删除选中的资
产
目录?',
content: '是否删除选中的资
源
目录?',
onOk: () => {
onOk: () => {
let payload = {
let payload = {
data: checkedKeys
data: checkedKeys
...
@@ -889,7 +889,7 @@ const AssetTable = (props) => {
...
@@ -889,7 +889,7 @@ const AssetTable = (props) => {
modal.confirm({
modal.confirm({
title: '提示',
title: '提示',
content: '是否停用选中的资
产
目录?',
content: '是否停用选中的资
源
目录?',
onOk: () => {
onOk: () => {
let payload = {
let payload = {
data: checkedKeys
data: checkedKeys
...
@@ -996,7 +996,7 @@ const AssetTable = (props) => {
...
@@ -996,7 +996,7 @@ const AssetTable = (props) => {
if ((checkedKeys||[]).length > 0) {
if ((checkedKeys||[]).length > 0) {
modal.confirm({
modal.confirm({
title: '提示',
title: '提示',
content: '您确定要恢复这些资
产
目录吗?',
content: '您确定要恢复这些资
源
目录吗?',
onOk: () => {
onOk: () => {
let payload = {
let payload = {
data: checkedKeys
data: checkedKeys
...
@@ -1015,7 +1015,7 @@ const AssetTable = (props) => {
...
@@ -1015,7 +1015,7 @@ const AssetTable = (props) => {
}
}
})
})
}else{
}else{
showMessage("warn","请选择资
产
目录");
showMessage("warn","请选择资
源
目录");
}
}
}
}
...
@@ -1095,7 +1095,7 @@ const AssetTable = (props) => {
...
@@ -1095,7 +1095,7 @@ const AssetTable = (props) => {
const onReportAnalyseClick = (val) => {
const onReportAnalyseClick = (val) => {
if ((checkedKeys||[]).length === 0) {
if ((checkedKeys||[]).length === 0) {
showMessage('warn', '请先选择资
产
');
showMessage('warn', '请先选择资
源
');
} else {
} else {
setReport(val);
setReport(val);
setWorksheetModalVisible(true);
setWorksheetModalVisible(true);
...
@@ -1123,7 +1123,7 @@ const AssetTable = (props) => {
...
@@ -1123,7 +1123,7 @@ const AssetTable = (props) => {
key='offline'
key='offline'
defaultPermission={offlineAble}
defaultPermission={offlineAble}
disabled={(checkedKeys??[]).length===0}
disabled={(checkedKeys??[]).length===0}
tip={(checkedKeys??[]).length===0?'请先选择资
产
':''}
tip={(checkedKeys??[]).length===0?'请先选择资
源
':''}
>
>
<div className='text-center'>
<div className='text-center'>
停用
停用
...
@@ -1133,7 +1133,7 @@ const AssetTable = (props) => {
...
@@ -1133,7 +1133,7 @@ const AssetTable = (props) => {
key='addTag'
key='addTag'
defaultPermission={addTagAble}
defaultPermission={addTagAble}
disabled={(checkedKeys??[]).length===0}
disabled={(checkedKeys??[]).length===0}
tip={(checkedKeys??[]).length===0?'请先选择资
产
':''}
tip={(checkedKeys??[]).length===0?'请先选择资
源
':''}
>
>
<div className='text-center'>
<div className='text-center'>
添加标签
添加标签
...
@@ -1232,7 +1232,7 @@ const AssetTable = (props) => {
...
@@ -1232,7 +1232,7 @@ const AssetTable = (props) => {
<PermissionButton
<PermissionButton
defaultPermission={subscribeAble}
defaultPermission={subscribeAble}
onClick={subscriptAsset}
onClick={subscriptAsset}
tip={(checkedKeys||[]).length===0?'请先选择资
产
':''}
tip={(checkedKeys||[]).length===0?'请先选择资
源
':''}
disabled={(checkedKeys||[]).length===0}
disabled={(checkedKeys||[]).length===0}
>
>
收藏
收藏
...
@@ -1240,7 +1240,7 @@ const AssetTable = (props) => {
...
@@ -1240,7 +1240,7 @@ const AssetTable = (props) => {
{
{
reference===AssetManageReference && <PermissionButton
reference===AssetManageReference && <PermissionButton
defaultPermission={changeDirectoryAble}
defaultPermission={changeDirectoryAble}
tip={(checkedKeys||[]).length===0?'请先选择资
产
':''}
tip={(checkedKeys||[]).length===0?'请先选择资
源
':''}
onClick={onBatchCatalogChangeBtnClick}
onClick={onBatchCatalogChangeBtnClick}
disabled={(checkedKeys||[]).length===0}
disabled={(checkedKeys||[]).length===0}
>
>
...
@@ -1250,7 +1250,7 @@ const AssetTable = (props) => {
...
@@ -1250,7 +1250,7 @@ const AssetTable = (props) => {
{
{
reference===AssetManageReference && <PermissionButton
reference===AssetManageReference && <PermissionButton
defaultPermission={deleteAble}
defaultPermission={deleteAble}
tip={(checkedKeys||[]).length===0?'请先选择资
产
':''}
tip={(checkedKeys||[]).length===0?'请先选择资
源
':''}
onClick={deleteAssets}
onClick={deleteAssets}
disabled={(checkedKeys||[]).length===0}
disabled={(checkedKeys||[]).length===0}
>
>
...
@@ -1288,7 +1288,7 @@ const AssetTable = (props) => {
...
@@ -1288,7 +1288,7 @@ const AssetTable = (props) => {
</Select>
</Select>
}
}
<Input size="middle"
<Input size="middle"
placeholder="请输入资
产
目录要素值"
placeholder="请输入资
源
目录要素值"
value={keyword} allowClear
value={keyword} allowClear
onChange={(e) => {
onChange={(e) => {
setKeyword(e.target.value);
setKeyword(e.target.value);
...
...
src/view/Manage/AssetManage/Component/AssetTagModal.jsx
View file @
be3f3004
...
@@ -212,7 +212,7 @@ const AssetTagModal = (props) => {
...
@@ -212,7 +212,7 @@ const AssetTagModal = (props) => {
<
Modal
<
Modal
forceRender
forceRender
className=
'asset-add'
className=
'asset-add'
title=
'资
产
目录打标签'
title=
'资
源
目录打标签'
visible=
{
visible
}
visible=
{
visible
}
width=
{
600
}
width=
{
600
}
onCancel=
{
()
=>
{
onCancel=
{
()
=>
{
...
@@ -234,7 +234,7 @@ const AssetTagModal = (props) => {
...
@@ -234,7 +234,7 @@ const AssetTagModal = (props) => {
value
?.
onGlobalStateChange
&&
value
?.
onGlobalStateChange
((
state
,
prev
)
=>
{
value
?.
onGlobalStateChange
&&
value
?.
onGlobalStateChange
((
state
,
prev
)
=>
{
if
(
state
.
message
===
'data-govern-show-metadata-list-callback-message'
)
{
if
(
state
.
message
===
'data-govern-show-metadata-list-callback-message'
)
{
setMetadataId
(
state
.
data
?.
metadataId
||
''
);
setMetadataId
(
state
.
data
?.
metadataId
||
''
);
form
?.
setFieldsValue
({
'资
产
项'
:
state
.
data
?.
metadataInfoJson
||
''
});
form
?.
setFieldsValue
({
'资
源
项'
:
state
.
data
?.
metadataInfoJson
||
''
});
if
((
state
.
data
?.
metadataId
||
''
)
!==
''
)
{
if
((
state
.
data
?.
metadataId
||
''
)
!==
''
)
{
fillElementValueBeforeCreate
(
state
.
data
?.
metadataId
||
''
);
fillElementValueBeforeCreate
(
state
.
data
?.
metadataId
||
''
);
...
@@ -245,7 +245,7 @@ const AssetTagModal = (props) => {
...
@@ -245,7 +245,7 @@ const AssetTagModal = (props) => {
return
(
return
(
<>
<>
<
Form
.
Item
<
Form
.
Item
label=
'资
产
目录标签'
label=
'资
源
目录标签'
name=
'tag'
name=
'tag'
>
>
<
span
>
{
tag
?.
name
||
''
}
</
span
>
<
span
>
{
tag
?.
name
||
''
}
</
span
>
...
@@ -264,7 +264,7 @@ const AssetTagModal = (props) => {
...
@@ -264,7 +264,7 @@ const AssetTagModal = (props) => {
name=
{
element
.
name
}
name=
{
element
.
name
}
key=
{
index
}
key=
{
index
}
>
>
{
(
element
.
name
===
'资
产
项'
)
?
<
MetadataInfo
/>
:
<
Input
disabled=
{
element
.
manualMaintain
===
'否'
}
/>
}
{
(
element
.
name
===
'资
源
项'
)
?
<
MetadataInfo
/>
:
<
Input
disabled=
{
element
.
manualMaintain
===
'否'
}
/>
}
</
Form
.
Item
>
</
Form
.
Item
>
)
)
})
}
})
}
...
...
src/view/Manage/AssetManage/Component/AssetTree.jsx
View file @
be3f3004
...
@@ -425,7 +425,7 @@ const AssetTree = (props) => {
...
@@ -425,7 +425,7 @@ const AssetTree = (props) => {
}
}
})
})
}
else
{
}
else
{
showMessage
(
"warn"
,
"目录下有资
产
目录信息,不允许删除!"
);
showMessage
(
"warn"
,
"目录下有资
源
目录信息,不允许删除!"
);
}
}
}
}
})
})
...
...
src/view/Manage/AssetManage/Component/AttributeMaintain.jsx
View file @
be3f3004
...
@@ -92,11 +92,11 @@ const FC = (props) => {
...
@@ -92,11 +92,11 @@ const FC = (props) => {
const
catalogs
=
useMemo
(()
=>
{
const
catalogs
=
useMemo
(()
=>
{
if
(
reference
===
AssetDraftReference
)
{
if
(
reference
===
AssetDraftReference
)
{
return
[{
title
:
'字段级资
产
目录'
,
key
:
'1'
}]
return
[{
title
:
'字段级资
源
目录'
,
key
:
'1'
}]
}
}
return
[
return
[
{
title
:
'字段级资
产
目录'
,
key
:
'1'
},
{
title
:
'字段级资
源
目录'
,
key
:
'1'
},
{
title
:
'映射关系'
,
key
:
'2'
},
{
title
:
'映射关系'
,
key
:
'2'
},
]
]
},
[
reference
])
},
[
reference
])
...
@@ -272,7 +272,7 @@ const FC = (props) => {
...
@@ -272,7 +272,7 @@ const FC = (props) => {
return
(
return
(
<
Drawer
<
Drawer
visible=
{
visible
}
visible=
{
visible
}
title=
'字段级资
产
目录维护'
title=
'字段级资
源
目录维护'
width=
{
900
}
width=
{
900
}
placement=
"right"
placement=
"right"
closable=
{
true
}
closable=
{
true
}
...
...
src/view/Manage/AssetManage/Component/AttributeRelationModal.jsx
View file @
be3f3004
...
@@ -389,7 +389,7 @@ const AttributeRelationModal = (props) => {
...
@@ -389,7 +389,7 @@ const AttributeRelationModal = (props) => {
return
(
return
(
<
Modal
<
Modal
forceRender
forceRender
title=
{
'资
产
目录属性关联'
}
title=
{
'资
源
目录属性关联'
}
visible=
{
visible
}
visible=
{
visible
}
width=
{
1000
}
width=
{
1000
}
onCancel=
{
()
=>
{
onCancel=
{
()
=>
{
...
...
src/view/Manage/AssetManage/Component/CustomDirectoryModal.jsx
View file @
be3f3004
...
@@ -14,7 +14,7 @@ import { showMessage } from '../../../../util';
...
@@ -14,7 +14,7 @@ import { showMessage } from '../../../../util';
const
resourceTypes
=
[
const
resourceTypes
=
[
{
key
:
'innerSource'
,
name
:
'内部资源'
},
{
key
:
'innerSource'
,
name
:
'内部资源'
},
{
key
:
'outerSource'
,
name
:
'外部资源'
},
{
key
:
'outerSource'
,
name
:
'外部资源'
},
{
key
:
'dataAsset'
,
name
:
'资
产
'
},
{
key
:
'dataAsset'
,
name
:
'资
源
'
},
]
]
const
CustomDirectoryModal
=
(
props
)
=>
{
const
CustomDirectoryModal
=
(
props
)
=>
{
...
@@ -254,10 +254,10 @@ const CustomDirectoryModal = (props) => {
...
@@ -254,10 +254,10 @@ const CustomDirectoryModal = (props) => {
>
>
<
Row
gutter=
{
30
}
>
<
Row
gutter=
{
30
}
>
<
Col
span=
{
8
}
style=
{
{
borderRight
:
'1px solid #EFEFEF'
}
}
>
<
Col
span=
{
8
}
style=
{
{
borderRight
:
'1px solid #EFEFEF'
}
}
>
<
div
className=
'mb-3'
>
资
产
目录要素
</
div
>
<
div
className=
'mb-3'
>
资
源
目录要素
</
div
>
<
Input
<
Input
value=
{
keyword
}
value=
{
keyword
}
placeholder=
'请输入资
产
目录要素'
placeholder=
'请输入资
源
目录要素'
style=
{
{
marginBottom
:
10
}
}
style=
{
{
marginBottom
:
10
}
}
onChange=
{
(
e
)
=>
{
onSearchChange
(
e
)
}
}
onChange=
{
(
e
)
=>
{
onSearchChange
(
e
)
}
}
/>
/>
...
...
src/view/Manage/AssetManage/Component/FilterElementModal.jsx
View file @
be3f3004
...
@@ -157,7 +157,7 @@ const FilterElementModal = (props) => {
...
@@ -157,7 +157,7 @@ const FilterElementModal = (props) => {
<
Modal
<
Modal
destroyOnClose
centered
destroyOnClose
centered
visible=
{
visible
}
visible=
{
visible
}
title=
{
type
===
'global'
?
'资
产
目录浏览管理'
:
'可见列设置'
}
title=
{
type
===
'global'
?
'资
源
目录浏览管理'
:
'可见列设置'
}
width=
{
520
}
width=
{
520
}
onCancel=
{
cancel
}
onCancel=
{
cancel
}
bodyStyle=
{
{
padding
:
'15px 15px 0px 15px'
,
maxHeight
:
'80vh'
,
overflow
:
'auto'
}
}
bodyStyle=
{
{
padding
:
'15px 15px 0px 15px'
,
maxHeight
:
'80vh'
,
overflow
:
'auto'
}
}
...
...
src/view/Manage/AssetManage/Component/ImportAssetDrawer.jsx
View file @
be3f3004
...
@@ -186,7 +186,7 @@ const ImportAssetDrawer = (props) => {
...
@@ -186,7 +186,7 @@ const ImportAssetDrawer = (props) => {
<Drawer
<Drawer
forceRender
forceRender
visible={ visible }
visible={ visible }
title='资
产
目录导入'
title='资
源
目录导入'
width={900}
width={900}
placement="right"
placement="right"
closable={ true }
closable={ true }
...
...
src/view/Manage/AssetManage/Component/ImportElement.jsx
View file @
be3f3004
...
@@ -63,7 +63,7 @@ const ImportElement = (props) => {
...
@@ -63,7 +63,7 @@ const ImportElement = (props) => {
<
Modal
<
Modal
forceRender
forceRender
visible=
{
visible
}
visible=
{
visible
}
title=
'资
产
目录属性导入'
title=
'资
源
目录属性导入'
width=
{
520
}
width=
{
520
}
confirmLoading=
{
confirmLoading
}
confirmLoading=
{
confirmLoading
}
onCancel=
{
()
=>
{
onCancel=
{
()
=>
{
...
...
src/view/Manage/AssetManage/Component/StartFlow.jsx
View file @
be3f3004
...
@@ -44,7 +44,7 @@ const StartFlowModal = (props) => {
...
@@ -44,7 +44,7 @@ const StartFlowModal = (props) => {
reset
();
reset
();
if
(
data
)
{
if
(
data
)
{
showNotifaction
(
'申请提示'
,
(
data
===
'ok'
)?
'资
产
目录申请成功,请在我的流程》我的申请中查看详情'
:
data
,
5
);
showNotifaction
(
'申请提示'
,
(
data
===
'ok'
)?
'资
源
目录申请成功,请在我的流程》我的申请中查看详情'
:
data
,
5
);
}
}
onCancel
&&
onCancel
(
true
);
onCancel
&&
onCancel
(
true
);
...
@@ -68,7 +68,7 @@ const StartFlowModal = (props) => {
...
@@ -68,7 +68,7 @@ const StartFlowModal = (props) => {
<
Modal
<
Modal
destroyOnClose
destroyOnClose
visible=
{
visible
}
visible=
{
visible
}
title=
'资
产
目录申请'
title=
'资
源
目录申请'
width=
{
520
}
width=
{
520
}
confirmLoading=
{
confirmLoading
}
confirmLoading=
{
confirmLoading
}
onCancel=
{
()
=>
{
onCancel=
{
()
=>
{
...
@@ -84,7 +84,7 @@ const StartFlowModal = (props) => {
...
@@ -84,7 +84,7 @@ const StartFlowModal = (props) => {
<
Form
.
Item
<
Form
.
Item
label=
"申请原因"
label=
"申请原因"
name=
"desc"
name=
"desc"
rules=
{
[{
required
:
true
,
message
:
'请在申请原因栏中描述用途说明以及必要性(资
产
目录和服务权限申请需要说明请求字段)'
}]
}
rules=
{
[{
required
:
true
,
message
:
'请在申请原因栏中描述用途说明以及必要性(资
源
目录和服务权限申请需要说明请求字段)'
}]
}
>
>
<
Input
.
TextArea
rows=
{
6
}
/>
<
Input
.
TextArea
rows=
{
6
}
/>
</
Form
.
Item
>
</
Form
.
Item
>
...
...
src/view/Manage/AssetManage/Component/UpdateDirectoryModal.jsx
View file @
be3f3004
...
@@ -8,7 +8,7 @@ import SelectUser from '../../Model/Component/SelectUsers';
...
@@ -8,7 +8,7 @@ import SelectUser from '../../Model/Component/SelectUsers';
// const resourceTypes = [
// const resourceTypes = [
// // { key: 'innerSource', name: '内部资源' },
// // { key: 'innerSource', name: '内部资源' },
// // { key: 'outerSource', name: '外部资源' },
// // { key: 'outerSource', name: '外部资源' },
// { key: 'dataAsset', name: '资
产
' },
// { key: 'dataAsset', name: '资
源
' },
// { key: 'custom', name: '自定义' },
// { key: 'custom', name: '自定义' },
// ]
// ]
...
...
src/view/Manage/AssetManage/Component/add-asset.jsx
View file @
be3f3004
...
@@ -74,7 +74,7 @@ const FC = ({ visible, nodeId, template, onCancel }) => {
...
@@ -74,7 +74,7 @@ const FC = ({ visible, nodeId, template, onCancel }) => {
return
(
return
(
<
Modal
<
Modal
title=
'新增资
产
目录信息'
title=
'新增资
源
目录信息'
visible=
{
visible
}
visible=
{
visible
}
footer=
{
footer
}
footer=
{
footer
}
width=
'80%'
width=
'80%'
...
...
src/view/Manage/AssetManage/Component/asset-relation-assets.jsx
View file @
be3f3004
...
@@ -64,7 +64,7 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
...
@@ -64,7 +64,7 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
dataIndex
:
'relatedDataAssetPath'
,
dataIndex
:
'relatedDataAssetPath'
,
},
},
{
{
title
:
'资
产
编码'
,
title
:
'资
源
编码'
,
dataIndex
:
'relatedDataAssetCode'
,
dataIndex
:
'relatedDataAssetCode'
,
},
},
{
{
...
@@ -136,7 +136,7 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
...
@@ -136,7 +136,7 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
{
{
action
!==
'detail'
&&
<
React
.
Fragment
>
action
!==
'detail'
&&
<
React
.
Fragment
>
<
Button
onClick=
{
onEditClick
}
>
新增
</
Button
>
<
Button
onClick=
{
onEditClick
}
>
新增
</
Button
>
<
Tooltip
title=
{
(
selectedRows
??[]).
length
===
0
?
'请先选择资
产
'
:
''
}
>
<
Tooltip
title=
{
(
selectedRows
??[]).
length
===
0
?
'请先选择资
源
'
:
''
}
>
<
Button
disabled=
{
(
selectedRows
??[]).
length
===
0
}
onClick=
{
onDeleteClick
}
>
删除
</
Button
>
<
Button
disabled=
{
(
selectedRows
??[]).
length
===
0
}
onClick=
{
onDeleteClick
}
>
删除
</
Button
>
</
Tooltip
>
</
Tooltip
>
</
React
.
Fragment
>
</
React
.
Fragment
>
...
...
src/view/Manage/AssetManage/Component/post-relation.jsx
View file @
be3f3004
...
@@ -77,7 +77,7 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
...
@@ -77,7 +77,7 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
dataIndex
:
'path'
,
dataIndex
:
'path'
,
},
},
{
{
title
:
'资
产
编码'
,
title
:
'资
源
编码'
,
dataIndex
:
'relatedAssetCode'
,
dataIndex
:
'relatedAssetCode'
,
},
},
{
{
...
@@ -118,7 +118,7 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
...
@@ -118,7 +118,7 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
dataIndex
:
'path'
,
dataIndex
:
'path'
,
},
},
{
{
title
:
'数据服务资
产
编号'
,
title
:
'数据服务资
源
编号'
,
dataIndex
:
'relatedServiceCode'
,
dataIndex
:
'relatedServiceCode'
,
},
},
{
{
...
@@ -259,20 +259,20 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
...
@@ -259,20 +259,20 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
setPagination
({
...
pagination
,
pageNum
:
1
})
setPagination
({
...
pagination
,
pageNum
:
1
})
setSelectedRows
()
setSelectedRows
()
}
}
>
}
}
>
<
Tabs
.
TabPane
tab=
'关联资
产
'
key=
'asset'
/>
<
Tabs
.
TabPane
tab=
'关联资
源
'
key=
'asset'
/>
<
Tabs
.
TabPane
tab=
'关联服务'
key=
'service'
/>
<
Tabs
.
TabPane
tab=
'关联服务'
key=
'service'
/>
</
Tabs
>
</
Tabs
>
<
div
style=
{
{
display
:
'flex'
,
justifyContent
:
'space-between'
}
}
>
<
div
style=
{
{
display
:
'flex'
,
justifyContent
:
'space-between'
}
}
>
{
{
action
!==
'detail'
?
<
Space
>
action
!==
'detail'
?
<
Space
>
<
Button
onClick=
{
onEditClick
}
>
编辑
</
Button
>
<
Button
onClick=
{
onEditClick
}
>
编辑
</
Button
>
<
Tooltip
title=
{
(
selectedRows
??[]).
length
===
0
?(
activeKey
===
'asset'
?
'请先选择资
产
'
:
'请先选择服务'
):
''
}
>
<
Tooltip
title=
{
(
selectedRows
??[]).
length
===
0
?(
activeKey
===
'asset'
?
'请先选择资
源
'
:
'请先选择服务'
):
''
}
>
<
Button
disabled=
{
(
selectedRows
??[]).
length
===
0
}
onClick=
{
onDeleteClick
}
>
删除
</
Button
>
<
Button
disabled=
{
(
selectedRows
??[]).
length
===
0
}
onClick=
{
onDeleteClick
}
>
删除
</
Button
>
</
Tooltip
>
</
Tooltip
>
</
Space
>
:
<
div
/>
</
Space
>
:
<
div
/>
}
}
<
Input
size=
"middle"
<
Input
size=
"middle"
placeholder=
{
activeKey
===
'asset'
?
'搜索资
产
名称'
:
'搜索服务名称'
}
placeholder=
{
activeKey
===
'asset'
?
'搜索资
源
名称'
:
'搜索服务名称'
}
value=
{
keyword
}
value=
{
keyword
}
bordered=
{
true
}
allowClear
bordered=
{
true
}
allowClear
style=
{
{
width
:
200
}
}
style=
{
{
width
:
200
}
}
...
...
src/view/Manage/AssetManage/Component/select-asset.jsx
View file @
be3f3004
...
@@ -131,7 +131,7 @@ const FC = (props) => {
...
@@ -131,7 +131,7 @@ const FC = (props) => {
}
}
}
}
if
(
name
===
'资
产
项'
)
{
if
(
name
===
'资
源
项'
)
{
column
.
width
=
250
column
.
width
=
250
column
.
render
=
(
text
)
=>
{
column
.
render
=
(
text
)
=>
{
let
metadata
=
null
let
metadata
=
null
...
@@ -346,7 +346,7 @@ const FC = (props) => {
...
@@ -346,7 +346,7 @@ const FC = (props) => {
justifyContent
:
'flex-end'
,
justifyContent
:
'flex-end'
,
}
}
>
}
}
>
<
Input
size=
"middle"
<
Input
size=
"middle"
placeholder=
"请输入资
产
目录要素值"
placeholder=
"请输入资
源
目录要素值"
value=
{
args
.
keyword
}
value=
{
args
.
keyword
}
bordered=
{
true
}
allowClear
bordered=
{
true
}
allowClear
onChange=
{
(
e
)
=>
{
onChange=
{
(
e
)
=>
{
...
...
src/view/Manage/AssetManage/Component/select-data-service.jsx
View file @
be3f3004
...
@@ -11,7 +11,7 @@ import { dispatch } from '../../../../model'
...
@@ -11,7 +11,7 @@ import { dispatch } from '../../../../model'
import
'./select-data-service.less'
import
'./select-data-service.less'
import
{
AppContext
}
from
'../../../../App'
import
{
AppContext
}
from
'../../../../App'
const
visibleColNames
=
[
'数据服务资
产
编码'
,
'主题域分组'
,
'主题域'
,
'业务对象'
,
'数据服务名称'
]
const
visibleColNames
=
[
'数据服务资
源
编码'
,
'主题域分组'
,
'主题域'
,
'业务对象'
,
'数据服务名称'
]
const
FC
=
(
props
)
=>
{
const
FC
=
(
props
)
=>
{
const
{
session
,
onChange
}
=
props
const
{
session
,
onChange
}
=
props
...
...
src/view/Manage/AssetManage/Component/select-resource.jsx
View file @
be3f3004
...
@@ -27,7 +27,7 @@ const FC = ({ visible, item, type, onCancel }) => {
...
@@ -27,7 +27,7 @@ const FC = ({ visible, item, type, onCancel }) => {
const
save
=
async
()
=>
{
const
save
=
async
()
=>
{
const
selectedRows
=
basicRef
.
current
?.
selectedRows
const
selectedRows
=
basicRef
.
current
?.
selectedRows
if
((
selectedRows
??[]).
length
===
0
)
{
if
((
selectedRows
??[]).
length
===
0
)
{
message
.
warn
(
type
===
'asset'
?
'请先选择资
产
'
:
'请先选择服务'
)
message
.
warn
(
type
===
'asset'
?
'请先选择资
源
'
:
'请先选择服务'
)
return
return
}
}
...
@@ -72,7 +72,7 @@ const FC = ({ visible, item, type, onCancel }) => {
...
@@ -72,7 +72,7 @@ const FC = ({ visible, item, type, onCancel }) => {
return
(
return
(
<
Modal
<
Modal
title=
{
type
===
'asset'
?
'新增资
产
'
:
'新增服务'
}
title=
{
type
===
'asset'
?
'新增资
源
'
:
'新增服务'
}
visible=
{
visible
}
visible=
{
visible
}
footer=
{
footer
}
footer=
{
footer
}
width=
'80%'
width=
'80%'
...
...
src/view/Manage/AssetManage/Component/tag-help.jsx
View file @
be3f3004
...
@@ -53,7 +53,7 @@ const FC = ({ type, id, did, tags, onChange }) => {
...
@@ -53,7 +53,7 @@ const FC = ({ type, id, did, tags, onChange }) => {
});
});
}
}
//资
产
或者资源详情里的标签同步
//资
源
或者资源详情里的标签同步
const
syncTag
=
()
=>
{
const
syncTag
=
()
=>
{
if
(
type
===
'dataAsset'
)
{
if
(
type
===
'dataAsset'
)
{
let
event
=
new
Event
(
'storage'
)
let
event
=
new
Event
(
'storage'
)
...
...
src/view/Manage/AssetRecycle/Component/AssetMount.jsx
View file @
be3f3004
...
@@ -19,7 +19,7 @@ const AssetMount = (props) => {
...
@@ -19,7 +19,7 @@ const AssetMount = (props) => {
const
onOk
=
()
=>
{
const
onOk
=
()
=>
{
if
((
dirIds
||
[]).
length
===
0
)
{
if
((
dirIds
||
[]).
length
===
0
)
{
showMessage
(
'warn'
,
'请先选择资
产
目录的目录'
);
showMessage
(
'warn'
,
'请先选择资
源
目录的目录'
);
return
;
return
;
}
}
...
...
src/view/Manage/AssetTask/TaskDetail.jsx
View file @
be3f3004
...
@@ -118,7 +118,7 @@ export const Basic = ({ task }) => {
...
@@ -118,7 +118,7 @@ export const Basic = ({ task }) => {
<
Descriptions
.
Item
label=
"任务说明"
>
{
task
?.
comment
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"任务说明"
>
{
task
?.
comment
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"任务状态"
>
{
status
[
task
?.
status
]
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"任务状态"
>
{
status
[
task
?.
status
]
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"所属部门"
>
{
task
?.
department
?.
groupDisplayName
??
task
?.
department
?.
groupName
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"所属部门"
>
{
task
?.
department
?.
groupDisplayName
??
task
?.
department
?.
groupName
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"资
产
专员"
>
{
task
?.
specialist
?.
userDisplayName
??
task
?.
specialist
?.
userName
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"资
源
专员"
>
{
task
?.
specialist
?.
userDisplayName
??
task
?.
specialist
?.
userName
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"更新日期"
>
{
task
?.
updateTime
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"更新日期"
>
{
task
?.
updateTime
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"更新人"
>
{
task
?.
updateUser
?.
userDisplayName
??
task
?.
updateUser
?.
userName
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"更新人"
>
{
task
?.
updateUser
?.
userDisplayName
??
task
?.
updateUser
?.
userName
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"创建日期"
>
{
task
?.
createTime
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"创建日期"
>
{
task
?.
createTime
}
</
Descriptions
.
Item
>
...
...
src/view/Manage/AssetTask/UpdateTask.jsx
View file @
be3f3004
...
@@ -202,9 +202,9 @@ const FC = (props) => {
...
@@ -202,9 +202,9 @@ const FC = (props) => {
<
GroupsSelect
data=
{
groups
}
/>
<
GroupsSelect
data=
{
groups
}
/>
</
Form
.
Item
>
</
Form
.
Item
>
<
Form
.
Item
<
Form
.
Item
label=
"资
产
专员"
label=
"资
源
专员"
name=
"specialist"
name=
"specialist"
rules=
{
[{
required
:
true
,
message
:
'请选择资
产
专员'
}]
}
rules=
{
[{
required
:
true
,
message
:
'请选择资
源
专员'
}]
}
>
>
<
UsersSelect
data=
{
users
}
/>
<
UsersSelect
data=
{
users
}
/>
</
Form
.
Item
>
</
Form
.
Item
>
...
...
src/view/Manage/AssetTask/index.jsx
View file @
be3f3004
...
@@ -84,7 +84,7 @@ const FC = (props) => {
...
@@ -84,7 +84,7 @@ const FC = (props) => {
render
:
(
department
,
_
,
__
)
=>
department
?.
groupDisplayName
??
department
?.
groupName
,
render
:
(
department
,
_
,
__
)
=>
department
?.
groupDisplayName
??
department
?.
groupName
,
},
},
{
{
title
:
'资
产
专员'
,
title
:
'资
源
专员'
,
dataIndex
:
'specialist'
,
dataIndex
:
'specialist'
,
ellipsis
:
true
,
ellipsis
:
true
,
render
:
(
user
,
_
,
__
)
=>
user
?.
userDisplayName
??
user
?.
userName
,
render
:
(
user
,
_
,
__
)
=>
user
?.
userDisplayName
??
user
?.
userName
,
...
...
src/view/Manage/Pdata/Component/GrantedList.jsx
View file @
be3f3004
...
@@ -23,7 +23,7 @@ const FC = (props) => {
...
@@ -23,7 +23,7 @@ const FC = (props) => {
ellipsis
:
true
,
ellipsis
:
true
,
},
},
{
{
title
:
'数据服务资
产
编码'
,
title
:
'数据服务资
源
编码'
,
dataIndex
:
'code'
,
dataIndex
:
'code'
,
ellipsis
:
true
,
ellipsis
:
true
,
render
:
(
_
,
record
)
=>
record
.
basicInfo
?.
code
render
:
(
_
,
record
)
=>
record
.
basicInfo
?.
code
...
...
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