From 33a335a3f52aead522b3fbee0d558e2e797580ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=A0=E6=9C=A8?= <netfan@foxmail.com>
Date: Mon, 9 Aug 2021 21:49:11 +0800
Subject: [PATCH] fix(table): `0` is not shown in editable cell
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复可编辑单元格中未能正确显示零值的问题

fixed: #1039
---
 CHANGELOG.zh_CN.md                               |  4 +++-
 .../src/components/editable/EditableCell.vue     | 16 +++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 9e09f4a174a..9488dc2044b 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -1,7 +1,9 @@
 ### 🐛 Bug Fixes
 
 - **Cropper** 修复未能及时销毁的问题
-- **BasicTable** 修复`CellFormat`无法使用`Map`类型数据的问题
+- **BasicTable**
+  - 修复`CellFormat`无法使用`Map`类型数据的问题
+  - 修复可编辑单元格未能正确显示`0`值的问题
 - **Qrcode** 修复二维码组件在创建时未能及时绘制的问题
 
 ## 2.7.0(2021-08-03)
diff --git a/src/components/Table/src/components/editable/EditableCell.vue b/src/components/Table/src/components/editable/EditableCell.vue
index 15bcf505a35..202736c1a93 100644
--- a/src/components/Table/src/components/editable/EditableCell.vue
+++ b/src/components/Table/src/components/editable/EditableCell.vue
@@ -5,8 +5,8 @@
       :class="{ [`${prefixCls}__normal`]: true, 'ellipsis-cell': column.ellipsis }"
       @click="handleEdit"
     >
-      <div class="cell-content" :title="column.ellipsis ? getValues || '' : ''">{{
-        getValues || '&nbsp;'
+      <div class="cell-content" :title="column.ellipsis ? getValues ?? '' : ''">{{
+        getValues ?? '&nbsp;'
       }}</div>
       <FormOutlined :class="`${prefixCls}__normal-icon`" v-if="!column.editRow" />
     </div>
@@ -35,11 +35,10 @@
 </template>
 <script lang="ts">
   import type { CSSProperties, PropType } from 'vue';
+  import { computed, defineComponent, nextTick, ref, toRaw, unref, watchEffect } from 'vue';
   import type { BasicColumn } from '../../types/table';
   import type { EditRecordRow } from './index';
-
-  import { defineComponent, ref, unref, nextTick, computed, watchEffect, toRaw } from 'vue';
-  import { FormOutlined, CloseOutlined, CheckOutlined } from '@ant-design/icons-vue';
+  import { CheckOutlined, CloseOutlined, FormOutlined } from '@ant-design/icons-vue';
   import { CellComponent } from './CellComponent';
 
   import { useDesign } from '/@/hooks/web/useDesign';
@@ -48,9 +47,9 @@
   import clickOutside from '/@/directives/clickOutside';
 
   import { propTypes } from '/@/utils/propTypes';
-  import { isString, isBoolean, isFunction, isNumber, isArray } from '/@/utils/is';
+  import { isArray, isBoolean, isFunction, isNumber, isString } from '/@/utils/is';
   import { createPlaceholderMessage } from './helper';
-  import { set, omit } from 'lodash-es';
+  import { omit, set } from 'lodash-es';
   import { treeToList } from '/@/utils/helper/treeHelper';
 
   export default defineComponent({
@@ -214,8 +213,7 @@
           if (isBoolean(editRule) && !currentValue && !isNumber(currentValue)) {
             ruleVisible.value = true;
             const component = unref(getComponent);
-            const message = createPlaceholderMessage(component);
-            ruleMessage.value = message;
+            ruleMessage.value = createPlaceholderMessage(component);
             return false;
           }
           if (isFunction(editRule)) {