From ac3056b9a7b46fbff00d3079de391995af71ec59 Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Wed, 3 Sep 2025 17:18:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=98=BE=E7=A4=BA=E5=88=97=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=94=AF=E6=8C=81=E5=AF=B9=E8=B1=A1=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/RightToolbar/index.vue     | 66 +++++++++++++------
 .../src/views/system/user/index.vue           | 33 +++++-----
 2 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/ruoyi-fastapi-frontend/src/components/RightToolbar/index.vue b/ruoyi-fastapi-frontend/src/components/RightToolbar/index.vue
index 57377ff..32fc644 100644
--- a/ruoyi-fastapi-frontend/src/components/RightToolbar/index.vue
+++ b/ruoyi-fastapi-frontend/src/components/RightToolbar/index.vue
@@ -7,7 +7,7 @@
       <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="Object.keys(columns).length > 0">
         <el-button circle icon="Menu" @click="showColumn()" v-if="showColumnsType == 'transfer'"/>
         <el-dropdown trigger="click" :hide-on-click="false" style="padding-left: 12px" v-if="showColumnsType == 'checkbox'">
           <el-button circle icon="Menu" />
@@ -18,9 +18,9 @@
                 <el-checkbox :indeterminate="isIndeterminate" v-model="isChecked" @change="toggleCheckAll"> 列展示 </el-checkbox>
               </el-dropdown-item>
               <div class="check-line"></div>
-              <template v-for="item in columns" :key="item.key">
+              <template v-for="(item, key) in columns" :key="item.key">
                 <el-dropdown-item>
-                  <el-checkbox v-model="item.visible" @change="checkboxChange($event, item.label)" :label="item.label" />
+                  <el-checkbox v-model="item.visible" @change="checkboxChange($event, key)" :label="item.label" />
                 </el-dropdown-item>
               </template>
             </el-dropdown-menu>
@@ -32,7 +32,7 @@
       <el-transfer
         :titles="['显示', '隐藏']"
         v-model="value"
-        :data="columns"
+        :data="transferData"
         @change="dataChange"
       ></el-transfer>
     </el-dialog>
@@ -46,9 +46,10 @@ const props = defineProps({
     type: Boolean,
     default: true
   },
-  /* 显隐列信息 */
+  /* 显隐列信息（数组格式、对象格式） */
   columns: {
-    type: Array
+    type: [Array, Object],
+    default: () => ({})
   },
   /* 是否显示检索图标 */
   search: {
@@ -82,14 +83,15 @@ const style = computed(() => {
     ret.marginRight = `${props.gutter / 2}px`
   }
   return ret
-});
+})
 
 // 是否全选/半选 状态
 const isChecked = computed({
-  get: () => props.columns.every(col => col.visible),
+  get: () => Array.isArray(props.columns) ? props.columns.every(col => col.visible) : Object.values(props.columns).every((col) => col.visible),
   set: () => {}
 })
-const isIndeterminate = computed(() => props.columns.some((col) => col.visible) && !isChecked.value)
+const isIndeterminate = computed(() => Array.isArray(props.columns) ? props.columns.some((col) => col.visible) && !isChecked.value : Object.values(props.columns).some((col) => col.visible) && !isChecked.value)
+const transferData = computed(() => Array.isArray(props.columns) ? props.columns.map((item, index) => ({ key: index, label: item.label })) : Object.keys(props.columns).map((key, index) => ({ key: index, label: props.columns[key].label })))
 
 // 搜索
 function toggleSearch() {
@@ -98,14 +100,20 @@ function toggleSearch() {
 
 // 刷新
 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)
+  if (Array.isArray(props.columns)) {
+    for (let item in props.columns) {
+      const key = props.columns[item].key
+      props.columns[item].visible = !data.includes(key)
+    }
+  } else {
+    Object.keys(props.columns).forEach((key, index) => {
+      props.columns[key].visible = !data.includes(index)
+    })
   }
 }
 
@@ -114,24 +122,40 @@ function showColumn() {
   open.value = true
 }
 
