Commit 504f8c525d864dc0423f0fcbccdb151cd1d14825
1 parent
e6a09eee
update Modal
Showing
4 changed files
with
362 additions
and
174 deletions
Show diff stats
examples/routers/modal.vue
1 | 1 | <template> |
2 | 2 | <div> |
3 | - <i-button @click="showModal = true">Modal有Tabs</i-button> | |
4 | - <i-button @click="showModal2 = true">Modal无Tabs</i-button> | |
5 | - <Modal v-model="showModal" title="弹窗"> | |
6 | - <Tabs> | |
7 | - <Tab-pane label="演示" style="height: 80px;"> | |
8 | - <!--<Date-picker transfer type="daterange" placement="bottom-end" placeholder="选择日期" style="width: 200px"></Date-picker>--> | |
9 | - <!--<i-select transfer multiple v-model="m1">--> | |
10 | - <!--<i-option v-for="item in options" :value="item.value" :key="item.value">{{ item.label }}</i-option>--> | |
11 | - <!--</i-select>--> | |
12 | - <Cascader transfer :data="data4" :load-data="loadData"></Cascader> | |
13 | - </Tab-pane> | |
14 | - </Tabs> | |
15 | - </Modal> | |
16 | - <Modal v-model="showModal2" title="弹窗"> | |
17 | - <i-select> | |
18 | - <i-option v-for="item in options" :value="item.value" :key="item.value">{{ item.label }}</i-option> | |
19 | - </i-select> | |
20 | - </Modal> | |
21 | - <Button @click="showModelFunc">弹出</Button> | |
3 | + <Button @click="instance('info')">Info</Button> | |
4 | + <Button @click="instance('success')">Success</Button> | |
5 | + <Button @click="instance('warning')">Warning</Button> | |
6 | + <Button @click="instance('error')">Error</Button> | |
22 | 7 | </div> |
23 | 8 | </template> |
24 | 9 | <script> |
25 | 10 | export default { |
26 | - data () { | |
27 | - return { | |
28 | - m1: [], | |
29 | - showModal: false, | |
30 | - showModal2: false, | |
31 | - options: [ | |
32 | - { | |
33 | - value: 'beijing', | |
34 | - label: '北京市' | |
35 | - }, | |
36 | - { | |
37 | - value: 'shanghai', | |
38 | - label: '上海市' | |
39 | - }, | |
40 | - { | |
41 | - value: 'shenzhen', | |
42 | - label: '深圳市' | |
43 | - }, | |
44 | - { | |
45 | - value: 'hangzhou', | |
46 | - label: '杭州市' | |
47 | - }, | |
48 | - { | |
49 | - value: 'nanjing', | |
50 | - label: '南京市' | |
51 | - }, | |
52 | - { | |
53 | - value: 'chongqing', | |
54 | - label: '重庆市' | |
55 | - } | |
56 | - ], | |
57 | - data4: [ | |
58 | - { | |
59 | - value: 'beijing', | |
60 | - label: '北京', | |
61 | - children: [], | |
62 | - loading: false | |
63 | - }, | |
64 | - { | |
65 | - value: 'hangzhou', | |
66 | - label: '杭州', | |
67 | - children: [], | |
68 | - loading:false | |
69 | - } | |
70 | - ] | |
71 | - } | |
72 | - }, | |
73 | 11 | methods: { |
74 | - ok () { | |
75 | - this.$Message.info('点击了确定'); | |
76 | - }, | |
77 | - cancel () { | |
78 | - this.$Message.info('点击了取消'); | |
79 | - }, | |
80 | - remoteMethod(query) { | |
81 | - this.loading = true; | |
82 | - setTimeout(() => { | |
83 | - this.loading = false; | |
84 | - this.options = this.cityList; | |
85 | - }, 200); | |
86 | - }, | |
87 | - resetForm() { | |
88 | - //加个计时器,就能解决这个定位问题了 | |
89 | - // setTimeout(()=> { | |
90 | - this.$refs["formSelect"].clearSingleSelect(); | |
91 | - this.options = []; | |
92 | - // }, 300) | |
93 | - }, | |
94 | - loadData (item, callback) { | |
95 | - item.loading = true; | |
96 | - setTimeout(() => { | |
97 | - if (item.value === 'beijing') { | |
98 | - item.children = [ | |
99 | - { | |
100 | - value: 'talkingdata', | |
101 | - label: 'TalkingData' | |
102 | - }, | |
103 | - { | |
104 | - value: 'baidu', | |
105 | - label: '百度' | |
106 | - }, | |
107 | - { | |
108 | - value: 'sina', | |
109 | - label: '新浪' | |
110 | - } | |
111 | - ]; | |
112 | - } else if (item.value === 'hangzhou') { | |
113 | - item.children = [ | |
114 | - { | |
115 | - value: 'ali', | |
116 | - label: '阿里巴巴' | |
117 | - }, | |
118 | - { | |
119 | - value: '163', | |
120 | - label: '网易' | |
121 | - } | |
122 | - ]; | |
123 | - } | |
124 | - item.loading = false; | |
125 | - callback(); | |
126 | - }, 1000); | |
127 | - }, | |
128 | - showModelFunc () { | |
129 | - this.$Modal.success({ | |
130 | - title: 'haha', | |
131 | - content: 'lsisdfsdfsdfs', | |
132 | - closable: false | |
133 | - }); | |
12 | + instance (type) { | |
13 | + const title = 'Title'; | |
14 | + const content = '<p>Content of dialog</p><p>Content of dialog</p>'; | |
15 | + switch (type) { | |
16 | + case 'info': | |
17 | + this.$Modal.info({ | |
18 | + title: title, | |
19 | + content: content, | |
20 | + closable: true | |
21 | + }); | |
22 | + break; | |
23 | + case 'success': | |
24 | + this.$Modal.success({ | |
25 | + title: title, | |
26 | + content: content | |
27 | + }); | |
28 | + break; | |
29 | + case 'warning': | |
30 | + this.$Modal.warning({ | |
31 | + title: title, | |
32 | + content: content | |
33 | + }); | |
34 | + break; | |
35 | + case 'error': | |
36 | + this.$Modal.error({ | |
37 | + title: title, | |
38 | + content: content | |
39 | + }); | |
40 | + break; | |
41 | + } | |
134 | 42 | } |
135 | 43 | } |
136 | 44 | } | ... | ... |
package-lock.json
1 | 1 | { |
2 | 2 | "name": "iview", |
3 | - "version": "2.7.3", | |
3 | + "version": "2.8.0-rc.4", | |
4 | 4 | "lockfileVersion": 1, |
5 | 5 | "requires": true, |
6 | 6 | "dependencies": { |
... | ... | @@ -149,6 +149,12 @@ |
149 | 149 | "micromatch": "2.3.11" |
150 | 150 | } |
151 | 151 | }, |
152 | + "aproba": { | |
153 | + "version": "1.2.0", | |
154 | + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", | |
155 | + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", | |
156 | + "dev": true | |
157 | + }, | |
152 | 158 | "argparse": { |
153 | 159 | "version": "1.0.9", |
154 | 160 | "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", |
... | ... | @@ -296,9 +302,9 @@ |
296 | 302 | "dev": true |
297 | 303 | }, |
298 | 304 | "async-validator": { |
299 | - "version": "1.8.1", | |
300 | - "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.1.tgz", | |
301 | - "integrity": "sha1-ZmV4jKOSaa93Dl7gLw5VfyQ40so=", | |
305 | + "version": "1.8.2", | |
306 | + "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.2.tgz", | |
307 | + "integrity": "sha1-t3WXIm6WJC+NUxwNRq4pX2JCK6Q=", | |
302 | 308 | "requires": { |
303 | 309 | "babel-runtime": "6.26.0" |
304 | 310 | } |
... | ... | @@ -1187,7 +1193,7 @@ |
1187 | 1193 | "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", |
1188 | 1194 | "dev": true, |
1189 | 1195 | "requires": { |
1190 | - "core-js": "2.5.1", | |
1196 | + "core-js": "2.5.3", | |
1191 | 1197 | "regenerator-runtime": "0.11.0" |
1192 | 1198 | } |
1193 | 1199 | } |
... | ... | @@ -1274,7 +1280,7 @@ |
1274 | 1280 | "requires": { |
1275 | 1281 | "babel-core": "6.26.0", |
1276 | 1282 | "babel-runtime": "6.26.0", |
1277 | - "core-js": "2.5.1", | |
1283 | + "core-js": "2.5.3", | |
1278 | 1284 | "home-or-tmp": "2.0.0", |
1279 | 1285 | "lodash": "4.17.4", |
1280 | 1286 | "mkdirp": "0.5.1", |
... | ... | @@ -1286,7 +1292,7 @@ |
1286 | 1292 | "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", |
1287 | 1293 | "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", |
1288 | 1294 | "requires": { |
1289 | - "core-js": "2.5.1", | |
1295 | + "core-js": "2.5.3", | |
1290 | 1296 | "regenerator-runtime": "0.11.0" |
1291 | 1297 | } |
1292 | 1298 | }, |
... | ... | @@ -1659,6 +1665,27 @@ |
1659 | 1665 | "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", |
1660 | 1666 | "dev": true |
1661 | 1667 | }, |
1668 | + "cacache": { | |
1669 | + "version": "10.0.1", | |
1670 | + "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.1.tgz", | |
1671 | + "integrity": "sha512-dRHYcs9LvG9cHgdPzjiI+/eS7e1xRhULrcyOx04RZQsszNJXU2SL9CyG60yLnge282Qq5nwTv+ieK2fH+WPZmA==", | |
1672 | + "dev": true, | |
1673 | + "requires": { | |
1674 | + "bluebird": "3.5.0", | |
1675 | + "chownr": "1.0.1", | |
1676 | + "glob": "7.1.2", | |
1677 | + "graceful-fs": "4.1.11", | |
1678 | + "lru-cache": "4.1.1", | |
1679 | + "mississippi": "1.3.0", | |
1680 | + "mkdirp": "0.5.1", | |
1681 | + "move-concurrently": "1.0.1", | |
1682 | + "promise-inflight": "1.0.1", | |
1683 | + "rimraf": "2.6.1", | |
1684 | + "ssri": "5.0.0", | |
1685 | + "unique-filename": "1.1.0", | |
1686 | + "y18n": "3.2.1" | |
1687 | + } | |
1688 | + }, | |
1662 | 1689 | "caller-path": { |
1663 | 1690 | "version": "0.1.0", |
1664 | 1691 | "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", |
... | ... | @@ -1803,6 +1830,12 @@ |
1803 | 1830 | "readdirp": "2.1.0" |
1804 | 1831 | } |
1805 | 1832 | }, |
1833 | + "chownr": { | |
1834 | + "version": "1.0.1", | |
1835 | + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", | |
1836 | + "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", | |
1837 | + "dev": true | |
1838 | + }, | |
1806 | 1839 | "cipher-base": { |
1807 | 1840 | "version": "1.0.4", |
1808 | 1841 | "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", |
... | ... | @@ -1989,22 +2022,45 @@ |
1989 | 2022 | } |
1990 | 2023 | }, |
1991 | 2024 | "compression-webpack-plugin": { |
1992 | - "version": "1.0.1", | |
1993 | - "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-1.0.1.tgz", | |
1994 | - "integrity": "sha512-ABF2AFb31gpIBeEy/w6Ct0u+K+jY8jFRfGwjUWGxVTidA9pf7iH/JzjcVBQ+KB1gNMycujMxA56/PznMPUV5jw==", | |
2025 | + "version": "1.1.3", | |
2026 | + "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-1.1.3.tgz", | |
2027 | + "integrity": "sha512-DIvTIkihu1tyoPdoan5Lh9GVvXgcNMDEgXSfyjlAriW3UaILoPhUFHFTU7Zsui+rPEexmFNlTyiLe0TCkQFJGg==", | |
1995 | 2028 | "dev": true, |
1996 | 2029 | "requires": { |
1997 | - "async": "2.4.1", | |
2030 | + "async": "2.5.0", | |
2031 | + "cacache": "10.0.1", | |
2032 | + "find-cache-dir": "1.0.0", | |
2033 | + "serialize-javascript": "1.4.0", | |
1998 | 2034 | "webpack-sources": "1.0.1" |
1999 | 2035 | }, |
2000 | 2036 | "dependencies": { |
2001 | - "async": { | |
2002 | - "version": "2.4.1", | |
2003 | - "resolved": "https://registry.npmjs.org/async/-/async-2.4.1.tgz", | |
2004 | - "integrity": "sha1-YqVrJ5yYoR0JhwlqAcw+6463u9c=", | |
2037 | + "find-cache-dir": { | |
2038 | + "version": "1.0.0", | |
2039 | + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", | |
2040 | + "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", | |
2005 | 2041 | "dev": true, |
2006 | 2042 | "requires": { |
2007 | - "lodash": "4.17.4" | |
2043 | + "commondir": "1.0.1", | |
2044 | + "make-dir": "1.1.0", | |
2045 | + "pkg-dir": "2.0.0" | |
2046 | + } | |
2047 | + }, | |
2048 | + "find-up": { | |
2049 | + "version": "2.1.0", | |
2050 | + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", | |
2051 | + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", | |
2052 | + "dev": true, | |
2053 | + "requires": { | |
2054 | + "locate-path": "2.0.0" | |
2055 | + } | |
2056 | + }, | |
2057 | + "pkg-dir": { | |
2058 | + "version": "2.0.0", | |
2059 | + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", | |
2060 | + "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", | |
2061 | + "dev": true, | |
2062 | + "requires": { | |
2063 | + "find-up": "2.1.0" | |
2008 | 2064 | } |
2009 | 2065 | } |
2010 | 2066 | } |
... | ... | @@ -2108,10 +2164,24 @@ |
2108 | 2164 | "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", |
2109 | 2165 | "dev": true |
2110 | 2166 | }, |
2167 | + "copy-concurrently": { | |
2168 | + "version": "1.0.5", | |
2169 | + "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", | |
2170 | + "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", | |
2171 | + "dev": true, | |
2172 | + "requires": { | |
2173 | + "aproba": "1.2.0", | |
2174 | + "fs-write-stream-atomic": "1.0.10", | |
2175 | + "iferr": "0.1.5", | |
2176 | + "mkdirp": "0.5.1", | |
2177 | + "rimraf": "2.6.1", | |
2178 | + "run-queue": "1.0.3" | |
2179 | + } | |
2180 | + }, | |
2111 | 2181 | "core-js": { |
2112 | - "version": "2.5.1", | |
2113 | - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz", | |
2114 | - "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=" | |
2182 | + "version": "2.5.3", | |
2183 | + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", | |
2184 | + "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=" | |
2115 | 2185 | }, |
2116 | 2186 | "core-util-is": { |
2117 | 2187 | "version": "1.0.2", |
... | ... | @@ -3699,6 +3769,12 @@ |
3699 | 3769 | "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=", |
3700 | 3770 | "dev": true |
3701 | 3771 | }, |
3772 | + "cyclist": { | |
3773 | + "version": "0.2.2", | |
3774 | + "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", | |
3775 | + "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", | |
3776 | + "dev": true | |
3777 | + }, | |
3702 | 3778 | "d": { |
3703 | 3779 | "version": "1.0.0", |
3704 | 3780 | "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", |
... | ... | @@ -4016,6 +4092,18 @@ |
4016 | 4092 | } |
4017 | 4093 | } |
4018 | 4094 | }, |
4095 | + "duplexify": { | |
4096 | + "version": "3.5.1", | |
4097 | + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz", | |
4098 | + "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==", | |
4099 | + "dev": true, | |
4100 | + "requires": { | |
4101 | + "end-of-stream": "1.4.0", | |
4102 | + "inherits": "2.0.3", | |
4103 | + "readable-stream": "2.3.3", | |
4104 | + "stream-shift": "1.0.0" | |
4105 | + } | |
4106 | + }, | |
4019 | 4107 | "ecc-jsbn": { |
4020 | 4108 | "version": "0.1.1", |
4021 | 4109 | "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", |
... | ... | @@ -4099,6 +4187,15 @@ |
4099 | 4187 | "iconv-lite": "0.4.15" |
4100 | 4188 | } |
4101 | 4189 | }, |
4190 | + "end-of-stream": { | |
4191 | + "version": "1.4.0", | |
4192 | + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz", | |
4193 | + "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=", | |
4194 | + "dev": true, | |
4195 | + "requires": { | |
4196 | + "once": "1.4.0" | |
4197 | + } | |
4198 | + }, | |
4102 | 4199 | "engine.io": { |
4103 | 4200 | "version": "1.8.3", |
4104 | 4201 | "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz", |
... | ... | @@ -5000,6 +5097,16 @@ |
5000 | 5097 | "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=", |
5001 | 5098 | "dev": true |
5002 | 5099 | }, |
5100 | + "flush-write-stream": { | |
5101 | + "version": "1.0.2", | |
5102 | + "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz", | |
5103 | + "integrity": "sha1-yBuQ2HRnZvGmCaRoCZRsRd2K5Bc=", | |
5104 | + "dev": true, | |
5105 | + "requires": { | |
5106 | + "inherits": "2.0.3", | |
5107 | + "readable-stream": "2.3.3" | |
5108 | + } | |
5109 | + }, | |
5003 | 5110 | "for-in": { |
5004 | 5111 | "version": "1.0.2", |
5005 | 5112 | "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", |
... | ... | @@ -5186,6 +5293,16 @@ |
5186 | 5293 | } |
5187 | 5294 | } |
5188 | 5295 | }, |
5296 | + "from2": { | |
5297 | + "version": "2.3.0", | |
5298 | + "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", | |
5299 | + "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", | |
5300 | + "dev": true, | |
5301 | + "requires": { | |
5302 | + "inherits": "2.0.3", | |
5303 | + "readable-stream": "2.3.3" | |
5304 | + } | |
5305 | + }, | |
5189 | 5306 | "fs-access": { |
5190 | 5307 | "version": "1.0.1", |
5191 | 5308 | "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", |
... | ... | @@ -5195,6 +5312,18 @@ |
5195 | 5312 | "null-check": "1.0.0" |
5196 | 5313 | } |
5197 | 5314 | }, |
5315 | + "fs-write-stream-atomic": { | |
5316 | + "version": "1.0.10", | |
5317 | + "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", | |
5318 | + "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", | |
5319 | + "dev": true, | |
5320 | + "requires": { | |
5321 | + "graceful-fs": "4.1.11", | |
5322 | + "iferr": "0.1.5", | |
5323 | + "imurmurhash": "0.1.4", | |
5324 | + "readable-stream": "2.3.3" | |
5325 | + } | |
5326 | + }, | |
5198 | 5327 | "fs.realpath": { |
5199 | 5328 | "version": "1.0.0", |
5200 | 5329 | "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", |
... | ... | @@ -10067,6 +10196,12 @@ |
10067 | 10196 | "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=", |
10068 | 10197 | "dev": true |
10069 | 10198 | }, |
10199 | + "iferr": { | |
10200 | + "version": "0.1.5", | |
10201 | + "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", | |
10202 | + "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=", | |
10203 | + "dev": true | |
10204 | + }, | |
10070 | 10205 | "ignore": { |
10071 | 10206 | "version": "3.3.3", |
10072 | 10207 | "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz", |
... | ... | @@ -10672,7 +10807,7 @@ |
10672 | 10807 | "colors": "1.1.2", |
10673 | 10808 | "combine-lists": "1.0.1", |
10674 | 10809 | "connect": "3.6.3", |
10675 | - "core-js": "2.5.1", | |
10810 | + "core-js": "2.5.3", | |
10676 | 10811 | "di": "0.0.1", |
10677 | 10812 | "dom-serialize": "2.2.1", |
10678 | 10813 | "expand-braces": "0.1.2", |
... | ... | @@ -11865,9 +12000,9 @@ |
11865 | 12000 | } |
11866 | 12001 | }, |
11867 | 12002 | "karma-webpack": { |
11868 | - "version": "2.0.6", | |
11869 | - "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-2.0.6.tgz", | |
11870 | - "integrity": "sha512-dcKvtiW00caWrceCKwIvlKwHQu8zI+e3zWZYDLk7kr7nl1lYSp8uP+8fQoBvRCnZiPUGuwU5Psm20NbEIn7KlA==", | |
12003 | + "version": "2.0.9", | |
12004 | + "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-2.0.9.tgz", | |
12005 | + "integrity": "sha512-F1j3IG/XhiMzcunAXbWXH95uizjzr3WdTzmVWlta8xqxcCtAu9FByCb4sccIMxaVFAefpgnUW9KlCo0oLvIX6A==", | |
11871 | 12006 | "dev": true, |
11872 | 12007 | "requires": { |
11873 | 12008 | "async": "0.9.2", |
... | ... | @@ -12344,6 +12479,23 @@ |
12344 | 12479 | "yallist": "2.1.2" |
12345 | 12480 | } |
12346 | 12481 | }, |
12482 | + "make-dir": { | |
12483 | + "version": "1.1.0", | |
12484 | + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz", | |
12485 | + "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==", | |
12486 | + "dev": true, | |
12487 | + "requires": { | |
12488 | + "pify": "3.0.0" | |
12489 | + }, | |
12490 | + "dependencies": { | |
12491 | + "pify": { | |
12492 | + "version": "3.0.0", | |
12493 | + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", | |
12494 | + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", | |
12495 | + "dev": true | |
12496 | + } | |
12497 | + } | |
12498 | + }, | |
12347 | 12499 | "makeerror": { |
12348 | 12500 | "version": "1.0.11", |
12349 | 12501 | "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz", |
... | ... | @@ -12583,6 +12735,24 @@ |
12583 | 12735 | "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", |
12584 | 12736 | "dev": true |
12585 | 12737 | }, |
12738 | + "mississippi": { | |
12739 | + "version": "1.3.0", | |
12740 | + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz", | |
12741 | + "integrity": "sha1-0gFYPrEjJ+PFwWQqQEqcrPlONPU=", | |
12742 | + "dev": true, | |
12743 | + "requires": { | |
12744 | + "concat-stream": "1.6.0", | |
12745 | + "duplexify": "3.5.1", | |
12746 | + "end-of-stream": "1.4.0", | |
12747 | + "flush-write-stream": "1.0.2", | |
12748 | + "from2": "2.3.0", | |
12749 | + "parallel-transform": "1.1.0", | |
12750 | + "pump": "1.0.3", | |
12751 | + "pumpify": "1.3.5", | |
12752 | + "stream-each": "1.2.2", | |
12753 | + "through2": "2.0.3" | |
12754 | + } | |
12755 | + }, | |
12586 | 12756 | "mkdirp": { |
12587 | 12757 | "version": "0.5.1", |
12588 | 12758 | "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", |
... | ... | @@ -12643,6 +12813,20 @@ |
12643 | 12813 | "integrity": "sha1-XceVaVZaENbv7VQ5SR5p0jkuWPE=", |
12644 | 12814 | "dev": true |
12645 | 12815 | }, |
12816 | + "move-concurrently": { | |
12817 | + "version": "1.0.1", | |
12818 | + "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", | |
12819 | + "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", | |
12820 | + "dev": true, | |
12821 | + "requires": { | |
12822 | + "aproba": "1.2.0", | |
12823 | + "copy-concurrently": "1.0.5", | |
12824 | + "fs-write-stream-atomic": "1.0.10", | |
12825 | + "mkdirp": "0.5.1", | |
12826 | + "rimraf": "2.6.1", | |
12827 | + "run-queue": "1.0.3" | |
12828 | + } | |
12829 | + }, | |
12646 | 12830 | "ms": { |
12647 | 12831 | "version": "2.0.0", |
12648 | 12832 | "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", |
... | ... | @@ -13060,6 +13244,17 @@ |
13060 | 13244 | "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", |
13061 | 13245 | "dev": true |
13062 | 13246 | }, |
13247 | + "parallel-transform": { | |
13248 | + "version": "1.1.0", | |
13249 | + "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", | |
13250 | + "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", | |
13251 | + "dev": true, | |
13252 | + "requires": { | |
13253 | + "cyclist": "0.2.2", | |
13254 | + "inherits": "2.0.3", | |
13255 | + "readable-stream": "2.3.3" | |
13256 | + } | |
13257 | + }, | |
13063 | 13258 | "param-case": { |
13064 | 13259 | "version": "2.1.1", |
13065 | 13260 | "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", |
... | ... | @@ -13391,6 +13586,12 @@ |
13391 | 13586 | "asap": "2.0.6" |
13392 | 13587 | } |
13393 | 13588 | }, |
13589 | + "promise-inflight": { | |
13590 | + "version": "1.0.1", | |
13591 | + "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", | |
13592 | + "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", | |
13593 | + "dev": true | |
13594 | + }, | |
13394 | 13595 | "promised-io": { |
13395 | 13596 | "version": "0.3.5", |
13396 | 13597 | "resolved": "https://registry.npmjs.org/promised-io/-/promised-io-0.3.5.tgz", |
... | ... | @@ -13448,6 +13649,27 @@ |
13448 | 13649 | "randombytes": "2.0.5" |
13449 | 13650 | } |
13450 | 13651 | }, |
13652 | + "pump": { | |
13653 | + "version": "1.0.3", | |
13654 | + "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz", | |
13655 | + "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==", | |
13656 | + "dev": true, | |
13657 | + "requires": { | |
13658 | + "end-of-stream": "1.4.0", | |
13659 | + "once": "1.4.0" | |
13660 | + } | |
13661 | + }, | |
13662 | + "pumpify": { | |
13663 | + "version": "1.3.5", | |
13664 | + "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz", | |
13665 | + "integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=", | |
13666 | + "dev": true, | |
13667 | + "requires": { | |
13668 | + "duplexify": "3.5.1", | |
13669 | + "inherits": "2.0.3", | |
13670 | + "pump": "1.0.3" | |
13671 | + } | |
13672 | + }, | |
13451 | 13673 | "punycode": { |
13452 | 13674 | "version": "1.4.1", |
13453 | 13675 | "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", |
... | ... | @@ -13938,6 +14160,15 @@ |
13938 | 14160 | "once": "1.4.0" |
13939 | 14161 | } |
13940 | 14162 | }, |
14163 | + "run-queue": { | |
14164 | + "version": "1.0.3", | |
14165 | + "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", | |
14166 | + "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", | |
14167 | + "dev": true, | |
14168 | + "requires": { | |
14169 | + "aproba": "1.2.0" | |
14170 | + } | |
14171 | + }, | |
13941 | 14172 | "rx-lite": { |
13942 | 14173 | "version": "3.1.2", |
13943 | 14174 | "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz", |
... | ... | @@ -14038,6 +14269,12 @@ |
14038 | 14269 | } |
14039 | 14270 | } |
14040 | 14271 | }, |
14272 | + "serialize-javascript": { | |
14273 | + "version": "1.4.0", | |
14274 | + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz", | |
14275 | + "integrity": "sha1-fJWFFNtqwkQ6irwGLcn3iGp/YAU=", | |
14276 | + "dev": true | |
14277 | + }, | |
14041 | 14278 | "serve-index": { |
14042 | 14279 | "version": "1.9.1", |
14043 | 14280 | "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", |
... | ... | @@ -14522,6 +14759,15 @@ |
14522 | 14759 | } |
14523 | 14760 | } |
14524 | 14761 | }, |
14762 | + "ssri": { | |
14763 | + "version": "5.0.0", | |
14764 | + "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.0.0.tgz", | |
14765 | + "integrity": "sha512-728D4yoQcQm1ooZvSbywLkV1RjfITZXh0oWrhM/lnsx3nAHx7LsRGJWB/YyvoceAYRq98xqbstiN4JBv1/wNHg==", | |
14766 | + "dev": true, | |
14767 | + "requires": { | |
14768 | + "safe-buffer": "5.1.1" | |
14769 | + } | |
14770 | + }, | |
14525 | 14771 | "stack-trace": { |
14526 | 14772 | "version": "0.0.10", |
14527 | 14773 | "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", |
... | ... | @@ -14544,6 +14790,16 @@ |
14544 | 14790 | "readable-stream": "2.3.3" |
14545 | 14791 | } |
14546 | 14792 | }, |
14793 | + "stream-each": { | |
14794 | + "version": "1.2.2", | |
14795 | + "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz", | |
14796 | + "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==", | |
14797 | + "dev": true, | |
14798 | + "requires": { | |
14799 | + "end-of-stream": "1.4.0", | |
14800 | + "stream-shift": "1.0.0" | |
14801 | + } | |
14802 | + }, | |
14547 | 14803 | "stream-http": { |
14548 | 14804 | "version": "2.7.2", |
14549 | 14805 | "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", |
... | ... | @@ -14557,6 +14813,12 @@ |
14557 | 14813 | "xtend": "4.0.1" |
14558 | 14814 | } |
14559 | 14815 | }, |
14816 | + "stream-shift": { | |
14817 | + "version": "1.0.0", | |
14818 | + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", | |
14819 | + "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", | |
14820 | + "dev": true | |
14821 | + }, | |
14560 | 14822 | "string-width": { |
14561 | 14823 | "version": "1.0.2", |
14562 | 14824 | "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", |
... | ... | @@ -14949,6 +15211,24 @@ |
14949 | 15211 | "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", |
14950 | 15212 | "dev": true |
14951 | 15213 | }, |
15214 | + "unique-filename": { | |
15215 | + "version": "1.1.0", | |
15216 | + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz", | |
15217 | + "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=", | |
15218 | + "dev": true, | |
15219 | + "requires": { | |
15220 | + "unique-slug": "2.0.0" | |
15221 | + } | |
15222 | + }, | |
15223 | + "unique-slug": { | |
15224 | + "version": "2.0.0", | |
15225 | + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz", | |
15226 | + "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=", | |
15227 | + "dev": true, | |
15228 | + "requires": { | |
15229 | + "imurmurhash": "0.1.4" | |
15230 | + } | |
15231 | + }, | |
14952 | 15232 | "unpipe": { |
14953 | 15233 | "version": "1.0.0", |
14954 | 15234 | "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", |
... | ... | @@ -15162,9 +15442,9 @@ |
15162 | 15442 | "dev": true |
15163 | 15443 | }, |
15164 | 15444 | "vue": { |
15165 | - "version": "2.5.9", | |
15166 | - "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.9.tgz", | |
15167 | - "integrity": "sha512-9B9XBpCtj8y5eJFrspIcKxIWt+lG9FMdF8qgyOlUeOIvcS4xSAvcARygbzHA6Pi0KWFj4BvxjtWbuPVWRx/wuA==", | |
15445 | + "version": "2.5.13", | |
15446 | + "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.13.tgz", | |
15447 | + "integrity": "sha512-3D+lY7HTkKbtswDM4BBHgqyq+qo8IAEE8lz8va1dz3LLmttjgo0FxairO4r1iN2OBqk8o1FyL4hvzzTFEdQSEw==", | |
15168 | 15448 | "dev": true |
15169 | 15449 | }, |
15170 | 15450 | "vue-hot-reload-api": { |
... | ... | @@ -15888,9 +16168,9 @@ |
15888 | 16168 | } |
15889 | 16169 | }, |
15890 | 16170 | "vue-template-compiler": { |
15891 | - "version": "2.5.9", | |
15892 | - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.9.tgz", | |
15893 | - "integrity": "sha512-Icev7QPuQ3flpOvxMe09irgXPklBi/VpiveUDs5nRVH5GA8R9asLBlahsA7AuRZQbaty0cGKm6kh/icDLcr93w==", | |
16171 | + "version": "2.5.13", | |
16172 | + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.13.tgz", | |
16173 | + "integrity": "sha512-15HWSgIxrGUcV0v7QRen2Y3fQsbgxXwMvjT/5XKMO0ANmaCcNh7y2OeIDTAuSGeosjb9+E1Pn2PHZ61VQWEgBQ==", | |
15894 | 16174 | "dev": true, |
15895 | 16175 | "requires": { |
15896 | 16176 | "de-indent": "1.0.2", |
... | ... | @@ -15933,14 +16213,14 @@ |
15933 | 16213 | } |
15934 | 16214 | }, |
15935 | 16215 | "webpack": { |
15936 | - "version": "3.8.1", | |
15937 | - "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.8.1.tgz", | |
15938 | - "integrity": "sha512-5ZXLWWsMqHKFr5y0N3Eo5IIisxeEeRAajNq4mELb/WELOR7srdbQk2N5XiyNy2A/AgvlR3AmeBCZJW8lHrolbw==", | |
16216 | + "version": "3.10.0", | |
16217 | + "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz", | |
16218 | + "integrity": "sha512-fxxKXoicjdXNUMY7LIdY89tkJJJ0m1Oo8PQutZ5rLgWbV5QVKI15Cn7+/IHnRTd3vfKfiwBx6SBqlorAuNA8LA==", | |
15939 | 16219 | "dev": true, |
15940 | 16220 | "requires": { |
15941 | 16221 | "acorn": "5.1.1", |
15942 | 16222 | "acorn-dynamic-import": "2.0.2", |
15943 | - "ajv": "5.5.0", | |
16223 | + "ajv": "5.5.2", | |
15944 | 16224 | "ajv-keywords": "2.1.1", |
15945 | 16225 | "async": "2.5.0", |
15946 | 16226 | "enhanced-resolve": "3.4.1", |
... | ... | @@ -15963,9 +16243,9 @@ |
15963 | 16243 | }, |
15964 | 16244 | "dependencies": { |
15965 | 16245 | "ajv": { |
15966 | - "version": "5.5.0", | |
15967 | - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.0.tgz", | |
15968 | - "integrity": "sha1-6yhAdG6dxIvV4GOjbj/UAMXqtak=", | |
16246 | + "version": "5.5.2", | |
16247 | + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", | |
16248 | + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", | |
15969 | 16249 | "dev": true, |
15970 | 16250 | "requires": { |
15971 | 16251 | "co": "4.6.0", |
... | ... | @@ -16120,9 +16400,9 @@ |
16120 | 16400 | } |
16121 | 16401 | }, |
16122 | 16402 | "webpack-dev-server": { |
16123 | - "version": "2.9.5", | |
16124 | - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.9.5.tgz", | |
16125 | - "integrity": "sha512-o0lS6enIxyOPiRJTh8vcgK5TsGNTn7lH1q/pNniAgs46mCE8sQYeqv7Y/oAIh/+u4kiBsFizLJo5EWC+ezz6FQ==", | |
16403 | + "version": "2.9.7", | |
16404 | + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.9.7.tgz", | |
16405 | + "integrity": "sha512-Pu7uoQFgQj5RE5wmlfkpYSzihMKxulwEuO2xCsaMnAnyRSApwoVi3B8WCm9XbigyWTHaIMzYGkB90Vr6leAeTQ==", | |
16126 | 16406 | "dev": true, |
16127 | 16407 | "requires": { |
16128 | 16408 | "ansi-html": "0.0.7", | ... | ... |
package.json
... | ... | @@ -40,8 +40,8 @@ |
40 | 40 | "url": "https://github.com/iview/iview/issues" |
41 | 41 | }, |
42 | 42 | "dependencies": { |
43 | - "async-validator": "^1.8.1", | |
44 | - "core-js": "^2.5.0", | |
43 | + "async-validator": "^1.8.2", | |
44 | + "core-js": "^2.5.3", | |
45 | 45 | "deepmerge": "^1.5.2", |
46 | 46 | "element-resize-detector": "^1.1.12", |
47 | 47 | "lodash.throttle": "^4.1.1", |
... | ... | @@ -61,7 +61,7 @@ |
61 | 61 | "babel-preset-stage-3": "^6.24.1", |
62 | 62 | "babel-runtime": "^6.26.0", |
63 | 63 | "chai": "^3.5.0", |
64 | - "compression-webpack-plugin": "^1.0.1", | |
64 | + "compression-webpack-plugin": "^1.1.3", | |
65 | 65 | "cross-env": "^3.2.4", |
66 | 66 | "css-loader": "^0.23.1", |
67 | 67 | "eslint": "^3.19.0", |
... | ... | @@ -83,7 +83,7 @@ |
83 | 83 | "karma-sinon-chai": "^1.3.3", |
84 | 84 | "karma-sourcemap-loader": "^0.3.7", |
85 | 85 | "karma-spec-reporter": "0.0.26", |
86 | - "karma-webpack": "^2.0.6", | |
86 | + "karma-webpack": "^2.0.9", | |
87 | 87 | "less": "^2.7.3", |
88 | 88 | "less-loader": "^2.2.3", |
89 | 89 | "lolex": "^1.5.2", |
... | ... | @@ -92,15 +92,15 @@ |
92 | 92 | "sinon-chai": "^2.14.0", |
93 | 93 | "style-loader": "^0.13.1", |
94 | 94 | "url-loader": "^0.5.9", |
95 | - "vue": "^2.5.9", | |
95 | + "vue": "^2.5.13", | |
96 | 96 | "vue-hot-reload-api": "^1.3.3", |
97 | 97 | "vue-html-loader": "^1.2.3", |
98 | 98 | "vue-loader": "^11.3.4", |
99 | 99 | "vue-router": "^2.8.1", |
100 | 100 | "vue-style-loader": "^1.0.0", |
101 | - "vue-template-compiler": "^2.5.9", | |
102 | - "webpack": "^3.8.1", | |
103 | - "webpack-dev-server": "^2.9.5", | |
101 | + "vue-template-compiler": "^2.5.13", | |
102 | + "webpack": "^3.10.0", | |
103 | + "webpack-dev-server": "^2.9.7", | |
104 | 104 | "webpack-merge": "^3.0.0" |
105 | 105 | }, |
106 | 106 | "engines": { | ... | ... |
src/components/modal/confirm.js