From a4b6b2d6c8f07ee672b15728004bae159ebfb0fa Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Thu, 29 Sep 2022 10:26:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2=E6=A0=8Fin?=
 =?UTF-8?q?put=E6=A1=86=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/components/popover-input/index.vue  | 40 ++++++++++++++-----
 admin/src/styles/element.scss                 |  2 +-
 admin/src/views/article/lists/index.vue       |  6 +--
 admin/src/views/consumer/lists/index.vue      |  4 +-
 admin/src/views/dev_tools/code/index.vue      |  4 +-
 .../views/dev_tools/components/data-table.vue |  4 +-
 .../views/organization/department/index.vue   |  4 +-
 admin/src/views/organization/post/index.vue   |  6 +--
 admin/src/views/permission/admin/index.vue    |  6 +--
 admin/src/views/setting/dict/data/index.vue   |  6 +--
 admin/src/views/setting/dict/type/index.vue   |  6 +--
 admin/src/views/setting/system/journal.vue    |  8 ++--
 12 files changed, 59 insertions(+), 37 deletions(-)

diff --git a/admin/src/components/popover-input/index.vue b/admin/src/components/popover-input/index.vue
index 0b1cbcde..88ba84a7 100644
--- a/admin/src/components/popover-input/index.vue
+++ b/admin/src/components/popover-input/index.vue
@@ -6,16 +6,18 @@
             :width="width"
             trigger="contextmenu"
             class="popover-input"
-            :teleported="false"
+            :teleported="teleported"
+            :persistent="false"
+            popper-class="!p-0"
         >
-            <div class="flex">
+            <div class="flex p-3" @click.stop="">
                 <div class="popover-input__input mr-[10px] flex-1">
                     <el-select
                         class="flex-1"
-                        size="small"
+                        :size="size"
                         v-if="type == 'select'"
                         v-model="inputValue"
-                        :teleported="false"
+                        :teleported="teleported"
                     >
                         <el-option
                             v-for="item in options"
@@ -27,14 +29,17 @@
                     <el-input
                         v-else
                         v-model.trim="inputValue"
+                        :maxlength="limit"
+                        :show-word-limit="showLimit"
                         :type="type"
-                        size="small"
+                        :size="size"
+                        clearable
                         :placeholder="placeholder"
                     />
                 </div>
                 <div class="popover-input__btns flex-none">
-                    <el-button link @click="visible = false">取消</el-button>
-                    <el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
+                    <el-button link @click="close">取消</el-button>
+                    <el-button type="primary" :size="size" @click="handleConfirm">确定</el-button>
                 </div>
             </div>
             <template #reference>
