diff --git a/.babelrc b/.babelrc
index 1e2392943..608f00b5a 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,4 +1,5 @@
{
"presets": ["es2015"],
+ "plugins": ["transform-vue-jsx"],
"comments": false
}
diff --git a/.eslintrc b/.eslintrc
index 75310fc75..4bcff8304 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -3,7 +3,8 @@
"extends": 'elemefe',
"parserOptions": {
"ecmaFeatures": {
- "experimentalObjectRestSpread": true
+ "experimentalObjectRestSpread": true,
+ "jsx": true
}
}
}
diff --git a/examples/index.template.html b/examples/index.template.html
index 1804eaab9..1fe11fdcf 100644
--- a/examples/index.template.html
+++ b/examples/index.template.html
@@ -2,7 +2,7 @@
- test-vue2
+ ELEMENT
diff --git a/package.json b/package.json
index 4a2950480..6fbf1a7d6 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,9 @@
"object-assign": "^4.1.0"
},
"devDependencies": {
+ "babel-helper-vue-jsx-merge-props": "^1.0.1",
+ "babel-plugin-syntax-jsx": "^6.8.0",
+ "babel-plugin-transform-vue-jsx": "^1.1.1",
"file-save": "^0.2.0",
"gh-pages": "^0.11.0",
"highlight.js": "^9.3.0",
@@ -42,7 +45,7 @@
"q": "^1.4.1",
"uppercamelcase": "^1.1.0",
"vue": "^2.0.0-beta.5",
- "vue-loader": "^9.2.0",
+ "vue-loader": "^9.2.3",
"vue-markdown-loader": "^0.4.0",
"vue-popup": "^0.1.8",
"vue-router": "^2.0.0-beta.2"
diff --git a/packages/pagination/src/pager.vue b/packages/pagination/src/pager.vue
index de69c9a27..a5a7dd004 100644
--- a/packages/pagination/src/pager.vue
+++ b/packages/pagination/src/pager.vue
@@ -1,11 +1,12 @@
-
-
diff --git a/packages/select/src/select.vue b/packages/select/src/select.vue
index 5f10652ca..0139b3479 100644
--- a/packages/select/src/select.vue
+++ b/packages/select/src/select.vue
@@ -228,7 +228,10 @@
return;
}
this.valueChangeBySelected = true;
- this.$emit('input', val.map(item => item.value));
+ const result = val.map(item => item.value);
+
+ this.$emit('input', result);
+ this.$emit('change', result);
if (this.selected.length > 0) {
this.currentPlaceholder = '';
} else {
@@ -246,6 +249,7 @@
} else {
if (val.value) {
this.$emit('input', val.value);
+ this.$emit('change', val.value);
}
}
},