From cd12a30764ae79f8d069f4e35a100d6cb1fe01b8 Mon Sep 17 00:00:00 2001
From: Gary Fu <xuebaiyouling@gmail.com>
Date: Mon, 1 Jan 2024 11:37:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E8=87=AA=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common-table/common-table-column.vue      | 52 ++++++++++++++-
 src/components/common-table/index.vue         | 65 ++++++++++++++++++-
 src/messages/common_cn.js                     |  7 ++
 src/messages/common_en.js                     |  7 ++
 src/views/tools/Tables.vue                    | 37 ++++++++++-
 5 files changed, 162 insertions(+), 6 deletions(-)

diff --git a/src/components/common-table/common-table-column.vue b/src/components/common-table/common-table-column.vue
index f9bffaf..ff60a6a 100644
--- a/src/components/common-table/common-table-column.vue
+++ b/src/components/common-table/common-table-column.vue
@@ -7,6 +7,9 @@
  * @property {string} property 数据属性
  * @property {string} width 宽度
  * @property {boolean} isOperation 是否是操作列
+ * @property {string} slot 自定义插槽
+ * @property [ButtonProps] buttons 自定义按钮
+ * @property {Object} attrs 其他属性
  */
 /**
  * 配置信息
@@ -18,16 +21,61 @@ const props = defineProps({
   column: {
     type: Object,
     required: true
+  },
+  buttonSize: {
+    type: String,
+    default: 'small'
   }
 })
+
 </script>
 
 <template>
   <el-table-column
-    :label="column.label"
+    v-if="!column.isOperation"
+    :label="column.label || $t(column.labelKey)"
     :property="column.property"
     :width="column.width"
-  />
+    v-bind="column.attrs"
+  >
+    <template
+      v-if="column.slot"
+      #default="scope"
+    >
+      <slot
+        v-bind="scope"
+        name="default"
+      />
+    </template>
+  </el-table-column>
+  <el-table-column
+    v-if="column.isOperation"
+    :label="column.label || $t(column.labelKey)"
+    :width="column.width"
+    v-bind="column.attrs"
+  >
+    <template
+      #default="scope"
+    >
+      <el-button
+        v-for="(button, index) in column.buttons"
+        :key="index"
+        :type="button.type"
+        :icon="button.icon"
+        :size="button.size||buttonSize"
+        :disabled="button.disabled"
+        :round="button.round"
+        :circle="button.circle"
+        @click="button.click&&button.click(scope.row, scope)"
+      >
+        {{ button.label || $t(button.labelKey) }}
+      </el-button>
+      <slot
+        name="default"
+        v-bind="scope"
+      />
+    </template>
+  </el-table-column>
 </template>
 
 <style scoped>
diff --git a/src/components/common-table/index.vue b/src/components/common-table/index.vue
index 7add52f..d7650dc 100644
--- a/src/components/common-table/index.vue
+++ b/src/components/common-table/index.vue
@@ -1,5 +1,6 @@
 <script setup>
 import CommonTableColumn from '@/components/common-table/common-table-column.vue'
+import { computed } from 'vue'
 
 /**
  * @typedef {TableProps} CommonTableProps
@@ -32,8 +33,54 @@ const props = defineProps({
   stripe: {
     type: Boolean,
     default: true
+  },
+  border: {
+    type: Boolean,
+    default: true
+  },
+  /**
+   * el-button
+   * @type [ButtonProps]
+   */
+  buttons: {
+    type: Array,
+    default () {
+      return []
+    }
+  },
+  buttonsSlot: {
+    type: String,
+    default: ''
+  },
+  buttonSize: {
+    type: String,
+    default: 'small'
+  },
+  pageInfo: {
+    type: Object,
+    default: null
+  },
+  pageAttrs: {
+    type: Object,
+    default () {
+      return {}
+    }
   }
 })
