From c31f9448654f03df330af24956c1d0f635f939d0 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: Sun, 1 May 2022 01:17:31 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=9D:=20=E6=9B=B4=E6=96=B0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/component/slider/Standard.vue         |  4 +-
 .../src/component/slider/StandardRange.vue    |  4 +-
 .../src/component/slider/Vertical.vue         |  4 +-
 .../src/component/slider/VerticalRange.vue    |  4 +-
 .../component/src/component/table/Column.vue  | 38 +++++++++++++++++
 .../component/src/component/table/index.vue   | 37 ++++++++--------
 .../src/document/zh-CN/components/table.md    | 42 +++++++++----------
 .../src/document/zh-CN/guide/changelog.md     | 14 +++++++
 8 files changed, 98 insertions(+), 49 deletions(-)
 create mode 100644 package/component/src/component/table/Column.vue

diff --git a/package/component/src/component/slider/Standard.vue b/package/component/src/component/slider/Standard.vue
index 7970ad73..be676e6f 100644
--- a/package/component/src/component/slider/Standard.vue
+++ b/package/component/src/component/slider/Standard.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 export default {
-  name: "StandardVue"
-}
+  name: "StandardVue",
+};
 </script>
 
 <script setup lang="ts">
diff --git a/package/component/src/component/slider/StandardRange.vue b/package/component/src/component/slider/StandardRange.vue
index 4b355dcd..d56c39c7 100644
--- a/package/component/src/component/slider/StandardRange.vue
+++ b/package/component/src/component/slider/StandardRange.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 export default {
-  name: "StandardRange"
-}
+  name: "StandardRange",
+};
 </script>
 
 <script setup lang="ts">
diff --git a/package/component/src/component/slider/Vertical.vue b/package/component/src/component/slider/Vertical.vue
index 3aa14ec6..dc9aee10 100644
--- a/package/component/src/component/slider/Vertical.vue
+++ b/package/component/src/component/slider/Vertical.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 export default {
-  name: "Vertical"
-}
+  name: "Vertical",
+};
 </script>
 
 <script setup lang="ts">
diff --git a/package/component/src/component/slider/VerticalRange.vue b/package/component/src/component/slider/VerticalRange.vue
index 3eeedc2a..1ea4507c 100644
--- a/package/component/src/component/slider/VerticalRange.vue
+++ b/package/component/src/component/slider/VerticalRange.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 export default {
-  name: "VerticalRange"
-}
+  name: "VerticalRange",
+};
 </script>
 
 <script setup lang="ts">
diff --git a/package/component/src/component/table/Column.vue b/package/component/src/component/table/Column.vue
new file mode 100644
index 00000000..f52f4f30
--- /dev/null
+++ b/package/component/src/component/table/Column.vue
@@ -0,0 +1,38 @@
+<template>
+  <th
+    v-if="tableColumnKeys.includes(column.key)"
+    class="layui-table-cell"
+    :style="{
+      textAlign: column.align,
+      flex: column.width ? '0 0 ' + column.width : '1',
+    }"
+  >
+    <span>
+      <template v-if="column.titleSlot">
+        <slot :name="column.titleSlot"></slot>
+      </template>
+      <template v-else>
+        {{ column.title }}
+      </template>
+    </span>
+    <!-- 插槽 -->
+    <slot></slot> 
+  </th>
+</template>
+
+<script lang="ts">
+export default {
+  name: "Column",
+};
+</script>
+
+<script lang="ts" setup>
+
+export interface LayTableProps {
+  column?: any;
+  tableColumnKeys?: any;
+}
+
+const props = withDefaults(defineProps<LayTableProps>(), {
+});
+</script>
diff --git a/package/component/src/component/table/index.vue b/package/component/src/component/table/index.vue
index fc547152..8ff660ea 100644
--- a/package/component/src/component/table/index.vue
+++ b/package/component/src/component/table/index.vue
@@ -5,6 +5,7 @@ export default {
 </script>
 
 <script setup lang="ts">
+import Column from "./Column.vue";
 import { ref, watch, useSlots, withDefaults, onMounted } from "vue";
 import { v4 as uuidv4 } from "../../utils/guidUtil";
 import { Recordable } from "../../types";
@@ -56,6 +57,19 @@ const tableColumnKeys = ref(
   })
 );
 
