|
@@ -93,7 +93,11 @@ export default defineComponent({
|
|
|
let columnName = '';
|
|
|
if (subject.children) {
|
|
|
children = [...subject.children];
|
|
|
- let activeIndex = children.length > 0 ? children[0].id : '';
|
|
|
+ let activeIndex = subject.activeIndex
|
|
|
+ ? subject.activeIndex
|
|
|
+ : children.length > 0
|
|
|
+ ? children[0].id
|
|
|
+ : '';
|
|
|
if (props.childShowAllCheck) {
|
|
|
children.unshift({
|
|
|
columnName: subject.children[0].columnName,
|
|
@@ -121,21 +125,22 @@ export default defineComponent({
|
|
|
() => {
|
|
|
if (!state.popoverShow || !props.value) return;
|
|
|
let ids = formatParentId(props.value, props.options);
|
|
|
- console.log(ids, 'ids');
|
|
|
- state.tagActiveId = ids[0].id;
|
|
|
- props.options.forEach((item: any) => {
|
|
|
- if (item.id === state.tagActiveId) {
|
|
|
- initParentSelect(item);
|
|
|
- }
|
|
|
- });
|
|
|
|
|
|
- //
|
|
|
const index = ids.findIndex((child: any) => child.id === props.value);
|
|
|
ids = ids.slice(0, index + 1);
|
|
|
const values = ids.map((item: any) => {
|
|
|
return item.id;
|
|
|
});
|
|
|
+ // 格式化数据
|
|
|
formatParentCurrentValue(values, props.options);
|
|
|
+
|
|
|
+ // 初始化选中数据
|
|
|
+ state.tagActiveId = ids[0].id;
|
|
|
+ props.options.forEach((item: any) => {
|
|
|
+ if (item.id === state.tagActiveId) {
|
|
|
+ initParentSelect(item);
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
);
|
|
|
|
|
@@ -422,7 +427,6 @@ const ChildNodeSearch = defineComponent({
|
|
|
setup(props, { emit }) {
|
|
|
const { activeRow } = toRefs(props);
|
|
|
const selectItem = ref({});
|
|
|
-
|
|
|
watch(
|
|
|
() => props.activeRow,
|
|
|
() => {
|