From 48626d7a37a2dfde733bcb5301a4d900e1c2bdf2 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: Wed, 16 Nov 2022 00:35:24 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8(table):=20=E4=BC=98=E5=8C=96=20defaul?=
 =?UTF-8?q?t-toolbar=20=E5=B1=9E=E6=80=A7=E6=94=AF=E6=8C=81=20array=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8C=87=E5=AE=9A=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/src/component/table/index.vue   | 31 +++++++++++++++----
 package/component/src/component/tag/index.vue |  4 ++-
 .../src/document/zh-CN/components/table.md    |  2 +-
 .../src/document/zh-CN/guide/changelog.md     |  3 +-
 package/document-component/src/view/index.vue |  2 +-
 5 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/package/component/src/component/table/index.vue b/package/component/src/component/table/index.vue
index 64e002af..c9224061 100644
--- a/package/component/src/component/table/index.vue
+++ b/package/component/src/component/table/index.vue
@@ -32,7 +32,7 @@ export interface TableProps {
   page?: Recordable;
   columns: Recordable[];
   dataSource: Recordable[];
-  defaultToolbar?: boolean | Recordable[];
+  defaultToolbar?: boolean | any[];
   selectedKey?: string;
   selectedKeys?: Recordable[];
   indentSize?: number;
@@ -60,6 +60,7 @@ const props = withDefaults(defineProps<TableProps>(), {
   childrenColumnName: "children",
   dataSource: () => [],
   selectedKeys: () => [],
+  defaultToolbar: false,
   selectedKey: "",
   maxHeight: "auto",
   even: false,
@@ -518,7 +519,6 @@ const childrenExpandSpace = computed(() => {
   );
 });
 
-
 const renderFixedStyle = (column: any, columnIndex: number) => {
   if (column.fixed) {
     if (column.fixed == "left") {
@@ -564,7 +564,11 @@ const renderFixedStyle = (column: any, columnIndex: number) => {
 /**
  * @remark 排除 hide 列
  */
-const renderHeadFixedStyle = (column: any, columnIndex: number, tableHeadColumn: any[]) => {
+const renderHeadFixedStyle = (
+  column: any,
+  columnIndex: number,
+  tableHeadColumn: any[]
+) => {
   if (column.fixed) {
     if (column.fixed == "left") {
       var left = 0;
@@ -671,6 +675,13 @@ const totalRowMethod = (column: any, dataSource: any[]) => {
   return total;
 };
 
+const showToolbar = (toolbarName: string) => {
+  if(props.defaultToolbar instanceof Array) {
+    return props.defaultToolbar.includes(toolbarName)
+  }
+  return props.defaultToolbar;
+}
+
 onBeforeUnmount(() => {
   window.onresize = null;
 });
@@ -685,7 +696,8 @@ onBeforeUnmount(() => {
           <slot name="toolbar"></slot>
         </div>
         <div v-if="defaultToolbar" class="layui-table-tool-self">
-          <lay-dropdown updateAtScroll>
+
+          <lay-dropdown updateAtScroll v-if="showToolbar('filter')">
             <div class="layui-inline" title="筛选" lay-event>
               <i class="layui-icon layui-icon-slider"></i>
             </div>
@@ -703,7 +715,9 @@ onBeforeUnmount(() => {
               </div>
             </template>
           </lay-dropdown>
+
           <div
+            v-if="showToolbar('export')"
             class="layui-inline"
             title="导出"
             lay-event
@@ -711,7 +725,8 @@ onBeforeUnmount(() => {
           >
             <i class="layui-icon layui-icon-export"></i>
           </div>
-          <div class="layui-inline" title="打印" lay-event @click="print()">
+
+          <div class="layui-inline" v-if="showToolbar('print')" title="打印" lay-event @click="print()">
             <i class="layui-icon layui-icon-print"></i>
           </div>
         </div>
@@ -782,7 +797,11 @@ onBeforeUnmount(() => {
                           {
                             textAlign: column.align,
                           },
-                          renderHeadFixedStyle(column, columnIndex, tableHeadColumn),
+                          renderHeadFixedStyle(
+                            column,
+                            columnIndex,
+                            tableHeadColumn
+                          ),
                         ]"
                       >
                         <template v-if="column.type == 'checkbox'">
diff --git a/package/component/src/component/tag/index.vue b/package/component/src/component/tag/index.vue
index 573bfcfe..2c4dfc24 100644
--- a/package/component/src/component/tag/index.vue
+++ b/package/component/src/component/tag/index.vue
@@ -105,7 +105,9 @@ function useTagCustomStyle(props: TagProps) {
     <span v-if="$slots.icon" class="layui-tag-icon">
       <slot name="icon" />
     </span>
-    <span style="overflow: hidden;text-overflow: ellipsis;white-space:nowrap;">
+    <span
+      style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
+    >
       <span v-if="maxWidth" :style="styleTag" class="layui-tag-text">
         <slot />
       </span>
diff --git a/package/document-component/src/document/zh-CN/components/table.md b/package/document-component/src/document/zh-CN/components/table.md
index e80aa8ce..149d2103 100644
--- a/package/document-component/src/document/zh-CN/components/table.md
+++ b/package/document-component/src/document/zh-CN/components/table.md
@@ -1430,7 +1430,7 @@ export default {
 
     const selectedKeys5 = ref(['1'])
     const checkbox5 = ref(true)
-    const defaultToolbar5 = ref(true)
+    const defaultToolbar5 = ref(['print'])
     const maxHeight5 = ref('600px');
 
     const page5 = {
diff --git a/package/document-component/src/document/zh-CN/guide/changelog.md b/package/document-component/src/document/zh-CN/guide/changelog.md
index b8206bca..06bbeb62 100644
--- a/package/document-component/src/document/zh-CN/guide/changelog.md
+++ b/package/document-component/src/document/zh-CN/guide/changelog.md
@@ -16,10 +16,11 @@
       <li> 
         <h3>1.7.8 <span class="layui-badge-rim">2022-11-15</span></h3> 
         <ul>
-          <li>[修复] backtop 组件部分浏览器版本无法正常返回顶部。</li>
+          <li>[优化] backtop 组件部分浏览器版本无法正常返回顶部。</li>
           <li>[优化] date-picker 组件 btn 操作 border-radius 样式细节。</li>
           <li>[优化] tag-input 组件 maxWidth 属性默认为 100%。</li>
           <li>[优化] tag-input 组件 tagWidth 超出 input 宽度时自动省略文本。</li>
+          <li>[优化] table 组件 default-toolbar 属性支持 Array 类型, 举例：['print']。</li>
         </ul> 
       </li>
     </ul>
diff --git a/package/document-component/src/view/index.vue b/package/document-component/src/view/index.vue
index 2552dbef..690856ec 100644
--- a/package/document-component/src/view/index.vue
+++ b/package/document-component/src/view/index.vue
@@ -32,7 +32,7 @@
           >
           <span
             >{{ t("home.download") }}：<em class="site-showdowns"
-              >35,223</em
+              >39,044</em
             ></span
           >
         </div>