diff --git a/README.md b/README.md index 04b3aa6..dd88c2b 100644 --- a/README.md +++ b/README.md @@ -43,8 +43,7 @@ npm install iview --save ```js module: { loaders: [ - { test: /iview\/.*?js$/, loader: 'babel' },// for Mac - { test: /iview\\.*?js$/, loader: 'babel' },// for Windows + { test: /iview.src.*?js$/, loader: 'babel' }, { test: /\.js$/, loader: 'babel', exclude: /node_modules/ } ] } diff --git a/package.json b/package.json index 544da81..45707a8 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,7 @@ "url": "https://github.com/iview/iview/issues" }, "dependencies": { - "popper.js": "^0.6.4", - "vue": "^1.0.26" + "popper.js": "^0.6.4" }, "devDependencies": { "autoprefixer-loader": "^2.0.0", @@ -55,6 +54,7 @@ "less-loader": "^2.2.3", "style-loader": "^0.13.1", "url-loader": "^0.5.7", + "vue": "^1.0.26", "vue-hot-reload-api": "^1.3.3", "vue-html-loader": "^1.2.3", "vue-loader": "^8.5.3", diff --git a/test/routers/button.vue b/test/routers/button.vue index 3fb059e..97a5da7 100644 --- a/test/routers/button.vue +++ b/test/routers/button.vue @@ -69,9 +69,29 @@ <i-button type="primary" icon="cloud"></i-button> <i-button type="primary" icon="upload"></i-button> </Button-group> + <Modal + :visible="true" + title="普通的Modal对话框标题"> + <p>对话框内容</p> + <p>对话框内容</p> + <p>对话框内容</p> + <div style="width: 200px"> + <i-select :model.sync="model6" > + <i-option value="beijing">北京市</i-option> + <i-option value="shanghai" disabled>上海市</i-option> + <i-option value="shenzhen">深圳市</i-option> + </i-select> + </div> + + </Modal> + <i-select :model.sync="model6" > + <i-option value="beijing">北京市</i-option> + <i-option value="shanghai" disabled>上海市</i-option> + <i-option value="shenzhen">深圳市</i-option> + </i-select> </template> <script> - import { Button, Icon, Input, Switch, Radio, Checkbox, InputNumber, Row, Col, Page } from 'iview'; + import { Button, Icon, Input, Switch, Radio, Checkbox, InputNumber, Row, Col, Page, Modal, iSelect, iOption } from 'iview'; const ButtonGroup = Button.Group; const RadioGroup = Radio.Group; const CheckboxGroup = Checkbox.Group; @@ -90,7 +110,10 @@ InputNumber, Row, iCol: Col, - Page + Page, + Modal, + iSelect, + iOption }, props: { @@ -98,7 +121,8 @@ data () { return { loading: false, - loading2: false + loading2: false, + model6: '' } }, methods: { -- libgit2 0.21.4