From 1be50b786f81acfe29cc8170b8dceec31df449b7 Mon Sep 17 00:00:00 2001 From: young Date: Tue, 14 Mar 2017 14:24:08 +0800 Subject: [PATCH 1/8] ignore vscode config --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c5cfd2b4..5d1bfef3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ npm-debug.log examples/dist/ dist/ yarn-error.log -test/unit/coverage \ No newline at end of file +test/unit/coverage +.vscode \ No newline at end of file From cd50d0d678e766cceb0b9f07729596c4170111d6 Mon Sep 17 00:00:00 2001 From: young Date: Tue, 14 Mar 2017 14:25:02 +0800 Subject: [PATCH 2/8] fix(input): all actions should emit event --- src/components/input/input.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/input/input.vue b/src/components/input/input.vue index baab0e3f..13703c47 100644 --- a/src/components/input/input.vue +++ b/src/components/input/input.vue @@ -141,17 +141,17 @@ } }, methods: { - handleEnter () { - this.$emit('on-enter'); + handleEnter (event) { + this.$emit('on-enter', event); }, - handleIconClick () { - this.$emit('on-click'); + handleIconClick (event) { + this.$emit('on-click', event); }, - handleFocus () { - this.$emit('on-focus'); + handleFocus (event) { + this.$emit('on-focus', event); }, - handleBlur () { - this.$emit('on-blur'); + handleBlur (event) { + this.$emit('on-blur', event); if (!findComponentUpward(this, ['DatePicker', 'TimePicker', 'Cascader'])) { this.dispatch('FormItem', 'on-form-blur', this.currentValue); } From 5016847870609b7db43af066be60a266006daf43 Mon Sep 17 00:00:00 2001 From: young Date: Tue, 14 Mar 2017 14:28:56 +0800 Subject: [PATCH 3/8] config(compontent): option --- src/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.js b/src/index.js index cb755f64..38c99f99 100644 --- a/src/index.js +++ b/src/index.js @@ -84,6 +84,7 @@ const iview = { Message, Modal, Notice, + Option: Option, iOption: Option, OptionGroup, Page, From 51155ea8128ad6c2ca47d3f62a5caba3c687700c Mon Sep 17 00:00:00 2001 From: young Date: Tue, 14 Mar 2017 14:34:28 +0800 Subject: [PATCH 4/8] config(compontent)): can customer the compontent prefix --- src/index.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index 38c99f99..739d009f 100644 --- a/src/index.js +++ b/src/index.js @@ -116,13 +116,16 @@ const iview = { Tree, Upload }; - +const defaultOptions = { + componentPrefix: 'i' +} const install = function (Vue, opts = {}) { + opts = Object.assign(defaultOptions, (opts || {})) locale.use(opts.locale); locale.i18n(opts.i18n); Object.keys(iview).forEach((key) => { - Vue.component(key, iview[key]); + Vue.component(`${opts.componentPrefix.toUpperCase()}${key}`, iview[key]); }); Vue.prototype.$Loading = LoadingBar; From 480911bd44b4026de84dd1dc08657668472e7fb7 Mon Sep 17 00:00:00 2001 From: young Date: Tue, 14 Mar 2017 14:58:38 +0800 Subject: [PATCH 5/8] fix: const to let --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 739d009f..4a527b71 100644 --- a/src/index.js +++ b/src/index.js @@ -116,7 +116,7 @@ const iview = { Tree, Upload }; -const defaultOptions = { +let defaultOptions = { componentPrefix: 'i' } const install = function (Vue, opts = {}) { From 75ed74e9a66a933a822a979c4a66854e29350251 Mon Sep 17 00:00:00 2001 From: young Date: Tue, 14 Mar 2017 15:34:19 +0800 Subject: [PATCH 6/8] fix: default prefix is empty --- src/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/index.js b/src/index.js index 4a527b71..b2e6cb27 100644 --- a/src/index.js +++ b/src/index.js @@ -117,10 +117,10 @@ const iview = { Upload }; let defaultOptions = { - componentPrefix: 'i' -} + componentPrefix: '' +}; const install = function (Vue, opts = {}) { - opts = Object.assign(defaultOptions, (opts || {})) + opts = Object.assign(defaultOptions, (opts || {})); locale.use(opts.locale); locale.i18n(opts.i18n); From fb189f1650f8bf3f0858c338084342fc9efd4f76 Mon Sep 17 00:00:00 2001 From: young Date: Wed, 15 Mar 2017 11:22:33 +0800 Subject: [PATCH 7/8] cancel the components prefix --- src/index.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/index.js b/src/index.js index b2e6cb27..38c99f99 100644 --- a/src/index.js +++ b/src/index.js @@ -116,16 +116,13 @@ const iview = { Tree, Upload }; -let defaultOptions = { - componentPrefix: '' -}; + const install = function (Vue, opts = {}) { - opts = Object.assign(defaultOptions, (opts || {})); locale.use(opts.locale); locale.i18n(opts.i18n); Object.keys(iview).forEach((key) => { - Vue.component(`${opts.componentPrefix.toUpperCase()}${key}`, iview[key]); + Vue.component(key, iview[key]); }); Vue.prototype.$Loading = LoadingBar; From 57737d7455232c4e380a3c37fde9aa106c03f7b6 Mon Sep 17 00:00:00 2001 From: muei Date: Thu, 16 Mar 2017 11:49:14 +0800 Subject: [PATCH 8/8] Update input.vue --- src/components/input/input.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/input/input.vue b/src/components/input/input.vue index 5fd8518a..db74a691 100644 --- a/src/components/input/input.vue +++ b/src/components/input/input.vue @@ -151,7 +151,7 @@ this.$emit('on-focus', event); }, handleBlur (event) { - this.$emit('on-blur', envent); + this.$emit('on-blur', event); if (!findComponentUpward(this, ['DatePicker', 'TimePicker', 'Cascader', 'Search'])) { this.dispatch('FormItem', 'on-form-blur', this.currentValue); }