Browse Source

Merge remote-tracking branch 'origin/master'

research/test
jian 1 year ago
parent
commit
efe5d2aed4
  1. 4
      packages/fineui/src/base/combination/loader.js
  2. 1
      packages/fineui/src/base/tree/customtree.js

4
packages/fineui/src/base/combination/loader.js

@ -204,7 +204,7 @@ export class Loader extends Widget {
{
times: this.times,
count: this.count,
}
}, this.options
]);
}
@ -218,7 +218,7 @@ export class Loader extends Widget {
{
times: this.times,
count: this.count,
}
}, this.options
]);
}

1
packages/fineui/src/base/tree/customtree.js

@ -105,6 +105,7 @@ export class CustomTree extends Widget {
return itemsCreator.apply(this, args);
};
isNull(item.popup.el) && (item.popup.el = deepClone(this.options.el));
item.popup.el.node = item.el;
items.push(item);
} else {
items.push(node);

Loading…
Cancel
Save