Merge branch 'master-v32-xwx' into 'master'

杭州-文档管理-删除按钮恢复



See merge request !125

@@ -55,10 +55,10 @@
                             <i class="iconfont icon-icon--shangchuan"></i>
                             上传
                         </el-button>
-<!--                        <el-button type="danger" :size="$global.elementSize" @click="deleteDocument('','file')">-->
-<!--                            <i class="iconfont icon-shanchuwenjianjia"></i>-->
-<!--                            删除-->
-<!--                        </el-button>-->
+                        <el-button type="danger" :size="$global.elementSize" @click="deleteDocument('','file')"  v-if="isRecycle">
+                            <i class="iconfont icon-shanchuwenjianjia"></i>
+                            删除
+                        </el-button>
                         <el-button :size="$global.elementSize" @click="restore()" v-if="isRecycle">
                             <i class="iconfont icon-lunxun"></i>
                             还原