Skip to content

Commit

Permalink
fix(table): 0 is not shown in editable cell
Browse files Browse the repository at this point in the history
修复可编辑单元格中未能正确显示零值的问题

fixed: #1039
  • Loading branch information
mynetfan committed Aug 9, 2021
1 parent 9d2231b commit 33a335a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.zh_CN.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
### 🐛 Bug Fixes

- **Cropper** 修复未能及时销毁的问题
- **BasicTable** 修复`CellFormat`无法使用`Map`类型数据的问题
- **BasicTable**
- 修复`CellFormat`无法使用`Map`类型数据的问题
- 修复可编辑单元格未能正确显示`0`值的问题
- **Qrcode** 修复二维码组件在创建时未能及时绘制的问题

## 2.7.0(2021-08-03)
Expand Down
16 changes: 7 additions & 9 deletions src/components/Table/src/components/editable/EditableCell.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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';
Expand All @@ -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({
Expand Down Expand Up @@ -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)) {
Expand Down

0 comments on commit 33a335a

Please sign in to comment.