From 5e844a1d388f57dff831fb9f4ae31ab8838e03f8 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Wed, 21 Sep 2022 16:42:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/views/dev_tools/code/edit.vue       | 20 +++++++++++++------
 admin/src/views/dev_tools/code/index.vue      |  6 ++++--
 .../views/dev_tools/components/data-table.vue |  6 ++++--
 admin/src/views/setting/dict/data/edit.vue    |  2 +-
 admin/src/views/setting/dict/data/index.vue   |  2 +-
 admin/src/views/setting/dict/type/index.vue   |  2 +-
 admin/src/views/setting/search/index.vue      |  7 ++++++-
 admin/src/views/setting/system/journal.vue    | 11 ++++++----
 app/src/pages/search/component/suggest.vue    | 10 ++++++++--
 9 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/admin/src/views/dev_tools/code/edit.vue b/admin/src/views/dev_tools/code/edit.vue
index 582a2256..374ed964 100644
--- a/admin/src/views/dev_tools/code/edit.vue
+++ b/admin/src/views/dev_tools/code/edit.vue
@@ -18,6 +18,7 @@
                                 <el-input
                                     v-model="formData.base.tableName"
                                     placeholder="请输入表名称"
+                                    clearable
                                 />
                             </div>
                         </el-form-item>
@@ -26,6 +27,7 @@
                                 <el-input
                                     v-model="formData.base.tableComment"
                                     placeholder="请输入表描述"
+                                    clearable
                                 />
                             </div>
                         </el-form-item>
@@ -34,6 +36,7 @@
                                 <el-input
                                     v-model="formData.base.entityName"
                                     placeholder="请输入实体类名称"
+                                    clearable
                                 />
                             </div>
                         </el-form-item>
@@ -43,6 +46,7 @@
                                 <el-input
                                     v-model="formData.base.authorName"
                                     placeholder="请输入作者"
+                                    clearable
                                 />
                             </div>
                         </el-form-item>
@@ -50,11 +54,12 @@
                             <div class="w-80">
                                 <el-input
                                     v-model="formData.base.remarks"
-                                    class="el-input"
+                                    class="w-full"
                                     type="textarea"
                                     :autosize="{ minRows: 4, maxRows: 4 }"
                                     maxlength="200"
                                     show-word-limit
+                                    clearable
                                 />
                             </div>
                         </el-form-item>
@@ -92,7 +97,7 @@
                                         v-model="row.isRequired"
                                         :true-label="1"
                                         :false-label="0"
-                                    ></el-checkbox>
+                                    />
                                 </template>
                             </el-table-column>
                             <el-table-column label="插入" width="80">
@@ -101,7 +106,7 @@
                                         v-model="row.isInsert"
                                         :true-label="1"
                                         :false-label="0"
-                                    ></el-checkbox>
+                                    />
                                 </template>
                             </el-table-column>
                             <el-table-column label="编辑" width="80">
@@ -110,7 +115,7 @@
                                         v-model="row.isEdit"
                                         :true-label="1"
                                         :false-label="0"
-                                    ></el-checkbox>
+                                    />
                                 </template>
                             </el-table-column>
                             <el-table-column label="列表" width="80">
@@ -119,7 +124,7 @@
                                         v-model="row.isList"
                                         :true-label="1"
                                         :false-label="0"
-                                    ></el-checkbox>
+                                    />
                                 </template>
                             </el-table-column>
                             <el-table-column label="查询" width="80">
@@ -128,7 +133,7 @@
                                         v-model="row.isQuery"
                                         :true-label="1"
                                         :false-label="0"
-                                    ></el-checkbox>
+                                    />
                                 </template>
                             </el-table-column>
                             <el-table-column label="查询方式">
@@ -198,6 +203,7 @@
                                 <el-input
                                     v-model="formData.gen.moduleName"
                                     placeholder="请输入模块名"
+                                    clearable
                                 />
                                 <div class="form-tips">生成文件所在模块名</div>
                             </div>
