From bf6cbd56ebcf407e09debc02f3a150c03f507687 Mon Sep 17 00:00:00 2001 From: tjz <415800467@qq.com> Date: Thu, 8 Mar 2018 23:02:04 +0800 Subject: [PATCH] add time-picker demo --- components/index.js | 1 + components/style.js | 1 + components/time-picker/demo/12hours.md | 28 ++ components/time-picker/demo/addon.md | 43 ++ components/time-picker/demo/basic.md | 26 ++ components/time-picker/demo/disabled.md | 23 ++ components/time-picker/demo/hide-column.md | 23 ++ .../time-picker/demo/interval-options.md | 15 + components/time-picker/demo/size.md | 27 ++ components/time-picker/demo/value.md | 43 ++ components/time-picker/index.vue | 259 ++++++------ .../locale/{ar_EG.tsx.js => ar_EG.js} | 0 .../locale/{bg_BG.tsx.js => bg_BG.js} | 4 +- .../locale/{es_ES.tsx.js => ca_ES.js} | 4 +- .../locale/{cs_CZ.tsx.js => cs_CZ.js} | 4 +- .../locale/{de_DE.tsx.js => de_DE.js} | 4 +- .../locale/{el_GR.tsx.js => el_GR.js} | 4 +- .../locale/{en_GB.tsx.js => en_GB.js} | 4 +- .../locale/{en_US.tsx.js => en_US.js} | 4 +- .../locale/{ca_ES.tsx.js => es_ES.js} | 4 +- .../locale/{et_EE.tsx.js => et_EE.js} | 4 +- .../locale/{fa_IR.tsx.js => fa_IR.js} | 4 +- .../locale/{fi_FI.tsx.js => fi_FI.js} | 4 +- .../locale/{fr_BE.tsx.js => fr_BE.js} | 4 +- .../locale/{fr_FR.tsx.js => fr_FR.js} | 4 +- .../locale/{is_IS.tsx.js => is_IS.js} | 4 +- .../locale/{it_IT.tsx.js => it_IT.js} | 4 +- .../locale/{ja_JP.tsx.js => ja_JP.js} | 4 +- .../locale/{ko_KR.tsx.js => ko_KR.js} | 4 +- .../locale/{ku_IQ.tsx.js => ku_IQ.js} | 4 +- .../locale/{nb_NO.tsx.js => nb_NO.js} | 4 +- .../locale/{nl_BE.tsx.js => nl_BE.js} | 4 +- .../locale/{nl_NL.tsx.js => nl_NL.js} | 4 +- .../locale/{pl_PL.tsx.js => pl_PL.js} | 4 +- .../locale/{pt_BR.tsx.js => pt_BR.js} | 4 +- .../locale/{pt_PT.tsx.js => pt_PT.js} | 4 +- .../locale/{ru_RU.tsx.js => ru_RU.js} | 4 +- .../locale/{sk_SK.tsx.js => sk_SK.js} | 4 +- .../locale/{sr_RS.tsx.js => sr_RS.js} | 4 +- .../locale/{sv_SE.tsx.js => sv_SE.js} | 4 +- .../locale/{th_TH.tsx.js => th_TH.js} | 4 +- .../locale/{tr_TR.tsx.js => tr_TR.js} | 4 +- .../locale/{uk_UA.tsx.js => uk_UA.js} | 4 +- .../locale/{vi_VN.tsx.js => vi_VN.js} | 4 +- .../locale/{zh_CN.tsx.js => zh_CN.js} | 4 +- .../locale/{zh_TW.tsx.js => zh_TW.js} | 4 +- components/time-picker/style/index.js | 5 + components/time-picker/style/index.tsx | 5 - components/vc-time-picker/Combobox.vue | 252 ++++++------ components/vc-time-picker/Header.vue | 287 ++++++------- components/vc-time-picker/Panel.vue | 193 +++++---- components/vc-time-picker/Select.vue | 167 ++++---- components/vc-time-picker/TimePicker.vue | 384 +++++++++--------- components/vc-time-picker/demo/all.vue | 160 ++++++++ examples/routes.js | 2 +- package-lock.json | 5 + package.json | 222 +++++----- 57 files changed, 1347 insertions(+), 960 deletions(-) create mode 100644 components/time-picker/demo/12hours.md create mode 100644 components/time-picker/demo/addon.md create mode 100644 components/time-picker/demo/basic.md create mode 100644 components/time-picker/demo/disabled.md create mode 100644 components/time-picker/demo/hide-column.md create mode 100644 components/time-picker/demo/interval-options.md create mode 100644 components/time-picker/demo/size.md create mode 100644 components/time-picker/demo/value.md rename components/time-picker/locale/{ar_EG.tsx.js => ar_EG.js} (100%) rename components/time-picker/locale/{bg_BG.tsx.js => bg_BG.js} (69%) rename components/time-picker/locale/{es_ES.tsx.js => ca_ES.js} (67%) rename components/time-picker/locale/{cs_CZ.tsx.js => cs_CZ.js} (64%) rename components/time-picker/locale/{de_DE.tsx.js => de_DE.js} (66%) rename components/time-picker/locale/{el_GR.tsx.js => el_GR.js} (69%) rename components/time-picker/locale/{en_GB.tsx.js => en_GB.js} (64%) rename components/time-picker/locale/{en_US.tsx.js => en_US.js} (64%) rename components/time-picker/locale/{ca_ES.tsx.js => es_ES.js} (67%) rename components/time-picker/locale/{et_EE.tsx.js => et_EE.js} (63%) rename components/time-picker/locale/{fa_IR.tsx.js => fa_IR.js} (69%) rename components/time-picker/locale/{fi_FI.tsx.js => fi_FI.js} (65%) rename components/time-picker/locale/{fr_BE.tsx.js => fr_BE.js} (69%) rename components/time-picker/locale/{fr_FR.tsx.js => fr_FR.js} (69%) rename components/time-picker/locale/{is_IS.tsx.js => is_IS.js} (64%) rename components/time-picker/locale/{it_IT.tsx.js => it_IT.js} (68%) rename components/time-picker/locale/{ja_JP.tsx.js => ja_JP.js} (66%) rename components/time-picker/locale/{ko_KR.tsx.js => ko_KR.js} (65%) rename components/time-picker/locale/{ku_IQ.tsx.js => ku_IQ.js} (67%) rename components/time-picker/locale/{nb_NO.tsx.js => nb_NO.js} (63%) rename components/time-picker/locale/{nl_BE.tsx.js => nl_BE.js} (66%) rename components/time-picker/locale/{nl_NL.tsx.js => nl_NL.js} (66%) rename components/time-picker/locale/{pl_PL.tsx.js => pl_PL.js} (67%) rename components/time-picker/locale/{pt_BR.tsx.js => pt_BR.js} (61%) rename components/time-picker/locale/{pt_PT.tsx.js => pt_PT.js} (61%) rename components/time-picker/locale/{ru_RU.tsx.js => ru_RU.js} (81%) rename components/time-picker/locale/{sk_SK.tsx.js => sk_SK.js} (65%) rename components/time-picker/locale/{sr_RS.tsx.js => sr_RS.js} (66%) rename components/time-picker/locale/{sv_SE.tsx.js => sv_SE.js} (63%) rename components/time-picker/locale/{th_TH.tsx.js => th_TH.js} (71%) rename components/time-picker/locale/{tr_TR.tsx.js => tr_TR.js} (64%) rename components/time-picker/locale/{uk_UA.tsx.js => uk_UA.js} (69%) rename components/time-picker/locale/{vi_VN.tsx.js => vi_VN.js} (67%) rename components/time-picker/locale/{zh_CN.tsx.js => zh_CN.js} (66%) rename components/time-picker/locale/{zh_TW.tsx.js => zh_TW.js} (66%) create mode 100644 components/time-picker/style/index.js delete mode 100644 components/time-picker/style/index.tsx create mode 100644 components/vc-time-picker/demo/all.vue diff --git a/components/index.js b/components/index.js index 9a2c788bd..da1f5b3f4 100644 --- a/components/index.js +++ b/components/index.js @@ -89,6 +89,7 @@ export { default as Cascader } from './cascader' export { default as BackTop } from './back-top' export { default as Modal } from './modal' export { default as Alert } from './alert' +export { default as TimePicker } from './time-picker' const api = { notification, diff --git a/components/style.js b/components/style.js index 37fe86642..954a968c3 100644 --- a/components/style.js +++ b/components/style.js @@ -29,3 +29,4 @@ import './cascader/style' import './back-top/style' import './modal/style' import './alert/style' +import './time-picker/style' diff --git a/components/time-picker/demo/12hours.md b/components/time-picker/demo/12hours.md new file mode 100644 index 000000000..7a72f876a --- /dev/null +++ b/components/time-picker/demo/12hours.md @@ -0,0 +1,28 @@ + +#### 12 小时制 +12 小时制的时间选择器,默认的 format 为 `h:mm:ss a`。 + + + +#### 12 hours +TimePicker of 12 hours format, with default format `h:mm:ss a`. + + +```html + + +``` diff --git a/components/time-picker/demo/addon.md b/components/time-picker/demo/addon.md new file mode 100644 index 000000000..2f744d775 --- /dev/null +++ b/components/time-picker/demo/addon.md @@ -0,0 +1,43 @@ + +#### 附加内容 +在 TimePicker 选择框底部显示自定义的内容。 + + + +#### Addon +Render addon contents to timepicker panel's bottom. + + +```html + + +``` diff --git a/components/time-picker/demo/basic.md b/components/time-picker/demo/basic.md new file mode 100644 index 000000000..643040b57 --- /dev/null +++ b/components/time-picker/demo/basic.md @@ -0,0 +1,26 @@ + +#### 基本 +点击 TimePicker,然后可以在浮层中选择或者输入某一时间。 + + + +#### Basic +Click `TimePicker`, and then we could select or input a time in panel. + + +```html + + +``` diff --git a/components/time-picker/demo/disabled.md b/components/time-picker/demo/disabled.md new file mode 100644 index 000000000..6cf2a43c4 --- /dev/null +++ b/components/time-picker/demo/disabled.md @@ -0,0 +1,23 @@ + +#### 禁用 +禁用时间选择。 + + + +#### disabled +A disabled state of the `TimePicker`. + + +```html + + +``` diff --git a/components/time-picker/demo/hide-column.md b/components/time-picker/demo/hide-column.md new file mode 100644 index 000000000..415e2d833 --- /dev/null +++ b/components/time-picker/demo/hide-column.md @@ -0,0 +1,23 @@ + +#### 选择时分 +TimePicker 浮层中的列会随着 `format` 变化,当略去 `format` 中的某部分时,浮层中对应的列也会消失。 + + + +#### Hour and minute +While part of `format` is omitted, the corresponding column in panel will disappear, too. + + +```html + + +``` diff --git a/components/time-picker/demo/interval-options.md b/components/time-picker/demo/interval-options.md new file mode 100644 index 000000000..0add82dd7 --- /dev/null +++ b/components/time-picker/demo/interval-options.md @@ -0,0 +1,15 @@ + +#### 步长选项 +可以使用 `hourStep` `minuteStep` `secondStep` 按步长展示可选的时分秒。 + + + +#### interval option +Show stepped options by `hourStep` `minuteStep` `secondStep`. + + +```html + +``` diff --git a/components/time-picker/demo/size.md b/components/time-picker/demo/size.md new file mode 100644 index 000000000..9569b03a4 --- /dev/null +++ b/components/time-picker/demo/size.md @@ -0,0 +1,27 @@ + +#### 三种大小 +三种大小的输入框,大的用在表单中,中的为默认。 + + + +#### Three Sizes +The input box comes in three sizes. large is used in the form, while the medium size is the default. + + +```html + + +``` diff --git a/components/time-picker/demo/value.md b/components/time-picker/demo/value.md new file mode 100644 index 000000000..f6578cb62 --- /dev/null +++ b/components/time-picker/demo/value.md @@ -0,0 +1,43 @@ + +#### 受控组件 +value 和 onChange 需要配合使用。也可以直接使用v-model。 + + + +#### Under Control +`value` and `@change` should be used together or use v-model. + + +```html + + +``` diff --git a/components/time-picker/index.vue b/components/time-picker/index.vue index 18bb909de..acdf41474 100644 --- a/components/time-picker/index.vue +++ b/components/time-picker/index.vue @@ -1,11 +1,13 @@ \ No newline at end of file diff --git a/components/time-picker/locale/ar_EG.tsx.js b/components/time-picker/locale/ar_EG.js similarity index 100% rename from components/time-picker/locale/ar_EG.tsx.js rename to components/time-picker/locale/ar_EG.js diff --git a/components/time-picker/locale/bg_BG.tsx.js b/components/time-picker/locale/bg_BG.js similarity index 69% rename from components/time-picker/locale/bg_BG.tsx.js rename to components/time-picker/locale/bg_BG.js index e6896fe4a..cf69fa433 100644 --- a/components/time-picker/locale/bg_BG.tsx.js +++ b/components/time-picker/locale/bg_BG.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Избор на час', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/es_ES.tsx.js b/components/time-picker/locale/ca_ES.js similarity index 67% rename from components/time-picker/locale/es_ES.tsx.js rename to components/time-picker/locale/ca_ES.js index cfd60a8b9..3333a9ab7 100644 --- a/components/time-picker/locale/es_ES.tsx.js +++ b/components/time-picker/locale/ca_ES.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Seleccionar hora', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/cs_CZ.tsx.js b/components/time-picker/locale/cs_CZ.js similarity index 64% rename from components/time-picker/locale/cs_CZ.tsx.js rename to components/time-picker/locale/cs_CZ.js index 5c89f7aff..0f9049c33 100644 --- a/components/time-picker/locale/cs_CZ.tsx.js +++ b/components/time-picker/locale/cs_CZ.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Vybrat čas', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/de_DE.tsx.js b/components/time-picker/locale/de_DE.js similarity index 66% rename from components/time-picker/locale/de_DE.tsx.js rename to components/time-picker/locale/de_DE.js index c912e9e8f..c784b34da 100644 --- a/components/time-picker/locale/de_DE.tsx.js +++ b/components/time-picker/locale/de_DE.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Zeit auswählen', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/el_GR.tsx.js b/components/time-picker/locale/el_GR.js similarity index 69% rename from components/time-picker/locale/el_GR.tsx.js rename to components/time-picker/locale/el_GR.js index 2c0dea51f..31df2e549 100644 --- a/components/time-picker/locale/el_GR.tsx.js +++ b/components/time-picker/locale/el_GR.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Επιλέξτε ώρα', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/en_GB.tsx.js b/components/time-picker/locale/en_GB.js similarity index 64% rename from components/time-picker/locale/en_GB.tsx.js rename to components/time-picker/locale/en_GB.js index b95b5a362..02b92d52a 100644 --- a/components/time-picker/locale/en_GB.tsx.js +++ b/components/time-picker/locale/en_GB.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Select time', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/en_US.tsx.js b/components/time-picker/locale/en_US.js similarity index 64% rename from components/time-picker/locale/en_US.tsx.js rename to components/time-picker/locale/en_US.js index b95b5a362..02b92d52a 100644 --- a/components/time-picker/locale/en_US.tsx.js +++ b/components/time-picker/locale/en_US.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Select time', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/ca_ES.tsx.js b/components/time-picker/locale/es_ES.js similarity index 67% rename from components/time-picker/locale/ca_ES.tsx.js rename to components/time-picker/locale/es_ES.js index cfd60a8b9..3333a9ab7 100644 --- a/components/time-picker/locale/ca_ES.tsx.js +++ b/components/time-picker/locale/es_ES.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Seleccionar hora', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/et_EE.tsx.js b/components/time-picker/locale/et_EE.js similarity index 63% rename from components/time-picker/locale/et_EE.tsx.js rename to components/time-picker/locale/et_EE.js index 7ebc008d0..04b9cbc85 100644 --- a/components/time-picker/locale/et_EE.tsx.js +++ b/components/time-picker/locale/et_EE.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Vali aeg', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/fa_IR.tsx.js b/components/time-picker/locale/fa_IR.js similarity index 69% rename from components/time-picker/locale/fa_IR.tsx.js rename to components/time-picker/locale/fa_IR.js index 0dcc5d924..82c5a5783 100644 --- a/components/time-picker/locale/fa_IR.tsx.js +++ b/components/time-picker/locale/fa_IR.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'انتخاب زمان', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/fi_FI.tsx.js b/components/time-picker/locale/fi_FI.js similarity index 65% rename from components/time-picker/locale/fi_FI.tsx.js rename to components/time-picker/locale/fi_FI.js index 6c4d9a122..e296072d0 100644 --- a/components/time-picker/locale/fi_FI.tsx.js +++ b/components/time-picker/locale/fi_FI.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Valitse aika', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/fr_BE.tsx.js b/components/time-picker/locale/fr_BE.js similarity index 69% rename from components/time-picker/locale/fr_BE.tsx.js rename to components/time-picker/locale/fr_BE.js index e6fca5d4e..76c4c75b0 100644 --- a/components/time-picker/locale/fr_BE.tsx.js +++ b/components/time-picker/locale/fr_BE.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Sélectionner l\'heure', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/fr_FR.tsx.js b/components/time-picker/locale/fr_FR.js similarity index 69% rename from components/time-picker/locale/fr_FR.tsx.js rename to components/time-picker/locale/fr_FR.js index e6fca5d4e..76c4c75b0 100644 --- a/components/time-picker/locale/fr_FR.tsx.js +++ b/components/time-picker/locale/fr_FR.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Sélectionner l\'heure', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/is_IS.tsx.js b/components/time-picker/locale/is_IS.js similarity index 64% rename from components/time-picker/locale/is_IS.tsx.js rename to components/time-picker/locale/is_IS.js index 6a5994a28..5542ec5c6 100644 --- a/components/time-picker/locale/is_IS.tsx.js +++ b/components/time-picker/locale/is_IS.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Velja tíma', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/it_IT.tsx.js b/components/time-picker/locale/it_IT.js similarity index 68% rename from components/time-picker/locale/it_IT.tsx.js rename to components/time-picker/locale/it_IT.js index 16dd65d4e..eecb1aed7 100644 --- a/components/time-picker/locale/it_IT.tsx.js +++ b/components/time-picker/locale/it_IT.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Selezionare il tempo', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/ja_JP.tsx.js b/components/time-picker/locale/ja_JP.js similarity index 66% rename from components/time-picker/locale/ja_JP.tsx.js rename to components/time-picker/locale/ja_JP.js index 366344d41..0f00617ea 100644 --- a/components/time-picker/locale/ja_JP.tsx.js +++ b/components/time-picker/locale/ja_JP.js @@ -1,5 +1,5 @@ const locale = { placeholder: '時刻を選択', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/ko_KR.tsx.js b/components/time-picker/locale/ko_KR.js similarity index 65% rename from components/time-picker/locale/ko_KR.tsx.js rename to components/time-picker/locale/ko_KR.js index fad0ffd8c..9354fbd3d 100644 --- a/components/time-picker/locale/ko_KR.tsx.js +++ b/components/time-picker/locale/ko_KR.js @@ -1,5 +1,5 @@ const locale = { placeholder: '날짜 선택', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/ku_IQ.tsx.js b/components/time-picker/locale/ku_IQ.js similarity index 67% rename from components/time-picker/locale/ku_IQ.tsx.js rename to components/time-picker/locale/ku_IQ.js index 838b1958d..fc1d17455 100755 --- a/components/time-picker/locale/ku_IQ.tsx.js +++ b/components/time-picker/locale/ku_IQ.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Demê hilbijêre', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/nb_NO.tsx.js b/components/time-picker/locale/nb_NO.js similarity index 63% rename from components/time-picker/locale/nb_NO.tsx.js rename to components/time-picker/locale/nb_NO.js index dfc0d96e9..8309eb2f3 100644 --- a/components/time-picker/locale/nb_NO.tsx.js +++ b/components/time-picker/locale/nb_NO.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Velg tid', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/nl_BE.tsx.js b/components/time-picker/locale/nl_BE.js similarity index 66% rename from components/time-picker/locale/nl_BE.tsx.js rename to components/time-picker/locale/nl_BE.js index 7318ca9f6..5a89f5331 100644 --- a/components/time-picker/locale/nl_BE.tsx.js +++ b/components/time-picker/locale/nl_BE.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Selecteer tijd', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/nl_NL.tsx.js b/components/time-picker/locale/nl_NL.js similarity index 66% rename from components/time-picker/locale/nl_NL.tsx.js rename to components/time-picker/locale/nl_NL.js index 7318ca9f6..5a89f5331 100644 --- a/components/time-picker/locale/nl_NL.tsx.js +++ b/components/time-picker/locale/nl_NL.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Selecteer tijd', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/pl_PL.tsx.js b/components/time-picker/locale/pl_PL.js similarity index 67% rename from components/time-picker/locale/pl_PL.tsx.js rename to components/time-picker/locale/pl_PL.js index bd48f4f68..a38a35c95 100644 --- a/components/time-picker/locale/pl_PL.tsx.js +++ b/components/time-picker/locale/pl_PL.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Wybierz godzinę', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/pt_BR.tsx.js b/components/time-picker/locale/pt_BR.js similarity index 61% rename from components/time-picker/locale/pt_BR.tsx.js rename to components/time-picker/locale/pt_BR.js index ed0247e10..d1722b879 100644 --- a/components/time-picker/locale/pt_BR.tsx.js +++ b/components/time-picker/locale/pt_BR.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Hora', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/pt_PT.tsx.js b/components/time-picker/locale/pt_PT.js similarity index 61% rename from components/time-picker/locale/pt_PT.tsx.js rename to components/time-picker/locale/pt_PT.js index ed0247e10..d1722b879 100644 --- a/components/time-picker/locale/pt_PT.tsx.js +++ b/components/time-picker/locale/pt_PT.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Hora', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/ru_RU.tsx.js b/components/time-picker/locale/ru_RU.js similarity index 81% rename from components/time-picker/locale/ru_RU.tsx.js rename to components/time-picker/locale/ru_RU.js index 0490573e7..f4395aea8 100644 --- a/components/time-picker/locale/ru_RU.tsx.js +++ b/components/time-picker/locale/ru_RU.js @@ -3,6 +3,6 @@ */ const locale = { placeholder: 'Выберите время', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/sk_SK.tsx.js b/components/time-picker/locale/sk_SK.js similarity index 65% rename from components/time-picker/locale/sk_SK.tsx.js rename to components/time-picker/locale/sk_SK.js index 4c62d104b..1a7cb3804 100644 --- a/components/time-picker/locale/sk_SK.tsx.js +++ b/components/time-picker/locale/sk_SK.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Vybrať čas', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/sr_RS.tsx.js b/components/time-picker/locale/sr_RS.js similarity index 66% rename from components/time-picker/locale/sr_RS.tsx.js rename to components/time-picker/locale/sr_RS.js index ef621a0d7..202655005 100644 --- a/components/time-picker/locale/sr_RS.tsx.js +++ b/components/time-picker/locale/sr_RS.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Izaberite vreme', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/sv_SE.tsx.js b/components/time-picker/locale/sv_SE.js similarity index 63% rename from components/time-picker/locale/sv_SE.tsx.js rename to components/time-picker/locale/sv_SE.js index 063c46b78..0d892a93a 100644 --- a/components/time-picker/locale/sv_SE.tsx.js +++ b/components/time-picker/locale/sv_SE.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Välj tid', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/th_TH.tsx.js b/components/time-picker/locale/th_TH.js similarity index 71% rename from components/time-picker/locale/th_TH.tsx.js rename to components/time-picker/locale/th_TH.js index 335e55e01..6d8628976 100644 --- a/components/time-picker/locale/th_TH.tsx.js +++ b/components/time-picker/locale/th_TH.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'เลือกเวลา', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/tr_TR.tsx.js b/components/time-picker/locale/tr_TR.js similarity index 64% rename from components/time-picker/locale/tr_TR.tsx.js rename to components/time-picker/locale/tr_TR.js index 66f860dca..3cb3d7e15 100644 --- a/components/time-picker/locale/tr_TR.tsx.js +++ b/components/time-picker/locale/tr_TR.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Zaman Seç', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/uk_UA.tsx.js b/components/time-picker/locale/uk_UA.js similarity index 69% rename from components/time-picker/locale/uk_UA.tsx.js rename to components/time-picker/locale/uk_UA.js index 20a81cc53..4f379c553 100644 --- a/components/time-picker/locale/uk_UA.tsx.js +++ b/components/time-picker/locale/uk_UA.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Оберіть час', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/vi_VN.tsx.js b/components/time-picker/locale/vi_VN.js similarity index 67% rename from components/time-picker/locale/vi_VN.tsx.js rename to components/time-picker/locale/vi_VN.js index 05dff1df5..225ef167f 100644 --- a/components/time-picker/locale/vi_VN.tsx.js +++ b/components/time-picker/locale/vi_VN.js @@ -1,5 +1,5 @@ const locale = { placeholder: 'Chọn thời gian', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/zh_CN.tsx.js b/components/time-picker/locale/zh_CN.js similarity index 66% rename from components/time-picker/locale/zh_CN.tsx.js rename to components/time-picker/locale/zh_CN.js index 6898e575d..1b83292e3 100644 --- a/components/time-picker/locale/zh_CN.tsx.js +++ b/components/time-picker/locale/zh_CN.js @@ -1,5 +1,5 @@ const locale = { placeholder: '请选择时间', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/locale/zh_TW.tsx.js b/components/time-picker/locale/zh_TW.js similarity index 66% rename from components/time-picker/locale/zh_TW.tsx.js rename to components/time-picker/locale/zh_TW.js index cde48a919..0d415a019 100644 --- a/components/time-picker/locale/zh_TW.tsx.js +++ b/components/time-picker/locale/zh_TW.js @@ -1,5 +1,5 @@ const locale = { placeholder: '請選擇時間', -}; +} -export default locale; +export default locale diff --git a/components/time-picker/style/index.js b/components/time-picker/style/index.js new file mode 100644 index 000000000..992a50794 --- /dev/null +++ b/components/time-picker/style/index.js @@ -0,0 +1,5 @@ +import '../../style/index.less' +import './index.less' + +// style dependencies +import '../../input/style' diff --git a/components/time-picker/style/index.tsx b/components/time-picker/style/index.tsx deleted file mode 100644 index 0e54062b3..000000000 --- a/components/time-picker/style/index.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import '../../style/index.less'; -import './index.less'; - -// style dependencies -import '../../input/style'; diff --git a/components/vc-time-picker/Combobox.vue b/components/vc-time-picker/Combobox.vue index 9fade4812..f989ead79 100644 --- a/components/vc-time-picker/Combobox.vue +++ b/components/vc-time-picker/Combobox.vue @@ -1,6 +1,7 @@ \ No newline at end of file + diff --git a/components/vc-time-picker/Header.vue b/components/vc-time-picker/Header.vue index 30c31c069..39ccd9fe2 100644 --- a/components/vc-time-picker/Header.vue +++ b/components/vc-time-picker/Header.vue @@ -1,202 +1,203 @@ \ No newline at end of file + diff --git a/components/vc-time-picker/Panel.vue b/components/vc-time-picker/Panel.vue index 2981bdd06..27bd549cb 100644 --- a/components/vc-time-picker/Panel.vue +++ b/components/vc-time-picker/Panel.vue @@ -1,9 +1,9 @@ \ No newline at end of file + diff --git a/components/vc-time-picker/demo/all.vue b/components/vc-time-picker/demo/all.vue new file mode 100644 index 000000000..a405a0bdd --- /dev/null +++ b/components/vc-time-picker/demo/all.vue @@ -0,0 +1,160 @@ + diff --git a/examples/routes.js b/examples/routes.js index 1481f4077..95aa1e7c4 100644 --- a/examples/routes.js +++ b/examples/routes.js @@ -3,7 +3,7 @@ const AsyncComp = () => { const hashs = window.location.hash.split('/') const d = hashs[hashs.length - 1] return { - component: import(`../components/grid/demo/${d}`), + component: import(`../components/time-picker/demo/${d}`), } } export default [ diff --git a/package-lock.json b/package-lock.json index 27fa07fb8..5e3eec983 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3265,6 +3265,11 @@ "tapable": "0.2.8" } }, + "enquire.js": { + "version": "2.1.6", + "resolved": "http://registry.npm.taobao.org/enquire.js/download/enquire.js-2.1.6.tgz", + "integrity": "sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ=" + }, "ent": { "version": "2.2.0", "resolved": "http://r.cnpmjs.org/ent/download/ent-2.2.0.tgz", diff --git a/package.json b/package.json index 1b2b19bad..bbfb22c0b 100644 --- a/package.json +++ b/package.json @@ -1,112 +1,112 @@ { - "name": "vue-ant-design", - "version": "1.0.0", - "description": "vue component", - "main": "index.js", - "scripts": { - "start": "NODE_ENV=development ./node_modules/.bin/webpack-dev-server --open --hot", - "test": "karma start test/karma.conf.js --single-run", - "build": "sh build.sh", - "lint": "eslint -c ./.eslintrc --fix --ext .js ./src/", - "lint:style": "stylelint \"./examples/**/*.less\" --fix --syntax less" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/vueComponent/ant-design.git" - }, - "keywords": [ - "vue" - ], - "author": "", - "license": "MIT", - "bugs": { - "url": "https://github.com/vueComponent/ant-design/issues" - }, - "homepage": "https://github.com/vueComponent/ant-design#readme", - "pre-commit": [ - "lint", - "lint:style" - ], - "devDependencies": { - "babel-cli": "^6.26.0", - "babel-eslint": "^8.0.1", - "babel-helper-vue-jsx-merge-props": "^2.0.2", - "babel-loader": "^7.1.2", - "babel-plugin-istanbul": "^4.1.1", - "babel-plugin-syntax-dynamic-import": "^6.18.0", - "babel-plugin-syntax-jsx": "^6.18.0", - "babel-plugin-transform-decorators": "^6.24.1", - "babel-plugin-transform-decorators-legacy": "^1.3.4", - "babel-plugin-transform-object-rest-spread": "^6.26.0", - "babel-plugin-transform-vue-jsx": "^3.5.0", - "babel-polyfill": "^6.26.0", - "babel-preset-env": "^1.6.0", - "chai": "^4.1.2", - "cheerio": "^1.0.0-rc.2", - "css-loader": "^0.28.7", - "eslint": "^4.7.2", - "eslint-plugin-html": "^3.2.2", - "eslint-plugin-vue-libs": "^1.2.1", - "extract-text-webpack-plugin": "^3.0.2", - "fetch-jsonp": "^1.1.3", - "highlight.js": "^9.12.0", - "html-webpack-plugin": "^2.30.1", - "istanbul-instrumenter-loader": "^3.0.0", - "jsonp": "^0.2.1", - "karma": "^1.4.1", - "karma-coverage": "^1.1.1", - "karma-coverage-istanbul-reporter": "^1.3.0", - "karma-mocha": "^1.3.0", - "karma-phantomjs-launcher": "^1.0.2", - "karma-phantomjs-shim": "^1.4.0", - "karma-sinon-chai": "^1.3.1", - "karma-sourcemap-loader": "^0.3.7", - "karma-spec-reporter": "0.0.31", - "karma-webpack": "^2.0.2", - "less": "^2.7.2", - "less-loader": "^4.0.5", - "markdown-it": "^8.4.0", - "marked": "^0.3.7", - "mocha": "^3.2.0", - "pre-commit": "^1.2.2", - "querystring": "^0.2.0", - "selenium-server": "^3.0.1", - "semver": "^5.3.0", - "sinon": "^4.0.2", - "sinon-chai": "^2.8.0", - "style-loader": "^0.18.2", - "stylelint": "^8.1.1", - "stylelint-config-standard": "^17.0.0", - "vue-antd-md-loader": "^1.0.2", - "vue-loader": "^13.0.5", - "vue-router": "^3.0.1", - "vue-template-compiler": "^2.5.13", - "webpack": "^3.6.0", - "webpack-chunk-hash": "^0.5.0", - "webpack-dev-server": "^2.8.2", - "webpack-merge": "^4.1.1" - }, - "dependencies": { - "add-dom-event-listener": "^1.0.2", - "array-tree-filter": "^2.1.0", - "classnames": "^2.2.5", - "component-classes": "^1.2.6", - "css-animation": "^1.4.1", - "dom-align": "^1.6.7", - "dom-scroll-into-view": "^1.2.1", - "enquire.js": "^2.1.6", - "eslint-plugin-vue": "^3.13.0", - "lodash.clonedeep": "^4.5.0", - "lodash.debounce": "^4.0.8", - "lodash.isequal": "^4.5.0", - "lodash.isplainobject": "^4.0.6", - "moment": "^2.21.0", - "omit.js": "^1.0.0", - "shallow-equal": "^1.0.0", - "shallowequal": "^1.0.2", - "vue": "^2.5.13", - "vue-clipboard2": "0.0.8", - "vue-types": "^1.0.2", - "warning": "^3.0.0" - } -} + "name": "vue-ant-design", + "version": "1.0.0", + "description": "vue component", + "main": "index.js", + "scripts": { + "start": "NODE_ENV=development ./node_modules/.bin/webpack-dev-server --open --hot", + "test": "karma start test/karma.conf.js --single-run", + "build": "sh build.sh", + "lint": "eslint -c ./.eslintrc --fix --ext .js ./components/time-picker/locale", + "lint:style": "stylelint \"./examples/**/*.less\" --fix --syntax less" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/vueComponent/ant-design.git" + }, + "keywords": [ + "vue" + ], + "author": "", + "license": "MIT", + "bugs": { + "url": "https://github.com/vueComponent/ant-design/issues" + }, + "homepage": "https://github.com/vueComponent/ant-design#readme", + "pre-commit": [ + "lint", + "lint:style" + ], + "devDependencies": { + "babel-cli": "^6.26.0", + "babel-eslint": "^8.0.1", + "babel-helper-vue-jsx-merge-props": "^2.0.2", + "babel-loader": "^7.1.2", + "babel-plugin-istanbul": "^4.1.1", + "babel-plugin-syntax-dynamic-import": "^6.18.0", + "babel-plugin-syntax-jsx": "^6.18.0", + "babel-plugin-transform-decorators": "^6.24.1", + "babel-plugin-transform-decorators-legacy": "^1.3.4", + "babel-plugin-transform-object-rest-spread": "^6.26.0", + "babel-plugin-transform-vue-jsx": "^3.5.0", + "babel-polyfill": "^6.26.0", + "babel-preset-env": "^1.6.0", + "chai": "^4.1.2", + "cheerio": "^1.0.0-rc.2", + "css-loader": "^0.28.7", + "eslint": "^4.7.2", + "eslint-plugin-html": "^3.2.2", + "eslint-plugin-vue-libs": "^1.2.1", + "extract-text-webpack-plugin": "^3.0.2", + "fetch-jsonp": "^1.1.3", + "highlight.js": "^9.12.0", + "html-webpack-plugin": "^2.30.1", + "istanbul-instrumenter-loader": "^3.0.0", + "jsonp": "^0.2.1", + "karma": "^1.4.1", + "karma-coverage": "^1.1.1", + "karma-coverage-istanbul-reporter": "^1.3.0", + "karma-mocha": "^1.3.0", + "karma-phantomjs-launcher": "^1.0.2", + "karma-phantomjs-shim": "^1.4.0", + "karma-sinon-chai": "^1.3.1", + "karma-sourcemap-loader": "^0.3.7", + "karma-spec-reporter": "0.0.31", + "karma-webpack": "^2.0.2", + "less": "^2.7.2", + "less-loader": "^4.0.5", + "markdown-it": "^8.4.0", + "marked": "^0.3.7", + "mocha": "^3.2.0", + "pre-commit": "^1.2.2", + "querystring": "^0.2.0", + "selenium-server": "^3.0.1", + "semver": "^5.3.0", + "sinon": "^4.0.2", + "sinon-chai": "^2.8.0", + "style-loader": "^0.18.2", + "stylelint": "^8.1.1", + "stylelint-config-standard": "^17.0.0", + "vue-antd-md-loader": "^1.0.2", + "vue-loader": "^13.0.5", + "vue-router": "^3.0.1", + "vue-template-compiler": "^2.5.13", + "webpack": "^3.6.0", + "webpack-chunk-hash": "^0.5.0", + "webpack-dev-server": "^2.8.2", + "webpack-merge": "^4.1.1" + }, + "dependencies": { + "add-dom-event-listener": "^1.0.2", + "array-tree-filter": "^2.1.0", + "classnames": "^2.2.5", + "component-classes": "^1.2.6", + "css-animation": "^1.4.1", + "dom-align": "^1.6.7", + "dom-scroll-into-view": "^1.2.1", + "enquire.js": "^2.1.6", + "eslint-plugin-vue": "^3.13.0", + "lodash.clonedeep": "^4.5.0", + "lodash.debounce": "^4.0.8", + "lodash.isequal": "^4.5.0", + "lodash.isplainobject": "^4.0.6", + "moment": "^2.21.0", + "omit.js": "^1.0.0", + "shallow-equal": "^1.0.0", + "shallowequal": "^1.0.2", + "vue": "^2.5.13", + "vue-clipboard2": "0.0.8", + "vue-types": "^1.0.2", + "warning": "^3.0.0" + } +} \ No newline at end of file