From 34442b7226b18f203daebf3cd428162178c637ed Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Wed, 7 Aug 2024 12:01:21 +0800
Subject: [PATCH] =?UTF-8?q?JVxeTable=E8=A1=A8=E6=A0=BCColumn=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AEformatter=E5=B1=9E=E6=80=A7=E4=B8=8D=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=20#6950]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/cells/JVxeNormalCell.vue          |  8 ++++----
 .../jeecg/JVxeTable/src/hooks/useJVxeComponent.ts    | 12 ++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/components/cells/JVxeNormalCell.vue b/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/components/cells/JVxeNormalCell.vue
index d6107f10..2ed70733 100644
--- a/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/components/cells/JVxeNormalCell.vue
+++ b/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/components/cells/JVxeNormalCell.vue
@@ -1,13 +1,12 @@
 <template>
-  <JVxeReloadEffect :vNode="innerValue" :effect="isEffect" @effectEnd="handleEffectEnd" />
+  <JVxeReloadEffect :vNode="innerLabel" :effect="isEffect" @effectEnd="handleEffectEnd" />
 </template>
 
 <script lang="ts">
-  import { ref, defineComponent } from 'vue';
+  import { ref, watch, defineComponent } from 'vue';
   import JVxeReloadEffect from '../JVxeReloadEffect';
   import { JVxeComponent } from '/@/components/jeecg/JVxeTable/types';
   import { useJVxeComponent, useJVxeCompProps } from '/@/components/jeecg/JVxeTable/hooks';
-  import { watch } from 'vue';
 
   export default defineComponent({
     name: 'JVxeNormalCell',
@@ -15,7 +14,7 @@
     props: useJVxeCompProps(),
     setup(props: JVxeComponent.Props) {
       const setup = useJVxeComponent(props);
-      const { innerValue, row } = setup;
+      const { innerValue, innerLabel, row } = setup;
 
       const reloadEffect = props.renderOptions.reloadEffect;
       const isEffect = ref<boolean>(false);
@@ -39,6 +38,7 @@
       }
 
       return {
+        innerLabel,
         innerValue,
         isEffect,
         handleEffectEnd,
diff --git a/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useJVxeComponent.ts b/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useJVxeComponent.ts
index 5a322a4c..d2326c1e 100644
--- a/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useJVxeComponent.ts
+++ b/jeecgboot-vue3/src/components/jeecg/JVxeTable/src/hooks/useJVxeComponent.ts
@@ -44,6 +44,17 @@ export function useJVxeComponent(props: JVxeComponent.Props) {
   const fullDataLength = computed(() => props.params.$table.internalData.tableFullData.length);
   // 是否正在滚动中
   const scrolling = computed(() => !!props.renderOptions.scrolling);
+  // 当有formatter时，优先使用formatter
+  const innerLabel = computed(() => {
+    if(typeof column.value?.formatter === 'function'){
+      return column.value.formatter({
+        cellValue: innerValue.value,
+        row: row.value,
+        column: column.value,
+      });
+    }
+    return innerValue.value
+  });
   const cellProps = computed(() => {
     let renderOptions = props.renderOptions;
     let col = originColumn.value;
@@ -111,6 +122,7 @@ export function useJVxeComponent(props: JVxeComponent.Props) {
     return listeners;
   });
   const context = {
+    innerLabel,
     innerValue,
     row,
     rows,