From bf16ca596312aeb7fc09f7daf5ae20a2ab568a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Sun, 20 Apr 2025 17:26:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=20eslint=20=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageForm.vue   | 23 ++++++++++-----------
 src/components/CURD/PageSearch.vue | 33 +++++++++++++++---------------
 src/components/CURD/types.ts       |  3 +--
 3 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/src/components/CURD/PageForm.vue b/src/components/CURD/PageForm.vue
index 7fff077b..e0ff8aab 100644
--- a/src/components/CURD/PageForm.vue
+++ b/src/components/CURD/PageForm.vue
@@ -5,21 +5,15 @@
         <el-col v-show="!item.hidden" v-bind="item.col">
           <el-form-item :label="item.label" :prop="item.prop">
             <!-- Label -->
-            <template v-if="item.tips" #label>
-              <span>
-                {{ item.label }}
-                <el-tooltip
-                  placement="bottom"
-                  effect="light"
-                  :content="item.tips"
-                  :raw-content="true"
-                >
-                  <el-icon style="vertical-align: -0.15em" size="16">
-                    <QuestionFilled />
-                  </el-icon>
+            <template #label>
+              <span class="flex-y-center">
+                {{ item?.label || "" }}
+                <el-tooltip v-if="item?.tips" v-bind="getTooltipProps(item.tips)">
+                  <QuestionFilled class="w-4 h-4 mx-1" />
                 </el-tooltip>
               </span>
             </template>
+
             <!-- Input 输入框 -->
             <template v-if="item.type === 'input' || item.type === undefined">
               <el-input v-model="formData[item.prop]" v-bind="item.attrs" />
@@ -151,6 +145,11 @@ function setFormItemData(key: string, value: any) {
   formData[key] = value;
 }
 
+// 获取tooltip提示框属性
+const getTooltipProps = (tips: string | IObject) => {
+  return typeof tips === "string" ? { content: tips } : tips;
+};
+
 // 暴露的属性和方法
 defineExpose({ formRef, getFormData, setFormData, setFormItemData });
 </script>
diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 1eedf14c..7d4c9d23 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -12,12 +12,7 @@
             <template #label>
               <span class="flex-y-center">
                 {{ item?.label || "" }}
-                <el-tooltip
-                  v-if="item?.tips"
-                  v-bind="
-                    typeof item.tips === 'string' ? { content: item.tips } : (item.tips as any)
-                  "
-                >
+                <el-tooltip v-if="item?.tips" v-bind="getTooltipProps(item.tips)">
                   <QuestionFilled class="w-4 h-4 mx-1" />
                 </el-tooltip>
                 <span v-if="searchConfig.colon" class="ml-0.5">:</span>
@@ -92,7 +87,10 @@ const componentMap = new Map<ISearchComponent, Component>([
   /* eslint-enable */
 ]);
 
+// 存储表单实例
 const queryFormRef = ref<FormInstance>();
+// 存储查询参数
+const queryParams = reactive<IObject>({});
 // 是否显示
 const visible = ref(true);
 // 响应式的formItems
@@ -119,12 +117,21 @@ const isGrid = computed(() =>
     ? "grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 3xl:grid-cols-5 4xl:grid-cols-6 gap-5"
     : "flex flex-wrap gap-x-8 gap-y-4"
 );
-// 搜索表单数据
-const queryParams = reactive<IObject>({});
+
+// 获取tooltip提示框属性
+const getTooltipProps = (tips: string | IObject) => {
+  return typeof tips === "string" ? { content: tips } : tips;
+};
+// 查询/重置操作
+const handleQuery = () => emit("queryClick", queryParams);
+const handleReset = () => {
+  queryFormRef.value?.resetFields();
+  emit("resetClick", queryParams);
+};
 
 onMounted(() => {
   formItems.forEach((item) => {
-    item.initFn && item.initFn(item);
+    item?.initFn && item.initFn(item);
     if (["input-tag", "custom-tag", "cascader"].includes(item?.type ?? "")) {
       queryParams[item.prop] = Array.isArray(item.initialValue) ? item.initialValue : [];
     } else if (item.type === "input-number") {
@@ -134,14 +141,6 @@ onMounted(() => {
     }
   });
 });
-
-// 查询/重置操作
-const handleQuery = () => emit("queryClick", queryParams);
-const handleReset = () => {
-  queryFormRef.value?.resetFields();
-  emit("resetClick", queryParams);
-};
-
 // 暴露的属性和方法
 defineExpose({
   // 获取分页数据
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 8b246948..5db9295d 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -1,6 +1,5 @@
 import type { DialogProps, DrawerProps, FormItemRule, PaginationProps } from "element-plus";
 import type { FormProps, TableProps, ColProps, ButtonProps, CardProps } from "element-plus";
-import type { ElTooltipProps } from "element-plus";
 import type PageContent from "./PageContent.vue";
 import type PageForm from "./PageForm.vue";
 import type PageModal from "./PageModal.vue";
@@ -53,7 +52,7 @@ export interface ISearchConfig {
     // 标签文本
     label?: string;
     // 标签提示
-    tips?: string | Partial<ElTooltipProps>;
+    tips?: string | IObject;
     // 键名
     prop: string;
     // 组件属性(input-tag组件支持join,btnText,size属性)