mirror of
https://gitee.com/dapppp/ruoyi-plus-vben5.git
synced 2026-03-16 15:52:00 +08:00
fix: 修复设置default-expanded-level后无法check更低层级节点 logic and tree value updates (#7155)
假设缺省展开2级,当check 3级节点时,会触发effectWatch重新收缩到2级,并丢失check操作check操作andling.
This commit is contained in:
@@ -65,16 +65,24 @@ const modelValue = defineModel<Arrayable<number | string>>();
|
|||||||
const expanded = ref<Array<number | string>>(props.defaultExpandedKeys ?? []);
|
const expanded = ref<Array<number | string>>(props.defaultExpandedKeys ?? []);
|
||||||
|
|
||||||
const treeValue = ref();
|
const treeValue = ref();
|
||||||
|
let lastTreeData: any = null;
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
watchEffect(() => {
|
watchEffect(() => {
|
||||||
flattenData.value = flatten(props.treeData, props.childrenField);
|
flattenData.value = flatten(props.treeData, props.childrenField);
|
||||||
updateTreeValue();
|
updateTreeValue();
|
||||||
if (
|
|
||||||
props.defaultExpandedLevel !== undefined &&
|
// 只在 treeData 变化时执行展开
|
||||||
props.defaultExpandedLevel > 0
|
const currentTreeData = JSON.stringify(props.treeData);
|
||||||
)
|
if (lastTreeData !== currentTreeData) {
|
||||||
expandToLevel(props.defaultExpandedLevel);
|
lastTreeData = currentTreeData;
|
||||||
|
if (
|
||||||
|
props.defaultExpandedLevel !== undefined &&
|
||||||
|
props.defaultExpandedLevel > 0
|
||||||
|
) {
|
||||||
|
expandToLevel(props.defaultExpandedLevel);
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -87,9 +95,11 @@ function getItemByValue(value: number | string) {
|
|||||||
function updateTreeValue() {
|
function updateTreeValue() {
|
||||||
const val = modelValue.value;
|
const val = modelValue.value;
|
||||||
if (val === undefined) {
|
if (val === undefined) {
|
||||||
treeValue.value = undefined;
|
treeValue.value = props.multiple ? [] : undefined;
|
||||||
} else {
|
} else if (Array.isArray(val)) {
|
||||||
if (Array.isArray(val)) {
|
if (val.length === 0) {
|
||||||
|
treeValue.value = [];
|
||||||
|
} else {
|
||||||
const filteredValues = val.filter((v) => {
|
const filteredValues = val.filter((v) => {
|
||||||
const item = getItemByValue(v);
|
const item = getItemByValue(v);
|
||||||
return item && !get(item, props.disabledField);
|
return item && !get(item, props.disabledField);
|
||||||
@@ -99,14 +109,14 @@ function updateTreeValue() {
|
|||||||
if (filteredValues.length !== val.length) {
|
if (filteredValues.length !== val.length) {
|
||||||
modelValue.value = filteredValues;
|
modelValue.value = filteredValues;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const item = getItemByValue(val);
|
||||||
|
if (item && !get(item, props.disabledField)) {
|
||||||
|
treeValue.value = item;
|
||||||
} else {
|
} else {
|
||||||
const item = getItemByValue(val);
|
treeValue.value = props.multiple ? [] : undefined;
|
||||||
if (item && !get(item, props.disabledField)) {
|
modelValue.value = props.multiple ? [] : undefined;
|
||||||
treeValue.value = item;
|
|
||||||
} else {
|
|
||||||
treeValue.value = undefined;
|
|
||||||
modelValue.value = undefined;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user