From 617e88e0b585e1a640d13c5bd384177bdeae4e0f Mon Sep 17 00:00:00 2001
From: Pang <aipaw@live.cn>
Date: Sun, 17 Dec 2023 16:29:09 +0800
Subject: [PATCH] no message

---
 resources/assets/js/components/TEditorTask.vue     |  4 ++++
 resources/assets/js/pages/manage/setting/index.vue |  2 +-
 resources/assets/js/store/actions.js               | 10 +---------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/resources/assets/js/components/TEditorTask.vue b/resources/assets/js/components/TEditorTask.vue
index 8387bb73b..6a89ebc82 100755
--- a/resources/assets/js/components/TEditorTask.vue
+++ b/resources/assets/js/components/TEditorTask.vue
@@ -138,6 +138,10 @@ export default {
             return this.$refs.desc.getContent();
         },
 
+        updateContent(html) {
+            this.content = html
+        },
+
         onEditing() {
             this.$refs.desc.onFull()
         },
diff --git a/resources/assets/js/pages/manage/setting/index.vue b/resources/assets/js/pages/manage/setting/index.vue
index 6338a4c54..4ee9b222d 100644
--- a/resources/assets/js/pages/manage/setting/index.vue
+++ b/resources/assets/js/pages/manage/setting/index.vue
@@ -30,7 +30,7 @@
                     </li>
                 </ul>
             </div>
-            <transition name="mobile-dialog">
+            <transition :name="$isEEUiApp ? 'mobile-dialog' : 'none'">
                 <div v-if="showContent" class="setting-content">
                     <MobileNavTitle :title="settingTitleName"/>
                     <div class="setting-content-title">{{titleNameRoute}}</div>
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 327545a07..4a81c05d7 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -1562,14 +1562,9 @@ export default {
      * @returns {Promise<unknown>}
      */
     getTasks({state, dispatch}, requestData) {
-        const taskData = [];
         if (requestData === null) {
             requestData = {}
         }
-        if ($A.isArray(requestData.taskData)) {
-            taskData.push(...requestData.taskData)
-            delete requestData.taskData;
-        }
         const callData = $callData('tasks', requestData, state)
         //
         return new Promise(function (resolve, reject) {
@@ -1589,12 +1584,11 @@ export default {
                 if (requestData.project_id) {
                     state.projectLoad--;
                 }
-                taskData.push(...data.data);
+                dispatch("saveTask", data.data);
                 callData.save(data).then(ids => dispatch("forgetTask", ids))
                 //
                 if (data.next_page_url) {
                     requestData.page = data.current_page + 1
-                    requestData.taskData = taskData
                     if (data.current_page % 10 === 0) {
                         $A.modalWarning({
                             content: "数据已超过" + data.to + "条，是否继续加载？",
@@ -1602,7 +1596,6 @@ export default {
                                 dispatch("getTasks", requestData).then(resolve).catch(reject)
                             },
                             onCancel: () => {
-                                dispatch("saveTask", taskData);
                                 resolve()
                             }
                         });
@@ -1610,7 +1603,6 @@ export default {
                         dispatch("getTasks", requestData).then(resolve).catch(reject)
                     }
                 } else {
-                    dispatch("saveTask", taskData);
                     resolve()
                 }
             }).catch(e => {