From e776a95edb4e7e6816da88735bd08eb06fd16ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Mon, 26 Sep 2022 21:07:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=98=BE=E9=9A=90=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/RightToolbar/index.vue | 88 ++++++++++++++++++---------
 1 file changed, 60 insertions(+), 28 deletions(-)

diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index 8825591..716eb5e 100644
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -1,5 +1,15 @@
 <template>
   <div class="top-right-btn">
+    <el-dropdown :hide-on-click="false" style="margin-right: 10px" trigger="click">
+      <el-button circle icon="menu" />
+      <template #dropdown>
+        <el-dropdown-menu>
+          <el-dropdown-item v-for="(item, index) in data" :key="index">
+            <el-checkbox v-model="item.visible" :label="item.label"></el-checkbox>
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
 
     <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
       <el-button circle icon="Search" @click="toggleSearch()" />
@@ -7,77 +17,94 @@
     <el-tooltip class="item" effect="dark" content="刷新" placement="top">
       <el-button circle icon="Refresh" @click="refresh()" />
     </el-tooltip>
-    <el-tooltip class="item" effect="dark" content="显隐列" placement="top" v-if="columns">
+    <!-- <el-tooltip class="item" effect="dark" content="显隐列" placement="top" v-if="data">
       <el-button circle icon="Menu" @click="showColumn()" />
-    </el-tooltip>
+    </el-tooltip> -->
 
-    <el-dialog :title="title" v-model="open" append-to-body>
-      <el-transfer :titles="['显示', '隐藏']" v-model="value" :data="columns" @change="dataChange"></el-transfer>
-    </el-dialog>
+    <!-- <el-dialog :title="title" v-model="open" append-to-body>
+      <el-transfer :titles="['隐藏', '显示']" v-model="value" :data="data" @change="dataChange"></el-transfer>
+    </el-dialog> -->
   </div>
 </template>
 
 <script setup>
+import { ref } from 'vue'
 const props = defineProps({
   showSearch: {
     type: Boolean,
-    default: true,
+    default: true
   },
   columns: {
-    type: Array,
-  },
-});
+    type: Object
+  }
+})
 
-const emits = defineEmits(["update:showSearch", "queryTable"]);
+const data = computed(() => {
+  if (!props.columns) return undefined
+  return Object.values(props.columns).map((element, index) => {
+    element.key = index
+    return element
+  })
+})
+const emits = defineEmits(['update:showSearch', 'queryTable'])
 
 // 显隐数据
-const value = ref([]);
+const value = ref([])
 // 弹出层标题
-const title = ref("显示/隐藏");
+const title = ref('显示/隐藏')
 // 是否显示弹出层
-const open = ref(false);
+const open = ref(false)
 
 // 搜索
 function toggleSearch() {
-  emits("update:showSearch", !props.showSearch);
+  emits('update:showSearch', !props.showSearch)
 }
 
 // 刷新
 function refresh() {
-  emits("queryTable");
+  emits('queryTable')
 }
 
 // 右侧列表元素变化
-function dataChange(data) {
-  for (let item in props.columns) {
-    const key = props.columns[item].key;
-    props.columns[item].visible = !data.includes(key);
-  }
+function dataChange(item) {
+  let arrSelected = data.value.filter((element) => value.value.indexOf(element.key) > -1)
+
+  arrSelected.forEach((element) => {
+    element.visible = true
+  })
+  let arrUnSelected = data.value.filter((element) => value.value.indexOf(element.key) == -1)
+  arrUnSelected.forEach((element) => {
+    element.visible = false
+  })
 }
 
 // 打开显隐列dialog
 function showColumn() {
-  open.value = true;
+  open.value = true
 }
-
-// 显隐列初始默认隐藏列
-for (let item in props.columns) {
-  if (props.columns[item].visible === false) {
-    value.value.push(parseInt(item));
+const init = () => {
+  if (props.columns) {
+    Object.values(props.columns).forEach((element, index) => {
+      if (element.visible == true) value.value.push(index)
+    })
   }
 }
+console.log(data.value)
+init()
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .top-right-btn {
   flex: 1;
   text-align: right;
 }
+
 :deep(.el-transfer__button) {
   border-radius: 50%;
   display: block;
   margin-left: 0px;
 }
+
 :deep(.el-transfer__button:first-child) {
   margin-bottom: 10px;
 }
@@ -85,4 +112,9 @@ for (let item in props.columns) {
 .my-el-transfer {
   text-align: center;
 }
-</style>
\ No newline at end of file
+.el-dropdown-menu {
+  max-height: 400px;
+  overflow-y: scroll;
+  overflow-x: hidden;
+}
+</style>