@@ -60,7 +65,7 @@ const props = defineProps({
     },
     width: {
         type: [Number, String],
-        default: 250
+        default: '300px'
     },
     placeholder: String,
     disabled: {
@@ -70,6 +75,22 @@ const props = defineProps({
     options: {
         type: Array as PropType<any[]>,
         default: () => []
+    },
+    size: {
+        type: String as PropType<'default' | 'small' | 'large'>,
+        default: 'default'
+    },
+    limit: {
+        type: Number,
+        default: 200
+    },
+    showLimit: {
+        type: Boolean,
+        default: false
+    },
+    teleported: {
+        type: Boolean,
+        default: true
     }
 })
 const emit = defineEmits(['confirm'])
@@ -99,7 +120,8 @@ watch(
         immediate: true
     }
 )
-useEventListener(document.body, 'click', () => {
+
+useEventListener(document.documentElement, 'click', () => {
     if (inPopover.value) return
     close()
 })
diff --git a/admin/src/styles/element.scss b/admin/src/styles/element.scss
index 2ff0e634..07d8e5df 100644
--- a/admin/src/styles/element.scss
+++ b/admin/src/styles/element.scss
@@ -91,7 +91,7 @@
         --el-messagebox-width: 350px;
     }
     .el-date-editor {
-        --el-date-editor-width: 235px;
+        --el-date-editor-width: 280px;
         .el-range-input {
             font-size: var(--el-font-size-small);
         }
diff --git a/admin/src/views/article/lists/index.vue b/admin/src/views/article/lists/index.vue
index 82e0da29..ba32e793 100644
--- a/admin/src/views/article/lists/index.vue
+++ b/admin/src/views/article/lists/index.vue
@@ -4,14 +4,14 @@
             <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
                 <el-form-item label="文章标题">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         v-model="queryParams.title"
                         clearable
                         @keyup.enter="resetPage"
                     />
                 </el-form-item>
                 <el-form-item label="栏目名称">
-                    <el-select class="w-56" v-model="queryParams.cid">
+                    <el-select class="w-[280px]" v-model="queryParams.cid">
                         <el-option label="全部" value />
                         <el-option
                             v-for="item in optionsData.articleCate"
@@ -22,7 +22,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="文章状态">
-                    <el-select class="w-56" v-model="queryParams.isShow">
+                    <el-select class="w-[280px]" v-model="queryParams.isShow">
                         <el-option label="全部" value />
                         <el-option label="显示" :value="1" />
                         <el-option label="隐藏" :value="0" />
diff --git a/admin/src/views/consumer/lists/index.vue b/admin/src/views/consumer/lists/index.vue
index f3b178e0..0d5b07fa 100644
--- a/admin/src/views/consumer/lists/index.vue
+++ b/admin/src/views/consumer/lists/index.vue
@@ -4,7 +4,7 @@
             <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
                 <el-form-item label="用户信息">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         v-model="queryParams.keyword"
                         placeholder="用户编号/昵称/手机号码"
                         clearable
@@ -18,7 +18,7 @@
                     />
                 </el-form-item>
                 <el-form-item label="注册来源">
-                    <el-select class="w-56" v-model="queryParams.channel">
+                    <el-select class="w-[280px]" v-model="queryParams.channel">
                         <el-option
                             v-for="(item, key) in ClientMap"
                             :key="key"
diff --git a/admin/src/views/dev_tools/code/index.vue b/admin/src/views/dev_tools/code/index.vue
index 7236166d..ca1f9a25 100644
--- a/admin/src/views/dev_tools/code/index.vue
+++ b/admin/src/views/dev_tools/code/index.vue
@@ -4,7 +4,7 @@
             <el-form class="mb-[-16px]" :model="formData" inline>
                 <el-form-item label="表名称">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         v-model="formData.tableName"
                         clearable
                         @keyup.enter="resetPage"
@@ -12,7 +12,7 @@
                 </el-form-item>
                 <el-form-item label="表描述">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         v-model="formData.tableComment"
                         clearable
                         @keyup.enter="resetPage"
diff --git a/admin/src/views/dev_tools/components/data-table.vue b/admin/src/views/dev_tools/components/data-table.vue
index 06cb2495..e4d2d49a 100644
--- a/admin/src/views/dev_tools/components/data-table.vue
+++ b/admin/src/views/dev_tools/components/data-table.vue
@@ -14,7 +14,7 @@
             <el-form class="ls-form" :model="formData" inline>
                 <el-form-item label="表名称">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         v-model="formData.tableName"
                         clearable
                         @keyup.enter="resetPage"
@@ -22,7 +22,7 @@
                 </el-form-item>
                 <el-form-item label="表描述">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         v-model="formData.tableComment"
                         clearable
                         @keyup.enter="resetPage"
diff --git a/admin/src/views/organization/department/index.vue b/admin/src/views/organization/department/index.vue
index 67af4ea3..720491d5 100644
--- a/admin/src/views/organization/department/index.vue
+++ b/admin/src/views/organization/department/index.vue
@@ -4,14 +4,14 @@
             <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
                 <el-form-item label="部门名称" prop="name">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         v-model="queryParams.name"
                         clearable
                         @keyup.enter="getLists"
                     />
                 </el-form-item>
                 <el-form-item label="部门状态" prop="isStop">
-                    <el-select class="w-56" v-model="queryParams.isStop">
+                    <el-select class="w-[280px]" v-model="queryParams.isStop">
                         <el-option label="全部" value />
                         <el-option label="正常" value="0" />
                         <el-option label="停用" value="1" />
diff --git a/admin/src/views/organization/post/index.vue b/admin/src/views/organization/post/index.vue
index 6ddc50e0..45f90586 100644
--- a/admin/src/views/organization/post/index.vue
+++ b/admin/src/views/organization/post/index.vue
@@ -4,7 +4,7 @@
             <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
                 <el-form-item label="岗位编码">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         v-model="queryParams.code"
                         clearable
                         @keyup.enter="resetPage"
@@ -12,14 +12,14 @@
                 </el-form-item>
                 <el-form-item label="岗位名称">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         v-model="queryParams.name"
                         clearable
                         @keyup.enter="resetPage"
                     />
                 </el-form-item>
                 <el-form-item label="岗位状态">
-                    <el-select class="w-56" v-model="queryParams.isStop">
+                    <el-select class="w-[280px]" v-model="queryParams.isStop">
                         <el-option label="全部" value />
                         <el-option label="正常" :value="0" />
                         <el-option label="停用" :value="1" />
diff --git a/admin/src/views/permission/admin/index.vue b/admin/src/views/permission/admin/index.vue
index 5695a53f..99389101 100644
--- a/admin/src/views/permission/admin/index.vue
+++ b/admin/src/views/permission/admin/index.vue
@@ -5,7 +5,7 @@
                 <el-form-item label="管理员账号">
                     <el-input
                         v-model="formData.username"
-                        class="w-56"
+                        class="w-[280px]"
                         clearable
                         @keyup.enter="resetPage"
                     />
@@ -13,13 +13,13 @@
                 <el-form-item label="管理员名称">
                     <el-input
                         v-model="formData.nickname"
-                        class="w-56"
+                        class="w-[280px]"
                         clearable
                         @keyup.enter="resetPage"
                     />
                 </el-form-item>
                 <el-form-item label="管理员角色">
-                    <el-select class="w-56" v-model="formData.role">
+                    <el-select class="w-[280px]" v-model="formData.role">
                         <el-option label="全部" value="" />
                         <el-option
                             v-for="(item, index) in optionsData.role"
diff --git a/admin/src/views/setting/dict/data/index.vue b/admin/src/views/setting/dict/data/index.vue
index e96bead4..529dfcf1 100644
--- a/admin/src/views/setting/dict/data/index.vue
+++ b/admin/src/views/setting/dict/data/index.vue
@@ -4,7 +4,7 @@
             <el-page-header class="mb-4" content="数据管理" @back="$router.back()" />
             <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="字典名称">
-                    <el-select class="w-56" v-model="queryParams.dictType" @change="getLists">
+                    <el-select class="w-[280px]" v-model="queryParams.dictType" @change="getLists">
                         <el-option
                             v-for="item in optionsData.dictType"
                             :label="item.dictName"
@@ -15,14 +15,14 @@
                 </el-form-item>
                 <el-form-item label="数据名称">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         v-model="queryParams.name"
                         clearable
                         @keyup.enter="resetPage"
                     />
                 </el-form-item>
                 <el-form-item label="数据状态">
-                    <el-select class="w-56" v-model="queryParams.status">
+                    <el-select class="w-[280px]" v-model="queryParams.status">
                         <el-option label="全部" value />
                         <el-option label="正常" :value="1" />
                         <el-option label="停用" :value="0" />
diff --git a/admin/src/views/setting/dict/type/index.vue b/admin/src/views/setting/dict/type/index.vue
index 537208b3..e5d99263 100644
--- a/admin/src/views/setting/dict/type/index.vue
+++ b/admin/src/views/setting/dict/type/index.vue
@@ -4,7 +4,7 @@
             <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="字典名称">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         v-model="queryParams.dictName"
                         clearable
                         @keyup.enter="resetPage"
@@ -12,14 +12,14 @@
                 </el-form-item>
                 <el-form-item label="字典类型">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         v-model="queryParams.dictType"
                         clearable
                         @keyup.enter="resetPage"
                     />
                 </el-form-item>
                 <el-form-item label="状态">
-                    <el-select class="w-56" v-model="queryParams.dictStatus">
+                    <el-select class="w-[280px]" v-model="queryParams.dictStatus">
                         <el-option label="全部" value />
                         <el-option label="正常" :value="1" />
                         <el-option label="停用" :value="0" />
diff --git a/admin/src/views/setting/system/journal.vue b/admin/src/views/setting/system/journal.vue
index b4038672..a554a833 100644
--- a/admin/src/views/setting/system/journal.vue
+++ b/admin/src/views/setting/system/journal.vue
@@ -5,7 +5,7 @@
             <el-form class="ls-form" :model="formData" inline>
                 <el-form-item label="管理员">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         placeholder="请输入"
                         v-model="formData.username"
                         clearable
@@ -14,7 +14,7 @@
                 </el-form-item>
 
                 <el-form-item label="访问方式">
-                    <el-select class="w-56" v-model="formData.type" placeholder="请选择">
+                    <el-select class="w-[280px]" v-model="formData.type" placeholder="请选择">
                         <el-option
                             v-for="(item, index) in visitType"
                             :key="index"
@@ -26,7 +26,7 @@
 
                 <el-form-item label="来源IP">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         placeholder="请输入"
                         v-model="formData.ip"
                         clearable
@@ -43,7 +43,7 @@
 
                 <el-form-item label="访问链接">
                     <el-input
-                        class="w-56"
+                        class="w-[280px]"
                         placeholder="请输入"
                         v-model="formData.url"
                         clearable