From fb8364fb126c1dcb87e30c4b6e9191bc4699c54b Mon Sep 17 00:00:00 2001
From: Aaron <427787340@qq.com>
Date: Fri, 27 Sep 2019 09:33:29 +0800
Subject: [PATCH] 修复Scheme中的List分组支持自定义问题

---
 packages/scheme/index.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/scheme/index.vue b/packages/scheme/index.vue
index 1f1ad54..5b02b87 100644
--- a/packages/scheme/index.vue
+++ b/packages/scheme/index.vue
@@ -81,9 +81,9 @@
   <div class="eagle-scheme">
     <div v-if="option.showSearch !== false" class="eagle-scheme__card">
       <!-- 搜索表单 -->
-      <component :is="_searchComponent" :list="_searchList" v-model="searchModel" :span="searchProps.span || 6" :showNumber="searchProps.showNumber" :formProps="searchProps" @search="value => handleSearch(value, true)" :searching="tableLoading">
+      <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">
+        <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>
@@ -121,7 +121,7 @@
         }"
       ></slot>
       <!-- 表格 -->
-      <component v-else :is="_tableComponent" ref="eagle-table" :list="_tableList" :value="tableData"
+      <component v-else :is="_tableComponent" ref="eagle-table" :list="tableList || _tableList" :value="tableData"
         v-loading="tableLoading"
         element-loading-background="rgba(255, 255, 255, 0.6)"
         :tableProps="{ border: true, 'row-key': 'id', ...tableProps }"
@@ -132,7 +132,7 @@
       >
         <slot></slot>
         <!-- 表格具名插槽 -->
-        <template v-for="(item, index) in _tableList">
+        <template v-for="(item, index) in tableList || _tableList">
           <slot v-if="$scopedSlots[`table-${item.key}`] || $slots[`table-${item.key}`]" :name="`table-${item.key}`" :slot="item.key" v-bind="slotMethod"></slot>
           <el-table-column v-else-if="$scopedSlots[`table-value-${item.key}`] || $slots[`table-value-${item.key}`]" :slot="item.key" :key="`column-${index}`" v-bind="item" :prop="item.agentKey || item.key" :min-width="item.minWidth || item['min-width'] || '120'">
             <slot slot-scope="{ row, column, $index }" :name="`table-value-${item.key}`" v-bind="{ ...item, ...slotMethod }" :row="row" :value="row[item.key]" :column="column" :index="$index"></slot>
@@ -192,7 +192,7 @@
       :visible.sync="dialogVisible" v-bind="{ width: '65%', size: dialogComponent === 'el-drawer' ? '50%' : undefined, ...dialogProps }"
     >
       <component :is="_formComponent" v-if="dialogType === 'dialog-form' && !$scopedSlots['dialog-form'] && !$slots['dialog-form']"
-        ref="eagle-form" :list="_formList" v-model="formModel" :params="{ formMode }" :span="formProps.span || 12" :formProps="formProps"
+        ref="eagle-form" :list="formList || _formList" v-model="formModel" :params="{ formMode }" :span="formProps.span || 12" :formProps="formProps"
         @submit="handleSubmit" @cancel="handleCancel" :style="dialogComponent === 'el-drawer' ? 'padding: 0 50px 0 10px;' : undefined"
       >
         <!-- 表单分组具名插槽 -->
@@ -200,19 +200,19 @@
           <slot v-if="$scopedSlots[`form-${key}`] || $slots[`form-${key}`]" :name="`form-${key}`" :slot="key" :model="formModel"></slot>
         </template>
         <!-- 表单项具名插槽 -->
-        <template v-for="item in _formList">
+        <template v-for="item in formList || _formList">
           <slot v-if="$scopedSlots[`form-item-${item.key}`] || $slots[`form-item-${item.key}`]" :name="`form-item-${item.key}`" :slot="`item-${item.key}`" :model="formModel"></slot>
           <slot v-else-if="$scopedSlots[`field-${item.key}`] || $slots[`field-${item.key}`]" :name="`field-${item.key}`" :slot="`item-${item.key}`" :model="formModel"></slot>
           <slot v-if="$scopedSlots[`form-label-${item.key}`] || $slots[`form-label-${item.key}`]" :name="`form-label-${item.key}`" :slot="`label-${item.key}`" :model="formModel" v-bind="item"></slot>
         </template>
       </component>
-      <component :is="_detailComponent" v-else-if="dialogType === 'dialog-view' && !$scopedSlots['dialog-view'] && !$slots['dialog-view']" v-model="formModel" :list="list || detailList || _formList" :span="detailProps.span || dialogComponent === 'el-drawer' ? 12 : 8" :formProps="detailProps">
+      <component :is="_detailComponent" v-else-if="dialogType === 'dialog-view' && !$scopedSlots['dialog-view'] && !$slots['dialog-view']" v-model="formModel" :list="detailList || list" :span="detailProps.span || dialogComponent === 'el-drawer' ? 12 : 8" :formProps="detailProps">
         <!-- 详情分组具名插槽 -->
         <template v-for="key in formGroupSlotsKeys">
           <slot v-if="$scopedSlots[`view-${key}`] || $slots[`view-${key}`]" :name="`view-${key}`" :slot="key" :model="formModel"></slot>
         </template>
         <!-- 详情项具名插槽 -->
-        <template v-for="item in list">
+        <template v-for="item in detailList || list">
           <slot v-if="$scopedSlots[`view-item-${item.key}`] || $slots[`view-item-${item.key}`]" :name="`view-item-${item.key}`" :slot="`item-${item.key}`" v-bind="{ ...item, ...slotMethod }" :model="formModel" :row="formModel" :value="formModel[item.key]"></slot>
           <slot v-else-if="$scopedSlots[`render-${item.key}`] || $slots[`render-${item.key}`]" :name="`render-${item.key}`" :slot="`item-${item.key}`" v-bind="{ ...item, ...slotMethod }" :model="formModel" :row="formModel" :value="formModel[item.key]"></slot>
         </template>
--
libgit2 0.21.0