github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-13 20:12:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix：1.修复任务详情英文不换行， 2.分享文件皮肤跟语言统一 ，3.聊天未读数修复

Browse Source
This commit is contained in:
weifashi 2023-08-21 20:42:45 +08:00
parent d64d06a70a
commit e928ff1fce
6 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@ -175,7 +175,7 @@ services:
okr: okr:
container_name: "dootask-okr-${APP_ID}" container_name: "dootask-okr-${APP_ID}"
image: "kuaifan/doookr:0.0.3" image: "kuaifan/doookr:0.0.4"
environment: environment:
TZ: "${TIMEZONE:-PRC}" TZ: "${TIMEZONE:-PRC}"
DOO_TASK_URL: "http://${APP_IPPR}.3" DOO_TASK_URL: "http://${APP_IPPR}.3"

8
resources/assets/js/app.js vendored
View File

@ -93,6 +93,14 @@ if (!isElectron && !isEEUiApp) {
ViewUI.LoadingBar._load = true; ViewUI.LoadingBar._load = true;
ViewUI.LoadingBar.start(); ViewUI.LoadingBar.start();
}, 300) }, 300)
if (to.query?.theme) {
store.dispatch("setTheme", to.query?.theme)
}
if (to.query?.lang && window.localStorage.getItem("__language:type__") != to.query?.lang) {
window.localStorage.setItem("__language:type__", to.query?.lang);
window.location.reload();
return false;
}
next(); next();
}); });
router.afterEach(() => { router.afterEach(() => {

1
resources/assets/js/components/TEditorTask.vue
View File

@ -34,6 +34,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.task-editor { .task-editor {
position: relative; position: relative;
word-break: break-all;
.task-editor-operate { .task-editor-operate {
position: absolute; position: absolute;
top: 0; top: 0;

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

@ -734,10 +734,18 @@
text = text.replace(atReg, `<span class="mention me" data-id="${userid}">`) text = text.replace(atReg, `<span class="mention me" data-id="${userid}">`)
// 处理内容连接 // 处理内容连接
if (/https*:\/\//.test(text)) { if (/https*:\/\//.test(text)) {
const match = $.apiUrl('').match(/^(?:https?:\/\/)?(?:[^@\n]+@)?(?:www\.)?([^:\/\n]+)/im);
const theme = window.localStorage.getItem("__theme:mode__")
const lang = window.localStorage.getItem("__language:type__")
text = text.split(/(<[^>]*>)/g).map(string => { text = text.split(/(<[^>]*>)/g).map(string => {
if (string && !/<[^>]*>/.test(string)) { if (string && !/<[^>]*>/.test(string)) {
string = string.replace(/(^|[^'"])((https*:\/\/)((\w|=|\?|\.|\/|&|-|:|\+|%|;|#|@|,|!)+))/g, "$1<a href=\"$2\" target=\"_blank\">$2</a>") string = string.replace(/(^|[^'"])((https*:\/\/)((\w|=|\?|\.|\/|&|-|:|\+|%|;|#|@|,|!)+))/g, "$1<a href=\"$2\" target=\"_blank\">$2</a>")
} }
if (match && match[1] && string.indexOf(match[1]) !== -1) {
if (string.indexOf("?") == -1) {
string = string.replace(/(href="[^"]*)/g, (string.indexOf("?") == -1 ? '$1?' : '$1&') + `theme=${theme}&lang=${lang}`);
}
}
return string; return string;
}).join("") }).join("")
} }

9
resources/assets/js/pages/manage/components/DialogWrapper.vue
View File

@ -963,12 +963,9 @@ export default {
return b.msg_id - a.msg_id return b.msg_id - a.msg_id
})[0] })[0]
if (this.allMsgs.findIndex(({id}) => id == item.msg_id) === -1) { if (this.allMsgs.findIndex(({id}) => id == item.msg_id) === -1) {
if (item.label === '{UNREAD}') { return Object.assign(item, {
return Object.assign(item, { 'label': this.$L(`未读消息${unread}条`)
'label': this.$L(`未读消息${unread}条`) })
})
}
return item
} }
return null return null
}, },

4
resources/assets/sass/pages/page-apply.scss vendored
View File

@ -349,8 +349,8 @@ body.window-portrait {
.apply-head{ .apply-head{
margin: 24px 24px 0 24px; margin: 24px 24px 0 24px;
} }
.apply-row{ .apply-content{
padding: 16px 24px; padding: 16px 20px;
} }
} }
} }