Commit 72493927e1aaeca250128edca4e4dfcc84333140

Authored by 梁灏
1 parent f12aca9e

fixed bug: Can not compile iview sometime

fixed bug: Can not compile iview sometime
Showing 3 changed files with 30 additions and 7 deletions   Show diff stats
README.md
... ... @@ -43,8 +43,7 @@ npm install iview --save
43 43 ```js
44 44 module: {
45 45 loaders: [
46   - { test: /iview\/.*?js$/, loader: 'babel' },// for Mac
47   - { test: /iview\\.*?js$/, loader: 'babel' },// for Windows
  46 + { test: /iview.src.*?js$/, loader: 'babel' },
48 47 { test: /\.js$/, loader: 'babel', exclude: /node_modules/ }
49 48 ]
50 49 }
... ...
package.json
... ... @@ -28,8 +28,7 @@
28 28 "url": "https://github.com/iview/iview/issues"
29 29 },
30 30 "dependencies": {
31   - "popper.js": "^0.6.4",
32   - "vue": "^1.0.26"
  31 + "popper.js": "^0.6.4"
33 32 },
34 33 "devDependencies": {
35 34 "autoprefixer-loader": "^2.0.0",
... ... @@ -55,6 +54,7 @@
55 54 "less-loader": "^2.2.3",
56 55 "style-loader": "^0.13.1",
57 56 "url-loader": "^0.5.7",
  57 + "vue": "^1.0.26",
58 58 "vue-hot-reload-api": "^1.3.3",
59 59 "vue-html-loader": "^1.2.3",
60 60 "vue-loader": "^8.5.3",
... ...
test/routers/button.vue
... ... @@ -69,9 +69,29 @@
69 69 <i-button type="primary" icon="cloud"></i-button>
70 70 <i-button type="primary" icon="upload"></i-button>
71 71 </Button-group>
  72 + <Modal
  73 + :visible="true"
  74 + title="普通的Modal对话框标题">
  75 + <p>对话框内容</p>
  76 + <p>对话框内容</p>
  77 + <p>对话框内容</p>
  78 + <div style="width: 200px">
  79 + <i-select :model.sync="model6" >
  80 + <i-option value="beijing">北京市</i-option>
  81 + <i-option value="shanghai" disabled>上海市</i-option>
  82 + <i-option value="shenzhen">深圳市</i-option>
  83 + </i-select>
  84 + </div>
  85 +
  86 + </Modal>
  87 + <i-select :model.sync="model6" >
  88 + <i-option value="beijing">北京市</i-option>
  89 + <i-option value="shanghai" disabled>上海市</i-option>
  90 + <i-option value="shenzhen">深圳市</i-option>
  91 + </i-select>
72 92 </template>
73 93 <script>
74   - import { Button, Icon, Input, Switch, Radio, Checkbox, InputNumber, Row, Col, Page } from 'iview';
  94 + import { Button, Icon, Input, Switch, Radio, Checkbox, InputNumber, Row, Col, Page, Modal, iSelect, iOption } from 'iview';
75 95 const ButtonGroup = Button.Group;
76 96 const RadioGroup = Radio.Group;
77 97 const CheckboxGroup = Checkbox.Group;
... ... @@ -90,7 +110,10 @@
90 110 InputNumber,
91 111 Row,
92 112 iCol: Col,
93   - Page
  113 + Page,
  114 + Modal,
  115 + iSelect,
  116 + iOption
94 117 },
95 118 props: {
96 119  
... ... @@ -98,7 +121,8 @@
98 121 data () {
99 122 return {
100 123 loading: false,
101   - loading2: false
  124 + loading2: false,
  125 + model6: ''
102 126 }
103 127 },
104 128 methods: {
... ...