+
+const calcColumns = computed(() => {
+  let _columns = props.columns
+  if (props.buttons.length || props.buttonsSlot) {
+    const buttonColumn = {
+      labelKey: 'common.label.operation',
+      isOperation: true,
+      slot: props.buttonsSlot,
+      buttons: props.buttons
+    }
+    _columns = [..._columns, buttonColumn]
+  }
+  return _columns
+})
 </script>
 
 <template>
@@ -42,12 +89,26 @@ const props = defineProps({
     :highlight-current-row="highlightCurrentRow"
     :stripe="stripe"
     :data="data"
+    :border="border"
   >
     <common-table-column
-      v-for="(column, index) in columns"
+      v-for="(column, index) in calcColumns"
       :key="index"
       :column="column"
-    />
+      :button-size="buttonSize"
+    >
+      <!--用于自定义显示属性-->
+      <template
+        #default="scope"
+      >
+        <slot
+          :scope="scope"
+          :item="scope.row"
+          :name="column.slot"
+        />
+      </template>
+    </common-table-column>
+    <el-pagination v-if="pageInfo" />
   </el-table>
 </template>
 
diff --git a/src/messages/common_cn.js b/src/messages/common_cn.js
index 28bce54..5871d8c 100644
--- a/src/messages/common_cn.js
+++ b/src/messages/common_cn.js
@@ -23,6 +23,13 @@ common.label.about = '关于'
 common.label.logout = '退出'
 common.label.submit = '提交'
 common.label.reset = '重置'
+common.label.operation = '操作'
+common.label.new = '新增'
+common.label.edit = '编辑'
+common.label.modify = '修改'
+common.label.delete = '删除'
+common.label.search = '搜索'
+common.label.find = '查找'
 
 //* =======================msg=====================//
 common.msg.nonNull = '{0}不能为空'
diff --git a/src/messages/common_en.js b/src/messages/common_en.js
index 4bbe482..9350e4c 100644
--- a/src/messages/common_en.js
+++ b/src/messages/common_en.js
@@ -23,6 +23,13 @@ common.label.about = 'About'
 common.label.logout = 'Logout'
 common.label.submit = 'Submit'
 common.label.reset = 'Reset'
+common.label.operation = 'Operations'
+common.label.new = 'New'
+common.label.edit = 'Edit'
+common.label.modify = 'Modify'
+common.label.delete = 'Delete'
+common.label.search = 'Search'
+common.label.find = 'Find'
 
 //* =======================msg=====================//
 common.msg.nonNull = '{0} is required.'
diff --git a/src/views/tools/Tables.vue b/src/views/tools/Tables.vue
index 9d186eb..ada793a 100644
--- a/src/views/tools/Tables.vue
+++ b/src/views/tools/Tables.vue
@@ -1,4 +1,6 @@
 <script setup>
+import { ref } from 'vue'
+
 const tableData = [
   {
     birthday: '2016-05-03',
@@ -34,7 +36,8 @@ const columns = [{
   property: 'userName'
 }, {
   label: '性别',
-  property: 'gender'
+  property: 'gender',
+  slot: 'gender'
 }, {
   label: '出生日期',
   property: 'birthday'
@@ -42,13 +45,43 @@ const columns = [{
   label: '地址',
   property: 'address'
 }]
+const buttons = ref([{
+  labelKey: 'common.label.edit',
+  type: 'primary',
+  click: item => {
+    console.info('编辑=============', item)
+  }
+}, {
+  labelKey: 'common.label.delete',
+  type: 'danger',
+  click: item => {
+    console.info('删除=============', item)
+  }
+}, {
+  label: '其他操作'
+}])
 </script>
 
 <template>
   <common-table
     :data="tableData"
     :columns="columns"
-  />
+    :buttons="buttons"
+    buttons-slot="buttons"
+  >
+    <template #gender="{item}">
+      <el-tag
+        :type="item.gender === 'male' ? '' : 'success'"
+      >
+        {{ item.gender }}
+      </el-tag>
+    </template>
+    <template #buttons="{item}">
+      <el-button @click="console.info(item)">
+        测试
+      </el-button>
+    </template>
+  </common-table>
 </template>
 
 <style scoped>