diff --git a/package.json b/package.json index 65e4450e..49b4fb2b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "DooTask", - "version": "0.2.13", + "version": "0.2.19", "description": "DooTask is task management system.", "scripts": { "dev": "npm run development", diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index f928df22..991ccb72 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -133,7 +133,7 @@ diff --git a/resources/assets/js/pages/manage/components/ProjectArchived.vue b/resources/assets/js/pages/manage/components/ProjectArchived.vue index 3b68fb07..1726f9bd 100644 --- a/resources/assets/js/pages/manage/components/ProjectArchived.vue +++ b/resources/assets/js/pages/manage/components/ProjectArchived.vue @@ -1,5 +1,20 @@ + + + + + {{$L("项目名")}} + + + + + + + {{$L('搜索')}} + + + { return h('UserAvatar', { props: { @@ -61,6 +82,19 @@ export default { }); } }, + { + title: this.$L('负责人'), + minWidth: 80, + render: (h, {row}) => { + return h('UserAvatar', { + props: { + showName: true, + size: 22, + userid: row.owner_userid, + } + }) + } + }, { title: this.$L('操作'), align: 'center', @@ -83,7 +117,17 @@ export default { this.recovery(params.row); } }, - }, this.$L('还原')); + }, [ + h('Button', { + props: { + type: 'primary', + size: 'small' + }, + style: { + fontSize: '12px', + }, + }, this.$L('还原')), + ]); return h('TableAction', { props: { column: params.column diff --git a/resources/assets/js/pages/manage/components/ProjectManagement.vue b/resources/assets/js/pages/manage/components/ProjectManagement.vue index 8ea82aa2..1db023a8 100644 --- a/resources/assets/js/pages/manage/components/ProjectManagement.vue +++ b/resources/assets/js/pages/manage/components/ProjectManagement.vue @@ -1,6 +1,6 @@ - + @@ -10,6 +10,18 @@ + + + {{$L("项目状态")}} + + + + {{$L('全部')}} + {{$L('未归档')}} + {{$L('已归档')}} + + + {{$L('搜索')}} @@ -125,13 +137,19 @@ export default { ] }, getLists() { + let archived = 'all'; + if (this.keys.status == 'archived') { + archived = 'yes'; + } else if (this.keys.status == 'unarchived') { + archived = 'no'; + } this.loadIng++; this.$store.dispatch("call", { url: 'project/lists', data: { keys: this.keys, all: 1, - archived: 'all', + archived, page: Math.max(this.page, 1), pagesize: Math.max($A.runNum(this.pageSize), 20), }, diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss index be9be6c3..ceb396c0 100755 --- a/resources/assets/sass/pages/common.scss +++ b/resources/assets/sass/pages/common.scss @@ -300,6 +300,14 @@ body { } } } + &.auto { + display: flex; + > ul { + > li:not(.search-button) { + min-width: 180px; + } + } + } } .icon-loading { diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss index 43d19be0..0b6ef022 100644 --- a/resources/assets/sass/pages/components/project-list.scss +++ b/resources/assets/sass/pages/components/project-list.scss @@ -644,6 +644,13 @@ white-space: nowrap; } } + &.row-priority { + .el-dropdown { + display: flex; + align-items: center; + overflow: hidden; + } + } &.row-user { padding: 8px; > ul {