From 8104c26b195d5ce83a2a5e2379aa576597d55fd5 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 2 Mar 2022 07:48:29 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=AE=80=E4=BB=8B=E5=87=BA=E7=8E=B0&quot;=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Module/Base.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/Module/Base.php b/app/Module/Base.php
index e6e3bd40d..ce48c18f6 100755
--- a/app/Module/Base.php
+++ b/app/Module/Base.php
@@ -342,19 +342,15 @@ class Base
     {
         if (strtolower($charset) == 'utf-8') {
             if (Base::getStrlen($string) <= $length) return $string;
-            $strcut = str_replace(array('&amp;', '&quot;', '&lt;', '&gt;'), array('&', '"', '<', '>'), $string);
-            $strcut = Base::utf8Substr($strcut, $length, $start);
-            $strcut = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $strcut);
+            $strcut = Base::utf8Substr($string, $length, $start);
             return $strcut . $dot;
         } else {
             $length = $length * 2;
             if (strlen($string) <= $length) return $string;
-            $string = str_replace(array('&amp;', '&quot;', '&lt;', '&gt;'), array('&', '"', '<', '>'), $string);
             $strcut = '';
             for ($i = 0; $i < $length; $i++) {
                 $strcut .= ord($string[$i]) > 127 ? $string[$i] . $string[++$i] : $string[$i];
             }
-            $strcut = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $strcut);
         }
         return $strcut . $dot;
     }

From 0a2a903c746ce892e5b467b40199e52fd51e4633 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 2 Mar 2022 07:59:53 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E8=AE=BE=E7=BD=AE=E4=B8=8B=E6=8B=89=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=85=A8=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/login.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue
index bcc5269fe..532f12285 100644
--- a/resources/assets/js/pages/login.vue
+++ b/resources/assets/js/pages/login.vue
@@ -37,7 +37,7 @@
                         <i class="taskfont">&#xe689;</i>
                     </div>
                     <Dropdown-menu slot="list" class="login-setting-menu">
-                        <Dropdown placement="right-start" @on-click="setTheme">
+                        <Dropdown placement="right" @on-click="setTheme">
                             <DropdownItem>
                                 <div class="login-setting-item">
                                     {{$L('主题皮肤')}}
@@ -48,7 +48,7 @@
                                 <Dropdown-item v-for="(item, key) in themeList" :key="key" :name="item.value" :selected="themeMode === item.value">{{$L(item.name)}}</Dropdown-item>
                             </DropdownMenu>
                         </Dropdown>
-                        <Dropdown placement="right-start" @on-click="setLanguage">
+                        <Dropdown placement="right" @on-click="setLanguage">
                             <DropdownItem divided>
                                 <div class="login-setting-item">
                                     {{currentLanguage}}

From e7196efaea41fa89c1dca37c9a96f7a43a5ebcbb Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 2 Mar 2022 08:17:30 +0800
Subject: [PATCH 3/5] =?UTF-8?q?pref:=20=E4=BC=98=E5=8C=96=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=AF=A6=E7=BB=86=E6=8F=8F=E8=BF=B0=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/components/TEditor.vue              | 2 +-
 resources/assets/sass/pages/components/task-add.scss    | 7 +++++++
 resources/assets/sass/pages/components/task-detail.scss | 7 +++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/components/TEditor.vue b/resources/assets/js/components/TEditor.vue
index ea15756e2..95549f22d 100755
--- a/resources/assets/js/components/TEditor.vue
+++ b/resources/assets/js/components/TEditor.vue
@@ -2,7 +2,7 @@
     <div class="teditor-wrapper">
         <div class="teditor-box" :class="[!inline && spinShow ? 'teditor-loadstyle' : 'teditor-loadedstyle']">
             <template v-if="inline">
-                <div ref="myTextarea" :id="id" v-html="content"></div>
+                <div ref="myTextarea" :id="id" v-html="spinShow ? '' : content"></div>
                 <Icon v-if="spinShow" type="ios-loading" :size="18" class="icon-loading icon-inline"></Icon>
             </template>
             <template v-else>
