From 8fee14cd6ebd86456956fc59bbb61c545faa1fdd Mon Sep 17 00:00:00 2001
From: nsnail <taokeu@gmail.com>
Date: Tue, 27 Feb 2024 18:31:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E5=9C=A8=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E7=95=8C=E9=9D=A2=E4=B8=AD=E5=BC=95=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6=EF=BC=8C=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=97=B6=EF=BC=8C=E4=BC=9A=E5=85=B3=E9=97=AD=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E7=9A=84bug=20(#95)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/admin/src/components/naSearch/index.vue       | 7 +++++--
 .../admin/src/views/home/work/components/myapp.vue         | 3 +--
 src/frontend/admin/src/views/sys/job/record/index.vue      | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/frontend/admin/src/components/naSearch/index.vue b/src/frontend/admin/src/components/naSearch/index.vue
index a0d72428..5e7f0d32 100644
--- a/src/frontend/admin/src/components/naSearch/index.vue
+++ b/src/frontend/admin/src/components/naSearch/index.vue
@@ -119,7 +119,7 @@
 
         <el-button-group>
             <el-button @click="search" icon="el-icon-search" type="primary">查询</el-button>
-            <el-button @click="tool.refreshTab(vue)" icon="el-icon-refresh-left">重置</el-button>
+            <el-button @click="reset" icon="el-icon-refresh-left">重置</el-button>
         </el-button-group>
     </form>
 </template>
@@ -137,6 +137,7 @@ export default {
     data() {
         return {
             casLoaded: false,
+            keepKeywords: null,
             form: {
                 root: {},
                 filter: {},
@@ -188,7 +189,9 @@ export default {
             Object.keys(this.form.dy).forEach((x) => {
                 delete this.form.dy[x]
             })
-
+            if (this.keepKeywords) {
+                this.form.root.keywords = this.keepKeywords
+            }
             this.search()
         },
     },
diff --git a/src/frontend/admin/src/views/home/work/components/myapp.vue b/src/frontend/admin/src/views/home/work/components/myapp.vue
index 70fd615a..f5f6d205 100644
--- a/src/frontend/admin/src/views/home/work/components/myapp.vue
+++ b/src/frontend/admin/src/views/home/work/components/myapp.vue
@@ -205,8 +205,7 @@ export default {
     margin: 5px;
     color: #fff;
     vertical-align: top;
-    padding: 4px;
-    padding-top: 1rem;
+    padding: 1rem 4px 4px;
     cursor: move;
     border-radius: 3px;
 }
diff --git a/src/frontend/admin/src/views/sys/job/record/index.vue b/src/frontend/admin/src/views/sys/job/record/index.vue
index d537daca..9d9d1d6c 100644
--- a/src/frontend/admin/src/views/sys/job/record/index.vue
+++ b/src/frontend/admin/src/views/sys/job/record/index.vue
@@ -111,6 +111,7 @@ export default {
     mounted() {
         if (this.keywords) {
             this.$refs.search.form.root.keywords = this.keywords
+            this.$refs.search.keepKeywords = this.keywords
         }
     },
     created() {