From 5d284605c4e3a3222c077582c1e3ff058ee656ce Mon Sep 17 00:00:00 2001 From: lambert Date: Mon, 24 Jul 2017 18:02:29 +0800 Subject: [PATCH 01/29] allow use Blob to download csv --- src/components/table/export-csv.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/table/export-csv.js b/src/components/table/export-csv.js index 3599eb67..3b07a01c 100644 --- a/src/components/table/export-csv.js +++ b/src/components/table/export-csv.js @@ -41,7 +41,7 @@ const csv = { _getDownloadUrl (text) { const BOM = '\uFEFF'; // Add BOM to text for open in excel correctly - if (window.Blob && window.URL && window.URL.createObjectURL && !has('Safari')) { + if (window.Blob && window.URL && window.URL.createObjectURL) { const csvData = new Blob([BOM + text], { type: 'text/csv' }); return URL.createObjectURL(csvData); } else { From 44b1490840fe6a2f7055c9c96ec2cad0c9ac3438 Mon Sep 17 00:00:00 2001 From: lambert Date: Wed, 2 Aug 2017 16:07:04 +0800 Subject: [PATCH 02/29] table: fix export csv for safari Author: liuyanshi --- src/components/table/export-csv.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/table/export-csv.js b/src/components/table/export-csv.js index 3b07a01c..8d7b4885 100644 --- a/src/components/table/export-csv.js +++ b/src/components/table/export-csv.js @@ -66,7 +66,6 @@ const csv = { const link = document.createElement('a'); link.download = filename; link.href = this._getDownloadUrl(text); - link.target = '_blank'; document.body.appendChild(link); link.click(); document.body.removeChild(link); From 98fbc5494ed818b9a728a88f9265f71a225adfb4 Mon Sep 17 00:00:00 2001 From: Sergio Crisostomo Date: Tue, 8 Aug 2017 09:40:36 +0200 Subject: [PATCH 03/29] use vertical-align: middle; in radio group also As in [button group](https://github.com/iview/iview/blob/v2.0.0/src/styles/mixins/butt on.less#L56) this makes grouped radio buttons to have same vertical align. --- src/styles/components/radio.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/components/radio.less b/src/styles/components/radio.less index d5e9e8b2..82962919 100644 --- a/src/styles/components/radio.less +++ b/src/styles/components/radio.less @@ -6,6 +6,7 @@ .@{radio-group-prefix-cls} { display: inline-block; font-size: @font-size-small; + vertical-align: middle; &-vertical{ .@{radio-prefix-cls}-wrapper { display: block; From daa9827c92ccdef437c420a47f724bc740b861cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Tue, 8 Aug 2017 17:19:03 +0800 Subject: [PATCH 04/29] fixed #1553 --- examples/routers/cascader.vue | 15 +-- src/components/cascader/caspanel.vue | 19 ++- src/locale/lang/vi-VN.js | 186 +++++++++++++-------------- 3 files changed, 114 insertions(+), 106 deletions(-) diff --git a/examples/routers/cascader.vue b/examples/routers/cascader.vue index 734cfa5a..37f99c5a 100644 --- a/examples/routers/cascader.vue +++ b/examples/routers/cascader.vue @@ -1,19 +1,13 @@ diff --git a/src/components/page/page.vue b/src/components/page/page.vue index 6c6ef4ad..a2fd8551 100644 --- a/src/components/page/page.vue +++ b/src/components/page/page.vue @@ -135,6 +135,12 @@ }; }, watch: { + total (val) { + let maxPage = Math.ceil(val / this.currentPageSize); + if (maxPage < this.currentPage && maxPage > 0) { + this.currentPage = maxPage; + } + }, current (val) { this.currentPage = val; }, From 61d5d48b9c1d1cb3a39d5df1336760c0024f02fb Mon Sep 17 00:00:00 2001 From: Rijn Date: Tue, 8 Aug 2017 14:17:47 -0500 Subject: [PATCH 07/29] return array of format string when type is datetimerange --- examples/routers/date.vue | 8 ++++++-- src/components/date-picker/picker.vue | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/examples/routers/date.vue b/examples/routers/date.vue index aad3af9c..4a66d2cf 100644 --- a/examples/routers/date.vue +++ b/examples/routers/date.vue @@ -2,12 +2,16 @@
- +
diff --git a/src/components/date-picker/picker.vue b/src/components/date-picker/picker.vue index c61a88db..9f03d559 100644 --- a/src/components/date-picker/picker.vue +++ b/src/components/date-picker/picker.vue @@ -459,7 +459,7 @@ ).formatter; let newDate = formatter(date, format); - if (type === 'daterange' || type === 'timerange') { + if (type === 'daterange' || type === 'timerange' || type === 'datetimerange') { newDate = [newDate.split(RANGE_SEPARATOR)[0], newDate.split(RANGE_SEPARATOR)[1]]; } return newDate; From eaf51d3e5d7c809d431d40e810b540fc6cde809d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Wed, 9 Aug 2017 15:08:00 +0800 Subject: [PATCH 08/29] update --- src/locale/lang/pt-PT.js | 188 +++++++++++++++++++-------------------- src/locale/lang/sv-SE.js | 188 +++++++++++++++++++-------------------- 2 files changed, 188 insertions(+), 188 deletions(-) diff --git a/src/locale/lang/pt-PT.js b/src/locale/lang/pt-PT.js index 9b46cf41..e61573a8 100644 --- a/src/locale/lang/pt-PT.js +++ b/src/locale/lang/pt-PT.js @@ -1,96 +1,96 @@ export default { - i: { - select: { - placeholder: 'Selecionar', - noMatch: 'Não encontrado', - loading: 'A carregar' - }, - table: { - noDataText: 'Sem dados', - noFilteredDataText: 'Sem dados filtrados', - confirmFilter: 'Confirmar', - resetFilter: 'Limpar', - clearFilter: 'Todos' - }, - datepicker: { - selectDate: 'Selecione a data', - selectTime: 'Selecione a hora', - startTime: 'Hora inicial', - endTime: 'Hora final', - clear: 'Limpar', - ok: 'Confirmar', - month: 'Mês', - month1: 'Janeiro', - month2: 'Fevereiro', - month3: 'Março', - month4: 'Abril', - month5: 'Maio', - month6: 'Junho', - month7: 'Julho', - month8: 'Agosto', - month9: 'Setembro', - month10: 'Outubro', - month11: 'Novembro', - month12: 'Dezembro', - year: 'Ano', - weeks: { - sun: 'Dom', - mon: 'Seg', - tue: 'Ter', - wed: 'Qua', - thu: 'Qui', - fri: 'Sex', - sat: 'Sáb' - }, - months: { - m1: 'Jan', - m2: 'Fev', - m3: 'Mar', - m4: 'Abr', - m5: 'Mai', - m6: 'Jun', - m7: 'Jul', - m8: 'Ago', - m9: 'Set', - m10: 'Out', - m11: 'Nov', - m12: 'Dez' - } - }, - transfer: { - titles: { - source: 'Origem', - target: 'Destino' - }, - filterPlaceholder: 'Pesquise aqui', - notFoundText: 'Não encontrado' - }, - modal: { - okText: 'Confirmar', - cancelText: 'Cancelar' - }, - poptip: { - okText: 'Confirmar', - cancelText: 'Cancelar' - }, - page: { - prev: 'Página anterior', - next: 'Próxima página', - total: 'Total', - item: 'item', - items: 'itens', - prev5: 'Voltar 5 páginas', - next5: 'Avançar 5 páginas', - page: '/page', - goto: 'Ir para', - p: '' - }, - rate: { - star: 'Estrela', - stars: 'Estrelas' - }, - tree: { - emptyText: 'Sem dados' - } - } + i: { + select: { + placeholder: 'Selecionar', + noMatch: 'Não encontrado', + loading: 'A carregar' + }, + table: { + noDataText: 'Sem dados', + noFilteredDataText: 'Sem dados filtrados', + confirmFilter: 'Confirmar', + resetFilter: 'Limpar', + clearFilter: 'Todos' + }, + datepicker: { + selectDate: 'Selecione a data', + selectTime: 'Selecione a hora', + startTime: 'Hora inicial', + endTime: 'Hora final', + clear: 'Limpar', + ok: 'Confirmar', + month: 'Mês', + month1: 'Janeiro', + month2: 'Fevereiro', + month3: 'Março', + month4: 'Abril', + month5: 'Maio', + month6: 'Junho', + month7: 'Julho', + month8: 'Agosto', + month9: 'Setembro', + month10: 'Outubro', + month11: 'Novembro', + month12: 'Dezembro', + year: 'Ano', + weeks: { + sun: 'Dom', + mon: 'Seg', + tue: 'Ter', + wed: 'Qua', + thu: 'Qui', + fri: 'Sex', + sat: 'Sáb' + }, + months: { + m1: 'Jan', + m2: 'Fev', + m3: 'Mar', + m4: 'Abr', + m5: 'Mai', + m6: 'Jun', + m7: 'Jul', + m8: 'Ago', + m9: 'Set', + m10: 'Out', + m11: 'Nov', + m12: 'Dez' + } + }, + transfer: { + titles: { + source: 'Origem', + target: 'Destino' + }, + filterPlaceholder: 'Pesquise aqui', + notFoundText: 'Não encontrado' + }, + modal: { + okText: 'Confirmar', + cancelText: 'Cancelar' + }, + poptip: { + okText: 'Confirmar', + cancelText: 'Cancelar' + }, + page: { + prev: 'Página anterior', + next: 'Próxima página', + total: 'Total', + item: 'item', + items: 'itens', + prev5: 'Voltar 5 páginas', + next5: 'Avançar 5 páginas', + page: '/page', + goto: 'Ir para', + p: '' + }, + rate: { + star: 'Estrela', + stars: 'Estrelas' + }, + tree: { + emptyText: 'Sem dados' + } + } }; diff --git a/src/locale/lang/sv-SE.js b/src/locale/lang/sv-SE.js index 9726a036..8a52e24e 100644 --- a/src/locale/lang/sv-SE.js +++ b/src/locale/lang/sv-SE.js @@ -1,96 +1,96 @@ export default { - i: { - select: { - placeholder: 'Välj', - noMatch: 'Ingen träff', - loading: 'Ladar' - }, - table: { - noDataText: 'Ingen data', - noFilteredDataText: 'Ingen filter data', - confirmFilter: 'Bekräfta', - resetFilter: 'Återställ filter', - clearFilter: 'Rensa filter' - }, - datepicker: { - selectDate: 'Välj datum', - selectTime: 'Välj tidpunkt', - startTime: 'Start tid', - endTime: 'Slut tid', - clear: 'Rensa', - ok: 'Ok', - month: 'Månad', - month1: 'Januari', - month2: 'Februari', - month3: 'Mars', - month4: 'April', - month5: 'Maj', - month6: 'Juni', - month7: 'Juli', - month8: 'Augusti', - month9: 'September', - month10: 'Oktober', - month11: 'November', - month12: 'December', - year: 'År', - weeks: { - sun: 'Sön', - mon: 'Mån', - tue: 'Tis', - wed: 'Ons', - thu: 'Tor', - fri: 'Fre', - sat: 'Lör' - }, - months: { - m1: 'Jan', - m2: 'Feb', - m3: 'Mar', - m4: 'Apr', - m5: 'Maj', - m6: 'Jun', - m7: 'Jul', - m8: 'Aug', - m9: 'Sep', - m10: 'Okt', - m11: 'Nov', - m12: 'Dec' - } - }, - transfer: { - titles: { - source: 'Källa', - target: 'Mål' - }, - filterPlaceholder: 'Sök här', - notFoundText: 'Hittade inte' - }, - modal: { - okText: 'Ok', - cancelText: 'Avbryt' - }, - poptip: { - okText: 'Ok', - cancelText: 'Avbryt' - }, - page: { - prev: 'Föregående sida', - next: 'Nästa sida', - total: 'Totalt', - item: 'objekt', - items: 'objekt', - prev5: 'Föregående 5 sidor', - next5: 'Nästa 5 sidor', - page: '/page', - goto: 'Gå till', - p: '' - }, - rate: { - star: 'Stjärna', - stars: 'Stjärnor' - }, - tree: { - emptyText: 'Ingen data' - } - } + i: { + select: { + placeholder: 'Välj', + noMatch: 'Ingen träff', + loading: 'Ladar' + }, + table: { + noDataText: 'Ingen data', + noFilteredDataText: 'Ingen filter data', + confirmFilter: 'Bekräfta', + resetFilter: 'Återställ filter', + clearFilter: 'Rensa filter' + }, + datepicker: { + selectDate: 'Välj datum', + selectTime: 'Välj tidpunkt', + startTime: 'Start tid', + endTime: 'Slut tid', + clear: 'Rensa', + ok: 'Ok', + month: 'Månad', + month1: 'Januari', + month2: 'Februari', + month3: 'Mars', + month4: 'April', + month5: 'Maj', + month6: 'Juni', + month7: 'Juli', + month8: 'Augusti', + month9: 'September', + month10: 'Oktober', + month11: 'November', + month12: 'December', + year: 'År', + weeks: { + sun: 'Sön', + mon: 'Mån', + tue: 'Tis', + wed: 'Ons', + thu: 'Tor', + fri: 'Fre', + sat: 'Lör' + }, + months: { + m1: 'Jan', + m2: 'Feb', + m3: 'Mar', + m4: 'Apr', + m5: 'Maj', + m6: 'Jun', + m7: 'Jul', + m8: 'Aug', + m9: 'Sep', + m10: 'Okt', + m11: 'Nov', + m12: 'Dec' + } + }, + transfer: { + titles: { + source: 'Källa', + target: 'Mål' + }, + filterPlaceholder: 'Sök här', + notFoundText: 'Hittade inte' + }, + modal: { + okText: 'Ok', + cancelText: 'Avbryt' + }, + poptip: { + okText: 'Ok', + cancelText: 'Avbryt' + }, + page: { + prev: 'Föregående sida', + next: 'Nästa sida', + total: 'Totalt', + item: 'objekt', + items: 'objekt', + prev5: 'Föregående 5 sidor', + next5: 'Nästa 5 sidor', + page: '/page', + goto: 'Gå till', + p: '' + }, + rate: { + star: 'Stjärna', + stars: 'Stjärnor' + }, + tree: { + emptyText: 'Ingen data' + } + } }; From 53a6915a943011be65074314aefd94e06f21aa03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Wed, 9 Aug 2017 16:45:22 +0800 Subject: [PATCH 09/29] fixed Cascader bug --- examples/routers/cascader.vue | 103 ++++++++++++++------------- src/components/cascader/caspanel.vue | 4 +- 2 files changed, 55 insertions(+), 52 deletions(-) diff --git a/examples/routers/cascader.vue b/examples/routers/cascader.vue index 37f99c5a..31688741 100644 --- a/examples/routers/cascader.vue +++ b/examples/routers/cascader.vue @@ -1,60 +1,61 @@ \ No newline at end of file + diff --git a/src/components/date-picker/panel/time.vue b/src/components/date-picker/panel/time.vue index fd7c13f3..4cd63979 100644 --- a/src/components/date-picker/panel/time.vue +++ b/src/components/date-picker/panel/time.vue @@ -6,6 +6,7 @@ [] + } + }, data () { return { prefixCls: prefixCls, @@ -113,4 +120,4 @@ if (this.$parent && this.$parent.$options.name === 'DatePicker') this.showDate = true; } }; - \ No newline at end of file + diff --git a/src/components/date-picker/picker.vue b/src/components/date-picker/picker.vue index 9f03d559..c9ccce3b 100644 --- a/src/components/date-picker/picker.vue +++ b/src/components/date-picker/picker.vue @@ -32,7 +32,6 @@ diff --git a/examples/routers/poptip.vue b/examples/routers/poptip.vue index 8d5f7f4f..4261d041 100644 --- a/examples/routers/poptip.vue +++ b/examples/routers/poptip.vue @@ -1,21 +1,24 @@ diff --git a/src/components/avatar/avatar.vue b/src/components/avatar/avatar.vue new file mode 100644 index 00000000..58856771 --- /dev/null +++ b/src/components/avatar/avatar.vue @@ -0,0 +1,26 @@ + + \ No newline at end of file diff --git a/src/components/avatar/index.js b/src/components/avatar/index.js new file mode 100644 index 00000000..9f578606 --- /dev/null +++ b/src/components/avatar/index.js @@ -0,0 +1,2 @@ +import Avatar from './avatar.vue'; +export default Avatar; \ No newline at end of file diff --git a/src/index.js b/src/index.js index fd9bdad4..40062326 100644 --- a/src/index.js +++ b/src/index.js @@ -3,6 +3,7 @@ import 'core-js/fn/array/find-index'; import Affix from './components/affix'; import Alert from './components/alert'; +import Avatar from './components/avatar'; import BackTop from './components/back-top'; import Badge from './components/badge'; import Breadcrumb from './components/breadcrumb'; @@ -49,6 +50,7 @@ import locale from './locale'; const iview = { Affix, Alert, + Avatar, BackTop, Badge, Breadcrumb, diff --git a/src/styles/components/avatar.less b/src/styles/components/avatar.less new file mode 100644 index 00000000..15fc68cf --- /dev/null +++ b/src/styles/components/avatar.less @@ -0,0 +1,5 @@ +@avatar-prefix-cls: ~"@{css-prefix}avatar"; + +.@{avatar-prefix-cls} { + +} \ No newline at end of file diff --git a/src/styles/components/index.less b/src/styles/components/index.less index 880f375a..4850ba3f 100644 --- a/src/styles/components/index.less +++ b/src/styles/components/index.less @@ -38,4 +38,5 @@ @import "carousel"; @import "rate"; @import "upload"; -@import "tree"; \ No newline at end of file +@import "tree"; +@import "avatar"; \ No newline at end of file From c5a721ade8f1a02da305e0683cb65937a22359f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Tue, 15 Aug 2017 10:15:35 +0800 Subject: [PATCH 23/29] update --- src/components/avatar/avatar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/avatar/avatar.vue b/src/components/avatar/avatar.vue index 58856771..eec02efe 100644 --- a/src/components/avatar/avatar.vue +++ b/src/components/avatar/avatar.vue @@ -13,7 +13,7 @@ }, data () { return { - + prefixCls: prefixCls }; }, computed: { From a1530fac5af6a9bed8791aed1fa5b3201d823b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Tue, 15 Aug 2017 11:03:20 +0800 Subject: [PATCH 24/29] update Avatar --- examples/routers/avatar.vue | 27 +++++++++++++++++++- src/components/avatar/avatar.vue | 41 +++++++++++++++++++++++++++--- src/styles/components/avatar.less | 42 ++++++++++++++++++++++++++++++- src/styles/custom.less | 13 +++++++++- 4 files changed, 116 insertions(+), 7 deletions(-) diff --git a/examples/routers/avatar.vue b/examples/routers/avatar.vue index 3a90b10a..2ca402f8 100644 --- a/examples/routers/avatar.vue +++ b/examples/routers/avatar.vue @@ -1,5 +1,30 @@ \ No newline at end of file From ad2255781235da85828b221583460d88d1a073e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Tue, 15 Aug 2017 14:52:56 +0800 Subject: [PATCH 26/29] add Avatar component --- examples/routers/avatar.vue | 22 ++++++++-- src/components/avatar/avatar.vue | 69 ++++++++++++++++++++++---------- 2 files changed, 65 insertions(+), 26 deletions(-) diff --git a/examples/routers/avatar.vue b/examples/routers/avatar.vue index 2ca402f8..d6c98a03 100644 --- a/examples/routers/avatar.vue +++ b/examples/routers/avatar.vue @@ -14,9 +14,13 @@

- Aresn - U - Tomserm + Leo + A + A + A + Tomserm + {{ name }} + {{ name }}

@@ -24,10 +28,20 @@ + diff --git a/src/components/avatar/avatar.vue b/src/components/avatar/avatar.vue index 6e3a7ac6..38db80db 100644 --- a/src/components/avatar/avatar.vue +++ b/src/components/avatar/avatar.vue @@ -1,3 +1,10 @@ + \ No newline at end of file From c6faec44a8d2940dba82e7fe303079f7ff7c2641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Tue, 15 Aug 2017 16:39:07 +0800 Subject: [PATCH 27/29] init ColorPicker --- examples/app.vue | 1 + examples/main.js | 4 ++++ examples/routers/color-picker.vue | 13 +++++++++++++ src/components/color-picker/color-picker.vue | 13 +++++++++++++ src/components/color-picker/color.js | 0 src/components/color-picker/index.js | 2 ++ src/styles/components/color-picker.less | 5 +++++ src/styles/components/index.less | 3 ++- 8 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 examples/routers/color-picker.vue create mode 100644 src/components/color-picker/color-picker.vue create mode 100644 src/components/color-picker/color.js create mode 100644 src/components/color-picker/index.js create mode 100644 src/styles/components/color-picker.less diff --git a/examples/app.vue b/examples/app.vue index a651d69a..87f3d9e0 100644 --- a/examples/app.vue +++ b/examples/app.vue @@ -55,6 +55,7 @@ li + li { border-left: solid 1px #bbb; padding-left: 10px; margin-left: 10px; }
  • Message
  • Notice
  • Avatar
    • +
  • ColorPicker
    • diff --git a/examples/main.js b/examples/main.js index f48654a7..3d4cad49 100644 --- a/examples/main.js +++ b/examples/main.js @@ -184,6 +184,10 @@ const router = new VueRouter({ { path: '/avatar', component: require('./routers/avatar.vue') + }, + { + path: '/color-picker', + component: require('./routers/color-picker.vue') } ] }); diff --git a/examples/routers/color-picker.vue b/examples/routers/color-picker.vue new file mode 100644 index 00000000..5bc46767 --- /dev/null +++ b/examples/routers/color-picker.vue @@ -0,0 +1,13 @@ + + \ No newline at end of file diff --git a/src/components/color-picker/color-picker.vue b/src/components/color-picker/color-picker.vue new file mode 100644 index 00000000..5bc46767 --- /dev/null +++ b/src/components/color-picker/color-picker.vue @@ -0,0 +1,13 @@ + + \ No newline at end of file diff --git a/src/components/color-picker/color.js b/src/components/color-picker/color.js new file mode 100644 index 00000000..e69de29b diff --git a/src/components/color-picker/index.js b/src/components/color-picker/index.js new file mode 100644 index 00000000..f5737396 --- /dev/null +++ b/src/components/color-picker/index.js @@ -0,0 +1,2 @@ +import ColorPicker from './color-picker.vue'; +export default ColorPicker; \ No newline at end of file diff --git a/src/styles/components/color-picker.less b/src/styles/components/color-picker.less new file mode 100644 index 00000000..72cfa9af --- /dev/null +++ b/src/styles/components/color-picker.less @@ -0,0 +1,5 @@ +@color-picker-prefix-cls: ~"@{css-prefix}color-picker"; + +.@{color-picker-prefix-cls} { + +} \ No newline at end of file diff --git a/src/styles/components/index.less b/src/styles/components/index.less index 4850ba3f..b857ac06 100644 --- a/src/styles/components/index.less +++ b/src/styles/components/index.less @@ -39,4 +39,5 @@ @import "rate"; @import "upload"; @import "tree"; -@import "avatar"; \ No newline at end of file +@import "avatar"; +@import "color-picker"; \ No newline at end of file From 5a9cda85f364adf2a6f7ab5788de76c0ad36373c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Tue, 15 Aug 2017 16:42:42 +0800 Subject: [PATCH 28/29] update ColorPicker --- src/index.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/index.js b/src/index.js index 40062326..306e2d22 100644 --- a/src/index.js +++ b/src/index.js @@ -14,6 +14,7 @@ import Cascader from './components/cascader'; import Checkbox from './components/checkbox'; import Circle from './components/circle'; import Collapse from './components/collapse'; +import ColorPicker from './components/color-picker'; import DatePicker from './components/date-picker'; import Dropdown from './components/dropdown'; import Form from './components/form'; @@ -65,6 +66,10 @@ const iview = { Checkbox, CheckboxGroup: Checkbox.Group, iCircle: Circle, + Col, + iCol: Col, + Collapse, + ColorPicker, DatePicker, Dropdown, DropdownItem: Dropdown.Item, @@ -72,9 +77,6 @@ const iview = { Form, iForm: Form, FormItem: Form.Item, - Col, - iCol: Col, - Collapse, Icon, Input, iInput: Input, From b6bda1dcb5654a238e5222276603505447655074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Wed, 16 Aug 2017 13:52:50 +0800 Subject: [PATCH 29/29] update ColorPicker --- examples/routers/color-picker.vue | 10 ++- src/components/color-picker/color-picker.vue | 89 ++++++++++++++++++-- src/components/input/input.vue | 2 +- src/styles/components/color-picker.less | 9 +- 4 files changed, 101 insertions(+), 9 deletions(-) diff --git a/examples/routers/color-picker.vue b/examples/routers/color-picker.vue index 5bc46767..f0091b07 100644 --- a/examples/routers/color-picker.vue +++ b/examples/routers/color-picker.vue @@ -1,5 +1,13 @@ \ No newline at end of file diff --git a/src/components/input/input.vue b/src/components/input/input.vue index c05f739e..f13d072e 100644 --- a/src/components/input/input.vue +++ b/src/components/input/input.vue @@ -74,7 +74,7 @@ }, size: { validator (value) { - return oneOf(value, ['small', 'large']); + return oneOf(value, ['small', 'large', 'default']); } }, placeholder: { diff --git a/src/styles/components/color-picker.less b/src/styles/components/color-picker.less index 72cfa9af..8c0991f9 100644 --- a/src/styles/components/color-picker.less +++ b/src/styles/components/color-picker.less @@ -1,5 +1,12 @@ @color-picker-prefix-cls: ~"@{css-prefix}color-picker"; .@{color-picker-prefix-cls} { - + &-rel{ + line-height: 0; + } + &-color{ + width: 20px; + height: 100%; + border: 1px solid @text-color; + } } \ No newline at end of file