Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
一臭打代码的 aka 潘先生です
vue-vben-admin
提交
f707541d
V
vue-vben-admin
项目概览
一臭打代码的 aka 潘先生です
/
vue-vben-admin
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vue-vben-admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f707541d
编写于
7月 16, 2021
作者:
无
无木
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(tree): fixed `checkedKeys` with `search` mode
修复搜索状态的切换导致的勾选值可能不正确的问题
上级
b06a7ab7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
39 addition
and
23 deletion
+39
-23
src/components/Tree/src/Tree.vue
src/components/Tree/src/Tree.vue
+16
-23
src/components/Tree/src/useTree.ts
src/components/Tree/src/useTree.ts
+23
-0
未找到文件。
src/components/Tree/src/Tree.vue
浏览文件 @
f707541d
...
...
@@ -18,8 +18,8 @@
import
TreeHeader
from
'
./TreeHeader.vue
'
;
import
{
ScrollContainer
}
from
'
/@/components/Container
'
;
import
{
omit
,
get
,
cloneDeep
,
concat
,
uniq
}
from
'
lodash-es
'
;
import
{
isBoolean
,
isFunction
}
from
'
/@/utils/is
'
;
import
{
omit
,
get
,
difference
}
from
'
lodash-es
'
;
import
{
is
Array
,
is
Boolean
,
isFunction
}
from
'
/@/utils/is
'
;
import
{
extendSlots
,
getSlot
}
from
'
/@/utils/helper/tsxHelper
'
;
import
{
filter
}
from
'
/@/utils/helper/treeHelper
'
;
...
...
@@ -56,25 +56,6 @@
searchData
:
[]
as
TreeItem
[],
});
const
copyState
=
{
checkedKeys
:
[],
};
watch
(
()
=>
searchState
.
startSearch
,
(
newVal
,
oldVal
)
=>
{
if
(
newVal
&&
!
oldVal
)
{
// before search, save current checkedKeys
copyState
.
checkedKeys
=
cloneDeep
(
state
.
checkedKeys
);
}
else
if
(
!
newVal
&&
oldVal
)
{
// after search, restore checkedKeys
state
.
checkedKeys
=
uniq
(
concat
(
state
.
checkedKeys
,
copyState
.
checkedKeys
));
copyState
.
checkedKeys
=
[];
}
},
{
immediate
:
true
}
);
const
treeDataRef
=
ref
<
TreeItem
[]
>
([]);
const
[
createContextMenu
]
=
useContextMenu
();
...
...
@@ -109,8 +90,19 @@
emit
(
'
update:selectedKeys
'
,
v
);
},
onCheck
:
(
v
:
CheckKeys
,
e
:
CheckEvent
)
=>
{
state
.
checkedKeys
=
v
;
const
rawVal
=
toRaw
(
v
);
let
currentValue
=
toRaw
(
state
.
checkedKeys
)
as
Keys
;
if
(
isArray
(
currentValue
)
&&
searchState
.
startSearch
)
{
const
{
key
}
=
unref
(
getReplaceFields
);
currentValue
=
difference
(
currentValue
,
getChildrenKeys
(
e
.
node
.
$attrs
.
node
[
key
]));
if
(
e
.
checked
)
{
currentValue
.
push
(
e
.
node
.
$attrs
.
node
[
key
]);
}
state
.
checkedKeys
=
currentValue
;
}
else
{
state
.
checkedKeys
=
v
;
}
const
rawVal
=
toRaw
(
state
.
checkedKeys
);
emit
(
'
update:value
'
,
rawVal
);
emit
(
'
check
'
,
rawVal
,
e
);
},
...
...
@@ -134,6 +126,7 @@
filterByLevel
,
updateNodeByKey
,
getAllKeys
,
getChildrenKeys
,
}
=
useTree
(
treeDataRef
,
getReplaceFields
);
function
getIcon
(
params
:
Recordable
,
icon
?:
string
)
{
...
...
src/components/Tree/src/useTree.ts
浏览文件 @
f707541d
...
...
@@ -27,6 +27,28 @@ export function useTree(
return
keys
as
Keys
;
}
function
getChildrenKeys
(
nodeKey
:
string
|
number
,
list
?:
TreeDataItem
[]):
Keys
{
const
keys
:
Keys
=
[];
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
];
const
children
=
node
[
childrenField
];
if
(
nodeKey
===
node
[
keyField
])
{
keys
.
push
(
node
[
keyField
]
!
);
if
(
children
&&
children
.
length
)
{
keys
.
push
(...(
getAllKeys
(
children
)
as
string
[]));
}
}
else
{
if
(
children
&&
children
.
length
)
{
keys
.
push
(...
getChildrenKeys
(
nodeKey
,
children
));
}
}
}
return
keys
as
Keys
;
}
// Update node
function
updateNodeByKey
(
key
:
string
,
node
:
TreeDataItem
,
list
?:
TreeDataItem
[])
{
if
(
!
key
)
return
;
...
...
@@ -146,5 +168,6 @@ export function useTree(
filterByLevel
,
updateNodeByKey
,
getAllKeys
,
getChildrenKeys
,
};
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录