From 5beab5d80c26bd67a2e1d7741831430a7255750f 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: Mon, 18 Jul 2022 14:49:48 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B(table):=20=E4=BF=AE=E5=A4=8D=20typ?=
 =?UTF-8?q?escript=20=E7=B1=BB=E5=9E=8B=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/component/table/TableRow.vue          | 20 +++++++++++--------
 .../component/src/component/table/index.vue   |  9 +++++----
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/package/component/src/component/table/TableRow.vue b/package/component/src/component/table/TableRow.vue
index 2a32fd70..76c1dff9 100644
--- a/package/component/src/component/table/TableRow.vue
+++ b/package/component/src/component/table/TableRow.vue
@@ -6,7 +6,7 @@ export default {
 
 <script lang="ts" setup>
 import { Recordable } from "../../types";
-import { computed, ref, useSlots, WritableComputedRef } from "vue";
+import { computed, ref, StyleValue, useSlots, WritableComputedRef } from "vue";
 import LayCheckbox from "../checkbox/index.vue";
 import LayDropdown from "../dropdown/index.vue";
 import LayTooltip from "../tooltip/index.vue";
@@ -133,7 +133,7 @@ const renderFixedStyle = (column: any, columnIndex: number) => {
           left = left + props.columns[i]?.width.replace("px", "");
         }
       }
-      return `left:${left}px`;
+      return { left: `${left}px` } as StyleValue;
     } else {
       var right = 0;
       for (var i = columnIndex + 1; i < props.columns.length; i++) {
@@ -141,9 +141,10 @@ const renderFixedStyle = (column: any, columnIndex: number) => {
           right = right + props.columns[i]?.width.replace("px", "");
         }
       }
-      return `right:${right}px`;
+      return { right: `${right}px` } as StyleValue;
     }
   }
+  return { } as StyleValue;
 };
 
 const renderFixedClassName = (column: any, columnIndex: number) => {
@@ -155,7 +156,7 @@ const renderFixedClassName = (column: any, columnIndex: number) => {
           left = false;
         }
       }
-      return `layui-table-fixed-left-last`;
+      return left ? `layui-table-fixed-left-last` : "";
     } else {
       var right = true;
       for (var i = 0; i < columnIndex; i++) {
@@ -163,7 +164,7 @@ const renderFixedClassName = (column: any, columnIndex: number) => {
           right = false;
         }
       }
-      return `layui-table-fixed-right-first`;
+      return right ? `layui-table-fixed-right-first` : "";
     }
   }
 };
@@ -226,7 +227,8 @@ const renderFixedClassName = (column: any, columnIndex: number) => {
 
             <lay-icon
               v-if="
-                (slot.expand || data[childrenColumnName]) && columnIndex === expandIndex
+                (slot.expand || data[childrenColumnName]) &&
+                columnIndex === expandIndex
               "
               class="layui-table-cell-expand-icon"
               :type="expandIconType"
@@ -279,7 +281,8 @@ const renderFixedClassName = (column: any, columnIndex: number) => {
 
             <lay-icon
               v-if="
-                (slot.expand || data[childrenColumnName]) && columnIndex === expandIndex
+                (slot.expand || data[childrenColumnName]) &&
+                columnIndex === expandIndex
               "
               class="layui-table-cell-expand-icon"
               :type="expandIconType"
@@ -334,7 +337,8 @@ const renderFixedClassName = (column: any, columnIndex: number) => {
 
               <lay-icon
                 v-if="
-                  (slot.expand || data[childrenColumnName]) && columnIndex === expandIndex
+                  (slot.expand || data[childrenColumnName]) &&
+                  columnIndex === expandIndex
                 "
                 class="layui-table-cell-expand-icon"
                 :type="expandIconType"
diff --git a/package/component/src/component/table/index.vue b/package/component/src/component/table/index.vue
index b693cf4b..30a55298 100644
--- a/package/component/src/component/table/index.vue
+++ b/package/component/src/component/table/index.vue
@@ -6,7 +6,7 @@ export default {
 
 <script setup lang="ts">
 import "./index.less";
-import { ref, watch, useSlots, withDefaults, onMounted, onUpdated } from "vue";
+import { ref, watch, useSlots, withDefaults, onMounted, onUpdated, StyleValue } from "vue";
 import { v4 as uuidv4 } from "../../utils/guidUtil";
 import { Recordable } from "../../types";
 import { LayIcon } from "@layui/icons-vue";
@@ -264,7 +264,7 @@ const renderFixedStyle = (column: any, columnIndex: number) => {
           left = left + props.columns[i]?.width.replace("px", "");
         }
       }
-      return `left:${left}px`;
+      return { left: `${left}px` } as StyleValue;
     } else {
       var right = 0;
       for (var i = columnIndex + 1; i < props.columns.length; i++) {
@@ -272,9 +272,10 @@ const renderFixedStyle = (column: any, columnIndex: number) => {
           right = right + props.columns[i]?.width.replace("px", "");
         }
       }
-      return `right:${right}px`;
+      return { right: `${right}px` } as StyleValue;
     }
   }
+  return { } as StyleValue;
 };
 
 const renderFixedClassName = (column: any, columnIndex: number) => {
@@ -471,7 +472,7 @@ const renderFixedClassName = (column: any, columnIndex: number) => {
                   :currentIndentSize="currentIndentSize"
                   :tableColumnKeys="tableColumnKeys"
                   :expandSpace="childrenExpandSpace"
-                  :expandIndex="expandIndex" 
+                  :expandIndex="expandIndex"
                   :cellStyle="cellStyle"
                   :cellClassName="cellClassName"
                   :rowStyle="rowStyle"