Commit 8f1d1581 by zhaochengxiang

增加结构类型

parent ec92c2db
...@@ -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?.structured||assets?.structured) setStructured(template?.structedStateEnum==='structured'||assets?.structedState==='structured')
}, [assets, template]) }, [assets, template])
useEffect(() => { useEffect(() => {
......
...@@ -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?.structured && (reportTypes??[]).length > 0 && <Dropdown overlay={moreMenu} placement="bottomCenter"> reference===AssetManageReference && template?.structedStateEnum==='structured' && (reportTypes??[]).length > 0 && <Dropdown overlay={moreMenu} placement="bottomCenter">
<Button>其他操作</Button> <Button>其他操作</Button>
</Dropdown> </Dropdown>
} }
......
...@@ -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.structured) const newTemplates = (data??[]).filter(item => item.structedStateEnum==='structured')
setTemplates(newTemplates) setTemplates(newTemplates)
......
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