@@ -207,6 +213,7 @@
                                 <el-input
                                     v-model="formData.gen.functionName"
                                     placeholder="请输入功能名称"
+                                    clearable
                                 />
                             </div>
                         </el-form-item>
@@ -225,6 +232,7 @@
                                 <el-input
                                     v-model="formData.gen.genPath"
                                     placeholder="请输入自定义路径"
+                                    clearable
                                 />
                             </div>
                         </el-form-item>
diff --git a/admin/src/views/dev_tools/code/index.vue b/admin/src/views/dev_tools/code/index.vue
index 7f039ef8..561f877c 100644
--- a/admin/src/views/dev_tools/code/index.vue
+++ b/admin/src/views/dev_tools/code/index.vue
@@ -3,10 +3,12 @@
         <el-card class="!border-none" shadow="never">
             <el-form class="mb-[-16px]" :model="formData" inline>
                 <el-form-item label="表名称">
-                    <el-input class="w-56" v-model="formData.tableName" />
+                    <el-input class="w-56" v-model="formData.tableName"    clearable
+                        @keyup.enter="resetPage" />
                 </el-form-item>
                 <el-form-item label="表描述">
-                    <el-input class="w-56" v-model="formData.tableComment" />
+                    <el-input class="w-56" v-model="formData.tableComment"    clearable
+                        @keyup.enter="resetPage" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
diff --git a/admin/src/views/dev_tools/components/data-table.vue b/admin/src/views/dev_tools/components/data-table.vue
index 02f0b790..2fdc2d73 100644
--- a/admin/src/views/dev_tools/components/data-table.vue
+++ b/admin/src/views/dev_tools/components/data-table.vue
@@ -13,10 +13,12 @@
             </template>
             <el-form class="ls-form" :model="formData" inline>
                 <el-form-item label="表名称">
-                    <el-input class="w-56" v-model="formData.tableName" />
+                    <el-input class="w-56" v-model="formData.tableName"   clearable
+                        @keyup.enter="resetPage" />
                 </el-form-item>
                 <el-form-item label="表描述">
-                    <el-input class="w-56" v-model="formData.tableComment" />
+                    <el-input class="w-56" v-model="formData.tableComment"   clearable
+                        @keyup.enter="resetPage" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
diff --git a/admin/src/views/setting/dict/data/edit.vue b/admin/src/views/setting/dict/data/edit.vue
index 5de9e174..0abf899e 100644
--- a/admin/src/views/setting/dict/data/edit.vue
+++ b/admin/src/views/setting/dict/data/edit.vue
@@ -31,7 +31,7 @@
                 </el-form-item>
                 <el-form-item label="排序" prop="sort">
                     <div>
-                        <el-input-number v-model="formData.sort" />
+                        <el-input-number v-model="formData.sort" :min="0" />
                         <div class="form-tips">数值越大越排前</div>
                     </div>
                 </el-form-item>
diff --git a/admin/src/views/setting/dict/data/index.vue b/admin/src/views/setting/dict/data/index.vue
index 68713b02..8be629af 100644
--- a/admin/src/views/setting/dict/data/index.vue
+++ b/admin/src/views/setting/dict/data/index.vue
@@ -71,7 +71,7 @@
                                 <el-tag v-else type="danger">停用</el-tag>
                             </template>
                         </el-table-column>
-                        <el-table-column label="备注" prop="remark" min-width="120" />
+                        <el-table-column label="备注" prop="remark" min-width="120" show-tooltip-when-overflow />
                         <el-table-column label="排序" prop="sort" />
                         <el-table-column label="操作" width="120" fixed="right">
                             <template #default="{ row }">
diff --git a/admin/src/views/setting/dict/type/index.vue b/admin/src/views/setting/dict/type/index.vue
index 8c56ad10..66904748 100644
--- a/admin/src/views/setting/dict/type/index.vue
+++ b/admin/src/views/setting/dict/type/index.vue
@@ -68,7 +68,7 @@
                                 <el-tag v-else type="danger">停用</el-tag>
                             </template>
                         </el-table-column>
