From 43e626cfe63a919f9e8b49b6f52c8c1753d16a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E5=84=80=E5=BC=8F?= <854085467@qq.com>
Date: Sat, 30 Jul 2022 18:01:05 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=80(component):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=20table=20=E5=AD=90=E8=A1=A8=E5=B5=8C=E5=A5=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/component/table/TableRow.vue          | 16 +++++-----
 .../component/src/component/table/index.vue   | 31 +++++++++++++------
 .../src/document/zh-CN/components/panel.md    |  2 +-
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/package/component/src/component/table/TableRow.vue b/package/component/src/component/table/TableRow.vue
index 1532f509..ae9bbc2d 100644
--- a/package/component/src/component/table/TableRow.vue
+++ b/package/component/src/component/table/TableRow.vue
@@ -156,13 +156,13 @@ const renderFixedStyle = (column: any, columnIndex: number) => {
       return { right: `${right}px` } as StyleValue;
     }
   } else {
-      var isLast = true;
-      for (var i = columnIndex + 1; i < props.columns.length; i++) {
-        if (props.columns[i].fixed == undefined) {
-          isLast = false;
-        }
+    var isLast = true;
+    for (var i = columnIndex + 1; i < props.columns.length; i++) {
+      if (props.columns[i].fixed == undefined) {
+        isLast = false;
       }
-      return isLast ? { "border-right": "none" } as StyleValue : {};
+    }
+    return isLast ? ({ "border-right": "none" } as StyleValue) : {};
   }
   return {} as StyleValue;
 };
@@ -454,7 +454,9 @@ const renderFixedClassName = (column: any, columnIndex: number) => {
   </tr>
 
   <tr class="layui-table-cell-expand" v-if="slot.expand && isExpand">
-    <slot name="expand" :data="data"></slot>
+    <td class="layui-table-cell" :colspan="columns.length">
+      <slot name="expand" :data="data"></slot>
+    </td>
   </tr>
 
   <template v-if="data[childrenColumnName] && isExpand">
diff --git a/package/component/src/component/table/index.vue b/package/component/src/component/table/index.vue
index 55f4c763..ec87fe0c 100644
--- a/package/component/src/component/table/index.vue
+++ b/package/component/src/component/table/index.vue
@@ -6,7 +6,16 @@ export default {
 
 <script setup lang="ts">
 import "./index.less";
-import { ref, watch, useSlots, withDefaults, onMounted, StyleValue, WritableComputedRef, computed } from "vue";
+import {
+  ref,
+  watch,
+  useSlots,
+  withDefaults,
+  onMounted,
+  StyleValue,
+  WritableComputedRef,
+  computed,
+} from "vue";
 import { v4 as uuidv4 } from "../../utils/guidUtil";
 import { Recordable } from "../../types";
 import { LayIcon } from "@layui/icons-vue";
@@ -322,13 +331,13 @@ const renderFixedStyle = (column: any, columnIndex: number) => {
       return { right: `${right}px` } as StyleValue;
     }
   } else {
-      var isLast = true;
-      for (var i = columnIndex + 1; i < props.columns.length; i++) {
-        if (props.columns[i].fixed == undefined) {
-          isLast = false;
-        }
+    var isLast = true;
+    for (var i = columnIndex + 1; i < props.columns.length; i++) {
+      if (props.columns[i].fixed == undefined) {
+        isLast = false;
       }
-      return isLast ? { "border-right": "none" } as StyleValue : {};
+    }
+    return isLast ? ({ "border-right": "none" } as StyleValue) : {};
   }
   return {} as StyleValue;
 };
@@ -458,9 +467,13 @@ const renderTotalRowCell = (column: any) => {
                       :class="[
                         renderFixedClassName(column, columnIndex),
                         column.fixed ? `layui-table-fixed-${column.fixed}` : '',
-                        column.type == 'checkbox' ? 'layui-table-cell-checkbox' : '',
+                        column.type == 'checkbox'
+                          ? 'layui-table-cell-checkbox'
+                          : '',
                         column.type == 'radio' ? 'layui-table-cell-radio' : '',
-                        column.type == 'number' ? 'layui-table-cell-number' : '',
+                        column.type == 'number'
+                          ? 'layui-table-cell-number'
+                          : '',
                       ]"
                       :style="[
                         {
diff --git a/package/document-component/src/document/zh-CN/components/panel.md b/package/document-component/src/document/zh-CN/components/panel.md
index 01ac150b..8de30175 100644
--- a/package/document-component/src/document/zh-CN/components/panel.md
+++ b/package/document-component/src/document/zh-CN/components/panel.md
@@ -13,7 +13,7 @@
 ::: demo 使用 `lay-panel` 标签, 创建面板组件
 
 <template>
-  <lay-panel><div style="padding: 30px;">面板</div></lay-panel>
+  <lay-panel>面板</lay-panel>
 </template>
 
 <script>