Browse Source

fix(dialog): 标题判断时未考虑插槽 (#1601)

qiang 3 years ago
parent
commit
3bf8577221

+ 11 - 0
src/packages/__VUE/dialog/__tests__/index.spec.ts

@@ -38,6 +38,17 @@ test('should render dialog template', async () => {
   expect(await overLay.find('.nut-dialog__content'));
 });
 
+test('header slot', async () => {
+  const wrapper = mount(DialogTemplate, {
+    slots: {
+      header: 'test-title'
+    }
+  });
+
+  const overLay = wrapper.getComponent(OverLay);
+  expect(await overLay.find('.nut-dialog__header'));
+});
+
 // test('should render dialog methods', async () => {
 // Dialog({
 //   title: '基础弹框',

+ 1 - 1
src/packages/__VUE/dialog/index.taro.vue

@@ -13,7 +13,7 @@
     @click-close-icon="closed"
   >
     <view :class="classes">
-      <view v-if="title" class="nut-dialog__header">
+      <view v-if="$slots.header || title" class="nut-dialog__header">
         <slot v-if="$slots.header" name="header"></slot>
         <template v-else>{{ title }}</template>
       </view>

+ 1 - 1
src/packages/__VUE/dialog/index.vue

@@ -13,7 +13,7 @@
     @click-close-icon="closed"
   >
     <view :class="classes">
-      <view v-if="title" class="nut-dialog__header">
+      <view v-if="$slots.header || title" class="nut-dialog__header">
         <slot v-if="$slots.header" name="header"></slot>
         <template v-else>{{ title }}</template>
       </view>