From 0a4b0a7f13bc5f8275816dc4d432ca9f28bc1bde Mon Sep 17 00:00:00 2001
From: Aaron <427787340@qq.com>
Date: Tue, 3 Dec 2019 14:44:54 +0800
Subject: [PATCH] 阻止默认表单事件，Scheme组件增加搜索栏插槽

---
 packages/form/index.vue   |  2 +-
 packages/scheme/index.vue | 28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/packages/form/index.vue b/packages/form/index.vue
index 09c168b..cae587f 100644
--- a/packages/form/index.vue
+++ b/packages/form/index.vue
@@ -20,7 +20,7 @@
 </style>
 
 <template>
-  <el-form class="eagle-form" ref="form" :model="model" v-bind="{ size: 'small', 'label-width': '100px', ...formProps }">
+  <el-form class="eagle-form" ref="form" :model="model" v-bind="{ size: 'small', 'label-width': '100px', ...formProps }" @submit.native.prevent>
     <el-row :gutter="15">
       <el-collapse v-if="(formProps.collapse || collapse) && listOption.isGroup" v-model="activeNames" :accordion="(formProps.accordion || accordion)" class="eagle-form__collapse">
         <template v-for="(data, index) in listOption.dataList">
diff --git a/packages/scheme/index.vue b/packages/scheme/index.vue
index 5b02b87..3dcf997 100644
--- a/packages/scheme/index.vue
+++ b/packages/scheme/index.vue
@@ -79,16 +79,24 @@
 
 <template>
   <div class="eagle-scheme">
-    <div v-if="option.showSearch !== false" class="eagle-scheme__card">
-      <!-- 搜索表单 -->
-      <component :is="_searchComponent" :list="searchList || _searchList" v-model="searchModel" :span="searchProps.span || 6" :showNumber="searchProps.showNumber" :formProps="searchProps" @search="value => handleSearch(value, true)" :searching="tableLoading">
-        <!-- 搜索表单项具名插槽 -->
-        <template v-for="item in searchList || _searchList">
-          <slot v-if="$scopedSlots[`search-${item.key}`] || $slots[`search-${item.key}`]" :name="`search-${item.key}`" :slot="item.key" :model="searchModel"></slot>
-          <slot v-else-if="$scopedSlots[`field-${item.key}`] || $slots[`field-${item.key}`]" :name="`field-${item.key}`" :slot="item.key" :model="searchModel"></slot>
-        </template>
-      </component>
-    </div>
+    <!-- 表格搜索栏插槽 -->
+    <template v-if="option.showSearch !== false">
+      <template v-if="$scopedSlots['search'] || $slots['search']">
+        <slot name="search" v-bind="slotMethod" :handleSearch="handleSearch" :searching="tableLoading"></slot>
+      </template>
+      <template v-else>
+        <div class="eagle-scheme__card">
+          <!-- 搜索表单 -->
+          <component :is="_searchComponent" :list="searchList || _searchList" v-model="searchModel" :span="searchProps.span || 6" :showNumber="searchProps.showNumber" :formProps="searchProps" @search="value => handleSearch(value, true)" :searching="tableLoading">
+            <!-- 搜索表单项具名插槽 -->
+            <template v-for="item in searchList || _searchList">
+              <slot v-if="$scopedSlots[`search-${item.key}`] || $slots[`search-${item.key}`]" :name="`search-${item.key}`" :slot="item.key" :model="searchModel"></slot>
+              <slot v-else-if="$scopedSlots[`field-${item.key}`] || $slots[`field-${item.key}`]" :name="`field-${item.key}`" :slot="item.key" :model="searchModel"></slot>
+            </template>
+          </component>
+        </div>
+      </template>
+    </template>
     <!-- 操作按钮栏 -->
     <div v-if="option.showActionBar !== false" class="eagle-scheme__action" v-loading="tableLoading" element-loading-spinner="none" element-loading-background="rgba(255, 255, 255, 0.6)">
       <slot v-if="$scopedSlots['action-bar'] || $slots['action-bar']" name="action-bar" v-bind="slotMethod" :model="formModel" :selection="tableSelection"></slot>
--
libgit2 0.21.0