diff --git a/components.json b/components.json index 8785c19f0..754da2b61 100644 --- a/components.json +++ b/components.json @@ -79,5 +79,6 @@ "page-header": "./packages/page-header/index.js", "cascader-panel": "./packages/cascader-panel/index.js", "avatar": "./packages/avatar/index.js", - "drawer": "./packages/drawer/index.js" + "drawer": "./packages/drawer/index.js", + "popconfirm": "./packages/popconfirm/index.js" } diff --git a/examples/docs/en-US/popconfirm.md b/examples/docs/en-US/popconfirm.md new file mode 100644 index 000000000..72033bfc0 --- /dev/null +++ b/examples/docs/en-US/popconfirm.md @@ -0,0 +1,54 @@ +## Popconfirm + +A simple confirmation dialog of an element click action. + +### Basic usage + +Popconfirm is similar to Popover. So for some duplicated attributes, please refer to the documentation of Popover. + +:::demo Only `title` attribute is avaliable in Popconfirm, `content` will be ignored. +```html + +```` +::: + +### Customise +You can customise Popconfirm like: +:::demo +```html + +``` +::: + +### Attributes +| Attribute | Description | Type | Accepted Values | Default | +|--------------------|----------------------------------------------------------|-------------------|-------------|--------| +| title | Title | String | — | — | +| confirmButtonText | Confirm button text | String | — | — | +| cancelButtonText | Cancel button text | String | — | — | +| confirmButtonType | Confirm button type | String | — | Primary | +| cancelButtonType | Cancel button type | String | — | Text | +| icon | Icon | String | — | el-icon-question | +| iconColor | Icon color | String | — | #f90 | +| hideIcon | is hide Icon | Boolean | — | false | + +### Slot +| Name | Description | +|--- | ---| +| reference | HTML element that triggers Popconfirm | diff --git a/examples/docs/es/popconfirm.md b/examples/docs/es/popconfirm.md new file mode 100644 index 000000000..72033bfc0 --- /dev/null +++ b/examples/docs/es/popconfirm.md @@ -0,0 +1,54 @@ +## Popconfirm + +A simple confirmation dialog of an element click action. + +### Basic usage + +Popconfirm is similar to Popover. So for some duplicated attributes, please refer to the documentation of Popover. + +:::demo Only `title` attribute is avaliable in Popconfirm, `content` will be ignored. +```html + +```` +::: + +### Customise +You can customise Popconfirm like: +:::demo +```html + +``` +::: + +### Attributes +| Attribute | Description | Type | Accepted Values | Default | +|--------------------|----------------------------------------------------------|-------------------|-------------|--------| +| title | Title | String | — | — | +| confirmButtonText | Confirm button text | String | — | — | +| cancelButtonText | Cancel button text | String | — | — | +| confirmButtonType | Confirm button type | String | — | Primary | +| cancelButtonType | Cancel button type | String | — | Text | +| icon | Icon | String | — | el-icon-question | +| iconColor | Icon color | String | — | #f90 | +| hideIcon | is hide Icon | Boolean | — | false | + +### Slot +| Name | Description | +|--- | ---| +| reference | HTML element that triggers Popconfirm | diff --git a/examples/docs/fr-FR/popconfirm.md b/examples/docs/fr-FR/popconfirm.md new file mode 100644 index 000000000..72033bfc0 --- /dev/null +++ b/examples/docs/fr-FR/popconfirm.md @@ -0,0 +1,54 @@ +## Popconfirm + +A simple confirmation dialog of an element click action. + +### Basic usage + +Popconfirm is similar to Popover. So for some duplicated attributes, please refer to the documentation of Popover. + +:::demo Only `title` attribute is avaliable in Popconfirm, `content` will be ignored. +```html + +```` +::: + +### Customise +You can customise Popconfirm like: +:::demo +```html + +``` +::: + +### Attributes +| Attribute | Description | Type | Accepted Values | Default | +|--------------------|----------------------------------------------------------|-------------------|-------------|--------| +| title | Title | String | — | — | +| confirmButtonText | Confirm button text | String | — | — | +| cancelButtonText | Cancel button text | String | — | — | +| confirmButtonType | Confirm button type | String | — | Primary | +| cancelButtonType | Cancel button type | String | — | Text | +| icon | Icon | String | — | el-icon-question | +| iconColor | Icon color | String | — | #f90 | +| hideIcon | is hide Icon | Boolean | — | false | + +### Slot +| Name | Description | +|--- | ---| +| reference | HTML element that triggers Popconfirm | diff --git a/examples/docs/zh-CN/popconfirm.md b/examples/docs/zh-CN/popconfirm.md new file mode 100644 index 000000000..e3eb86e1c --- /dev/null +++ b/examples/docs/zh-CN/popconfirm.md @@ -0,0 +1,54 @@ +## Popconfirm 气泡确认框 + +点击元素，弹出气泡确认框。 + +### 基础用法 + +Popconfirm 的属性与 Popover 很类似，因此对于重复属性，请参考 Popover 的文档，在此文档中不做详尽解释。 +:::demo 在 Popconfirm 中，只有 `title` 属性可用，`content` 属性不会被展示。 +```html + +```` +::: + +### 自定义 + +可以在 Popconfirm 中自定义内容。 +:::demo +```html + +``` +::: + +### Attributes +| 参数 | 说明 | 类型 | 可选值 | 默认值 | +|--------------------|----------------------------------------------------------|-------------------|-------------|--------| +| title | 标题 | String | — | — | +| confirmButtonText | 确认按钮文字 | String | — | — | +| cancelButtonText | 取消按钮文字 | String | — | — | +| confirmButtonType | 确认按钮类型 | String | — | Primary | +| cancelButtonType | 取消按钮类型 | String | — | Text | +| icon | Icon | String | — | el-icon-question | +| iconColor | Icon 颜色 | String | — | #f90 | +| hideIcon | 是否隐藏 Icon | Boolean | — | false | + +### Slot +| 参数 | 说明 | +|--- | ---| +| reference | 触发 Popconfirm 显示的 HTML 元素 | diff --git a/examples/nav.config.json b/examples/nav.config.json index 0daf262df..f16534423 100644 --- a/examples/nav.config.json +++ b/examples/nav.config.json @@ -248,6 +248,10 @@ "path": "/popover", "title": "Popover 弹出框" }, + { + "path": "/popconfirm", + "title": "Popconfirm 气泡确认框" + }, { "path": "/card", "title": "Card 卡片" @@ -538,6 +542,10 @@ "path": "/popover", "title": "Popover" }, + { + "path": "/popconfirm", + "title": "Popconfirm" + }, { "path": "/card", "title": "Card" @@ -832,6 +840,10 @@ "path": "/popover", "title": "Popover" }, + { + "path": "/popconfirm", + "title": "Popconfirm" + }, { "path": "/card", "title": "Card" @@ -1126,6 +1138,10 @@ "path": "/popover", "title": "Popover" }, + { + "path": "/popconfirm", + "title": "Popconfirm" + }, { "path": "/card", "title": "Card" diff --git a/packages/popconfirm/index.js b/packages/popconfirm/index.js new file mode 100644 index 000000000..15db1f0e1 --- /dev/null +++ b/packages/popconfirm/index.js @@ -0,0 +1,8 @@ +import Popconfirm from './src/main'; + +/* istanbul ignore next */ +Popconfirm.install = function(Vue) { + Vue.component(Popconfirm.name, Popconfirm); +}; + +export default Popconfirm; diff --git a/packages/popconfirm/src/main.vue b/packages/popconfirm/src/main.vue new file mode 100644 index 000000000..8e158e021 --- /dev/null +++ b/packages/popconfirm/src/main.vue @@ -0,0 +1,98 @@ + + + diff --git a/packages/theme-chalk/src/index.scss b/packages/theme-chalk/src/index.scss index 8cdb8c13c..3572c9962 100644 --- a/packages/theme-chalk/src/index.scss +++ b/packages/theme-chalk/src/index.scss @@ -77,3 +77,4 @@ @import "./cascader-panel.scss"; @import "./avatar.scss"; @import "./drawer.scss"; +@import "./popconfirm.scss"; diff --git a/packages/theme-chalk/src/popconfirm.scss b/packages/theme-chalk/src/popconfirm.scss new file mode 100644 index 000000000..bc4bb526c --- /dev/null +++ b/packages/theme-chalk/src/popconfirm.scss @@ -0,0 +1,16 @@ +@import "mixins/mixins"; +@import "common/var"; + +@include b(popconfirm) { + @include e(main) { + display: flex; + align-items: center; + } + @include e(icon) { + margin-right: 5px; + } + @include e(action) { + text-align: right; + margin: 0 + } +} diff --git a/src/index.js b/src/index.js index 982fce298..64338b8ad 100644 --- a/src/index.js +++ b/src/index.js @@ -81,6 +81,7 @@ import PageHeader from '../packages/page-header/index.js'; import CascaderPanel from '../packages/cascader-panel/index.js'; import Avatar from '../packages/avatar/index.js'; import Drawer from '../packages/drawer/index.js'; +import Popconfirm from '../packages/popconfirm/index.js'; import locale from 'element-ui/src/locale'; import CollapseTransition from 'element-ui/src/transitions/collapse-transition'; @@ -161,6 +162,7 @@ const components = [ CascaderPanel, Avatar, Drawer, + Popconfirm, CollapseTransition ]; @@ -281,5 +283,6 @@ export default { PageHeader, CascaderPanel, Avatar, - Drawer + Drawer, + Popconfirm }; diff --git a/src/locale/lang/af-ZA.js b/src/locale/lang/af-ZA.js index a26af24c8..391be2e32 100644 --- a/src/locale/lang/af-ZA.js +++ b/src/locale/lang/af-ZA.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/ar.js b/src/locale/lang/ar.js index 7accd667e..bec1800d0 100644 --- a/src/locale/lang/ar.js +++ b/src/locale/lang/ar.js @@ -110,6 +110,10 @@ export default { }, pageHeader: { title: 'عودة' + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/bg.js b/src/locale/lang/bg.js index b4cbbdc47..fb5b7bf6f 100644 --- a/src/locale/lang/bg.js +++ b/src/locale/lang/bg.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/ca.js b/src/locale/lang/ca.js index 4eeac96d0..d50361ed9 100644 --- a/src/locale/lang/ca.js +++ b/src/locale/lang/ca.js @@ -110,6 +110,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/cs-CZ.js b/src/locale/lang/cs-CZ.js index f15f421e5..a2e19ba1c 100644 --- a/src/locale/lang/cs-CZ.js +++ b/src/locale/lang/cs-CZ.js @@ -113,6 +113,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/da.js b/src/locale/lang/da.js index 44ef40769..35a25d7f8 100644 --- a/src/locale/lang/da.js +++ b/src/locale/lang/da.js @@ -110,6 +110,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/de.js b/src/locale/lang/de.js index 14542795f..a3ad3d576 100644 --- a/src/locale/lang/de.js +++ b/src/locale/lang/de.js @@ -112,6 +112,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/ee.js b/src/locale/lang/ee.js index da65b1f09..d9d4914e7 100644 --- a/src/locale/lang/ee.js +++ b/src/locale/lang/ee.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/el.js b/src/locale/lang/el.js index 03d8e1cc8..8722a69d4 100644 --- a/src/locale/lang/el.js +++ b/src/locale/lang/el.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/en.js b/src/locale/lang/en.js index 3e45ee637..b096f421d 100644 --- a/src/locale/lang/en.js +++ b/src/locale/lang/en.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', + cancelButtonText: 'No' } } }; diff --git a/src/locale/lang/eo.js b/src/locale/lang/eo.js index ac182d6e2..da1d8decd 100644 --- a/src/locale/lang/eo.js +++ b/src/locale/lang/eo.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Reen' + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/es.js b/src/locale/lang/es.js index f963b908e..348a319af 100644 --- a/src/locale/lang/es.js +++ b/src/locale/lang/es.js @@ -110,6 +110,10 @@ export default { }, pageHeader: { title: 'Volver' + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/eu.js b/src/locale/lang/eu.js index 481b3d060..7da9aa427 100644 --- a/src/locale/lang/eu.js +++ b/src/locale/lang/eu.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/fa.js b/src/locale/lang/fa.js index 61205d573..3e00457f1 100644 --- a/src/locale/lang/fa.js +++ b/src/locale/lang/fa.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'بازگشت' + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/fi.js b/src/locale/lang/fi.js index b836c90c8..9f1e7c720 100644 --- a/src/locale/lang/fi.js +++ b/src/locale/lang/fi.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/fr.js b/src/locale/lang/fr.js index 3421e2a58..13a31a2e5 100644 --- a/src/locale/lang/fr.js +++ b/src/locale/lang/fr.js @@ -110,6 +110,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/he.js b/src/locale/lang/he.js index 09650186a..c63163cb6 100644 --- a/src/locale/lang/he.js +++ b/src/locale/lang/he.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/hr.js b/src/locale/lang/hr.js index dbb1b0764..9b3801685 100644 --- a/src/locale/lang/hr.js +++ b/src/locale/lang/hr.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/hu.js b/src/locale/lang/hu.js index 0086727d4..d4c5e7666 100644 --- a/src/locale/lang/hu.js +++ b/src/locale/lang/hu.js @@ -110,6 +110,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/hy-AM.js b/src/locale/lang/hy-AM.js index 7f2c79375..f8d55f8da 100644 --- a/src/locale/lang/hy-AM.js +++ b/src/locale/lang/hy-AM.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/id.js b/src/locale/lang/id.js index ce3bedf60..f52494998 100644 --- a/src/locale/lang/id.js +++ b/src/locale/lang/id.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/it.js b/src/locale/lang/it.js index b9be34bb0..40bc974ee 100644 --- a/src/locale/lang/it.js +++ b/src/locale/lang/it.js @@ -110,6 +110,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/ja.js b/src/locale/lang/ja.js index e449f01f4..a6b62bef6 100644 --- a/src/locale/lang/ja.js +++ b/src/locale/lang/ja.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/kg.js b/src/locale/lang/kg.js index b6a715a7d..8c8526f6e 100644 --- a/src/locale/lang/kg.js +++ b/src/locale/lang/kg.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/km.js b/src/locale/lang/km.js index 185ab0bc8..dfef469c8 100644 --- a/src/locale/lang/km.js +++ b/src/locale/lang/km.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/ko.js b/src/locale/lang/ko.js index 71fe33889..b5b4c5ee4 100644 --- a/src/locale/lang/ko.js +++ b/src/locale/lang/ko.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/ku.js b/src/locale/lang/ku.js index ff57fcf60..5188ba704 100644 --- a/src/locale/lang/ku.js +++ b/src/locale/lang/ku.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/kz.js b/src/locale/lang/kz.js index 7cdba7530..acfc8e27e 100644 --- a/src/locale/lang/kz.js +++ b/src/locale/lang/kz.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/lt.js b/src/locale/lang/lt.js index 7f5e10f79..988de6b95 100644 --- a/src/locale/lang/lt.js +++ b/src/locale/lang/lt.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/lv.js b/src/locale/lang/lv.js index 975b9174a..b9497ea18 100644 --- a/src/locale/lang/lv.js +++ b/src/locale/lang/lv.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/mn.js b/src/locale/lang/mn.js index 5c3aaf27a..a0e3f6d65 100644 --- a/src/locale/lang/mn.js +++ b/src/locale/lang/mn.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/nb-NO.js b/src/locale/lang/nb-NO.js index 2674d286f..843a67e0d 100644 --- a/src/locale/lang/nb-NO.js +++ b/src/locale/lang/nb-NO.js @@ -110,6 +110,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/nl.js b/src/locale/lang/nl.js index 37a97379b..6d084318b 100644 --- a/src/locale/lang/nl.js +++ b/src/locale/lang/nl.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/pl.js b/src/locale/lang/pl.js index b0eaf8936..72af96397 100644 --- a/src/locale/lang/pl.js +++ b/src/locale/lang/pl.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/pt-br.js b/src/locale/lang/pt-br.js index 7939dfb0c..6bc2860c9 100644 --- a/src/locale/lang/pt-br.js +++ b/src/locale/lang/pt-br.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Voltar' + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/pt.js b/src/locale/lang/pt.js index 1cc88a656..722e0a7a8 100644 --- a/src/locale/lang/pt.js +++ b/src/locale/lang/pt.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/ro.js b/src/locale/lang/ro.js index 21134defa..3f5646b96 100644 --- a/src/locale/lang/ro.js +++ b/src/locale/lang/ro.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/ru-RU.js b/src/locale/lang/ru-RU.js index 03cf91d8b..d58dec838 100644 --- a/src/locale/lang/ru-RU.js +++ b/src/locale/lang/ru-RU.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/sk.js b/src/locale/lang/sk.js index 82e89dc73..7c7103cb8 100644 --- a/src/locale/lang/sk.js +++ b/src/locale/lang/sk.js @@ -113,6 +113,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/sl.js b/src/locale/lang/sl.js index e2e8eccd8..8c64be817 100644 --- a/src/locale/lang/sl.js +++ b/src/locale/lang/sl.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/sr.js b/src/locale/lang/sr.js index 2b54ac135..a64b8aaeb 100644 --- a/src/locale/lang/sr.js +++ b/src/locale/lang/sr.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/sv-SE.js b/src/locale/lang/sv-SE.js index 5977f87b7..b0d0c7d62 100644 --- a/src/locale/lang/sv-SE.js +++ b/src/locale/lang/sv-SE.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/ta.js b/src/locale/lang/ta.js index 897b30ba0..2f2892981 100644 --- a/src/locale/lang/ta.js +++ b/src/locale/lang/ta.js @@ -110,6 +110,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/th.js b/src/locale/lang/th.js index 3c118f2eb..a175e7a40 100644 --- a/src/locale/lang/th.js +++ b/src/locale/lang/th.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'ย้อนกลับ' + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/tk.js b/src/locale/lang/tk.js index 77ece7d62..86dc9a664 100644 --- a/src/locale/lang/tk.js +++ b/src/locale/lang/tk.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/tr-TR.js b/src/locale/lang/tr-TR.js index 4e5eab83e..1984dbc87 100644 --- a/src/locale/lang/tr-TR.js +++ b/src/locale/lang/tr-TR.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/ua.js b/src/locale/lang/ua.js index 6ae9df8b0..f952fefa3 100644 --- a/src/locale/lang/ua.js +++ b/src/locale/lang/ua.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/ug-CN.js b/src/locale/lang/ug-CN.js index 2dc32f77d..f76a64a64 100644 --- a/src/locale/lang/ug-CN.js +++ b/src/locale/lang/ug-CN.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/uz-UZ.js b/src/locale/lang/uz-UZ.js index 516190d56..39ac99f1a 100644 --- a/src/locale/lang/uz-UZ.js +++ b/src/locale/lang/uz-UZ.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Orqaga' + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/vi.js b/src/locale/lang/vi.js index 5f143424d..ad03d056a 100644 --- a/src/locale/lang/vi.js +++ b/src/locale/lang/vi.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: 'Back' // to be translated + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/src/locale/lang/zh-CN.js b/src/locale/lang/zh-CN.js index 1e586162c..cef54779d 100644 --- a/src/locale/lang/zh-CN.js +++ b/src/locale/lang/zh-CN.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: '返回' + }, + popconfirm: { + confirmButtonText: '确定', + cancelButtonText: '取消' } } }; diff --git a/src/locale/lang/zh-TW.js b/src/locale/lang/zh-TW.js index 519d044b1..43312be7e 100644 --- a/src/locale/lang/zh-TW.js +++ b/src/locale/lang/zh-TW.js @@ -111,6 +111,10 @@ export default { }, pageHeader: { title: '返回' + }, + popconfirm: { + confirmButtonText: 'Yes', // to be translated + cancelButtonText: 'No' // to be translated } } }; diff --git a/test/unit/specs/popconfirm.spec.js b/test/unit/specs/popconfirm.spec.js new file mode 100644 index 000000000..a956513a4 --- /dev/null +++ b/test/unit/specs/popconfirm.spec.js @@ -0,0 +1,29 @@ +import { createVue, destroyVM } from '../util'; + +describe('Popconfirm', () => { + let vm; + afterEach(() => { + destroyVM(vm); + }); + + describe('trigger', () => { + const createVM = () => { + return createVue(` +
+ + + +
+ `, true); + }; + it('click', () => { + vm = createVM(); + vm.$el.querySelector('button').click(); + document.body.click(); + expect(document.body.querySelector('.el-popconfirm__action').style.display).to.equal(''); + }); + }); + +}); diff --git a/types/element-ui.d.ts b/types/element-ui.d.ts index b23fead13..ea819dbb7 100644 --- a/types/element-ui.d.ts +++ b/types/element-ui.d.ts @@ -79,6 +79,7 @@ import { ElInfiniteScroll } from './infinite-scroll' import { ElPageHeader } from './page-header' import { ElAvatar } from './avatar' import { ElDrawer } from './drawer' +import { ElPopconfirm } from './popconfirm' export interface InstallationOptions { locale: any, @@ -340,3 +341,6 @@ export class Avatar extends ElAvatar {} /** Drawer Component */ export class Drawer extends ElDrawer {} + +/** Popconfirm Component */ +export class Popconfirm extends ElPopconfirm {} diff --git a/types/popconfirm.d.ts b/types/popconfirm.d.ts new file mode 100644 index 000000000..b3bee53a3 --- /dev/null +++ b/types/popconfirm.d.ts @@ -0,0 +1,29 @@ +import { ElementUIComponent } from './component' +import { ElPopover } from './popover' + +/** Popconfirm Component */ +export declare class ElPopconfirm extends ElPopover { + /** Popconfirm title */ + title: string + + /** Popconfirm ok text */ + confirmButtonText: string + + /** Popconfirm cancel text */ + cancelButtonText: string + + /** Popconfirm ok type */ + confirmButtonType: string + + /** Popconfirm cancal type */ + cancelButtonType: string + + /** Popconfirm icon */ + icon: string + + /** Popconfirm icon color */ + iconColor: string + + /** Popconfirm hide icon */ + hideIcon: boolean +}