diff --git a/resources/assets/sass/pages/components/task-add.scss b/resources/assets/sass/pages/components/task-add.scss
index 3f9a832d0..47ee7d82d 100644
--- a/resources/assets/sass/pages/components/task-add.scss
+++ b/resources/assets/sass/pages/components/task-add.scss
@@ -77,6 +77,13 @@
                 img {
                     max-width: 100%;
                 }
+                pre {
+                    padding: 14px;
+                    margin: 7px 0;
+                    overflow: auto;
+                    background: #f5f2f0;
+                    border-radius: 5px;
+                }
                 &[data-mce-placeholder]:not(.mce-visualblocks)::before {
                     color: #bbbbbb;
                 }
diff --git a/resources/assets/sass/pages/components/task-detail.scss b/resources/assets/sass/pages/components/task-detail.scss
index 17041c8dd..ccb9314db 100644
--- a/resources/assets/sass/pages/components/task-detail.scss
+++ b/resources/assets/sass/pages/components/task-detail.scss
@@ -163,6 +163,13 @@
                     img {
                         max-width: 100%;
                     }
+                    pre {
+                        padding: 14px;
+                        margin: 7px 0;
+                        overflow: auto;
+                        background: #f5f2f0;
+                        border-radius: 5px;
+                    }
                     &[data-mce-placeholder]:not(.mce-visualblocks)::before {
                         color: #bbbbbb;
                     }

From a7d9e635eb2cf9a834078a0ca550b5b973ebd99e Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 2 Mar 2022 08:19:09 +0800
Subject: [PATCH 4/5] =?UTF-8?q?pref:=20=E9=BC=A0=E6=A0=87=E6=BB=91?=
 =?UTF-8?q?=E5=8A=A8=E8=87=B3=E4=BB=AA=E8=A1=A8=E7=9B=98=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E5=BE=85=E5=AE=8C=E6=88=90=E4=BB=BB=E5=8A=A1=E5=8D=A1=E7=89=87?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=8D=A1=E7=89=87=E5=91=A8=E5=9B=B4=E6=9C=AA?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=85=89=E6=99=95=EF=BC=8C=E4=B8=94=E6=9C=AA?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=E6=89=8B=E6=8C=87=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/sass/pages/page-dashboard.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/resources/assets/sass/pages/page-dashboard.scss b/resources/assets/sass/pages/page-dashboard.scss
index 18be428e5..9a99c37b8 100644
--- a/resources/assets/sass/pages/page-dashboard.scss
+++ b/resources/assets/sass/pages/page-dashboard.scss
@@ -51,8 +51,6 @@
                 &:last-child {
                     background-color: #98de6e;
                     margin-right: 0;
-                    cursor: default;
-                    box-shadow: none;
                 }
                 .block-title {
                     color: rgba(255, 255, 255, 0.6);

From d027d67e08ada9330f74585d70044e5a26901c86 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 2 Mar 2022 08:25:38 +0800
Subject: [PATCH 5/5] =?UTF-8?q?pref:=20=E5=80=92=E8=AE=A1=E6=97=B6?=
 =?UTF-8?q?=E5=88=9A=E5=88=B0=E5=88=B0=E8=BE=BE0=E6=97=B6=E4=BC=9A?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=87=AA=E5=AE=9A=E4=B9=89=E6=89=8D=E7=BB=A7?=
 =?UTF-8?q?=E7=BB=AD=E6=98=BE=E7=A4=BA=E8=AE=A1=E6=97=B6=EF=BC=8C=E4=B8=94?=
 =?UTF-8?q?=E6=9C=AA=E6=98=BE=E7=A4=BA=E8=B6=85=E6=97=B6=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/functions/web.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/functions/web.js b/resources/assets/js/functions/web.js
index c4dbc5b69..ae01631c3 100755
--- a/resources/assets/js/functions/web.js
+++ b/resources/assets/js/functions/web.js
@@ -157,8 +157,10 @@
             let time = Math.round(this.Date(date).getTime() / 1000) - nowTime;
             if (time < 86400 * 7 && time > 0 ) {
                 return this.formatSeconds(time);
-            } else if (time <= 0) {
+            } else if (time < 0) {
                 return '-' + this.formatSeconds(time * -1);
+            } else if (time == 0) {
+                return 0;
             }
             return this.formatTime(date)
         },