github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-04-04 19:50:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2022-05-17 18:27:20 +08:00
parent a4a7939eae
commit 94e4054cd4
7 changed files with 435 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/components/Mobile/Tabbar.vue
View File

@ -58,8 +58,8 @@ export default {
{icon: '', name: 'setting', label: '设置'},
],
[
{icon: '', name: 'addProject', label: '创建项目'},
{icon: '', name: 'addTask', label: '添加任务'},
{icon: '', name: 'addProject', label: '添加项目'},
]
],
};

6
resources/assets/js/functions/web.js vendored
View File

@ -549,6 +549,12 @@
setTimeout(() => { $A.modalWarning(config) }, millisecond);
return;
}
if (typeof config === "string" && config === "Network exception") {
return;
}
if ($A.isJson(config) && config.content === "Network exception") {
return;
}
$A.Modal.warning($A.modalConfig(config));
},

58
resources/assets/js/pages/login.vue
View File

@ -10,16 +10,62 @@
<div v-else class="login-subtitle">{{$L('输入您的凭证以访问您的帐户。')}}</div>
<div class="login-input">
<Input v-if="isSoftware && cacheServerUrl" :value="$A.getDomain(cacheServerUrl)" prefix="ios-globe-outline" size="large" readonly clearable @on-clear="clearServerUrl"/>
<Input
v-if="isSoftware && cacheServerUrl"
:value="$A.getDomain(cacheServerUrl)"
prefix="ios-globe-outline"
size="large"
readonly
clearable
@on-clear="clearServerUrl"/>
<Input v-model="email" prefix="ios-mail-outline" :placeholder="$L('输入您的电子邮件')" type="email" size="large" @on-enter="onLogin" @on-blur="onBlur" />
<Input
v-model="email"
prefix="ios-mail-outline"
:placeholder="$L('输入您的电子邮件')"
type="email"
size="large"
@on-enter="onLogin"
@on-blur="onBlur"
clearable/>
<Input v-model="password" prefix="ios-lock-outline" :placeholder="$L('输入您的密码')" type="password" size="large" @on-enter="onLogin" />
<Input
v-model="password"
prefix="ios-lock-outline"
:placeholder="$L('输入您的密码')"
type="password"
size="large"
@on-enter="onLogin"
clearable/>
<Input v-if="loginType=='reg'" v-model="password2" prefix="ios-lock-outline" :placeholder="$L('输入确认密码')" type="password" size="large" @on-enter="onLogin" />
<Input v-if="loginType=='reg' && needInvite" v-model="invite" class="login-code" :placeholder="$L('请输入注册邀请码')" type="text" size="large" @on-enter="onLogin"><span slot="prepend">&nbsp;{{$L('邀请码')}}&nbsp;</span></Input>
<Input
v-if="loginType=='reg'"
v-model="password2"
prefix="ios-lock-outline"
:placeholder="$L('输入确认密码')"
type="password"
size="large"
@on-enter="onLogin"
clearable/>
<Input
v-if="loginType=='reg' && needInvite"
v-model="invite"
class="login-code"
:placeholder="$L('请输入注册邀请码')"
type="text"
size="large"
@on-enter="onLogin"
clearable><span slot="prepend">&nbsp;{{$L('邀请码')}}&nbsp;</span></Input>
<Input v-if="loginType=='login' && codeNeed" v-model="code" class="login-code" :placeholder="$L('输入图形验证码')" type="text" size="large" @on-enter="onLogin">
<Input
v-if="loginType=='login' && codeNeed"
v-model="code"
class="login-code"
:placeholder="$L('输入图形验证码')"
type="text"
size="large"
@on-enter="onLogin"
clearable>
<Icon type="ios-checkmark-circle-outline" class="login-icon" slot="prepend"></Icon>
<div slot="append" class="login-code-end" @click="reCode"><img :src="codeUrl"/></div>
</Input>

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

