From 4dd2024becf164b7e6849515bd0e370ddd7ca455 Mon Sep 17 00:00:00 2001
From: XiaoDaiGua-Ray <443547225@qq.com>
Date: Tue, 29 Aug 2023 10:30:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DRayCollapseGrid?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=80=E4=BA=9B=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.cjs                                |  7 ++++-
 src/components/RayCollapseGrid/src/index.tsx | 33 +++++++++-----------
 src/views/demo/mock-demo/index.tsx           | 10 +++---
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index f564c44a..5a8d10e1 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -105,7 +105,12 @@ module.exports = {
     'no-labels': 2, // 禁止标签声明
     'no-lone-blocks': 2, // 禁止不必要的嵌套块
     'no-multi-spaces': 1, // 禁止使用多余的空格
-    'no-multiple-empty-lines': [1, { max: 2 }], // 空行最多不能超过 `2` 行
+    'no-multiple-empty-lines': [
+      'error',
+      {
+        max: 2,
+      },
+    ], // 空行最多不能超过 `2` 行
     'no-new-func': 2, // 禁止使用 `new Function`
     'no-new-object': 2, // 禁止使用 `new Object`
     'no-new-require': 2, // 禁止使用 `new require`
diff --git a/src/components/RayCollapseGrid/src/index.tsx b/src/components/RayCollapseGrid/src/index.tsx
index 1f49d0d5..4c29feb4 100644
--- a/src/components/RayCollapseGrid/src/index.tsx
+++ b/src/components/RayCollapseGrid/src/index.tsx
@@ -9,6 +9,16 @@
  * @remark 今天也是元气满满撸代码的一天
  */
 
+/**
+ *
+ * <https://www.naiveui.com/zh-CN/dark/components/grid>
+ *
+ * 可折叠操作栏
+ * 可以结合表单或者表格使用，让你快捷的实现高级搜索功能
+ *
+ * 该组件完全基于 `NGrid` `NGridItem` 实现, 所以需要在使用该组件时使用 `NGridItem` 包裹元素
+ */
+
 import './index.scss'
 
 import { collapseGridProps } from './props'
@@ -76,14 +86,10 @@ const RayCollapseGrid = defineComponent({
             >
               {this.$slots.default?.()}
               <NGridItem suffix class="ray-collapse-grid__suffix--btn">
-                {{
-                  default: ({ overflow }: { overflow: boolean }) => (
-                    <NSpace justify="end">
-                      {this.$slots.action?.()}
-                      {overflow ? this.CollapseIcon() : ''}
-                    </NSpace>
-                  ),
-                }}
+                <NSpace justify="end">
+                  {this.$slots.action?.()}
+                  {this.CollapseIcon()}
+                </NSpace>
               </NGridItem>
             </NGrid>
           ),
@@ -94,14 +100,3 @@ const RayCollapseGrid = defineComponent({
 })
 
 export default RayCollapseGrid
-
-/**
- *
- * <https://www.naiveui.com/zh-CN/dark/components/grid>
- *
- * 可折叠操作栏
- *
- * 可以结合表单或者表格使用
- *
- * 该组件完全基于 `NGrid` `NGridItem` 实现, 所以需要在使用该组件时使用 `NGridItem` 包裹元素
- */
diff --git a/src/views/demo/mock-demo/index.tsx b/src/views/demo/mock-demo/index.tsx
index 4df1755d..dbc65de9 100644
--- a/src/views/demo/mock-demo/index.tsx
+++ b/src/views/demo/mock-demo/index.tsx
@@ -170,13 +170,13 @@ const MockDemo = defineComponent({
                   <NFormItemGi label="邮箱">
                     <NInput v-model:value={this.email} clearable />
                   </NFormItemGi>
-                  <NFormItemGi>
-                    <NButton type="primary" onClick={this.getPerson.bind(this)}>
-                      搜索
-                    </NButton>
-                  </NFormItemGi>
                 </>
               ),
+              action: () => (
+                <NButton type="primary" onClick={this.getPerson.bind(this)}>
+                  搜索
+                </NButton>
+              ),
             }}
           </RayCollapseGrid>
         </NForm>