github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-11 18:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2024-12-04 13:24:48 +08:00
parent 506207d3ba
commit 1a0c1e3306
6 changed files with 68 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -71,7 +71,7 @@
"vue-resize-observer": "^2.0.16", "vue-resize-observer": "^2.0.16",
"vue-router": "^3.6.5", "vue-router": "^3.6.5",
"vue-template-compiler": "~2.6.14", "vue-template-compiler": "~2.6.14",
"vue-virtual-scroll-list-hi": "^2.3.5-12", "vue-virtual-scroll-list-hi": "^2.3.5-14",
"vuedraggable": "^2.24.3", "vuedraggable": "^2.24.3",
"vuex": "^3.6.2" "vuex": "^3.6.2"
}, },

24
resources/assets/js/pages/manage/components/ProjectPanel.vue
View File

@ -238,22 +238,28 @@
<Scrollbar v-else-if="tabTypeActive === 'table'" class="project-table" enable-x> <Scrollbar v-else-if="tabTypeActive === 'table'" class="project-table" enable-x>
<div class="project-table-head"> <div class="project-table-head">
<Row class="task-row"> <Row class="task-row">
<Col span="12"><span class="head-title"># {{$L('任务名称')}}</span></Col> <Col span="12">
<Col span="3"><span class="head-title">{{$L('列表')}}</span></Col> <div class="ellipsis"># {{$L('任务名称')}}</div>
</Col>
<Col span="3">
<div class="ellipsis">{{$L('列表')}}</div>
</Col>
<Col span="3"> <Col span="3">
<div class="sort" @click="onSort('level')"> <div class="sort" @click="onSort('level')">
<span class="head-title">{{$L('优先级')}}</span> <div class="head-title">{{$L('优先级')}}</div>
<div class="task-sort"> <div class="head-sort">
<Icon :class="{on:sortField=='level' && sortType=='asc'}" type="md-arrow-dropup" /> <Icon :class="{on:sortField=='level' && sortType=='asc'}" type="md-arrow-dropup" />
<Icon :class="{on:sortField=='level' && sortType=='desc'}" type="md-arrow-dropdown" /> <Icon :class="{on:sortField=='level' && sortType=='desc'}" type="md-arrow-dropdown" />
</div> </div>
</div> </div>
</Col> </Col>
<Col span="3">{{$L('负责人')}}</Col> <Col span="3">
<div class="ellipsis">{{$L('负责人')}}</div>
</Col>
<Col span="3"> <Col span="3">
<div class="sort" @click="onSort('end_at')"> <div class="sort" @click="onSort('end_at')">
<span class="head-title">{{$L('到期时间')}}</span> <div class="head-title">{{$L('到期时间')}}</div>
<div class="task-sort"> <div class="head-sort">
<Icon :class="{on:sortField=='end_at' && sortType=='asc'}" type="md-arrow-dropup" /> <Icon :class="{on:sortField=='end_at' && sortType=='asc'}" type="md-arrow-dropup" />
<Icon :class="{on:sortField=='end_at' && sortType=='desc'}" type="md-arrow-dropdown" /> <Icon :class="{on:sortField=='end_at' && sortType=='desc'}" type="md-arrow-dropdown" />
</div> </div>
@ -317,7 +323,9 @@
<Col span="3"></Col> <Col span="3"></Col>
<Col span="3"></Col> <Col span="3"></Col>
<Col span="3"></Col> <Col span="3"></Col>
<Col span="3">{{projectData.task_num > 0 && projectData.cacheParameter.showCompleted ? $L('完成时间') : ''}}</Col> <Col span="3">
<div class="ellipsis">{{projectData.task_num > 0 && projectData.cacheParameter.showCompleted ? $L('完成时间') : ''}}</div>
</Col>
</Row> </Row>
<TaskRow v-if="projectData.cacheParameter.showCompleted" :list="completedList" open-key="completed" @on-priority="addTaskOpen" showCompleteAt/> <TaskRow v-if="projectData.cacheParameter.showCompleted" :list="completedList" open-key="completed" @on-priority="addTaskOpen" showCompleteAt/>
</div> </div>

3
resources/assets/js/store/actions.js vendored
View File

@ -3092,6 +3092,9 @@ export default {
dispatch("saveDialogMsg", msg) dispatch("saveDialogMsg", msg)
}); });
} else if ($A.isJson(data)) { } else if ($A.isJson(data)) {
if (data.type == "notice") {
data.estimateSize = 42;
}
const index = state.dialogMsgs.findIndex(({id}) => id == data.id); const index = state.dialogMsgs.findIndex(({id}) => id == data.id);
if (index > -1) { if (index > -1) {
const original = state.dialogMsgs[index] const original = state.dialogMsgs[index]

6
resources/assets/sass/pages/common.scss vendored
View File

@ -1,6 +1,12 @@
body { body {
overflow: hidden; overflow: hidden;
.ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.form-tip { .form-tip {
color: $primary-desc-color; color: $primary-desc-color;
line-height: 22px; line-height: 22px;

5
resources/assets/sass/pages/components/dialog-wrapper.scss vendored
View File

@ -1191,6 +1191,11 @@
.content-template { .content-template {
color: $primary-title-color; color: $primary-title-color;
max-width: 100%; max-width: 100%;
padding: 0 2px;
min-height: 24px;
display: flex;
flex-direction: column;
justify-content: center;
.warning-color { .warning-color {
color: $flow-status-start-color; color: $flow-status-start-color;

70
resources/assets/sass/pages/components/project-panel.scss vendored
View File

@ -658,40 +658,44 @@
display: flex; display: flex;
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
} max-width: 100%;
.head-title{ .head-title {
white-space: nowrap; max-width: calc(100% - 14px);
}
.task-sort {
display: inline-block;
width: 14px;
height: 12px;
margin-top: -1px;
margin-left: 1px;
vertical-align: middle;
overflow: hidden;
cursor: pointer;
position: relative;
> i {
display: block;
height: 6px;
line-height: 6px;
overflow: hidden; overflow: hidden;
position: absolute; text-overflow: ellipsis;
color: #c5c8ce; white-space: nowrap;
transition: color .2s ease-in-out; }
font-size: 16px; .head-sort {
&.on { display: inline-block;
color: $primary-color width: 14px;
} height: 12px;
&:hover { margin-top: -1px;
color: inherit margin-left: 1px;
} vertical-align: middle;
&:first-child { overflow: hidden;
top: 0 cursor: pointer;
} position: relative;
&:last-child { > i {
bottom: 0 display: block;
height: 6px;
line-height: 6px;
overflow: hidden;
position: absolute;
color: #c5c8ce;
transition: color .2s ease-in-out;
font-size: 16px;
&.on {
color: $primary-color
}
&:hover {
color: inherit
}
&:first-child {
top: 0
}
&:last-child {
bottom: 0
}
} }
} }
} }