默认点击蒙层或按ESC可关闭
@@ -23,7 +25,7 @@
:visible.sync="visibleModelessDrag"
mode="modeless"
draggable
- :onConfirm="()=>this.visibleModelessDrag = false"
+ :onConfirm="() => (this.visibleModelessDrag = false)"
>
对话框内容
@@ -34,13 +36,12 @@
header="非模态对话框-不可拖拽"
:visible.sync="visibleModeless"
mode="modeless"
- :onConfirm="()=>this.visibleModeless = false"
+ :onConfirm="() => (this.visibleModeless = false)"
>
-
-
diff --git a/examples/dialog/demos/icon.vue b/examples/dialog/demos/icon.vue
index 09a8b49fc..4ae607d25 100644
--- a/examples/dialog/demos/icon.vue
+++ b/examples/dialog/demos/icon.vue
@@ -8,7 +8,7 @@
theme="info"
:onConfirm="close1"
/>
-
+
-
+
-
+
-
+
+
theme: info
theme: warning
theme: danger
@@ -46,7 +47,7 @@
export default {
data() {
return {
- visible1: true,
+ visible1: false,
visible2: true,
visible3: true,
visible4: true,
@@ -65,12 +66,6 @@ export default {
close4() {
this.visible4 = false;
},
-
},
};
-
diff --git a/examples/dialog/demos/modal.vue b/examples/dialog/demos/modal.vue
index df92f88e5..3af73c300 100644
--- a/examples/dialog/demos/modal.vue
+++ b/examples/dialog/demos/modal.vue
@@ -1,9 +1,11 @@
-
模态对话框
-
非模态对话框
-
模态对话框-不可拖拽
-
普通对话框-不可拖拽
+
+ 模态对话框
+ 非模态对话框
+ 模态对话框-不可拖拽
+ 普通对话框-不可拖拽
+
-
diff --git a/examples/dialog/demos/plugin.vue b/examples/dialog/demos/plugin.vue
index c7fb9d48e..128ff3808 100644
--- a/examples/dialog/demos/plugin.vue
+++ b/examples/dialog/demos/plugin.vue
@@ -1,11 +1,11 @@
-
+
dialog
handleDialogNode
confirm
alert
DialogPlugin.confirm
-
+
diff --git a/examples/dialog/demos/warning.vue b/examples/dialog/demos/warning.vue
index 5a35bd601..0fe7c309c 100644
--- a/examples/dialog/demos/warning.vue
+++ b/examples/dialog/demos/warning.vue
@@ -1,6 +1,12 @@
-
提示反馈
+
+ 提示反馈
+ 成功反馈
+ 警示反馈
+ 错误反馈
+ 自定义图标
+
-
-
-
成功反馈
+ />
-
-
-
警示反馈
+ />
-
-
-
错误反馈
+ />
-
-
-
自定义图标
+ />
@@ -106,8 +100,3 @@ export default Vue.extend({
},
});
-
diff --git a/test/ssr/__snapshots__/ssr.test.js.snap b/test/ssr/__snapshots__/ssr.test.js.snap
index 456566a0f..d1b24a29f 100644
--- a/test/ssr/__snapshots__/ssr.test.js.snap
+++ b/test/ssr/__snapshots__/ssr.test.js.snap
@@ -5623,7 +5623,13 @@ exports[`ssr snapshot test renders ./examples/dialog/demos/async.vue correctly 1
`;
exports[`ssr snapshot test renders ./examples/dialog/demos/attach.vue correctly 1`] = `
-
+
+
+
+
+
+
+
@@ -5641,7 +5647,12 @@ exports[`ssr snapshot test renders ./examples/dialog/demos/base.vue correctly 1`
exports[`ssr snapshot test renders ./examples/dialog/demos/custom.vue correctly 1`] = `
弹窗内容自定义
-
+
+
+
+
+
+
@@ -5650,7 +5661,13 @@ exports[`ssr snapshot test renders ./examples/dialog/demos/custom.vue correctly
底部按钮有两个控制属性:confirmBtn 和 cancelBtn。属性类型有多种:string | ButtonProps | TNode。也可以通过 footer
来自定义控制
-
+
+
+
+
+
+
+
@@ -5659,7 +5676,12 @@ exports[`ssr snapshot test renders ./examples/dialog/demos/custom.vue correctly
`;
exports[`ssr snapshot test renders ./examples/dialog/demos/drag.vue correctly 1`] = `
-
+
+
+
+
+
+
@@ -5671,8 +5693,7 @@ exports[`ssr snapshot test renders ./examples/dialog/demos/icon.vue correctly 1`
-
-
+
@@ -5680,7 +5701,13 @@ exports[`ssr snapshot test renders ./examples/dialog/demos/icon.vue correctly 1`
`;
exports[`ssr snapshot test renders ./examples/dialog/demos/modal.vue correctly 1`] = `
-
+
+
+
+
+
+
+
@@ -5689,10 +5716,24 @@ exports[`ssr snapshot test renders ./examples/dialog/demos/modal.vue correctly 1
`;
-exports[`ssr snapshot test renders ./examples/dialog/demos/plugin.vue correctly 1`] = `
`;
+exports[`ssr snapshot test renders ./examples/dialog/demos/plugin.vue correctly 1`] = `
+
+
+
+
+
+
+
+`;
exports[`ssr snapshot test renders ./examples/dialog/demos/position.vue correctly 1`] = `
-
+
+
+
+
+
+
+
@@ -5701,11 +5742,18 @@ exports[`ssr snapshot test renders ./examples/dialog/demos/position.vue correctl
`;
exports[`ssr snapshot test renders ./examples/dialog/demos/warning.vue correctly 1`] = `
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
`;
diff --git a/test/unit/dialog/__snapshots__/demo.test.js.snap b/test/unit/dialog/__snapshots__/demo.test.js.snap
index e42924ac5..e69ce8d54 100644
--- a/test/unit/dialog/__snapshots__/demo.test.js.snap
+++ b/test/unit/dialog/__snapshots__/demo.test.js.snap
@@ -123,49 +123,67 @@ exports[`Dialog Dialog attachVue demo works fine 1`] = `
-
-
-
+
+
- 挂载特定元素
-
-
-
-
+
+
- 挂载函数返回节点
-
-
-
-
+
+
- 展示在挂载元素区域
-
-
+
+
+
-
-
-
+
+
- 渲染函数定义内容
-
-
-
-
+
+
- 插槽方式定义内容
-
-
+
+
+
-
-
-
+
+
- 按钮属性
-
-
-
-
+
+
- 渲染函数按钮
-
-
-
-
+
+
- 隐藏底部
-
-
+
+
+
-
-
-
+
+
- 渲染函数定义内容
-
-
-
-
+
+
- 插槽方式定义内容
-
-
+
+
+
-
-
-
+
+
- 按钮属性
-
-
-
-
+
+
- 渲染函数按钮
-
-
-
-
+
+
- 隐藏底部
-
-
+
+
+
-
-
-
+
+
- 非模态对话框-不可拖拽
-
-
-
-
+
+
- 模态对话框-不支持拖拽
-
-
+
+
+
@@ -2043,6 +2142,7 @@ exports[`Dialog Dialog iconVue demo works fine 1`] = `
>
-
+
@@ -2409,49 +2518,67 @@ exports[`Dialog Dialog iconVue demo works fine 1`] = `
exports[`Dialog Dialog modalVue demo works fine 1`] = `
-
-
-
+
+
- 非模态对话框
-
-
-
-
+
+
- 模态对话框-不可拖拽
-
-
-
-
+
+
- 普通对话框-不可拖拽
-
-
+
+
+
-
`;
exports[`Dialog Dialog positionVue demo works fine 1`] = `
-
-
- 默认位置
-
-
-
-
-
+
+ 默认位置
+
+
+
+
- 垂直居中
-
-
-
-
-
+
+ 垂直居中
+
+
+
+
- 自定义top
-
-
-
-
-
+
+ 自定义top
+
+
+
+
- 文本溢出
-
-
+
+
+ 文本溢出
+
+
+
+
-
-
- 提示反馈
-
-
+
+
+ 提示反馈
+
+
+
+
+
+
+ 成功反馈
+
+
+
+
+
+
+ 警示反馈
+
+
+
+
+
+
+ 错误反馈
+
+
+
+
+
+
+ 自定义图标
+
+
+
+
-
-
- 成功反馈
-
-
-
-
-
- 警示反馈
-
-
-
-
-
- 错误反馈
-
-
-
-
-
- 自定义图标
-
-
-