+const tableColumns1 = [];
+
+
+/**
+ * 复杂表头 
+ * 
+ * 思路：将 Column 处理为多级别 tr。
+ */
+tableColumns.value.forEach((tableColumn) => {
+  
+})
+
+
 watch(
   () => props.dataSource,
   () => {
@@ -268,27 +282,12 @@ onMounted(() => {
                     />
                   </div>
                 </th>
-                <template v-for="column in columns" :key="column">
-                  <th
-                    class="layui-table-cell"
-                    :style="{
-                      textAlign: column.align,
-                      flex: column.width ? '0 0 ' + column.width : '1',
-                    }"
-                    v-if="tableColumnKeys.includes(column.key)"
-                  >
-                    <span>
-                      <template v-if="column.titleSlot">
-                        <slot :name="column.titleSlot"></slot>
-                      </template>
-                      <template v-else>
-                        {{ column.title }}
-                      </template>
-                    </span>
+                <template v-for="column in columns" :key="column">  
+                  <column :tableColumnKeys="tableColumnKeys" :column="column">
                     <span
                       v-if="column.sort"
                       class="layui-table-sort layui-inline"
-                      lay-sort=""
+                      lay-sort
                     >
                       <i
                         @click.stop="sortTable($event, column.key, 'asc')"
@@ -301,7 +300,7 @@ onMounted(() => {
                         title="降序"
                       ></i>
                     </span>
-                  </th>
+                  </column>
                 </template>
               </tr>
             </thead>
diff --git a/package/document/src/document/zh-CN/components/table.md b/package/document/src/document/zh-CN/components/table.md
index 0c74fc70..fbb829e3 100644
--- a/package/document/src/document/zh-CN/components/table.md
+++ b/package/document/src/document/zh-CN/components/table.md
@@ -167,7 +167,6 @@ export default {
 
 :::
 
-
 ::: title 开启排序
 :::
 
@@ -311,15 +310,15 @@ export default {
 
 ::: table
 
-| 属性                 | 描述                          | 类型 | 默认值 | 可选值         |
-| -------------------- | ----------------------------- | ---- | ------ | -------------- |
-| columns              | 列配置 - [更多](#tableColumn) | --   | --     | --             |
-| dataSource           | 数据源                        | --   | --     | --             |
-| checkbox             | 开启复选框                    | `boolean`   | `false`     | `true` `false`             |
-| id                   | 主键                          | `string`   | --     | --             |
-| v-model:selectedKeys | 选中项                        | --   | --     | --             |
-| default-toolbar      | 工具栏                        | `boolean`   | `false`     | `true` `false` |
-| size                 | 尺寸                          | `string`   | `md`     | `lg` `md` `sm` |
+| 属性                 | 描述                          | 类型      | 默认值  | 可选值         |
+| -------------------- | ----------------------------- | --------- | ------- | -------------- |
+| columns              | 列配置 - [更多](#tableColumn) | --        | --      | --             |
+| dataSource           | 数据源                        | --        | --      | --             |
+| checkbox             | 开启复选框                    | `boolean` | `false` | `true` `false` |
+| id                   | 主键                          | `string`  | --      | --             |
+| v-model:selectedKeys | 选中项                        | --        | --      | --             |
+| default-toolbar      | 工具栏                        | `boolean` | `false` | `true` `false` |
+| size                 | 尺寸                          | `string`  | `md`    | `lg` `md` `sm` |
 
 :::
 
@@ -353,18 +352,17 @@ export default {
 
 ::: table
 
-| 插槽       | 描述       | 类型 | 默认值 | 可选值 |
-| ---------- | ---------- | ---- |---- |---- |
-| title      | 列标题     | --   |--   |--   |
-| key        | 数据字段   | --   |--   |--   |
-| customSlot | 自定义插槽 | --   |--   |--   |
-| width      | 宽度       | --   |--   |--   |
-| sort       | 排序       | --   |--   |--   |
-| titleSlot  | 标题插槽   | --   |--   |--   |
-| align      | 对齐方式   | `string` | `left` | `left` `right` `center`   |
+| 插槽       | 描述       | 类型     | 默认值 | 可选值                  |
+| ---------- | ---------- | -------- | ------ | ----------------------- |
+| title      | 列标题     | --       | --     | --                      |
+| key        | 数据字段   | --       | --     | --                      |
+| customSlot | 自定义插槽 | --       | --     | --                      |
+| width      | 宽度       | --       | --     | --                      |
+| sort       | 排序       | --       | --     | --                      |
+| titleSlot  | 标题插槽   | --       | --     | --                      |
+| align      | 对齐方式   | `string` | `left` | `left` `right` `center` |
+
 :::
 
- 
-
 ::: previousNext table
-:::
\ No newline at end of file
+:::
diff --git a/package/document/src/document/zh-CN/guide/changelog.md b/package/document/src/document/zh-CN/guide/changelog.md
index 1a200c9f..f650a40d 100644
--- a/package/document/src/document/zh-CN/guide/changelog.md
+++ b/package/document/src/document/zh-CN/guide/changelog.md
@@ -11,6 +11,20 @@
 <template>
 <lay-timeline>
   <lay-timeline-item title="1.0.x">
+      <ul> 
+      <a name="1-0-5"> </a> 
+      <li> 
+        <h3>1.0.5 <span class="layui-badge-rim">2022-05-01</span></h3> 
+        <ul>
+          <li>[新增] dropdown 组件 context-menu 属性。。</li>
+          <li>[修复] layer 组件 tooltip 组件 index 层级冲突。</li>
+          <li>[修复] table 组件 columns 宽度超出 table-box 错位。</li>
+          <li>[修复] table 组件 selected-keys 属性 deep 监听。</li>
+          <li>[修复] slider 组件 btn 背景色。</li>
+          <li>[修复] upload 组件 url 失效。</li>
+        </ul> 
+      </li>
+    </ul>
     <ul> 
       <a name="1-0-4"> </a> 
       <li>