From e928ff1fce87a1db80cdf3512e3886011425f55f Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Mon, 21 Aug 2023 20:42:45 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A1.=E4=BF=AE=E5=A4=8D=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=AF=A6=E6=83=85=E8=8B=B1=E6=96=87=E4=B8=8D=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C=EF=BC=8C=202.=E5=88=86=E4=BA=AB=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=AE=E8=82=A4=E8=B7=9F=E8=AF=AD=E8=A8=80=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=20=EF=BC=8C3.=E8=81=8A=E5=A4=A9=E6=9C=AA=E8=AF=BB=E6=95=B0?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                                       | 2 +-
 resources/assets/js/app.js                               | 8 ++++++++
 resources/assets/js/components/TEditorTask.vue           | 1 +
 resources/assets/js/functions/web.js                     | 8 ++++++++
 .../assets/js/pages/manage/components/DialogWrapper.vue  | 9 +++------
 resources/assets/sass/pages/page-apply.scss              | 4 ++--
 6 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5359c52e7..cab1b32fe 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -175,7 +175,7 @@ services:
   
   okr:
     container_name: "dootask-okr-${APP_ID}"
-    image: "kuaifan/doookr:0.0.3"
+    image: "kuaifan/doookr:0.0.4"
     environment:
       TZ: "${TIMEZONE:-PRC}"
       DOO_TASK_URL: "http://${APP_IPPR}.3"
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index cb2045cf3..3d31862bd 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -93,6 +93,14 @@ if (!isElectron && !isEEUiApp) {
             ViewUI.LoadingBar._load = true;
             ViewUI.LoadingBar.start();
         }, 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();
     });
     router.afterEach(() => {
diff --git a/resources/assets/js/components/TEditorTask.vue b/resources/assets/js/components/TEditorTask.vue
index ce20ed4a3..8387bb73b 100755
--- a/resources/assets/js/components/TEditorTask.vue
+++ b/resources/assets/js/components/TEditorTask.vue
@@ -34,6 +34,7 @@
 <style lang="scss" scoped>
 .task-editor {
     position: relative;
+    word-break: break-all;
     .task-editor-operate {
         position: absolute;
         top: 0;
diff --git a/resources/assets/js/functions/web.js b/resources/assets/js/functions/web.js
index 5203c905a..4a7802dc2 100755
--- a/resources/assets/js/functions/web.js
+++ b/resources/assets/js/functions/web.js
@@ -734,10 +734,18 @@
             text = text.replace(atReg, `<span class="mention me" data-id="${userid}">`)
             // 处理内容连接
             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 => {
                     if (string && !/<[^>]*>/.test(string)) {
                         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;
                 }).join("")
             }
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index d342959c8..8e9ee2cd2 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -963,12 +963,9 @@ export default {
                 return b.msg_id - a.msg_id
             })[0]
             if (this.allMsgs.findIndex(({id}) => id == item.msg_id) === -1) {
-                if (item.label === '{UNREAD}') {
-                    return Object.assign(item, {
-                        'label': this.$L(`未读消息${unread}条`)
-                    })
-                }
-                return item
+                return Object.assign(item, {
+                    'label': this.$L(`未读消息${unread}条`)
+                })
             }
             return null
         },
diff --git a/resources/assets/sass/pages/page-apply.scss b/resources/assets/sass/pages/page-apply.scss
index 92d866c7f..c57989b02 100644
--- a/resources/assets/sass/pages/page-apply.scss
+++ b/resources/assets/sass/pages/page-apply.scss
@@ -349,8 +349,8 @@ body.window-portrait {
         .apply-head{
             margin: 24px 24px 0 24px;
         }
-        .apply-row{
-            padding: 16px 24px;
+        .apply-content{
+            padding: 16px 20px;
         }
     }
 }
\ No newline at end of file