Commit ae02246a2eee2046fecf6057f8c8dc6876b685b0
1 parent
0f0e311e
fixed #4718
Showing
4 changed files
with
8 additions
and
13 deletions
Show diff stats
examples/routers/color-picker.vue
| 1 | <template> | 1 | <template> |
| 2 | - <div style="margin: 100px;"> | ||
| 3 | - {{ color1 }} | ||
| 4 | - <ColorPicker v-model="color1" /> | ||
| 5 | - <ColorPicker v-model="color2" :editable="false"/> | ||
| 6 | - </div> | 2 | + <ColorPicker v-model="color1" transfer /> |
| 7 | </template> | 3 | </template> |
| 8 | <script> | 4 | <script> |
| 9 | export default { | 5 | export default { |
| @@ -11,7 +7,7 @@ | @@ -11,7 +7,7 @@ | ||
| 11 | return { | 7 | return { |
| 12 | color1: '#19be6b', | 8 | color1: '#19be6b', |
| 13 | color2: '' | 9 | color2: '' |
| 14 | - }; | 10 | + } |
| 15 | } | 11 | } |
| 16 | - }; | 12 | + } |
| 17 | </script> | 13 | </script> |
package-lock.json
| 1 | { | 1 | { |
| 2 | "name": "iview", | 2 | "name": "iview", |
| 3 | - "version": "3.1.2", | 3 | + "version": "3.1.4", |
| 4 | "lockfileVersion": 1, | 4 | "lockfileVersion": 1, |
| 5 | "requires": true, | 5 | "requires": true, |
| 6 | "dependencies": { | 6 | "dependencies": { |
| @@ -13082,9 +13082,9 @@ | @@ -13082,9 +13082,9 @@ | ||
| 13082 | "optional": true | 13082 | "optional": true |
| 13083 | }, | 13083 | }, |
| 13084 | "v-click-outside-x": { | 13084 | "v-click-outside-x": { |
| 13085 | - "version": "3.0.0", | ||
| 13086 | - "resolved": "https://registry.npmjs.org/v-click-outside-x/-/v-click-outside-x-3.0.0.tgz", | ||
| 13087 | - "integrity": "sha512-VKm35tQ1tlZFXZc527v05sRXbyoQ8KKT1aeefZrcRCW+mPU4KuTiPy4pe1AH8Pibjzx80iU3pNJ4gNUFSXekUQ==" | 13085 | + "version": "3.5.0", |
| 13086 | + "resolved": "https://registry.npmjs.org/v-click-outside-x/-/v-click-outside-x-3.5.0.tgz", | ||
| 13087 | + "integrity": "sha512-JkF3uurCszLjuCTqyQEaWRTJleZf+3jrW8kTN5k4I3Rz/IwYgrCWCAugDBs3K71TX13tiSDBtJbnVmlnogc15A==" | ||
| 13088 | }, | 13088 | }, |
| 13089 | "v8flags": { | 13089 | "v8flags": { |
| 13090 | "version": "2.1.1", | 13090 | "version": "2.1.1", |
package.json
| @@ -50,7 +50,7 @@ | @@ -50,7 +50,7 @@ | ||
| 50 | "lodash.throttle": "^4.1.1", | 50 | "lodash.throttle": "^4.1.1", |
| 51 | "popper.js": "^1.14.1", | 51 | "popper.js": "^1.14.1", |
| 52 | "tinycolor2": "^1.4.1", | 52 | "tinycolor2": "^1.4.1", |
| 53 | - "v-click-outside-x": "^3.0.0" | 53 | + "v-click-outside-x": "^3.5.0" |
| 54 | }, | 54 | }, |
| 55 | "peerDependencies": { | 55 | "peerDependencies": { |
| 56 | "vue": "^2.5.2" | 56 | "vue": "^2.5.2" |
src/components/color-picker/color-picker.vue