-                        <el-table-column label="备注" prop="dictRemark" />
+                        <el-table-column label="备注" prop="dictRemark" show-tooltip-when-overflow />
                         <el-table-column label="创建时间" prop="createTime" min-width="180" />
                         <el-table-column label="操作" width="190" fixed="right">
                             <template #default="{ row }">
diff --git a/admin/src/views/setting/search/index.vue b/admin/src/views/setting/search/index.vue
index 4c101513..805a2faa 100644
--- a/admin/src/views/setting/search/index.vue
+++ b/admin/src/views/setting/search/index.vue
@@ -18,7 +18,12 @@
         <el-card class="!border-none mt-4" shadow="never">
             <div class="lg:flex">
                 <div class="flex-1 min-w-0">
-                    <el-button type="primary" class="mb-4" @click="handleAdd">添加</el-button>
+                    <el-button type="primary" class="mb-4" @click="handleAdd">
+                        <template #icon>
+                            <icon name="el-icon-Plus" />
+                        </template>
+                        添加
+                    </el-button>
                     <el-table size="large" :data="formData.list">
                         <el-table-column label="关键词" prop="describe" min-width="200">
                             <template #default="{ row }">
diff --git a/admin/src/views/setting/system/journal.vue b/admin/src/views/setting/system/journal.vue
index 3ee8a300..77aaaebc 100644
--- a/admin/src/views/setting/system/journal.vue
+++ b/admin/src/views/setting/system/journal.vue
@@ -4,7 +4,8 @@
         <el-card class="!border-none" shadow="never">
             <el-form class="ls-form" :model="formData" inline>
                 <el-form-item label="管理员">
-                    <el-input class="w-56" placeholder="请输入" v-model="formData.username" />
+                    <el-input class="w-56" placeholder="请输入" v-model="formData.username" clearable
+                        @keyup.enter="resetPage" />
                 </el-form-item>
 
                 <el-form-item label="访问方式">
@@ -14,12 +15,13 @@
                             :key="index"
                             :label="item.label"
                             :value="item.value"
-                        ></el-option>
+                            />
                     </el-select>
                 </el-form-item>
 
                 <el-form-item label="来源IP">
-                    <el-input class="w-56" placeholder="请输入" v-model="formData.ip" />
+                    <el-input class="w-56" placeholder="请输入" v-model="formData.ip" clearable
+                        @keyup.enter="resetPage" />
                 </el-form-item>
 
                 <el-form-item label="访问时间">
@@ -30,7 +32,8 @@
                 </el-form-item>
 
                 <el-form-item label="访问链接">
-                    <el-input class="w-56" placeholder="请输入" v-model="formData.url" />
+                    <el-input class="w-56" placeholder="请输入" v-model="formData.url" clearable
+                        @keyup.enter="resetPage" />
                 </el-form-item>
 
                 <el-form-item>
diff --git a/app/src/pages/search/component/suggest.vue b/app/src/pages/search/component/suggest.vue
index 0158ba9c..b539b635 100644
--- a/app/src/pages/search/component/suggest.vue
+++ b/app/src/pages/search/component/suggest.vue
@@ -6,7 +6,11 @@
 
             <view class="w-full px-[24rpx]">
                 <block v-for="(hotItem, index) in hot_search" :key="index">
-                    <view class="keyword truncate max-w-full" @click="handleHistoreSearch(hotItem)">{{ hotItem }}</view>
+                    <view
+                        class="keyword truncate max-w-full"
+                        @click="handleHistoreSearch(hotItem)"
+                        >{{ hotItem }}</view
+                    >
                 </block>
             </view>
         </view>
@@ -25,7 +29,9 @@
 
             <view class="w-full px-[24rpx]">
                 <block v-for="(hisItem, index) in his_search" :key="index">
-                    <view class="keyword truncate" @click="handleHistoreSearch(hisItem)">{{ hisItem }}</view>
+                    <view class="keyword truncate" @click="handleHistoreSearch(hisItem)">{{
+                        hisItem
+                    }}</view>
                 </block>
             </view>
         </view>