Merge branches 'feature/upload' and 'feature/upload' of git.yoho.cn:OPENTECH/yoh…
…o-node-ci into feature/upload
Showing
1 changed file
with
16 additions
and
41 deletions
@@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
17 | <div class="contentpanel"> | 17 | <div class="contentpanel"> |
18 | <div class="row"> | 18 | <div class="row"> |
19 | <div class="col-sm-12"> | 19 | <div class="col-sm-12"> |
20 | - <form class="form-horizontal" method='post' action='/files/upload' enctype="multipart/form-data"> | 20 | + <div class="form-horizontal"> |
21 | <div class="form-group col-sm-12"> | 21 | <div class="form-group col-sm-12"> |
22 | <label class="control-label col-sm-1">上传地址:</label> | 22 | <label class="control-label col-sm-1">上传地址:</label> |
23 | <div class="input-group col-sm-5"> | 23 | <div class="input-group col-sm-5"> |
@@ -28,7 +28,8 @@ | @@ -28,7 +28,8 @@ | ||
28 | <div class="form-group col-sm-12"> | 28 | <div class="form-group col-sm-12"> |
29 | <label class="control-label col-sm-1">上传文件:</label> | 29 | <label class="control-label col-sm-1">上传文件:</label> |
30 | <div class="input-group col-sm-3"> | 30 | <div class="input-group col-sm-3"> |
31 | - <input type="file" name="file" id="fileInput" class="btn btn-default btn-block"> | 31 | + <input type="file" accept="application/x-zip-compressed" name="file" id="fileInput" class="btn btn-default btn-block"> |
32 | + <p class="form-control-static">注:仅支持zip格式</p> | ||
32 | <button id="upload" class="btn btn-primary btn-block">上传</button> | 33 | <button id="upload" class="btn btn-primary btn-block">上传</button> |
33 | </div> | 34 | </div> |
34 | </div> | 35 | </div> |
@@ -37,51 +38,25 @@ | @@ -37,51 +38,25 @@ | ||
37 | <div class="input-group col-sm-11"> | 38 | <div class="input-group col-sm-11"> |
38 | <table class="table table-bordered table-hover"> | 39 | <table class="table table-bordered table-hover"> |
39 | <tr> | 40 | <tr> |
40 | - <th>文件名</th> | ||
41 | - <th>文件大小</th> | ||
42 | - <th>上传时间</th> | ||
43 | - <th>上传人</th> | 41 | + <th style="text-align:center;">文件路径</th> |
42 | + <th style="text-align:center;">文件大小</th> | ||
43 | + <th style="text-align:center;">文件格式</th> | ||
44 | + <th style="text-align:center;">上传时间</th> | ||
44 | </tr> | 45 | </tr> |
46 | + {{#if fileList}} | ||
47 | + {{#fileList.items}} | ||
45 | <tr> | 48 | <tr> |
46 | - <td>你懂的HD1080p.avi</td> | ||
47 | - <td>3.7G</td> | ||
48 | - <td>2017-10-19</td> | ||
49 | - <td>迪迦奥特曼</td> | ||
50 | - </tr> | ||
51 | - <tr> | ||
52 | - <td>你懂的HD1080p.avi</td> | ||
53 | - <td>3.7G</td> | ||
54 | - <td>2017-10-19</td> | ||
55 | - <td>迪迦奥特曼</td> | ||
56 | - </tr> | ||
57 | - <tr> | ||
58 | - <td>你懂的HD1080p.avi</td> | ||
59 | - <td>3.7G</td> | ||
60 | - <td>2017-10-19</td> | ||
61 | - <td>迪迦奥特曼</td> | ||
62 | - </tr> | ||
63 | - <tr> | ||
64 | - <td>你懂的HD1080p.avi</td> | ||
65 | - <td>3.7G</td> | ||
66 | - <td>2017-10-19</td> | ||
67 | - <td>迪迦奥特曼</td> | ||
68 | - </tr> | ||
69 | - <tr> | ||
70 | - <td>你懂的HD1080p.avi</td> | ||
71 | - <td>3.7G</td> | ||
72 | - <td>2017-10-19</td> | ||
73 | - <td>迪迦奥特曼</td> | ||
74 | - </tr> | ||
75 | - <tr> | ||
76 | - <td>你懂的HD1080p.avi</td> | ||
77 | - <td>3.7G</td> | ||
78 | - <td>2017-10-19</td> | ||
79 | - <td>迪迦奥特曼</td> | 49 | + <td>{{key}}</td> |
50 | + <td>{{fsize}}</td> | ||
51 | + <td>{{mimeType}}</td> | ||
52 | + <td>{{putTime}}</td> | ||
80 | </tr> | 53 | </tr> |
54 | + {{/fileList.items}} | ||
55 | + {{/if}} | ||
81 | </table> | 56 | </table> |
82 | </div> | 57 | </div> |
83 | </div> | 58 | </div> |
84 | - </form> | 59 | + </div> |
85 | </div> | 60 | </div> |
86 | </div> | 61 | </div> |
87 | </div> | 62 | </div> |
-
Please register or login to post a comment