diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index c22faef5..5a25bf7b 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -32,12 +32,14 @@ Vue.component('UserAvatar', UserAvatar);
import {
Avatar,
Tooltip,
+ Popover,
Dropdown,
DropdownMenu,
DropdownItem,
} from 'element-ui';
Vue.component('EAvatar', Avatar);
Vue.component('ETooltip', Tooltip);
+Vue.component('EPopover', Popover);
Vue.component('EDropdown', Dropdown);
Vue.component('EDropdownMenu', DropdownMenu);
Vue.component('EDropdownItem', DropdownItem);
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 29117342..78b2d22f 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -285,7 +285,16 @@
{{file.name}}
{{$A.bytesToSize(file.size)}}
-
+
+
+
{{$L('你确定要删除这个文件吗?')}}
+
+
+
+
+
+
+
@@ -1093,13 +1102,14 @@ export default {
});
},
- deleteFile(file_id) {
- this.$store.dispatch("forgetTaskFile", file_id)
+ deleteFile(file) {
+ this.$set(file, '_deling', false);
+ this.$store.dispatch("forgetTaskFile", file.id)
//
this.$store.dispatch("call", {
url: 'project/task/filedelete',
data: {
- file_id,
+ file_id: file.id,
},
}).catch(({msg}) => {
$A.modalError(msg);
diff --git a/resources/assets/sass/element.scss b/resources/assets/sass/element.scss
index a3af2877..deca265a 100644
--- a/resources/assets/sass/element.scss
+++ b/resources/assets/sass/element.scss
@@ -8,6 +8,7 @@ $--dropdown-menuItem-hover-color: #606266;
@import "~element-ui/packages/theme-chalk/src/common/transition";
@import "~element-ui/packages/theme-chalk/src/avatar";
@import "~element-ui/packages/theme-chalk/src/tooltip";
+@import "~element-ui/packages/theme-chalk/src/popover";
@import "~element-ui/packages/theme-chalk/src/dropdown";
@import "~element-ui/packages/theme-chalk/src/dropdown-menu";
@import "~element-ui/packages/theme-chalk/src/dropdown-item";
diff --git a/resources/assets/sass/pages/components/task-detail.scss b/resources/assets/sass/pages/components/task-detail.scss
index 092d50e7..83937d31 100644
--- a/resources/assets/sass/pages/components/task-detail.scss
+++ b/resources/assets/sass/pages/components/task-detail.scss
@@ -183,19 +183,26 @@
color: #bbbbbb;
}
.file-delete {
- display: none;
padding-left: 12px;
- font-size: 14px;
- cursor: pointer;
- color: #aaaaaa;
- transition: color 0.3s;
- &:hover {
- color: #ff0000;
+ .iconfont {
+ display: none;
+ font-size: 14px;
+ color: #aaaaaa;
+ transition: color 0.3s;
+ cursor: pointer;
+ &:hover {
+ color: #ff0000;
+ }
+ &.deling {
+ display: inline-block;
+ }
}
}
&:hover {
.file-delete {
- display: inline-block;
+ .iconfont {
+ display: inline-block;
+ }
}
}
}
@@ -277,7 +284,6 @@
.subtask-avatar {
height: 26px;
line-height: 26px;
- margin-top: -2px;
cursor: pointer;
}
.ivu-icon-ios-loading {
@@ -540,6 +546,17 @@
}
}
+.task-detail-delete-file-popover {
+ max-width: 200px;
+ .buttons {
+ text-align: right;
+ margin-top: 12px;
+ .ivu-btn-small {
+ font-size: 12px
+ }
+ }
+}
+
.task-detail-avatar-buttons {
margin-top: 12px;
margin-bottom: 4px;