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 2025-08-01 08:23:35 +08:00
parent 20acbd0331
commit 02544d29fd
9 changed files with 61 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/assets/js/pages/manage/components/ProjectInvite.vue
View File

@ -9,7 +9,9 @@
</div>
<div v-else-if="project.id > 0" class="invite-content">
<p slot="title" class="invite-title" v-html="transformEmojiToHtml(project.name)"></p>
<div v-if="project.desc" class="invite-desc" :title="$L('项目介绍')">{{project.desc}}</div>
<div v-if="project.desc" class="invite-desc user-select-auto">
<VMPreviewNostyle :value="project.desc"/>
</div>
<div v-else>{{$L('暂无介绍')}}</div>
</div>
<div v-else>
@ -18,7 +20,7 @@
<div slot="footer" class="adaption">
<template v-if="already">
<Button v-if="project.id > 0" type="default" @click="show=false">{{$L('关闭')}}</Button>
<Button v-if="already" type="success" icon="ios-checkmark-circle-outline" @click="goProject">{{$L('已加入')}}</Button>
<Button v-if="already" type="success" icon="md-checkmark-circle-outline" @click="goProject">{{$L('已加入')}}</Button>
</template>
<template v-else-if="project.id > 0">
<Button v-if="project.id > 0" :disabled="joinLoad > 0" type="default" @click="show=false">{{$L('取消')}}</Button>
@ -59,9 +61,11 @@
<script>
import emitter from "../../../store/events";
import transformEmojiToHtml from "../../../utils/emoji";
import VMPreviewNostyle from "../../../components/VMEditor/nostyle.vue";
export default {
name: "ProjectInvite",
components: {VMPreviewNostyle},
data() {
return {
show: false,

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

@ -132,21 +132,25 @@
@command="dropColumn(column, $event)">
<Icon type="ios-more" />
<EDropdownMenu slot="dropdown" class="project-panel-more-dropdown-menu">
<EDropdownItem command="title">
<div class="item">
<Icon type="md-create" />{{$L('修改')}}
</div>
</EDropdownItem>
<EDropdownItem command="remove">
<div class="item">
<Icon type="md-trash" />{{$L('删除')}}
</div>
</EDropdownItem>
<EDropdownItem v-for="(c, k) in $store.state.columnColorList" :key="k" :divided="k==0" :command="c">
<div class="item">
<i class="taskfont" :style="{color:c.color||'#ddd'}" v-html="c.color == column.color ? '&#xe61d;' : '&#xe61c;'"></i>{{$L(c.name)}}
</div>
</EDropdownItem>
<li class="project-panel-more-dropdown-warp">
<ul>
<EDropdownItem command="title">
<div class="item">
<Icon type="md-create" />{{$L('修改')}}
</div>
</EDropdownItem>
<EDropdownItem command="remove">
<div class="item">
<Icon type="md-trash" />{{$L('删除')}}
</div>
</EDropdownItem>
<EDropdownItem v-for="(c, k) in $store.state.columnColorList" :key="k" :divided="k==0" :command="c">
<div class="item">
<i class="taskfont" :style="{color:c.color||'#ddd'}" v-html="c.color == column.color ? '&#xe61d;' : '&#xe61c;'"></i>{{$L(c.name)}}
</div>
</EDropdownItem>
</ul>
</li>
</EDropdownMenu>
</EDropdown>
<Icon class="last" type="md-add" @click="addTopShow(column.id, true)" />

2
resources/assets/js/pages/manage/components/TaskOperation.vue
View File

@ -45,7 +45,7 @@
<template v-if="operationShow">
<EDropdownItem command="send" :divided="turns.length > 0">
<div class="item">
<i class="taskfont movefont">&#xe606;</i>{{$L('发送')}}
<i class="taskfont movefont">&#xe629;</i>{{$L('发送')}}
</div>
</EDropdownItem>
<EDropdownItem command="archived">

14
resources/assets/js/pages/manage/projectInvite.vue
View File

@ -7,10 +7,12 @@
<div v-else class="invite-warp">
<Card v-if="project.id > 0">
<p slot="title" v-html="transformEmojiToHtml(project.name)"></p>
<div v-if="project.desc" class="invite-desc" :title="$L('项目介绍')">{{project.desc}}</div>
<div v-if="project.desc" class="invite-desc user-select-auto">
<VMPreviewNostyle :value="project.desc"/>
</div>
<div v-else>{{$L('暂无介绍')}}</div>
<div class="invite-footer">
<Button v-if="already" type="success" icon="ios-checkmark-circle-outline" @click="goProject">{{$L('已加入')}}</Button>
<Button v-if="already" type="success" icon="md-checkmark-circle-outline" @click="goProject">{{$L('已加入')}}</Button>
<Button v-else type="primary" :loading="joinLoad > 0" @click="joinProject">{{$L('加入项目')}}</Button>
</div>
</Card>
@ -27,7 +29,13 @@
align-items: center;
justify-content: center;
.invite-warp {
max-width: 90%;
.ivu-card {
border-radius: 8px;
}
.invite-desc {
min-width: 400px;
max-width: 460px;
max-height: 300px;
overflow: auto;
@ -48,8 +56,10 @@
<script>
import {mapState} from "vuex";
import transformEmojiToHtml from "../../utils/emoji";
import VMPreviewNostyle from "../../components/VMEditor/nostyle.vue";
export default {
components: {VMPreviewNostyle},
data() {
return {
loadIng: 0,

17
resources/assets/sass/components/user-select.scss vendored
View File

@ -236,7 +236,11 @@
display: flex;
flex-direction: column;
min-height: 300px;
max-height: calc(100vh - 280px);
max-height: calc(100vh - 410px);
@media (max-height: 900px) {
max-height: calc(100vh - 280px);
}
ul {
padding: 8px 24px;
@ -254,6 +258,17 @@
top: 0;
background-color: #ffffff;
z-index: 10;
&:before {
content: "";
position: absolute;
left: 0;
right: 0;
top: -2px;
height: 4px;
background-color: #ffffff;
pointer-events: none;
}
}
&.user-modal-project {

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

@ -953,12 +953,18 @@
position: relative
}
}
.project-panel-project-menu-dropdown {
max-height: calc(100vh - 120px);
overflow-y: auto;
}
.project-panel-more-dropdown-menu {
> li {
.project-panel-more-dropdown-warp {
min-height: 120px;
max-height: calc(100vh - 250px);
overflow-y: auto;
list-style: none;
.item {
display: flex;
align-items: center;

BIN
resources/assets/statics/public/css/fonts/taskfont/iconfont.ttf
View File

Binary file not shown.

BIN
resources/assets/statics/public/css/fonts/taskfont/iconfont.woff
View File

Binary file not shown.

BIN
resources/assets/statics/public/css/fonts/taskfont/iconfont.woff2
View File

Binary file not shown.