diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
index 785a1ce8..55df592a 100644
--- a/resources/assets/js/pages/manage/components/ProjectList.vue
+++ b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -364,6 +364,7 @@
{{$L('移除成员负责的任务将变成无负责人,')}}
{{$L('注意此操作不可逆!')}}
+
+ - {{$L('即将移除')}}:
+ -
+
+
+
+
@@ -482,6 +490,12 @@ export default {
this.projectDialogsubscribe = Store.subscribe('onProjectDialogBack', () => {
this.$store.dispatch('toggleTablePanel', 'chat');
});
+ //
+ document.addEventListener('keydown', this.shortcutAdd);
+ },
+
+ beforeDestroy () {
+ document.removeEventListener('keydown', this.shortcutAdd);
},
destroyed() {
@@ -508,6 +522,20 @@ export default {
...mapGetters(['projectData', 'tablePanel']),
+ userWaitRemove() {
+ const {userids, useridbak} = this.userData;
+ if (!userids) {
+ return [];
+ }
+ let wait = [];
+ useridbak.some(id => {
+ if (!userids.includes(id)) {
+ wait.push(id)
+ }
+ })
+ return wait;
+ },
+
msgUnread() {
const {dialogs, projectData} = this;
const dialog = dialogs.find(({id}) => id === projectData.dialog_id);
@@ -1082,7 +1110,9 @@ export default {
break;
case "user":
- this.$set(this.userData, 'userids', this.projectData.project_user.map(({userid}) => userid));
+ const userids = this.projectData.project_user.map(({userid}) => userid);
+ this.$set(this.userData, 'userids', userids);
+ this.$set(this.userData, 'useridbak', userids);
this.$set(this.userData, 'uncancelable', [this.projectData.owner_userid]);
this.userShow = true;
break;
@@ -1149,6 +1179,17 @@ export default {
this.completeJust = [];
},
+ shortcutAdd(e) {
+ if (this.projectId && this.projectId == this.$route.params.id) {
+ if (e.keyCode === 75 || e.keyCode === 78) {
+ if (e.metaKey || e.ctrlKey) {
+ e.preventDefault();
+ this.addTaskOpen(0);
+ }
+ }
+ }
+ },
+
formatTime(date) {
let time = Math.round($A.Date(date).getTime() / 1000),
string = '';
diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss
index e5bc755c..88a3c5eb 100644
--- a/resources/assets/sass/pages/components/project-list.scss
+++ b/resources/assets/sass/pages/components/project-list.scss
@@ -797,6 +797,19 @@
}
}
+.project-list-wait-remove {
+ margin-top: 6px;
+ > li {
+ display: flex;
+ align-items: center;
+ list-style: none;
+ line-height: 26px;
+ &:first-child {
+ font-weight: 600;
+ }
+ }
+}
+
@media (max-width: 768px) {
.project-list {
.project-head {