@ -1,7 +1,6 @@
<template>
<div class="project-panel" :class="[tabTypeActive]">
<PageTitle :title="projectData.name"/>
<div class="project-head">
<div class="project-titbox">
<div class="project-title">
<div class="project-back" @click="goBack">
@ -74,7 +73,7 @@
</li>
</ul>
</div>
<div class="project-subbox clearfix">
<div class="project-subbox">
<div class="project-subtitle" @click="showDesc">{{projectData.desc}}</div>
<div class="project-switch">
<div v-if="completedCount > 0" class="project-checkbox">
@ -93,7 +92,6 @@
</div>
</div>
</div>
</div>
<div v-if="tabTypeActive === 'column'" class="project-column">
<Draggable
:list="columnList"

2
resources/assets/sass/dark.scss vendored
View File

@ -96,7 +96,6 @@ body.dark-mode-reverse {
}
.project-panel {
.project-head {
.project-titbox {
.project-title {
.top-text {
@ -113,7 +112,6 @@ body.dark-mode-reverse {
}
}
}
}
.project-column {
> ul {
> li {

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

@ -1,20 +1,14 @@
.project-panel {
display: flex;
flex-direction: column;
.project-head {
display: flex;
flex-direction: column;
align-items: flex-start;
margin: 32px 32px 0;
.project-titbox {
width: 100%;
display: flex;
align-items: flex-start;
justify-content: space-between;
margin-bottom: 20px;
padding: 32px 32px 4px;
.project-title {
float: left;
display: flex;
align-items: center;
margin-bottom: 8px;
.project-back {
display: none;
}
@ -46,10 +40,11 @@
}
}
.project-icons {
float: right;
display: flex;
align-items: center;
flex-shrink: 0;
margin-top: 3px;
margin-bottom: 8px;
> li {
list-style: none;
display: flex;
@ -138,11 +133,12 @@
}
.project-subbox {
width: 100%;
padding: 0 32px;
.project-subtitle {
float: left;
color: #999999;
line-height: 24px;
padding: 6px 0;
margin: 6px 0;
}
.project-switch {
float: right;
@ -243,7 +239,6 @@
}
}
}
}
.project-column {
display: flex;
height: 100%;
@ -1026,14 +1021,14 @@
@media (max-width: 768px) {
.project-panel {
.project-head {
margin: 12px 16px 0;
.project-titbox {
display: block;
margin-bottom: 16px;
position: sticky;
top: 0;
z-index: 2;
background-color: #fafafa;
padding: 12px 16px 4px;
.project-title {
float: left;
padding-bottom: 8px;
.project-back {
display: flex;
align-items: center;
@ -1056,9 +1051,8 @@
}
}
.project-subbox {
display: block;
padding: 0 16px;
.project-subtitle {
margin-bottom: 6px;
word-break: break-all;
text-overflow: ellipsis;
overflow: hidden;
@ -1071,7 +1065,6 @@
justify-content: flex-end;
}
}
}
.project-column {
&::-webkit-scrollbar {
display: none;

34
resources/assets/sass/pages/page-login.scss vendored
View File

@ -63,12 +63,19 @@
.login-code {
.ivu-input-group-prepend,
.ivu-input-group-append {
font-size: 14px;
font-size: 16px;
background: transparent;
border-color: #f1f1f1;
> span {
font-size: 14px;
}
}
.ivu-input-group-prepend {
padding-right: 0;
}
.ivu-input {
border-left-color: transparent;
box-shadow: none;
}
.login-code-end {
margin: -6px -7px;
@ -187,11 +194,32 @@
width: 44px;
}
.ivu-input-wrapper-large .ivu-input-prefix i,
.ivu-input-wrapper-large .ivu-input-suffix i {
.ivu-input-wrapper-large {
.ivu-input-prefix i,
.ivu-input-suffix i {
font-size: 20px;
line-height: 44px;
}
.ivu-input-icon {
height: 44px;
line-height: 44px;
}
}
.login-code {
.ivu-input-group-prepend,
.ivu-input-group-append {
font-size: 18px;
background: #ffffff;
.login-code-end {
height: 42px;
}
}
.ivu-input-group-prepend {
padding-left: 12px;
padding-right: 2px;
}
}
}
}