From 3d783c59c27c18078a9eb7ce2e2626aa83b5ba1c Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 2 Aug 2023 15:53:44 +0800
Subject: [PATCH] no message

---
 resources/assets/js/app.js                    | 12 ++---
 resources/assets/js/components/PageTitle.vue  |  2 -
 .../manage/components/DialogMarkdown.vue      | 40 +----------------
 .../pages/manage/components/DialogModal.vue   |  4 +-
 .../pages/manage/components/DialogWrapper.vue |  4 +-
 .../pages/manage/components/ProjectPanel.vue  |  4 +-
 .../assets/js/pages/manage/messenger.vue      |  8 +++-
 resources/assets/js/store/markdown.js         | 45 +++++++++++++++++++
 resources/assets/js/store/utils.js            | 13 +++---
 resources/mobile                              |  2 +-
 10 files changed, 75 insertions(+), 59 deletions(-)
 create mode 100644 resources/assets/js/store/markdown.js

diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index 96cc0a870..96c466629 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -20,17 +20,17 @@ import mixin from "./store/mixin"
 import "../sass/app.scss";
 
 Vue.use(Vuex);
-Vue.use(ViewUI, {
-    modal: {
-        checkEscClose: true
-    }
-});
+Vue.use(VueRouter);
 Vue.use(VueClipboard, {
     config: {
         autoSetContainer: true
     }
 });
-Vue.use(VueRouter);
+Vue.use(ViewUI, {
+    modal: {
+        checkEscClose: true
+    }
+});
 
 import PageTitle from './components/PageTitle.vue'
 import Loading from './components/Loading.vue'
diff --git a/resources/assets/js/components/PageTitle.vue b/resources/assets/js/components/PageTitle.vue
index dfe6e3276..b86aed61e 100755
--- a/resources/assets/js/components/PageTitle.vue
+++ b/resources/assets/js/components/PageTitle.vue
@@ -3,8 +3,6 @@
 </template>
 
 <script>
