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
8f1d1581
Commit
8f1d1581
authored
Jun 06, 2024
by
zhaochengxiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加结构类型
parent
ec92c2db
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
AssetAction.jsx
src/view/Manage/AssetManage/Component/AssetAction.jsx
+1
-1
AssetTable.jsx
src/view/Manage/AssetManage/Component/AssetTable.jsx
+3
-3
select-asset.jsx
src/view/Manage/AssetManage/Component/select-asset.jsx
+1
-1
No files found.
src/view/Manage/AssetManage/Component/AssetAction.jsx
View file @
8f1d1581
...
@@ -280,7 +280,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
...
@@ -280,7 +280,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
},
[
currentDomainGroup
,
currentBussinessDomain
,
treeDataMap
])
},
[
currentDomainGroup
,
currentBussinessDomain
,
treeDataMap
])
useEffect
(()
=>
{
useEffect
(()
=>
{
setStructured
(
template
?.
struct
ured
||
assets
?.
structured
)
setStructured
(
template
?.
struct
edStateEnum
===
'structured'
||
assets
?.
structedState
===
'structured'
)
},
[
assets
,
template
])
},
[
assets
,
template
])
useEffect
(()
=>
{
useEffect
(()
=>
{
...
...
src/view/Manage/AssetManage/Component/AssetTable.jsx
View file @
8f1d1581
...
@@ -1084,13 +1084,13 @@ const AssetTable = (props) => {
...
@@ -1084,13 +1084,13 @@ const AssetTable = (props) => {
>
>
<Space>
<Space>
{
{
((reference===AssetManageReference||isDataKeyUser) && template &&
!template?.structured
) && nodeId && <Button onClick={addAsset}>新增</Button>
((reference===AssetManageReference||isDataKeyUser) && template &&
template?.structedStateEnum!=='structured'
) && nodeId && <Button onClick={addAsset}>新增</Button>
}
}
{
{
(reference===AssetManageReference && nodeType!=='custom') && <Button onClick={importAsset}>导入</Button>
(reference===AssetManageReference && nodeType!=='custom') && <Button onClick={importAsset}>导入</Button>
}
}
{
{
(reference===AssetManageReference && nodeType!=='custom' && template &&
!template?.structured
) && <Button onClick={importBusinessColumn}>导入字段</Button>
(reference===AssetManageReference && nodeType!=='custom' && template &&
template?.structedStateEnum!=='structured'
) && <Button onClick={importBusinessColumn}>导入字段</Button>
}
}
{
{
(reference===AssetManageReference) && <Tooltip>
(reference===AssetManageReference) && <Tooltip>
...
@@ -1119,7 +1119,7 @@ const AssetTable = (props) => {
...
@@ -1119,7 +1119,7 @@ const AssetTable = (props) => {
}
}
<Button onClick={onFilterElementClick}>可见列设置</Button>
<Button onClick={onFilterElementClick}>可见列设置</Button>
{
{
reference===AssetManageReference && template?.struct
ured
&& (reportTypes??[]).length > 0 && <Dropdown overlay={moreMenu} placement="bottomCenter">
reference===AssetManageReference && template?.struct
edStateEnum==='structured'
&& (reportTypes??[]).length > 0 && <Dropdown overlay={moreMenu} placement="bottomCenter">
<Button>其他操作</Button>
<Button>其他操作</Button>
</Dropdown>
</Dropdown>
}
}
...
...
src/view/Manage/AssetManage/Component/select-asset.jsx
View file @
8f1d1581
...
@@ -201,7 +201,7 @@ const FC = (props) => {
...
@@ -201,7 +201,7 @@ const FC = (props) => {
type
:
'assetmanage.getTemplates'
,
type
:
'assetmanage.getTemplates'
,
callback
:
data
=>
{
callback
:
data
=>
{
setLoadingTemplates
(
false
)
setLoadingTemplates
(
false
)
const
newTemplates
=
(
data
??[]).
filter
(
item
=>
item
.
struct
ured
)
const
newTemplates
=
(
data
??[]).
filter
(
item
=>
item
.
struct
edStateEnum
===
'structured'
)
setTemplates
(
newTemplates
)
setTemplates
(
newTemplates
)
...
...
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