From 0ea7d0a51399d66509a811902f2d29f1a7eadd0d Mon Sep 17 00:00:00 2001
From: cshaptx4869 <994774638@qq.com>
Date: Fri, 17 May 2024 20:37:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(PageContent):=20:sparkles:=20=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=88=97=E5=A2=9E=E5=8A=A0show=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PageContent/index.vue   | 225 +++++++++++--------------
 src/views/demo/curd/config/content.ts  |   2 +-
 src/views/demo/curd/config/content2.ts |   5 +-
 3 files changed, 100 insertions(+), 132 deletions(-)

diff --git a/src/components/PageContent/index.vue b/src/components/PageContent/index.vue
index 29a01c6e..7ec2e6ab 100644
--- a/src/components/PageContent/index.vue
+++ b/src/components/PageContent/index.vue
@@ -59,37 +59,21 @@
         <template v-for="item in defaultToolbar" :key="item">
           <!-- 刷新 -->
           <template v-if="item === 'refresh'">
-            <el-icon class="cursor-pointer ml-2" @click="handleToolbar(item)">
-              <i-ep-refresh />
-            </el-icon>
+            <el-button icon="refresh" circle @click="handleToolbar(item)" />
           </template>
           <!-- 列设置 -->
           <template v-else-if="item === 'filter'">
             <el-popover placement="bottom" trigger="click">
               <template #reference>
-                <el-icon class="cursor-pointer ml-2">
-                  <i-ep-setting />
-                </el-icon>
+                <el-button icon="Operation" circle />
+              </template>
+              <template v-for="col in cols" :key="col">
+                <el-checkbox
+                  v-if="col.prop"
+                  v-model="col.show"
+                  :label="col.label"
+                />
               </template>
-              <el-checkbox
-                v-model="columnSetting.checkAll"
-                :indeterminate="columnSetting.isIndeterminate"
-                @change="handleCheckAllChange"
-              >
-                全选
-              </el-checkbox>
-              <el-checkbox-group
-                v-model="columnSetting.checkedCols"
-                @change="handleCheckedColumnsChange"
-              >
-                <div v-for="col in contentConfig.cols" :key="col.label">
-                  <el-checkbox
-                    v-if="col.label"
-                    :value="col.label"
-                    :label="col.label"
-                  />
-                </div>
-              </el-checkbox-group>
             </el-popover>
           </template>
         </template>
@@ -102,95 +86,113 @@
       :data="pageData"
       @selection-change="handleSelectionChange"
     >
-      <template v-for="col in displayedColumns" :key="col.prop">
+      <template v-for="col in cols" :key="col">
         <el-table-column v-if="col.show" v-bind="col">
           <template #default="scope">
             <!-- 显示图片 -->
             <template v-if="col.templet === 'image'">
-              <template v-if="Array.isArray(scope.row[col.prop])">
-                <template
-                  v-for="(item, index) in scope.row[col.prop]"
-                  :key="item"
-                >
+              <template v-if="col.prop">
+                <template v-if="Array.isArray(scope.row[col.prop])">
+                  <template
+                    v-for="(item, index) in scope.row[col.prop]"
+                    :key="item"
+                  >
+                    <el-image
+                      :src="item"
+                      :preview-src-list="scope.row[col.prop]"
+                      :initial-index="index"
+                      :preview-teleported="true"
+                      :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40}px`"
+                    />
+                  </template>
+                </template>
+                <template v-else>
                   <el-image
-                    :src="item"
-                    :preview-src-list="scope.row[col.prop]"
-                    :initial-index="index"
+                    :src="scope.row[col.prop]"
+                    :preview-src-list="[scope.row[col.prop]]"
                     :preview-teleported="true"
                     :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40}px`"
                   />
                 </template>
               </template>
