mirror of
https://github.com/kuaifan/dootask.git
synced 2026-02-21 07:50:30 +00:00
no message
This commit is contained in:
kuaifan
parent
ba95f33592
commit
461546e914
@ -45,7 +45,7 @@
|
||||
"stylus-loader": "^6.2.0",
|
||||
"tinymce": "^5.10.3",
|
||||
"tui-calendar-hi": "^1.15.1-5",
|
||||
"view-design-hi": "^4.7.0-24",
|
||||
"view-design-hi": "^4.7.0-25",
|
||||
"vue": "^2.6.14",
|
||||
"vue-clipboard2": "^0.3.3",
|
||||
"vue-kityminder-ggg": "^1.3.10",
|
||||
|
||||
2
resources/assets/js/app.js
vendored
2
resources/assets/js/app.js
vendored
@ -50,7 +50,6 @@ import {
|
||||
Dropdown,
|
||||
DropdownMenu,
|
||||
DropdownItem,
|
||||
Progress,
|
||||
} from 'element-ui';
|
||||
|
||||
Vue.component('EAvatar', Avatar);
|
||||
@ -59,7 +58,6 @@ Vue.component('EPopover', Popover);
|
||||
Vue.component('EDropdown', Dropdown);
|
||||
Vue.component('EDropdownMenu', DropdownMenu);
|
||||
Vue.component('EDropdownItem', DropdownItem);
|
||||
Vue.component('EProgress', Progress);
|
||||
|
||||
const originalPush = VueRouter.prototype.push
|
||||
VueRouter.prototype.push = function push(location) {
|
||||
|
||||
5
resources/assets/js/functions/eeui.js
vendored
5
resources/assets/js/functions/eeui.js
vendored
@ -16,6 +16,11 @@
|
||||
requireModuleJs("eeui").alert(object, callback);
|
||||
},
|
||||
|
||||
eeuiAppToast(object) {
|
||||
if (!$A.isEEUiApp) return;
|
||||
requireModuleJs("eeui").toast(object);
|
||||
},
|
||||
|
||||
eeuiAppOpenPage(object, callback) {
|
||||
if (!$A.isEEUiApp) return;
|
||||
if (typeof callback !== "function") callback = _ => {};
|
||||
|
||||
@ -166,7 +166,7 @@ export default {
|
||||
style: {
|
||||
fontSize: '13px',
|
||||
cursor: 'pointer',
|
||||
color: '#8bcf70',
|
||||
color: '#84C56A',
|
||||
},
|
||||
on: {
|
||||
'on-ok': () => {
|
||||
|
||||
@ -33,13 +33,17 @@
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="item.task_num > 0" class="item-right" @click.stop="modalPercent(item)">
|
||||
<EProgress
|
||||
<iCircle
|
||||
type="circle"
|
||||
color="#8bcf70"
|
||||
:percentage="item.task_percent"
|
||||
:status="item.task_percent >= 100 ? 'success' : ''"
|
||||
:width="60"
|
||||
:stroke-width="5"/>
|
||||
trail-color="rgba(132, 197, 106, 0.2)"
|
||||
:trail-width="8"
|
||||
:stroke-color="item.task_percent === 100 ? 'rgba(132, 197, 106, 0)' : '#84C56A'"
|
||||
:stroke-width="8"
|
||||
:percent="item.task_percent"
|
||||
:size="56">
|
||||
<Icon v-if="item.task_percent === 100" type="ios-checkmark"></Icon>
|
||||
<span v-else class="percent-text">{{item.task_percent}}%</span>
|
||||
</iCircle>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
@ -184,7 +184,7 @@ export default {
|
||||
style: {
|
||||
fontSize: '13px',
|
||||
cursor: 'pointer',
|
||||
color: '#8bcf70',
|
||||
color: '#84C56A',
|
||||
},
|
||||
on: {
|
||||
'click': () => {
|
||||
@ -203,7 +203,7 @@ export default {
|
||||
marginLeft: '6px',
|
||||
fontSize: '13px',
|
||||
cursor: 'pointer',
|
||||
color: '#8bcf70',
|
||||
color: '#84C56A',
|
||||
},
|
||||
on: {
|
||||
'on-ok': () => {
|
||||
|
||||
@ -170,7 +170,7 @@ export default {
|
||||
style: {
|
||||
fontSize: '13px',
|
||||
cursor: 'pointer',
|
||||
color: '#8bcf70',
|
||||
color: '#84C56A',
|
||||
},
|
||||
on: {
|
||||
'on-ok': () => {
|
||||
|
||||
@ -73,7 +73,7 @@
|
||||
<p>{{$L('没有任何文件')}}</p>
|
||||
</div>
|
||||
<div v-else class="file-list" @contextmenu.prevent="handleRightClick">
|
||||
<ul class="clearfix">
|
||||
<ul>
|
||||
<li
|
||||
v-for="item in fileList"
|
||||
:class="{
|
||||
|
||||
@ -58,7 +58,7 @@ export default {
|
||||
'name': '',
|
||||
'priority': 1,
|
||||
'days': 1,
|
||||
'color': '#8bcf70',
|
||||
'color': '#84C56A',
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
1
resources/assets/sass/components/mobile.scss
vendored
1
resources/assets/sass/components/mobile.scss
vendored
@ -7,6 +7,7 @@
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
z-index: 99;
|
||||
user-select: none;
|
||||
|
||||
.tabbar-box {
|
||||
position: relative;
|
||||
|
||||
1
resources/assets/sass/element.scss
vendored
1
resources/assets/sass/element.scss
vendored
@ -14,7 +14,6 @@ $--dropdown-menuItem-hover-color: #606266;
|
||||
@import "~element-ui/packages/theme-chalk/src/dropdown-menu";
|
||||
@import "~element-ui/packages/theme-chalk/src/dropdown-item";
|
||||
@import "~element-ui/packages/theme-chalk/src/notification";
|
||||
@import "~element-ui/packages/theme-chalk/src/progress";
|
||||
|
||||
|
||||
.el-dropdown-menu__item {
|
||||
|
||||
@ -223,9 +223,10 @@
|
||||
.chat-emoji-box {
|
||||
width: 360px;
|
||||
height: 280px;
|
||||
display: grid;
|
||||
justify-content: space-between;
|
||||
grid-template-columns: repeat(auto-fill, 40px);
|
||||
padding: 8px;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
flex-wrap: wrap;
|
||||
overflow-x: hidden;
|
||||
word-break: break-all;
|
||||
@ -252,6 +253,7 @@
|
||||
}
|
||||
|
||||
&.emoticon {
|
||||
grid-template-columns: repeat(auto-fill, 72px);
|
||||
> li {
|
||||
width: 72px;
|
||||
height: 72px;
|
||||
@ -530,16 +532,20 @@
|
||||
background-color: #ffffff;
|
||||
.chat-emoji-box {
|
||||
height: 246px;
|
||||
grid-template-columns: repeat(auto-fill, 50px);
|
||||
> li {
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
line-height: 50px;
|
||||
font-size: 28px;
|
||||
}
|
||||
&.emoticon > li {
|
||||
width: 80px;
|
||||
height: 80px;
|
||||
padding: 8px;
|
||||
&.emoticon {
|
||||
grid-template-columns: repeat(auto-fill, 80px);
|
||||
> li {
|
||||
width: 80px;
|
||||
height: 80px;
|
||||
padding: 8px;
|
||||
}
|
||||
}
|
||||
}
|
||||
.chat-emoji-menu {
|
||||
|
||||
@ -54,6 +54,7 @@
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
background-color: #f8f8f8;
|
||||
user-select: none;
|
||||
> li {
|
||||
padding: 16px;
|
||||
margin: 16px;
|
||||
@ -136,17 +137,15 @@
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-left: 28px;
|
||||
.el-progress {
|
||||
&.is-success {
|
||||
opacity: 0.5;
|
||||
.el-icon-check {
|
||||
font-size: 28px;
|
||||
font-weight: 900;
|
||||
color: $primary-color;
|
||||
}
|
||||
.ivu-chart-circle {
|
||||
.ivu-icon {
|
||||
font-size: 40px;
|
||||
font-weight: 900;
|
||||
color: rgba($primary-color, 0.25);
|
||||
}
|
||||
.el-progress__text {
|
||||
font-size: 12px !important;
|
||||
.percent-text {
|
||||
color: $primary-color;
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -209,6 +209,7 @@
|
||||
}
|
||||
.calendar-box {
|
||||
padding: 0 24px 5px;
|
||||
user-select: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -302,6 +302,7 @@
|
||||
padding-bottom: 2px;
|
||||
.dashboard-ul {
|
||||
margin-bottom: 36px;
|
||||
user-select: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
13
resources/assets/sass/pages/page-file.scss
vendored
13
resources/assets/sass/pages/page-file.scss
vendored
@ -324,11 +324,12 @@
|
||||
margin-top: 16px;
|
||||
overflow: auto;
|
||||
> ul {
|
||||
margin-top: -12px;
|
||||
display: grid;
|
||||
justify-content: space-between;
|
||||
grid-template-columns: repeat(auto-fill, 100px);
|
||||
grid-gap: 12px;
|
||||
> li {
|
||||
list-style: none;
|
||||
float: left;
|
||||
margin: 12px;
|
||||
width: 100px;
|
||||
height: 110px;
|
||||
position: relative;
|
||||
@ -659,6 +660,12 @@
|
||||
margin: 0 24px 0;
|
||||
}
|
||||
.file-drag {
|
||||
.file-list {
|
||||
user-select: none;
|
||||
> ul {
|
||||
grid-gap: 4px;
|
||||
}
|
||||
}
|
||||
.file-table {
|
||||
margin: 16px 24px 24px;
|
||||
}
|
||||
|
||||
@ -453,6 +453,7 @@
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
> ul {
|
||||
user-select: none;
|
||||
&.dialog {
|
||||
> li {
|
||||
.dialog-split {
|
||||
|
||||
2
resources/assets/sass/var.scss
vendored
2
resources/assets/sass/var.scss
vendored
@ -1,4 +1,4 @@
|
||||
$primary-color: #8bcf70;
|
||||
$primary-color: #84C56A;
|
||||
$primary-title-color: #303133;
|
||||
$primary-text-color: #606266;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user