chore: 🔨 合并冲突解决

src/components/TableSelect/index.vue

@@ -63,17 +63,11 @@
               </template>
               <!-- TreeSelect 树形选择 -->
               <template v-else-if="item.type === 'tree-select'">
-                <el-tree-select
-                  v-model="queryParams[item.prop]"
-                  v-bind="item.attrs"
-                />
+                <el-tree-select v-model="queryParams[item.prop]" v-bind="item.attrs" />
               </template>
               <!-- DatePicker 日期选择器 -->
               <template v-else-if="item.type === 'date-picker'">
-                <el-date-picker
-                  v-model="queryParams[item.prop]"
-                  v-bind="item.attrs"
-                />
+                <el-date-picker v-model="queryParams[item.prop]" v-bind="item.attrs" />
               </template>
               <!-- Input 输入框 -->
               <template v-else>
@@ -95,9 +89,7 @@
             </el-form-item>
           </template>
           <el-form-item>
-            <el-button type="primary" icon="search" @click="handleQuery">
-              搜索
-            </el-button>
+            <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
             <el-button icon="refresh" @click="handleReset">重置</el-button>
           </el-form-item>
         </el-form>
@@ -119,11 +111,7 @@
             <template v-if="col.templet === 'custom'">
               <el-table-column v-bind="col">
                 <template #default="scope">
-                  <slot
-                    :name="col.slotName ?? col.prop"
-                    :prop="col.prop"
-                    v-bind="scope"
-                  />
+                  <slot :name="col.slotName ?? col.prop" :prop="col.prop" v-bind="scope" />
                 </template>
               </el-table-column>
             </template>
@@ -294,9 +282,7 @@ for (const item of props.selectConfig.tableColumns) {
 // 选择
 const selectedItems = ref<IObject[]>([]);
 const confirmText = computed(() => {
-  return selectedItems.value.length > 0
-    ? `已选(${selectedItems.value.length})`
-    : "确 定";
+  return selectedItems.value.length > 0 ? `已选(${selectedItems.value.length})` : "确 定";
 });
 function handleSelect(selection: any[], row: any) {
   if (isMultiple || selection.length === 0) {