diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index b60f001fd..4493cdea2 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -1,4 +1,8 @@ # CHANGELOG +## 1.1.6 (2020-06-01) +### Fixes +- 修正 `$NConfirm` 的 `show-icon` & `closable` & `bordered` 属性设置无效. + ## 1.1.5 (2020-05-28) ### Features - 为 `n-collapse` 和 `n-collapse-item` 增加了 `display-directive` 属性 diff --git a/package.json b/package.json index fde1ff3f7..573649ca2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "naive-ui", - "version": "1.1.5", + "version": "1.1.6", "description": "A Vue UI Framework. Caring About Styles, Themed, Batteries Included, Not Rather Slow.", "main": "lib/index.js", "module": "es/index.js", diff --git a/src/Confirm/src/ConfirmEnvironment.vue b/src/Confirm/src/ConfirmEnvironment.vue index 8aca7c32a..6b4779f99 100644 --- a/src/Confirm/src/ConfirmEnvironment.vue +++ b/src/Confirm/src/ConfirmEnvironment.vue @@ -14,6 +14,9 @@ :negative-text="negativeText" :title="title" :loading="loading" + :closable="closable" + :show-icon="showIcon" + :bordered="bordered" theme-context-activated @close="handleCloseClick" @negative-click="handleNegativeClick" @@ -49,7 +52,10 @@ export default { onPositiveClick: () => true, onNegativeClick: () => true, onClose: () => true, - instances: null + instances: null, + closable: true, + showIcon: true, + bordered: false } }, computed: {