github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1020 from QingWei-Li/upload/add-progress 

Upload: fix missing progress, fixed #1013
pull/1026/head
杨奕 2016-11-13 09:53:25 +08:00 committed by GitHub
parent 58dc7e14c0 192a1a2a30
commit 30d606692d
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/upload/src/cover.vue
View File

@ -33,10 +33,13 @@
</template> </template>
<script> <script>
import Locale from 'element-ui/src/mixins/locale'; import Locale from 'element-ui/src/mixins/locale';
import ElProgress from 'element-ui/packages/progress';
export default { export default {
mixins: [Locale], mixins: [Locale],
components: { ElProgress },
props: { props: {
image: {}, image: {},
onPreview: { onPreview: {

4
packages/upload/src/upload-list.vue
View File

@ -24,9 +24,13 @@
</template> </template>
<script> <script>
import Locale from 'element-ui/src/mixins/locale'; import Locale from 'element-ui/src/mixins/locale';
import ElProgress from 'element-ui/packages/progress';
export default { export default {
mixins: [Locale], mixins: [Locale],
components: { ElProgress },
props: { props: {
files: { files: {
type: Array, type: Array,