From 4f8e1c1b5ffc78242b300e85be22b1fa07c7d902 Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: Fri, 19 Feb 2021 23:59:43 +0800
Subject: [PATCH] fix(table): fix known errors in editable tables close #267

---
 CHANGELOG.zh_CN.md                            |  7 +++
 src/components/Table/src/BasicTable.vue       |  1 +
 .../src/components/editable/EditableCell.vue  | 45 +++++++++++--------
 src/design/ant/index.less                     |  4 +-
 src/views/demo/page/form/high/PersonTable.vue | 10 +++--
 5 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 63259412..41e10cd1 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -4,9 +4,16 @@
 
 - 新增 `settingButtonPosition`配置项,用于配置`设置`按钮位置
 
+### ⚡ Performance Improvements
+
+- 优化可编辑居中样式及下拉框宽度过短
+- 表格新增编辑时`edit-change`事件监听
+
 ### 🐛 Bug Fixes
 
 - 修复图片预览样式错误
+- 修复图标样式问题
+- 修复可编辑表格下拉回显问题
 
 ## 2.0.0 (2021-02-18)
 
diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index df52e2b1..98c1c2bb 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -88,6 +88,7 @@
       'edit-end',
       'edit-cancel',
       'edit-row-end',
+      'edit-change',
     ],
     setup(props, { attrs, emit, slots }) {
       const tableElRef = ref<ComponentRef>(null);
diff --git a/src/components/Table/src/components/editable/EditableCell.vue b/src/components/Table/src/components/editable/EditableCell.vue
index 39e6b38d..39cc47a3 100644
--- a/src/components/Table/src/components/editable/EditableCell.vue
+++ b/src/components/Table/src/components/editable/EditableCell.vue
@@ -29,21 +29,21 @@
 <script lang="ts">
   import type { CSSProperties, PropType } from 'vue';
   import type { BasicColumn } from '../../types/table';
+  import type { EditRecordRow } from './index';
 
-  import { defineComponent, ref, unref, nextTick, computed, watchEffect } from 'vue';
+  import { defineComponent, ref, unref, nextTick, computed, watchEffect, toRaw } from 'vue';
   import { FormOutlined, CloseOutlined, CheckOutlined } from '@ant-design/icons-vue';
+  import { CellComponent } from './CellComponent';
 
   import { useDesign } from '/@/hooks/web/useDesign';
-  import { isString, isBoolean, isFunction, isNumber, isArray } from '/@/utils/is';
+  import { useTableContext } from '../../hooks/useTableContext';
+
   import clickOutside from '/@/directives/clickOutside';
 
-  import { CellComponent } from './CellComponent';
-  import { useTableContext } from '../../hooks/useTableContext';
   import { propTypes } from '/@/utils/propTypes';
+  import { isString, isBoolean, isFunction, isNumber, isArray } from '/@/utils/is';
   import { createPlaceholderMessage } from './helper';
 
-  import type { EditRecordRow } from './index';
-
   export default defineComponent({
     name: 'EditableCell',
     components: { FormOutlined, CloseOutlined, CheckOutlined, CellComponent },
@@ -136,9 +136,11 @@
         if (!component.includes('Select')) {
           return value;
         }
+
         const options: LabelValueOptions = editComponentProps?.options ?? (unref(optionsRef) || []);
         const option = options.find((item) => `${item.value}` === `${value}`);
-        return option?.label;
+
+        return option?.label ?? value;
       });
 
       const getWrapperStyle = computed(
@@ -188,6 +190,11 @@
         } else if (isString(e) || isBoolean(e) || isNumber(e)) {
           currentValueRef.value = e;
         }
+        table.emit?.('edit-change', {
+          column: props.column,
+          value: unref(currentValueRef),
+          record: toRaw(props.record),
+        });
         handleSubmiRule();
       }
 
@@ -220,13 +227,17 @@
         return true;
       }
 
-      async function handleSubmit(needEmit = true) {
-        const isPass = await handleSubmiRule();
-        if (!isPass) return false;
+      async function handleSubmit(needEmit = true, valid = true) {
+        if (valid) {
+          const isPass = await handleSubmiRule();
+          if (!isPass) return false;
+        }
+
         const { column, index } = props;
         const { key, dataIndex } = column;
         const value = unref(currentValueRef);
         if (!key || !dataIndex) return;
+
         const dataKey = (dataIndex || key) as string;
 
         const record = await table.updateTableData(index, dataKey, value);
@@ -287,15 +298,15 @@
             const validFns = (props.record?.validCbs || []).map((fn) => fn());
 
             const res = await Promise.all(validFns);
+
             const pass = res.every((item) => !!item);
 
             if (!pass) return;
             const submitFns = props.record?.submitCbs || [];
-            submitFns.forEach((fn) => fn(false));
+            submitFns.forEach((fn) => fn(false, false));
             table.emit?.('edit-row-end');
             return true;
           }
-          // isArray(props.record?.submitCbs) && props.record?.submitCbs.forEach((fn) => fn());
         };
       }
 
@@ -328,10 +339,6 @@
   @prefix-cls: ~'@{namespace}-editable-cell';
 
   .edit-cell-rule-popover {
-    // .ant-popover-arrow {
-    //   // border-color: transparent @error-color @error-color transparent !important;
-    // }
-
     .ant-popover-inner-content {
       padding: 4px 8px;
       color: @error-color;
@@ -346,6 +353,10 @@
       display: flex;
       align-items: center;
       justify-content: center;
+
+      > .ant-select {
+        min-width: calc(100% - 50px);
+      }
     }
 
     &__icon {
@@ -359,8 +370,6 @@
     }
 
     &__normal {
-      padding-right: 48px;
-
       &-icon {
         position: absolute;
         top: 4px;
diff --git a/src/design/ant/index.less b/src/design/ant/index.less
index 7eaf5b92..6b5a132e 100644
--- a/src/design/ant/index.less
+++ b/src/design/ant/index.less
@@ -14,8 +14,8 @@
 }
 
 body {
-  .anticon {
-    display: inline-flex;
+  .anticon:not(.app-iconify) {
+    vertical-align: 0.1em;
   }
 }
 
diff --git a/src/views/demo/page/form/high/PersonTable.vue b/src/views/demo/page/form/high/PersonTable.vue
index 219b68bd..0ee9fc70 100644
--- a/src/views/demo/page/form/high/PersonTable.vue
+++ b/src/views/demo/page/form/high/PersonTable.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <BasicTable @register="registerTable">
+    <BasicTable @register="registerTable" @edit-change="handleEditChange">
       <template #action="{ record, column }">
         <TableAction :actions="createActions(record, column)" />
       </template>
@@ -29,14 +29,11 @@
       title: '工号',
       dataIndex: 'no',
       editRow: true,
-      // customRender: renderEditableRow({ dataIndex: 'no', placeholder: '请输入工号' }),
     },
     {
       title: '所属部门',
       dataIndex: 'dept',
       editRow: true,
-
-      // customRender: renderEditableRow({ dataIndex: 'dept', placeholder: '请输入所属部门' }),
     },
   ];
 
@@ -90,6 +87,10 @@
         record.onEdit?.(false, true);
       }
 
+      function handleEditChange(data: Recordable) {
+        console.log(data);
+      }
+
       function handleAdd() {
         const data = getDataSource();
         const addRow: EditRecordRow = {
@@ -136,6 +137,7 @@
         createActions,
         handleAdd,
         getDataSource,
+        handleEditChange,
       };
     },
   });