From c1d513bc82ab3817d2c695a7b8a3dc049868ce69 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 27 Nov 2023 16:37:56 +0800
Subject: [PATCH] =?UTF-8?q?ref:=20=E4=BC=98=E5=8C=96=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=88=97=E6=8E=92=E5=BA=8F=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableColumnsDnd/index.vue | 54 ++++++++++++++++--------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/components/TableColumnsDnd/index.vue b/src/components/TableColumnsDnd/index.vue
index 5a71e8ac..1112b250 100644
--- a/src/components/TableColumnsDnd/index.vue
+++ b/src/components/TableColumnsDnd/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { reactive, watch, computed } from 'vue';
+import { reactive, watch, onMounted, PropType } from 'vue';
 import { Container, Draggable } from 'vue3-smooth-dnd';
 import useI18n from '@/hooks/useI18n';
 import { type ColumnsType } from 'ant-design-vue/lib/table';
@@ -7,11 +7,23 @@ const { t } = useI18n();
 
 const emit = defineEmits(['update:columns-dnd']);
 const props = defineProps({
-  /**表格字段列，必传 */
+  /**
+   * 表格字段列非响应式数据，必传
+   *
+   * v-model:columns-dnd取变更的数据
+   */
   columns: {
     type: Array<any>,
     required: true,
   },
+  /**按钮类型
+   * text 图标
+   * ghost 图标按钮带文字
+   */
+  type: {
+    type: String as PropType<'text' | 'ghost'>,
+    default: 'text',
+  },
 });
 
 /**表格字段列 */
@@ -19,8 +31,8 @@ const tableColumns = reactive<ColumnsType>(props.columns);
 
 /**表格字段列勾选状态 */
 const state = reactive({
-  indeterminate: true,
-  checkAll: false,
+  indeterminate: false,
+  checkAll: true,
   columnsTitleList: tableColumns.map(s => `${s.title}`),
 });
 
@@ -38,6 +50,7 @@ function fnTableColumnsDrop(dropResult: any) {
     let itemToAdd = payload;
     itemToAdd = tableColumns.splice(removedIndex, 1)[0];
     tableColumns.splice(addedIndex, 0, itemToAdd);
+    fnUpdateColumns();
   }
 }
 
@@ -55,6 +68,18 @@ function fnTableColumnsFixed(row: Record<string, any>) {
   }
 }
 
+/**表格字段列勾选字段变化 */
+function fnUpdateColumns() {
+  let list = tableColumns.filter(s =>
+    state.columnsTitleList.includes(`${s.title}`)
+  );
+  // 取消全选时留第一个
+  if (list.length === 0) {
+    list = [tableColumns[0]];
+  }
+  emit('update:columns-dnd', list);
+}
+
 /**表格字段列勾选监听 */
 watch(
   () => state.columnsTitleList,
@@ -62,21 +87,13 @@ watch(
     const len = val.length;
     state.indeterminate = !!len && len < tableColumns.length;
     state.checkAll = len === tableColumns.length;
+    fnUpdateColumns();
   }
 );
 
-/**表格字段列勾选字段变化 */
-const tableColumnsCheckList = computed(() => {
-  let list = tableColumns.filter(s =>
-    state.columnsTitleList.includes(`${s.title}`)
-  );
-  // 取消全选时留最后一个
-  if (list.length === 0) {
-    list = [tableColumns[tableColumns.length - 1]];
-  }
-  return list;
+onMounted(() => {
+  fnUpdateColumns();
 });
-emit('update:columns-dnd', tableColumnsCheckList);
 </script>
 
 <template>
@@ -99,7 +116,7 @@ emit('update:columns-dnd', tableColumnsCheckList);
       <template #content>
         <a-checkbox-group
           v-model:value="state.columnsTitleList"
-          style="width: 100%; max-height: 450px; overflow-y: auto;"
+          style="width: 100%; max-height: 450px; overflow-y: auto"
         >
           <Container orientation="vertical" @drop="fnTableColumnsDrop">
             <Draggable v-for="c in tableColumns" :key="c.title">
@@ -121,8 +138,11 @@ emit('update:columns-dnd', tableColumnsCheckList);
           </Container>
         </a-checkbox-group>
       </template>
-      <a-button type="text">
+      <a-button :type="props.type" size="small">
         <template #icon><TableOutlined /></template>
+        <span v-if="props.type === 'ghost'">
+          {{ t('common.columnSetText') }}
+        </span>
       </a-button>
     </a-popover>
   </a-tooltip>