-              <template v-else>
-                <el-image
-                  :src="scope.row[col.prop]"
-                  :preview-src-list="[scope.row[col.prop]]"
-                  :preview-teleported="true"
-                  :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40}px`"
-                />
-              </template>
             </template>
             <!-- 根据行的selectList属性返回对应列表值 -->
             <template v-else-if="col.templet === 'list'">
-              {{ (col.selectList ?? {})[scope.row[col.prop]] }}
+              <template v-if="col.prop">
+                {{ (col.selectList ?? {})[scope.row[col.prop]] }}
+              </template>
             </template>
             <!-- 格式化显示链接 -->
             <template v-else-if="col.templet === 'url'">
-              <el-link
-                type="primary"
-                :href="scope.row[col.prop]"
-                target="_blank"
-              >
-                {{ scope.row[col.prop] }}
-              </el-link>
+              <template v-if="col.prop">
+                <el-link
+                  type="primary"
+                  :href="scope.row[col.prop]"
+                  target="_blank"
+                >
+                  {{ scope.row[col.prop] }}
+                </el-link>
+              </template>
             </template>
             <!-- 生成开关组件 -->
             <template v-else-if="col.templet === 'switch'">
-              <!-- pageData.length>0: 解决el-switch组件会在表格初始化的时候触发一次change事件 -->
-              <el-switch
-                v-model="scope.row[col.prop]"
-                :active-value="col.activeValue ?? 1"
-                :inactive-value="col.inactiveValue ?? 0"
-                :inline-prompt="true"
-                :active-text="col.activeText ?? ''"
-                :inactive-text="col.inactiveText ?? ''"
-                :validate-event="false"
-                :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
-                @change="
-                  pageData.length > 0 &&
-                    handleSwitchChange(col.prop, scope.row[col.prop], scope.row)
-                "
-              />
+              <template v-if="col.prop">
+                <!-- pageData.length>0: 解决el-switch组件会在表格初始化的时候触发一次change事件 -->
+                <el-switch
+                  v-model="scope.row[col.prop]"
+                  :active-value="col.activeValue ?? 1"
+                  :inactive-value="col.inactiveValue ?? 0"
+                  :inline-prompt="true"
+                  :active-text="col.activeText ?? ''"
+                  :inactive-text="col.inactiveText ?? ''"
+                  :validate-event="false"
+                  :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
+                  @change="
+                    pageData.length > 0 &&
+                      handleSwitchChange(
+                        col.prop,
+                        scope.row[col.prop],
+                        scope.row
+                      )
+                  "
+                />
+              </template>
             </template>
             <!-- 格式化为价格 -->
             <template v-else-if="col.templet === 'price'">
-              {{ `${col.priceFormat ?? "￥"}${scope.row[col.prop]}` }}
+              <template v-if="col.prop">
+                {{ `${col.priceFormat ?? "￥"}${scope.row[col.prop]}` }}
+              </template>
             </template>
             <!-- 格式化为百分比 -->
             <template v-else-if="col.templet === 'percent'">
-              {{ scope.row[col.prop] }}%
+              <template v-if="col.prop"> {{ scope.row[col.prop] }}% </template>
             </template>
             <!-- 显示图标 -->
             <template v-else-if="col.templet === 'icon'">
-              <template v-if="scope.row[col.prop].startsWith('el-icon-')">
-                <el-icon>
-                  <component
-                    :is="scope.row[col.prop].replace('el-icon-', '')"
-                  />
-                </el-icon>
-              </template>
-              <template v-else>
-                <svg-icon :icon-class="scope.row[col.prop]" />
+              <template v-if="col.prop">
+                <template v-if="scope.row[col.prop].startsWith('el-icon-')">
+                  <el-icon>
+                    <component
+                      :is="scope.row[col.prop].replace('el-icon-', '')"
+                    />
+                  </el-icon>
+                </template>
+                <template v-else>
+                  <svg-icon :icon-class="scope.row[col.prop]" />
+                </template>
               </template>
             </template>
             <!-- 格式化时间 -->
             <template v-else-if="col.templet === 'date'">
-              {{
-                useDateFormat(
-                  scope.row[col.prop],
-                  col.dateFormat ?? "YYYY-MM-DD HH:mm:ss"
-                ).value
-              }}
+              <template v-if="col.prop">
+                {{
+                  useDateFormat(
+                    scope.row[col.prop],
+                    col.dateFormat ?? "YYYY-MM-DD HH:mm:ss"
+                  ).value
+                }}
+              </template>
             </template>
             <!-- 列操作栏 -->
             <template v-else-if="col.templet === 'tool'">
@@ -271,7 +273,7 @@ import { useDateFormat } from "@vueuse/core";
 import { hasAuth } from "@/plugins/permission";
 import Pagination from "@/components/Pagination/index.vue";
 import SvgIcon from "@/components/SvgIcon/index.vue";
-import type { TableProps, CheckboxValueType } from "element-plus";
+import type { TableProps } from "element-plus";
 
 // 对象类型
 export type IObject = Record<string, any>;
@@ -322,6 +324,7 @@ export interface IContentConfig<T = any> {
     prop?: string;
     width?: string | number;
     align?: "left" | "center" | "right";
+    show?: boolean;
     templet?:
       | "image"
       | "list"
@@ -378,6 +381,15 @@ const defaultToolbar = props.contentConfig.defaultToolbar ?? [
   "refresh",
   "filter",
 ];
+// 表格列
+const cols = ref(
+  props.contentConfig.cols.map((col) => {
+    if (col.show === undefined) {
+      col.show = true;
+    }
+    return col;
+  })
+);
 // 加载状态
 const loading = ref(false);
 // 删除ID集合 用于批量删除
@@ -525,53 +537,6 @@ function handleSwitchChange(
     ElMessage.error("未配置modifyAction");
   }
 }
-
-// 列设置类型声明
-interface IColumnSetting {
-  checkAll: boolean;
-  isIndeterminate: boolean;
-  checkedCols: string[];
-}
-
-// 列设置
-const columnSetting = ref<IColumnSetting>({
-  checkAll: true,
-  isIndeterminate: false,
-  checkedCols: [],
-});
-// 创建一个响应式副本，用于存储最后显示的列配置
-const displayedColumns = ref<IObject>(props.contentConfig.cols);
-
-// 全选/取消全选
-const handleCheckAllChange = (checkAll: CheckboxValueType) => {
-  columnSetting.value.checkedCols = checkAll
-    ? (props.contentConfig.cols.map((col) => col.label) as any[])
-    : [];
-  columnSetting.value.isIndeterminate = false;
-
-  displayedColumns.value = displayedColumns.value.map((col: IObject) => ({
-    ...col,
-    show: checkAll,
-  }));
-};
-
-// 选中列变化
-const handleCheckedColumnsChange = (values: CheckboxValueType[]) => {
-  const showColumnsLength = props.contentConfig.cols.length;
-
-  const checkedCount = values.length;
-  columnSetting.value.checkAll = checkedCount === showColumnsLength;
-  columnSetting.value.isIndeterminate =
-    checkedCount > 0 && checkedCount < showColumnsLength;
-
-  displayedColumns.value = displayedColumns.value.map((col: IObject) => ({
-    ...col,
-    show: values.includes(col.label),
-  }));
-};
-
-// 初始化全选状态
-handleCheckAllChange(columnSetting.value.checkAll);
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/demo/curd/config/content.ts b/src/views/demo/curd/config/content.ts
index a05a37db..ddbb51d0 100644
--- a/src/views/demo/curd/config/content.ts
+++ b/src/views/demo/curd/config/content.ts
@@ -33,7 +33,7 @@ const contentConfig: IContentConfig<UserQuery> = {
   ],
   cols: [
     { type: "selection", width: 50, align: "center" },
-    { label: "编号", align: "center", prop: "id", width: 100 },
+    { label: "编号", align: "center", prop: "id", width: 100, show: false },
     { label: "用户名", align: "center", prop: "username" },
     { label: "头像", align: "center", prop: "avatar", templet: "image" },
     { label: "用户昵称", align: "center", prop: "nickname", width: 120 },
diff --git a/src/views/demo/curd/config/content2.ts b/src/views/demo/curd/config/content2.ts
index ea310d5e..b4b02c7e 100644
--- a/src/views/demo/curd/config/content2.ts
+++ b/src/views/demo/curd/config/content2.ts
@@ -2,6 +2,9 @@ import type { IContentConfig } from "@/components/PageContent/index.vue";
 
 const contentConfig: IContentConfig = {
   pageName: "sys:user",
+  table: {
+    showOverflowTooltip: true,
+  },
   indexAction: function (params) {
     // console.log("indexAction:", params);
     return Promise.resolve({
@@ -44,7 +47,7 @@ const contentConfig: IContentConfig = {
   },
   cols: [
     { type: "selection", width: 50, align: "center" },
-    { label: "ID", align: "center", prop: "id" },
+    { label: "ID", align: "center", prop: "id", show: false },
     { label: "用户名", align: "center", prop: "username" },
     { label: "图片", align: "center", prop: "avatar", templet: "image" },
     {