Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
najiu-admin-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
najiu-frontend
najiu-admin-template
Commits
ddd1893b
Commit
ddd1893b
authored
Jul 30, 2021
by
无木
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(tree): fix `checkAll` effects `disabled` node
parent
e8eefd1b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
1 deletion
+21
-1
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+1
-0
Tree.vue
src/components/Tree/src/Tree.vue
+2
-1
useTree.ts
src/components/Tree/src/useTree.ts
+18
-0
No files found.
CHANGELOG.zh_CN.md
View file @
ddd1893b
...
...
@@ -9,6 +9,7 @@
-
**ImgRotateDragVerify**
修复组件
`resume`
方法无法调用的问题
-
**TableAction**
修复 stopButtonPropagation 属性某些情况下不起作用的问题
-
**PageWrapper**
修复
`class`
属性无效的问题
-
**BasicTree**
修复
`checkAll`
方法会影响到
`disabled`
状态节点的问题
-
**BasicTable**
-
修复可编辑单元格不支持
`ellipsis`
配置的问题
-
修复全屏模式下看不到子组件弹出层(popconfirm 以及 select、treeSelect 等编辑组件)的问题
...
...
src/components/Tree/src/Tree.vue
View file @
ddd1893b
...
...
@@ -127,6 +127,7 @@
updateNodeByKey
,
getAllKeys
,
getChildrenKeys
,
getEnabledKeys
,
}
=
useTree
(
treeDataRef
,
getReplaceFields
);
function
getIcon
(
params
:
Recordable
,
icon
?:
string
)
{
...
...
@@ -180,7 +181,7 @@
}
function
checkAll
(
checkAll
:
boolean
)
{
state
.
checkedKeys
=
checkAll
?
get
All
Keys
()
:
([]
as
Keys
);
state
.
checkedKeys
=
checkAll
?
get
Enabled
Keys
()
:
([]
as
Keys
);
}
function
expandAll
(
expandAll
:
boolean
)
{
...
...
src/components/Tree/src/useTree.ts
View file @
ddd1893b
...
...
@@ -26,6 +26,23 @@ export function useTree(
}
return
keys
as
Keys
;
}
// get keys that can be checked and selected
function
getEnabledKeys
(
list
?:
TreeDataItem
[])
{
const
keys
:
string
[]
=
[];
const
treeData
=
list
||
unref
(
treeDataRef
);
const
{
key
:
keyField
,
children
:
childrenField
}
=
unref
(
getReplaceFields
);
if
(
!
childrenField
||
!
keyField
)
return
keys
;
for
(
let
index
=
0
;
index
<
treeData
.
length
;
index
++
)
{
const
node
=
treeData
[
index
];
node
.
disabled
!==
true
&&
node
.
selectable
!==
false
&&
keys
.
push
(
node
[
keyField
]
!
);
const
children
=
node
[
childrenField
];
if
(
children
&&
children
.
length
)
{
keys
.
push
(...(
getEnabledKeys
(
children
)
as
string
[]));
}
}
return
keys
as
Keys
;
}
function
getChildrenKeys
(
nodeKey
:
string
|
number
,
list
?:
TreeDataItem
[]):
Keys
{
const
keys
:
Keys
=
[];
...
...
@@ -169,5 +186,6 @@ export function useTree(
updateNodeByKey
,
getAllKeys
,
getChildrenKeys
,
getEnabledKeys
,
};
}
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