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
09aa4cc7
Commit
09aa4cc7
authored
Jan 23, 2024
by
zhaochengxiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
岗位新增
parent
5201b9ac
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
15 deletions
+14
-15
AssetManageTree.jsx
src/view/Manage/AssetManage/Component/AssetManageTree.jsx
+8
-10
AssetTable.jsx
src/view/Manage/AssetManage/Component/AssetTable.jsx
+2
-2
index.jsx
src/view/Manage/AssetManage/index.jsx
+4
-3
No files found.
src/view/Manage/AssetManage/Component/AssetManageTree.jsx
View file @
09aa4cc7
...
@@ -149,7 +149,7 @@ const AssetManageTree = (props) => {
...
@@ -149,7 +149,7 @@ const AssetManageTree = (props) => {
}
}
listSubject
.
next
({
msg
:
'templateChange'
})
listSubject
.
next
({
msg
:
'templateChange'
})
onSelect
?.(
''
,
''
)
onSelect
?.(
''
,
''
,
null
,
false
)
getAllDirectoryAsTree
(
false
)
getAllDirectoryAsTree
(
false
)
}
}
},
},
...
@@ -194,9 +194,6 @@ const AssetManageTree = (props) => {
...
@@ -194,9 +194,6 @@ const AssetManageTree = (props) => {
const
getAllDirectoryAsTree
=
(
resetCurrentDirId
=
true
,
defaultSelectedId
=
''
,
refresh
=
false
)
=>
{
const
getAllDirectoryAsTree
=
(
resetCurrentDirId
=
true
,
defaultSelectedId
=
''
,
refresh
=
false
)
=>
{
setLoading
(
true
);
setLoading
(
true
);
// if (resetCurrentDirId) {
// onSelect && onSelect('', '');
// }
function
disposeData
(
data
)
{
function
disposeData
(
data
)
{
setLoading
(
false
);
setLoading
(
false
);
...
@@ -268,7 +265,7 @@ const AssetManageTree = (props) => {
...
@@ -268,7 +265,7 @@ const AssetManageTree = (props) => {
setCurrentDirId
(
defaultItem
.
nodeId
);
setCurrentDirId
(
defaultItem
.
nodeId
);
setCurrentDirType
(
defaultItem
.
type
||
''
);
setCurrentDirType
(
defaultItem
.
type
||
''
);
setCurrentDir
(
defaultItem
);
setCurrentDir
(
defaultItem
);
onSelect
&&
onSelect
(
defaultItem
.
nodeId
,
defaultItem
.
type
||
''
,
defaultItem
.
level
);
onSelect
&&
onSelect
(
defaultItem
.
nodeId
,
defaultItem
.
type
||
''
,
defaultItem
.
level
,
defaultItem
.
allowdLoadDataAsset
);
}
}
}
}
}
}
...
@@ -343,7 +340,7 @@ const AssetManageTree = (props) => {
...
@@ -343,7 +340,7 @@ const AssetManageTree = (props) => {
setCurrentDirId
(
defaultItem
.
nodeId
);
setCurrentDirId
(
defaultItem
.
nodeId
);
setCurrentDirType
(
defaultItem
.
type
||
''
);
setCurrentDirType
(
defaultItem
.
type
||
''
);
setCurrentDir
(
defaultItem
)
setCurrentDir
(
defaultItem
)
onSelect
&&
onSelect
(
defaultItem
.
nodeId
,
defaultItem
.
type
||
''
,
defaultItem
.
level
);
onSelect
&&
onSelect
(
defaultItem
.
nodeId
,
defaultItem
.
type
||
''
,
defaultItem
.
level
,
defaultItem
.
allowdLoadDataAsset
);
}
}
}
}
...
@@ -594,7 +591,7 @@ const AssetManageTree = (props) => {
...
@@ -594,7 +591,7 @@ const AssetManageTree = (props) => {
const
onTreeSelect
=
(
keys
,
{
node
})
=>
{
const
onTreeSelect
=
(
keys
,
{
node
})
=>
{
if
((
keys
||
[]).
length
===
0
)
{
if
((
keys
||
[]).
length
===
0
)
{
setCurrentDirId
();
setCurrentDirId
();
onSelect
?.(
''
,
''
);
onSelect
?.(
''
,
''
,
null
,
false
);
return
;
return
;
}
}
...
@@ -605,7 +602,8 @@ const AssetManageTree = (props) => {
...
@@ -605,7 +602,8 @@ const AssetManageTree = (props) => {
setCurrentDirType
(
_currentDirType
);
setCurrentDirType
(
_currentDirType
);
setCurrentDir
(
_currentDir
);
setCurrentDir
(
_currentDir
);
onSelect
&&
onSelect
(
keys
[
0
],
_currentDirType
,
node
.
level
);
onSelect
&&
onSelect
(
keys
[
0
],
_currentDirType
,
node
.
level
,
node
.
allowdLoadDataAsset
);
}
}
const
onTreeCheck
=
(
values
,
e
)
=>
{
const
onTreeCheck
=
(
values
,
e
)
=>
{
...
@@ -800,9 +798,9 @@ const AssetManageTree = (props) => {
...
@@ -800,9 +798,9 @@ const AssetManageTree = (props) => {
listSubject
.
next
({
msg
:
'templateChange'
})
listSubject
.
next
({
msg
:
'templateChange'
})
setCurrentDirId
();
setCurrentDirId
();
onSelect
?.(
null
,
null
);
onSelect
?.(
null
,
null
,
null
,
false
);
setTimeout
(()
=>
{
setTimeout
(()
=>
{
onSelect
?.(
''
,
''
);
onSelect
?.(
''
,
''
,
null
,
false
);
getAllDirectoryAsTree
(
false
)
getAllDirectoryAsTree
(
false
)
},
100
)
},
100
)
}
}
}
}
...
...
src/view/Manage/AssetManage/Component/AssetTable.jsx
View file @
09aa4cc7
...
@@ -92,7 +92,7 @@ export const listSubject = new Subject();
...
@@ -92,7 +92,7 @@ export const listSubject = new Subject();
const
AssetTable
=
(
props
)
=>
{
const
AssetTable
=
(
props
)
=>
{
const
{
className
,
nodeId
,
nodeType
,
nodeLevel
,
elementsChanged
,
assetActionChanged
,
onSelect
,
onCountChange
,
reference
=
AssetManageReference
,
onFullScreenChange
}
=
props
;
const
{
className
,
nodeId
,
nodeType
,
nodeLevel
,
nodeAllowdLoadDataAsset
,
elementsChanged
,
assetActionChanged
,
onSelect
,
onCountChange
,
reference
=
AssetManageReference
,
onFullScreenChange
}
=
props
;
const
MENU_ID
=
'asset-table'
;
const
MENU_ID
=
'asset-table'
;
...
@@ -986,7 +986,7 @@ const AssetTable = (props) => {
...
@@ -986,7 +986,7 @@ const AssetTable = (props) => {
>
>
<
Space
size=
{
15
}
>
<
Space
size=
{
15
}
>
{
{
(
reference
===
AssetManageReference
&&
isPostAsset
(
getTemplateType
())
&&
node
Id
)
&&
<
Button
onClick=
{
addAsset
}
>
新增
</
Button
>
(
reference
===
AssetManageReference
&&
isPostAsset
(
getTemplateType
())
&&
node
AllowdLoadDataAsset
)
&&
<
Button
onClick=
{
addAsset
}
>
新增
</
Button
>
}
}
{
{
...
...
src/view/Manage/AssetManage/index.jsx
View file @
09aa4cc7
...
@@ -19,6 +19,7 @@ const AssetManage = (props) => {
...
@@ -19,6 +19,7 @@ const AssetManage = (props) => {
const
[
nodeId
,
setNodeId
]
=
useState
(
null
);
const
[
nodeId
,
setNodeId
]
=
useState
(
null
);
const
[
nodeType
,
setNodeType
]
=
useState
(
''
);
const
[
nodeType
,
setNodeType
]
=
useState
(
''
);
const
[
nodeLevel
,
setNodeLevel
]
=
useState
(
null
);
const
[
nodeLevel
,
setNodeLevel
]
=
useState
(
null
);
const
[
nodeAllowdLoadDataAsset
,
setNodeAllowdLoadDataAsset
]
=
useState
(
false
);
const
[
assetParams
,
setAssetParams
]
=
useState
({
assetId
:
''
,
assetDirId
:
''
})
const
[
assetParams
,
setAssetParams
]
=
useState
({
assetId
:
''
,
assetDirId
:
''
})
const
[
expandTree
,
setExpandTree
]
=
useState
(
true
);
const
[
expandTree
,
setExpandTree
]
=
useState
(
true
);
const
[
assetFullScreen
,
setAssetFullScreen
]
=
useState
(
false
);
const
[
assetFullScreen
,
setAssetFullScreen
]
=
useState
(
false
);
...
@@ -31,11 +32,11 @@ const AssetManage = (props) => {
...
@@ -31,11 +32,11 @@ const AssetManage = (props) => {
const
{
assetId
,
assetDirId
}
=
assetParams
;
const
{
assetId
,
assetDirId
}
=
assetParams
;
const
onTreeSelect
=
(
value
,
type
,
level
)
=>
{
const
onTreeSelect
=
(
value
,
type
,
level
,
allowdLoadDataAsset
)
=>
{
setNodeId
(
value
);
setNodeId
(
value
);
setNodeType
(
type
);
setNodeType
(
type
);
setNodeLevel
(
level
);
setNodeLevel
(
level
);
setNodeAllowdLoadDataAsset
(
allowdLoadDataAsset
)
}
}
const
onTableSelect
=
(
id
,
did
)
=>
{
const
onTableSelect
=
(
id
,
did
)
=>
{
...
@@ -91,7 +92,7 @@ const AssetManage = (props) => {
...
@@ -91,7 +92,7 @@ const AssetManage = (props) => {
<
div
className=
{
middleClasses
}
>
<
div
className=
{
middleClasses
}
>
{
/* <AssetDirectory id={nodeId} assetCount={assetCount} directoryChanged={directoryChanged} onElementsChange={onElementsChange} />
{
/* <AssetDirectory id={nodeId} assetCount={assetCount} directoryChanged={directoryChanged} onElementsChange={onElementsChange} />
<Separate height={15} /> */
}
<Separate height={15} /> */
}
<
AssetTable
nodeId=
{
nodeId
}
nodeType=
{
nodeType
}
nodeLevel=
{
nodeLevel
}
reference=
{
AssetManageReference
}
elementsChanged=
{
elementsChanged
}
assetActionChanged=
{
assetActionChanged
}
onSelect=
{
onTableSelect
}
onCountChange=
{
onAssetCountChange
}
onFullScreenChange=
{
onFullScreenChange
}
{
...
props
}
/>
<
AssetTable
nodeId=
{
nodeId
}
nodeType=
{
nodeType
}
nodeLevel=
{
nodeLevel
}
nodeAllowdLoadDataAsset=
{
nodeAllowdLoadDataAsset
}
reference=
{
AssetManageReference
}
elementsChanged=
{
elementsChanged
}
assetActionChanged=
{
assetActionChanged
}
onSelect=
{
onTableSelect
}
onCountChange=
{
onAssetCountChange
}
onFullScreenChange=
{
onFullScreenChange
}
{
...
props
}
/>
<
div
className=
'tree-toggle'
onClick=
{
treeToggleClick
}
>
<
div
className=
'tree-toggle'
onClick=
{
treeToggleClick
}
>
{
expandTree
?
<
CaretLeftOutlined
/>
:
<
CaretRightOutlined
/>
}
{
expandTree
?
<
CaretLeftOutlined
/>
:
<
CaretRightOutlined
/>
}
</
div
>
</
div
>
...
...
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