From 720fb75f36d2f881091c03dd4b871589070a7e71 Mon Sep 17 00:00:00 2001
From: Aaron <427787340@qq.com>
Date: Tue, 24 Sep 2019 10:49:24 +0800
Subject: [PATCH] 修复Search默认值

---
 packages/scheme/index.vue |  2 +-
 packages/search/index.vue | 34 +++++++++++++++++++++++++---------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/packages/scheme/index.vue b/packages/scheme/index.vue
index 08313ef..1f1ad54 100644
--- a/packages/scheme/index.vue
+++ b/packages/scheme/index.vue
@@ -81,7 +81,7 @@
   <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" :formProps="searchProps" @search="value => handleSearch(value, true)" :searching="tableLoading">
+      <component :is="_searchComponent" :list="_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">
           <slot v-if="$scopedSlots[`search-${item.key}`] || $slots[`search-${item.key}`]" :name="`search-${item.key}`" :slot="item.key" :model="searchModel"></slot>
diff --git a/packages/search/index.vue b/packages/search/index.vue
index db1d7a9..865a54b 100644
--- a/packages/search/index.vue
+++ b/packages/search/index.vue
@@ -63,7 +63,9 @@ export default {
     span: {
       type: Number,
       default: 6
-    }
+    },
+    // 表单折叠情况下显示数量
+    showNumber: Number,
   },
   data() {
     return {
@@ -78,11 +80,19 @@ export default {
     this.initModel(this.list);
   },
   mounted() {
-    this.setModelValue(this.value);
+    this.setModelValue(this.value, true);
   },
   computed: {
+    // 配置列表键值对形式
+    listKeySet() {
+      let result = {};
+      this.list.forEach(item => {
+        result[item.key] = item;
+      });
+      return result;
+    },
     visibleColNum() {
-      return 24 / this.span;
+      return this.showNumber ? this.showNumber + 1 : 24 / this.span;
     }
   },
   watch: {
@@ -104,10 +114,16 @@ export default {
   },
   methods: {
     // 设置表单值
-    setModelValue(value) {
-      Object.keys(this.model).forEach(key => {
-        this.model[key] = value ? value[key] : undefined;
-      });
+    setModelValue(value, isInit) {
+      if (isInit) {
+        Object.keys(this.listKeySet).forEach(key => {
+          this.model[key] = this.listKeySet[key] ? this.listKeySet[key].default : undefined;
+        });
+      } else {
+        Object.keys(this.model).forEach(key => {
+          this.model[key] = value ? value[key] : undefined;
+        });
+      }
     },
     // 绑定提示组件参数
     bindItemTip(tip) {
@@ -174,8 +190,8 @@ export default {
     },
     // 重置表单
     handleReset() {
-      Object.keys(this.model).forEach(key => {
-        this.model[key] = this.list[key] ? this.list[key].default : undefined;
+      Object.keys(listObj).forEach(key => {
+        this.model[key] = this.listKeySet[key] ? this.listKeySet[key].default : undefined;
       });
       this.$nextTick(() => {
         this.$refs.search.clearValidate();
--
libgit2 0.21.0