other / mew-iview

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
Inline Side-by-side
@@ -43,8 +43,7 @@ npm install iview --save @@ -43,8 +43,7 @@ npm install iview --save
43 ```js 43 ```js
44 module: { 44 module: {
45 loaders: [ 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 { test: /\.js$/, loader: 'babel', exclude: /node_modules/ } 47 { test: /\.js$/, loader: 'babel', exclude: /node_modules/ }
49 ] 48 ]
50 } 49 }
@@ -28,8 +28,7 @@ @@ -28,8 +28,7 @@
28 "url": "https://github.com/iview/iview/issues" 28 "url": "https://github.com/iview/iview/issues"
29 }, 29 },
30 "dependencies": { 30 "dependencies": {
31 - "popper.js": "^0.6.4",  
32 - "vue": "^1.0.26" 31 + "popper.js": "^0.6.4"
33 }, 32 },
34 "devDependencies": { 33 "devDependencies": {
35 "autoprefixer-loader": "^2.0.0", 34 "autoprefixer-loader": "^2.0.0",
@@ -55,6 +54,7 @@ @@ -55,6 +54,7 @@
55 "less-loader": "^2.2.3", 54 "less-loader": "^2.2.3",
56 "style-loader": "^0.13.1", 55 "style-loader": "^0.13.1",
57 "url-loader": "^0.5.7", 56 "url-loader": "^0.5.7",
  57 + "vue": "^1.0.26",
58 "vue-hot-reload-api": "^1.3.3", 58 "vue-hot-reload-api": "^1.3.3",
59 "vue-html-loader": "^1.2.3", 59 "vue-html-loader": "^1.2.3",
60 "vue-loader": "^8.5.3", 60 "vue-loader": "^8.5.3",
test/routers/button.vue
  Show/Hide comments   View file @7249392
@@ -69,9 +69,29 @@ @@ -69,9 +69,29 @@
69 <i-button type="primary" icon="cloud"></i-button> 69 <i-button type="primary" icon="cloud"></i-button>
70 <i-button type="primary" icon="upload"></i-button> 70 <i-button type="primary" icon="upload"></i-button>
71 </Button-group> 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 </template> 92 </template>
73 <script> 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 const ButtonGroup = Button.Group; 95 const ButtonGroup = Button.Group;
76 const RadioGroup = Radio.Group; 96 const RadioGroup = Radio.Group;
77 const CheckboxGroup = Checkbox.Group; 97 const CheckboxGroup = Checkbox.Group;
@@ -90,7 +110,10 @@ @@ -90,7 +110,10 @@
90 InputNumber, 110 InputNumber,
91 Row, 111 Row,
92 iCol: Col, 112 iCol: Col,
93 - Page 113 + Page,
  114 + Modal,
  115 + iSelect,
  116 + iOption
94 }, 117 },
95 props: { 118 props: {
96 119
@@ -98,7 +121,8 @@ @@ -98,7 +121,8 @@
98 data () { 121 data () {
99 return { 122 return {
100 loading: false, 123 loading: false,
101 - loading2: false 124 + loading2: false,
  125 + model6: ''
102 } 126 }
103 }, 127 },
104 methods: { 128 methods: {