-import {mapState} from "vuex";
-
 export default {
     name: 'PageTitle',
     props: {
diff --git a/resources/assets/js/pages/manage/components/DialogMarkdown.vue b/resources/assets/js/pages/manage/components/DialogMarkdown.vue
index 5f63d022f..891336296 100644
--- a/resources/assets/js/pages/manage/components/DialogMarkdown.vue
+++ b/resources/assets/js/pages/manage/components/DialogMarkdown.vue
@@ -4,10 +4,7 @@
 
 <script>
 import '../../../../sass/pages/components/dialog-markdown/markdown.less'
-import MarkdownIt from 'markdown-it'
-import mdKatex from '@traptitech/markdown-it-katex'
-import mila from 'markdown-it-link-attributes'
-import hljs from 'highlight.js'
+import {MarkdownConver} from "../../../store/markdown";
 
 export default {
     name: "DialogMarkdown",
@@ -33,44 +30,11 @@ export default {
 
     computed: {
         html({text}) {
-            if (text === '...') {
-                return '<p class="input-blink">&nbsp;</p>'
-            }
-            if (this.mdi === null) {
-                const {highlightBlock} = this
-                this.mdi = new MarkdownIt({
-                    linkify: true,
-                    highlight(code, language) {
-                        const validLang = !!(language && hljs.getLanguage(language))
-                        if (validLang) {
-                            const lang = language ?? ''
-                            return highlightBlock(hljs.highlight(code, {language: lang}).value, lang)
-                        }
-                        return highlightBlock(hljs.highlightAuto(code).value, '')
-                    },
-                })
-                this.mdi.use(mila, {attrs: {target: '_blank', rel: 'noopener'}})
-                this.mdi.use(mdKatex, {blockClass: 'katexmath-block rounded-md p-[10px]', errorColor: ' #cc0000'})
-            }
-            return this.formatMsg(this.mdi.render(text))
+            return MarkdownConver(text)
         }
     },
 
     methods: {
-        highlightBlock(str, lang = '') {
-            return `<pre class="code-block-wrapper"><div class="code-block-header"><span class="code-block-header__lang">${lang}</span><span class="code-block-header__copy">${this.$L('复制代码')}</span></div><code class="hljs code-block-body ${lang}">${str}</code></pre>`
-        },
-
-        formatMsg(text) {
-            const array = text.match(/<img\s+[^>]*?>/g);
-            if (array) {
-                array.some(res => {
-                    text = text.replace(res, `<div class="no-size-image-box">${res}</div>`);
-                })
-            }
-            return text
-        },
-
         copyCodeBlock() {
             const codeBlockWrapper = this.$el.querySelectorAll('.code-block-wrapper')
             codeBlockWrapper.forEach((wrapper) => {
diff --git a/resources/assets/js/pages/manage/components/DialogModal.vue b/resources/assets/js/pages/manage/components/DialogModal.vue
index 5ab2b31ee..0e02828e8 100644
--- a/resources/assets/js/pages/manage/components/DialogModal.vue
+++ b/resources/assets/js/pages/manage/components/DialogModal.vue
@@ -67,8 +67,8 @@ export default {
 
     methods: {
         onBeforeClose() {
-            return new Promise(_ => {
-                this.$store.dispatch("openDialog", 0)
+            return new Promise(resolve => {
+                resolve(this.$store.dispatch("openDialog", 0))
             })
         },
     }
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 623930364..e6dc32f15 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -2744,7 +2744,9 @@ export default {
                 this.onTodoSubmit(todoData).then(msg => {
                     $A.messageSuccess(msg)
                     this.todoSettingShow = false
-                }).catch($A.messageError).finally(_ => {
+                }).catch(e => {
+                    $A.messageError(e)
+                }).finally(_ => {
                     this.todoSettingLoad--
                 })
             } else {
diff --git a/resources/assets/js/pages/manage/components/ProjectPanel.vue b/resources/assets/js/pages/manage/components/ProjectPanel.vue
index 0a64dab81..a6b6f0a16 100644
--- a/resources/assets/js/pages/manage/components/ProjectPanel.vue
+++ b/resources/assets/js/pages/manage/components/ProjectPanel.vue
@@ -1035,7 +1035,9 @@ export default {
             else if (command.name) {
                 this.updateColumn(column, {
                     color: command.color
-                }).catch($A.modalError);
+                }).catch(e => {
+                    $A.modalError(e)
+                });
             }
         },
 
diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index a10f5d907..1fd78fd74 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -454,10 +454,14 @@ export default {
             this.$store.state.messengerSearchKey.dialog = val
             switch (val) {
                 case 'log.o':
-                    $A.IDBSet("logOpen", "open").then($A.reloadUrl);
+                    $A.IDBSet("logOpen", "open").then(_ => {
+                        $A.reloadUrl()
+                    });
                     break;
                 case 'log.c':
-                    $A.IDBSet("logOpen", "close").then($A.reloadUrl);
+                    $A.IDBSet("logOpen", "close").then(_ => {
+                        $A.reloadUrl()
+                    });
                     break;
             }
             //
diff --git a/resources/assets/js/store/markdown.js b/resources/assets/js/store/markdown.js
new file mode 100644
index 000000000..9618d0df6
--- /dev/null
+++ b/resources/assets/js/store/markdown.js
@@ -0,0 +1,45 @@
+import MarkdownIt from "markdown-it";
+import hljs from "highlight.js";
+import mila from "markdown-it-link-attributes";
+import mdKatex from "@traptitech/markdown-it-katex";
+
+/**
+ * Markdown
+ */
+const MarkdownUtils = {
+    mdi: null,
+    formatMsg: (text) => {
+        const array = text.match(/<img\s+[^>]*?>/g);
+        if (array) {
+            array.some(res => {
+                text = text.replace(res, `<div class="no-size-image-box">${res}</div>`);
+            })
+        }
+        return text
+    },
+    highlightBlock: (str, lang = '') => {
+        return `<pre class="code-block-wrapper"><div class="code-block-header"><span class="code-block-header__lang">${lang}</span><span class="code-block-header__copy">${$A.L('复制代码')}</span></div><code class="hljs code-block-body ${lang}">${str}</code></pre>`
+    },
+}
+
+export function MarkdownConver(text) {
+    if (text === '...') {
+        return '<p class="input-blink">&nbsp;</p>'
+    }
+    if (MarkdownUtils.mdi === null) {
+        MarkdownUtils.mdi = new MarkdownIt({
+            linkify: true,
+            highlight(code, language) {
+                const validLang = !!(language && hljs.getLanguage(language))
+                if (validLang) {
+                    const lang = language ?? ''
+                    return MarkdownUtils.highlightBlock(hljs.highlight(code, {language: lang}).value, lang)
+                }
+                return MarkdownUtils.highlightBlock(hljs.highlightAuto(code).value, '')
+            },
+        })
+        MarkdownUtils.mdi.use(mila, {attrs: {target: '_blank', rel: 'noopener'}})
+        MarkdownUtils.mdi.use(mdKatex, {blockClass: 'katexmath-block rounded-md p-[10px]', errorColor: ' #cc0000'})
+    }
+    return MarkdownUtils.formatMsg(MarkdownUtils.mdi.render(text))
+}
diff --git a/resources/assets/js/store/utils.js b/resources/assets/js/store/utils.js
index 8faedbfb5..0a387f68c 100644
--- a/resources/assets/js/store/utils.js
+++ b/resources/assets/js/store/utils.js
@@ -20,7 +20,8 @@ function __callData(key, requestData, state) {
         callData.updated = 0
         callData.deleted = 0
         state.callAt.push(callData)
-        $A.IDBSet("callAt", state.callAt).then(_ => {})
+        $A.IDBSet("callAt", state.callAt).then(_ => {
+        })
     }
 
     /**
@@ -85,14 +86,14 @@ export function $urlSafe(value, encode = true) {
     return value
 }
 
-const SSEDefaultOptions = {
-    retry: 5,
-    interval: 3 * 1000,
-};
-
 /**
  * EventSource
  */
+const SSEDefaultOptions = {
+    retry: 5,
+    interval: 3 * 1000,
+}
+
 export class SSEClient {
     constructor(url, options = SSEDefaultOptions) {
         this.url = url;
diff --git a/resources/mobile b/resources/mobile
index 9f75260ca..152fef781 160000
--- a/resources/mobile
+++ b/resources/mobile
@@ -1 +1 @@
-Subproject commit 9f75260ca48aaec97649506a011e002c4adfb436
+Subproject commit 152fef7813b47e021e7b68f4040eb85234a99474