diff --git a/build/webpack.dev.config.js b/build/webpack.dev.config.js index ff61ffe..6c44211 100644 --- a/build/webpack.dev.config.js +++ b/build/webpack.dev.config.js @@ -4,7 +4,7 @@ var path = require('path'); var webpack = require('webpack'); -var ExtractTextPlugin = require('extract-text-webpack-plugin'); +// var ExtractTextPlugin = require('extract-text-webpack-plugin'); var HtmlWebpackPlugin = require('html-webpack-plugin'); module.exports = { diff --git a/package.json b/package.json index 19f661e..23aa868 100644 --- a/package.json +++ b/package.json @@ -76,6 +76,7 @@ "vue-loader": "^11.0.0", "vue-router": "^2.2.1", "vue-style-loader": "^1.0.0", + "vue-template-compiler": "^2.2.1", "webpack": "^2.2.1", "webpack-dev-server": "^2.4.1" } diff --git a/src/components/steps/step.vue b/src/components/steps/step.vue index 7a211fc..9991722 100644 --- a/src/components/steps/step.vue +++ b/src/components/steps/step.vue @@ -21,11 +21,11 @@ export default { props: { - status: { - validator (value) { - return oneOf(value, ['wait', 'process', 'finish', 'error']); - } - }, + // status: { + // validator (value) { + // return oneOf(value, ['wait', 'process', 'finish', 'error']); + // } + // }, title: { type: String, default: '' @@ -42,7 +42,8 @@ prefixCls: prefixCls, stepNumber: '', nextError: false, - total: 1 + total: 1, + status: '' }; }, computed: { diff --git a/src/components/steps/steps.vue b/src/components/steps/steps.vue index 53a0440..906c2fd 100644 --- a/src/components/steps/steps.vue +++ b/src/components/steps/steps.vue @@ -43,7 +43,7 @@ ]; } }, - ready () { + mounted () { this.updateChildProps(true); this.setNextError(); this.updateCurrent(true); diff --git a/src/index.js b/src/index.js index 7f06249..e4e0ef4 100644 --- a/src/index.js +++ b/src/index.js @@ -31,7 +31,7 @@ import Radio from './components/radio'; // import Rate from './components/rate'; // import Slider from './components/slider'; // import Spin from './components/spin'; -// import Steps from './components/steps'; +import Steps from './components/steps'; // import Switch from './components/switch'; // import Table from './components/table'; // import Tabs from './components/tabs'; @@ -96,8 +96,8 @@ const iview = { // iSelect: Select, // Slider, // Spin, - // Step: Steps.Step, - // Steps, + Step: Steps.Step, + Steps, // Switch, // iTable: Table, // Tabs: Tabs, diff --git a/test/app.vue b/test/app.vue index 60c82c3..8f20712 100644 --- a/test/app.vue +++ b/test/app.vue @@ -2,26 +2,15 @@ @import "../src/styles/index.less";