-if (props.showColumnsType == 'transfer') {
-  // 显隐列初始默认隐藏列
-  for (let item in props.columns) {
-    if (props.columns[item].visible === false) {
-      value.value.push(parseInt(item))
+if (props.showColumnsType == "transfer") {
+  // transfer穿梭显隐列初始默认隐藏列
+  if (Array.isArray(props.columns)) {
+    for (let item in props.columns) {
+      if (props.columns[item].visible === false) {
+        value.value.push(parseInt(item))
+      }
     }
+  } else {
+    Object.keys(props.columns).forEach((key, index) => {
+      if (props.columns[key].visible === false) {
+        value.value.push(index)
+      }
+    })
   }
 }
 
 // 单勾选
-function checkboxChange(event, label) {
-  props.columns.filter(item => item.label == label)[0].visible = event
+function checkboxChange(event, key) {
+  if (Array.isArray(props.columns)) {
+    props.columns.filter(item => item.key == key)[0].visible = event
+  } else {
+    props.columns[key].visible = event
+  }
 }
 
 // 切换全选/反选
 function toggleCheckAll() {
   const newValue = !isChecked.value
-  props.columns.forEach((col) => (col.visible = newValue))
+  if (Array.isArray(props.columns)) {
+    props.columns.forEach((col) => (col.visible = newValue))
+  } else {
+    Object.values(props.columns).forEach((col) => (col.visible = newValue))
+  }
 }
 </script>
 
diff --git a/ruoyi-fastapi-frontend/src/views/system/user/index.vue b/ruoyi-fastapi-frontend/src/views/system/user/index.vue
index b464236..d35dbdf 100644
--- a/ruoyi-fastapi-frontend/src/views/system/user/index.vue
+++ b/ruoyi-fastapi-frontend/src/views/system/user/index.vue
@@ -164,14 +164,14 @@
                 align="center"
                 key="userId"
                 prop="userId"
-                v-if="columns[0].visible"
+                v-if="columns.userId.visible"
               />
               <el-table-column
                 label="用户名称"
                 align="center"
                 key="userName"
                 prop="userName"
-                v-if="columns[1].visible"
+                v-if="columns.userName.visible"
                 :show-overflow-tooltip="true"
               />
               <el-table-column
@@ -179,7 +179,7 @@
                 align="center"
                 key="nickName"
                 prop="nickName"
-                v-if="columns[2].visible"
+                v-if="columns.nickName.visible"
                 :show-overflow-tooltip="true"
               />
               <el-table-column
@@ -187,7 +187,7 @@
                 align="center"
                 key="deptName"
                 prop="dept.deptName"
-                v-if="columns[3].visible"
+                v-if="columns.deptName.visible"
                 :show-overflow-tooltip="true"
               />
               <el-table-column
@@ -195,14 +195,14 @@
                 align="center"
                 key="phonenumber"
                 prop="phonenumber"
-                v-if="columns[4].visible"
+                v-if="columns.phonenumber.visible"
                 width="120"
               />
               <el-table-column
                 label="状态"
                 align="center"
                 key="status"
-                v-if="columns[5].visible"
+                v-if="columns.status.visible"
               >
                 <template #default="scope">
                   <el-switch
@@ -217,7 +217,7 @@
                 label="创建时间"
                 align="center"
                 prop="createTime"
-                v-if="columns[6].visible"
+                v-if="columns.createTime.visible"
                 width="160"
               >
                 <template #default="scope">
@@ -556,15 +556,16 @@ const upload = reactive({
   url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData",
 });
 // 列显隐信息
-const columns = ref([
-  { key: 0, label: `用户编号`, visible: true },
-  { key: 1, label: `用户名称`, visible: true },
-  { key: 2, label: `用户昵称`, visible: true },
-  { key: 3, label: `部门`, visible: true },
-  { key: 4, label: `手机号码`, visible: true },
-  { key: 5, label: `状态`, visible: true },
-  { key: 6, label: `创建时间`, visible: true },
-]);
+
+const columns = ref({
+  userId: { label: "用户编号", visible: true },
+  userName: { label: "用户名称", visible: true },
+  nickName: { label: "用户昵称", visible: true },
+  deptName: { label: "部门", visible: true },
+  phonenumber: { label: "手机号码", visible: true },
+  status: { label: "状态", visible: true },
+  createTime: { label: "创建时间", visible: true },
+});
 
 const data = reactive({
   form: {},