From 4500214b2a158965281e43e673622e4492e8ca26 Mon Sep 17 00:00:00 2001
From: nebv <vbenadmin@163.com>
Date: Tue, 13 Oct 2020 01:40:10 +0800
Subject: [PATCH] fix: fix editable cells cannot be entered

---
 .../Table/src/components/renderEditableCell.tsx           | 8 ++++----
 src/views/demo/echarts/Line.vue                           | 6 ++----
 src/views/demo/echarts/Map.vue                            | 6 ++----
 src/views/demo/echarts/Pie.vue                            | 6 ++----
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/components/Table/src/components/renderEditableCell.tsx b/src/components/Table/src/components/renderEditableCell.tsx
index 125e0cd6..a8039328 100644
--- a/src/components/Table/src/components/renderEditableCell.tsx
+++ b/src/components/Table/src/components/renderEditableCell.tsx
@@ -43,7 +43,7 @@ const EditableCell = defineComponent({
     const elRef = ref<any>(null);
 
     const isEditRef = ref(false);
-    const currentValueRef = ref<string | boolean>('');
+    const currentValueRef = ref<string | boolean>(props.value);
 
     function handleChange(e: ChangeEvent | string | boolean) {
       if ((e as ChangeEvent).target && Reflect.has((e as ChangeEvent).target, 'value')) {
@@ -106,7 +106,7 @@ const EditableCell = defineComponent({
                     }}
                     style={{ width: 'calc(100% - 48px)' }}
                     ref={elRef}
-                    value={value}
+                    value={unref(currentValueRef)}
                     size="small"
                     onChange={handleChange}
                     onPressEnter={handleSubmit}
@@ -141,12 +141,12 @@ export function renderEditableCell({
   return ({ text, record }: { text: string; record: any }) => {
     return (
       <EditableCell
+        {...componentOn}
+        {...componentProps}
         value={text}
         dataKey={record.key}
         dataIndex={dataIndex}
         component={component}
-        on={componentOn}
-        componentProps={componentProps}
       />
     );
   };
diff --git a/src/views/demo/echarts/Line.vue b/src/views/demo/echarts/Line.vue
index 249bbcc8..f6113daf 100644
--- a/src/views/demo/echarts/Line.vue
+++ b/src/views/demo/echarts/Line.vue
@@ -1,7 +1,5 @@
 <template>
-  <div class="p-4">
-    <div ref="chartRef" :style="{ height, width }" />
-  </div>
+  <div ref="chartRef" :style="{ height, width }" />
 </template>
 <script lang="ts">
   import { defineComponent, PropType, ref, Ref, onMounted } from 'vue';
@@ -18,7 +16,7 @@
       },
       height: {
         type: String as PropType<string>,
-        default: '80vh',
+        default: 'calc(100vh - 78px)',
       },
     },
     setup() {
diff --git a/src/views/demo/echarts/Map.vue b/src/views/demo/echarts/Map.vue
index e06ba519..673adae7 100644
--- a/src/views/demo/echarts/Map.vue
+++ b/src/views/demo/echarts/Map.vue
@@ -1,7 +1,5 @@
 <template>
-  <div class="p-4">
-    <div ref="chartRef" :style="{ height, width }" />
-  </div>
+  <div ref="chartRef" :style="{ height, width }" />
 </template>
 <script lang="ts">
   import { defineComponent, PropType, ref, Ref, onMounted } from 'vue';
@@ -18,7 +16,7 @@
       },
       height: {
         type: String as PropType<string>,
-        default: '80vh',
+        default: 'calc(100vh - 78px)',
       },
     },
     setup() {
diff --git a/src/views/demo/echarts/Pie.vue b/src/views/demo/echarts/Pie.vue
index 4d67f35e..7238efc1 100644
--- a/src/views/demo/echarts/Pie.vue
+++ b/src/views/demo/echarts/Pie.vue
@@ -1,7 +1,5 @@
 <template>
-  <div class="p-4">
-    <div ref="chartRef" :style="{ height, width }" />
-  </div>
+  <div ref="chartRef" :style="{ height, width }" />
 </template>
 <script lang="ts">
   import { defineComponent, PropType, ref, Ref, onMounted } from 'vue';
@@ -16,7 +14,7 @@
       },
       height: {
         type: String as PropType<string>,
-        default: '80vh',
+        default: 'calc(100vh - 78px)',
       },
     },
     setup() {