Merge pull request #217 from suyuan32/dev

fix(BasicModal): error when wrapper props is undefined
suyuan32 · Jun 5, 2024 · 2f243ac · 2f243ac
2 parents c0a9549 + a1d4501
commit 2f243ac
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/components/Modal/src/BasicModal.vue b/src/components/Modal/src/BasicModal.vue
@@ -36,7 +36,11 @@
  :height="getWrapperHeight"
  :open="openRef"
  :modalFooterHeight="footer !== undefined && !footer ? 0 : undefined"
- v-bind="omit(getProps.wrapperProps, ['open', 'height', 'modalFooterHeight'])"
+ v-bind="
+ getProps.wrapperProps
+ ? omit(getProps.wrapperProps as any, ['open', 'height', 'modalFooterHeight'])
+ : {}
+ "
  @ext-height="handleExtHeight"
  @height-change="handleHeightChange"
  >
@@ -141,10 +145,11 @@
  };
  attr['wrapClassName'] =
  `${attr?.['wrapClassName'] || ''} ${unref(getWrapClassName)}` + 'vben-basic-modal-wrap';
+
  if (unref(fullScreenRef)) {
- return omit(attr, ['height', 'title']);
+ return omit(attr as any, ['height', 'title']);
  }
- return omit(attr, ['title']);
+ return omit(attr as any, ['title']);
  });
 
  const getWrapperHeight = computed(() => {