Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(select-tree): 修正下拉宽度变更 #353

Merged
merged 1 commit into from
Jul 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions components/select-tree/selectTree.vue
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ import {
unref,
watch,
computed,
onMounted,
CSSProperties,
PropType,
} from 'vue';
Expand Down Expand Up @@ -206,6 +205,11 @@ export default defineComponent({

watch(isOpened, () => {
emit('visibleChange', unref(isOpened));

// trigger 在mounted 之后可能会改变
if (isOpened.value && triggerDomRef.value) {
triggerWidth.value = triggerDomRef.value.$el.offsetWidth;
}
});

const handleChange = () => {
Expand Down Expand Up @@ -341,12 +345,6 @@ export default defineComponent({
const triggerDomRef = ref();
const triggerWidth = ref(0);

onMounted(() => {
if (triggerDomRef.value) {
triggerWidth.value = triggerDomRef.value.$el.offsetWidth;
}
});

const dropdownStyle = computed(() => {
const style: CSSProperties = {};
if (triggerWidth.value) {
Expand Down
8 changes: 1 addition & 7 deletions components/select/select.vue
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ import {
reactive,
watch,
computed,
onMounted,
CSSProperties,
defineComponent,
} from 'vue';
Expand Down Expand Up @@ -137,6 +136,7 @@ export default defineComponent({

watch(isOpenedRef, () => {
emit('visibleChange', unref(isOpenedRef));
// trigger 在mounted 之后可能会改变
if (isOpenedRef.value && triggerRef.value) {
triggerWidth.value = triggerRef.value.$el.offsetWidth;
}
Expand Down Expand Up @@ -373,12 +373,6 @@ export default defineComponent({
}
};

onMounted(() => {
if (triggerRef.value) {
triggerWidth.value = triggerRef.value.$el.offsetWidth;
}
});

const dropdownStyle = computed(() => {
const style: CSSProperties = {};
if (triggerWidth.value) {
Expand Down
6 changes: 3 additions & 3 deletions docs/.vitepress/components/selectTree/common.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ function createLabel(level) {
export default {
setup() {
const data = ref([]);
setTimeout(()=>{
data.value = createData(4);
})
setTimeout(() => {
data.value = createData(4);
});
return {
data,
};
Expand Down