gitee/dootask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:kuaifan/dootask into develop

Browse Source 
# Conflicts:
#	public/js/app.js
#	public/js/build/657.js
#	public/js/build/782.js
#	public/js/build/845.js
This commit is contained in:
kuaifan 2022-01-22 14:18:32 +08:00
commit b6ff6f5453
14 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electron/package.json
View File

@ -1,6 +1,6 @@
{
"name": "DooTask",
"version": "0.6.78",
"version": "0.6.83",
"description": "DooTask is task management system.",
"main": "main.js",
"license": "MIT",

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "DooTask",
"version": "0.6.78",
"version": "0.6.83",
"description": "DooTask is task management system.",
"scripts": {
"start": "./cmd dev",

2
public/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/build/357.js vendored
View File

File diff suppressed because one or more lines are too long

4
public/js/build/357.js.LICENSE.txt
View File

@ -1,6 +1,6 @@
/*!
* TOAST UI Calendar
* @version 1.15.1 | Wed Dec 22 2021
* @version 1.15.1-5 | Sun Jan 09 2022
* @author NHN FE Development Lab <dl_javascript@nhn.com>
* @license MIT
*/
@ -304,7 +304,7 @@
/*! ./weekdayInMonth */
/*! @license DOMPurify 2.3.1 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.3.1/LICENSE */
/*! @license DOMPurify 2.3.4 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.3.4/LICENSE */
/*! dompurify */

2
public/js/build/782.js → public/js/build/407.js vendored
View File

File diff suppressed because one or more lines are too long

1
public/mix-manifest.json
View File

@ -1,6 +1,5 @@
{
"/js/app.js": "/js/app.js",
"/css/app.css": "/css/app.css",
"/.DS_Store": "/.DS_Store",
"/favicon.ico": "/favicon.ico"
}

9
resources/assets/js/functions/common.js vendored
View File

@ -511,6 +511,15 @@
return (ua.match(/MicroMessenger/i) + '' === 'micromessenger');
},
/**
* 是否Chrome
* @returns {boolean}
*/
isChrome() {
let ua = typeof window !== 'undefined' && window.navigator.userAgent.toLowerCase();
return (ua.match(/Chrome/i) + '' === 'chrome');
},
/**
* 获取对象
* @param obj

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

@ -662,6 +662,9 @@
},
enableDarkMode() {
if (!$A.isChrome()) {
return;
}
if (this.isDarkEnabled()) {
return
}

6
resources/assets/js/pages/manage.vue
View File

@ -180,7 +180,7 @@
v-model="workReportShow"
placement="right"
:size="1100">
<Report v-if="workReportShow" :reportType="reportTabs" :reportUnreadNumber="reportUnreadNumber" @read="getReportUnread" />
<Report v-if="workReportShow" :reportType="reportTabs" :reportUnreadNumber="reportUnreadNumber" @on-read="getReportUnread" />
</DrawerOverlay>
<!--查看所有团队-->
@ -514,6 +514,10 @@ export default {
},
setTheme(mode) {
if (!$A.isChrome()) {
$A.modalWarning("仅客户端或Chrome浏览器支持主题功能");
return;
}
switch (mode) {
case 'dark':
$A.dark.enableDarkMode()

15
resources/assets/js/pages/manage/components/Report.vue
View File

@ -2,10 +2,10 @@
<div class="report">
<Tabs v-model="reportTabs">
<TabPane :label="$L('我的汇报')" name="my">
<ReportMy ref="report" v-if="reportTabs === 'my'" @detail="showDetail" @edit="editReport"></ReportMy>
<ReportMy ref="report" v-if="reportTabs === 'my'" @on-view="onView" @on-edit="onEditReport"></ReportMy>
</TabPane>
<TabPane :label="tabRebder(reportUnreadNumber)" name="receive">
<ReportReceive v-if="reportTabs === 'receive'" @detail="showDetail"></ReportReceive>
<ReportReceive v-if="reportTabs === 'receive'" @on-view="onView"></ReportReceive>
</TabPane>
</Tabs>
<DrawerOverlay
@ -84,16 +84,13 @@ export default {
}
},
showDetail(row) {
onView(row) {
this.showDetailDrawer = true;
this.detailData = row;
//1.5秒后执行
setTimeout(() => {
this.$emit("read");
}, 1500);
this.$emit("on-read");
},
editReport(id) {
onEditReport(id) {
this.reportId = id;
this.showEditDrawer = true;
},
@ -102,7 +99,7 @@ export default {
this.reportId = 0;
this.reportTabs = "my";
this.showEditDrawer = false;
this.$refs.report.getLists();
this.$refs.report && this.$refs.report.getLists();
}
}
}

6
resources/assets/js/pages/manage/components/ReportMy.vue
View File

@ -126,7 +126,7 @@ export default {
style: {margin: '0 3px', cursor: 'pointer'},
on: {
click: () => {
this.$emit("edit", row.id);
this.$emit("on-edit", row.id);
}
}
})]),
@ -138,7 +138,7 @@ export default {
style: {margin: '0 3px', cursor: 'pointer'},
on: {
click: () => {
this.$emit("detail", row);
this.$emit("on-view", row);
}
}
})]),
@ -200,7 +200,7 @@ export default {
},
addReport() {
this.$emit("edit", 0);
this.$emit("on-edit", 0);
}
}
}

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

@ -157,7 +157,7 @@ export default {
style: {margin: '0 3px', cursor: 'pointer'},
on: {
click: () => {
this.$emit("detail", row)
this.$emit("on-view", row)
const myUser = row.receives_user.find(({userid}) => userid == this.userId)
if (myUser) {
this.$set(myUser.pivot, 'read', 1)

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

@ -104,7 +104,7 @@ const stateData = {
],
// 主题皮肤
themeMode: $A.getStorageString("cacheThemeMode", "auto"),
themeMode: $A.getStorageString("cacheThemeMode"),
themeList: [
{name: '跟随系统', value: 'auto'},
{name: '明亮', value: 'light'},
@ -134,6 +134,7 @@ switch (stateData.themeMode) {
$A.dark.disableDarkMode()
break;
default:
stateData.themeMode = "auto"
$A.dark.autoDarkMode()
break;
}