From ede7e7be3a932179a316d70486c46bace90c63b1 Mon Sep 17 00:00:00 2001
From: tianxin <tianxin930618@163.com>
Date: Fri, 20 Oct 2023 00:19:33 -0700
Subject: [PATCH 1/2] =?UTF-8?q?grid=E8=A1=A8=E6=A0=BC=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E5=99=A8=E6=8F=92=E6=A7=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demos/pc/app/grid/slot/editor-slot.vue    | 83 +++++++++++++++++++
 .../demos/pc/app/grid/webdoc/grid-slot.js     |  6 ++
 2 files changed, 89 insertions(+)
 create mode 100644 examples/sites/demos/pc/app/grid/slot/editor-slot.vue

diff --git a/examples/sites/demos/pc/app/grid/slot/editor-slot.vue b/examples/sites/demos/pc/app/grid/slot/editor-slot.vue
new file mode 100644
index 0000000000..1e0f1c2118
--- /dev/null
+++ b/examples/sites/demos/pc/app/grid/slot/editor-slot.vue
@@ -0,0 +1,83 @@
+<template>
+    <div>
+        <tiny-grid :data="tableData" :edit-config="{ trigger: 'click', mode: 'row', showStatus: true }">
+            <tiny-grid-column type="index" width="60"></tiny-grid-column>
+            <tiny-grid-column field="name" title="插槽自定义列编辑" :editor="{component: 'input', autoselect: true}">
+                <template #edit="data">
+                    <tiny-autocomplete v-model="data.row.name" 
+                        placeholder="请输入内容"></tiny-autocomplete>
+                </template>
+            </tiny-grid-column>
+            <tiny-grid-column field="employees" title="员工人数"></tiny-grid-column>
+            <tiny-grid-column field="area" title="所属区域"></tiny-grid-column>
+            <tiny-grid-column field="address" title="地址"></tiny-grid-column>
+            <tiny-grid-column field="introduction" title="公司简介" show-overflow></tiny-grid-column>
+        </tiny-grid>
+    </div>
+</template>
+  
+<script lang="jsx">
+import { Grid, GridColumn, Autocomplete } from '@opentiny/vue'
+
+export default {
+    components: {
+        TinyGrid: Grid,
+        TinyGridColumn: GridColumn,
+        TinyAutocomplete: Autocomplete
+    },
+    data() {
+        return {
+            tableData: [
+                {
+                    id: '1',
+                    name: 'GFD科技YX公司',
+                    area: '华东区',
+                    address: '福州',
+                    employees: 423,
+                    introduction: '公司技术和研发实力雄厚，是国家863项目的参与者，并被政府认定为“高新技术企业”。'
+                },
+                {
+                    id: '2',
+                    name: 'WWWW科技YX公司',
+                    area: '华南区',
+                    address: '深圳福田区',
+                    employees: 363,
+                    introduction: '公司技术和研发实力雄厚，是国家863项目的参与者，并被政府认定为“高新技术企业”。'
+                },
+                {
+                    id: '3',
+                    name: 'RFV有限责任公司',
+                    area: '华南区',
+                    address: '中山市',
+                    employees: 131,
+                    introduction: '公司技术和研发实力雄厚，是国家863项目的参与者，并被政府认定为“高新技术企业”。'
+                },
+                {
+                    id: '4',
+                    name: 'TGBYX公司',
+                    area: '华北区',
+                    address: '梅州',
+                    employees: 215,
+                    introduction: '公司技术和研发实力雄厚，是国家863项目的参与者，并被政府认定为“高新技术企业”。'
+                },
+                {
+                    id: '5',
+                    name: 'YHN科技YX公司',
+                    area: '华南区',
+                    address: '韶关',
+                    employees: 322,
+                    introduction: '公司技术和研发实力雄厚，是国家863项目的参与者，并被政府认定为“高新技术企业”。'
+                },
+                {
+                    id: '6',
+                    name: '康康物业YX公司',
+                    area: '华北区',
+                    address: '广州天河区',
+                    employees: 168,
+                    introduction: '公司技术和研发实力雄厚，是国家863项目的参与者，并被政府认定为“高新技术企业”。'
+                }
+            ]
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/examples/sites/demos/pc/app/grid/webdoc/grid-slot.js b/examples/sites/demos/pc/app/grid/webdoc/grid-slot.js
index d5b4a67626..c66448c014 100644
--- a/examples/sites/demos/pc/app/grid/webdoc/grid-slot.js
+++ b/examples/sites/demos/pc/app/grid/webdoc/grid-slot.js
@@ -19,6 +19,12 @@ export default {
       'name': { 'zh-CN': '空数据显示插槽', 'en-US': 'Empty data display slot' },
       'desc': { 'zh-CN': '详细用法参考如下示例', 'en-US': 'For details, see the following example.' },
       'codeFiles': ['slot/empty-slot.vue']
+    },
+    {
+      'demoId': 'slot-editor-slot',
+      'name': { 'zh-CN': '编辑器插槽', 'en-US': 'Editor slot' },
+      'desc': { 'zh-CN': '详细用法参考如下示例', 'en-US': 'For details, see the following example.' },
+      'codeFiles': ['slot/editor-slot.vue']
     }
   ],
   apis: [{ 'name': 'grid-slot', 'type': 'component', 'properties': [], 'events': [], 'slots': [] }]

From 5867d5cc3e725a9080186a9e568f0c1b962be5e9 Mon Sep 17 00:00:00 2001
From: tianxin <tianxin930618@163.com>
Date: Mon, 23 Oct 2023 00:46:26 -0700
Subject: [PATCH 2/2] =?UTF-8?q?grid=E8=A1=A8=E6=A0=BC=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E5=99=A8=E6=8F=92=E6=A7=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/sites/demos/pc/app/grid/slot/editor-slot.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/sites/demos/pc/app/grid/slot/editor-slot.vue b/examples/sites/demos/pc/app/grid/slot/editor-slot.vue
index 1e0f1c2118..bfc923ff5b 100644
--- a/examples/sites/demos/pc/app/grid/slot/editor-slot.vue
+++ b/examples/sites/demos/pc/app/grid/slot/editor-slot.vue
@@ -4,8 +4,8 @@
             <tiny-grid-column type="index" width="60"></tiny-grid-column>
             <tiny-grid-column field="name" title="插槽自定义列编辑" :editor="{component: 'input', autoselect: true}">
                 <template #edit="data">
-                    <tiny-autocomplete v-model="data.row.name" 
-                        placeholder="请输入内容"></tiny-autocomplete>
+                    <tiny-input v-model="data.row.name" 
+                        placeholder="请输入内容"></tiny-input>
                 </template>
             </tiny-grid-column>
             <tiny-grid-column field="employees" title="员工人数"></tiny-grid-column>
@@ -17,13 +17,13 @@
 </template>
   
 <script lang="jsx">
-import { Grid, GridColumn, Autocomplete } from '@opentiny/vue'
+import { Grid, GridColumn, Input } from '@opentiny/vue'
 
 export default {
     components: {
         TinyGrid: Grid,
         TinyGridColumn: GridColumn,
-        TinyAutocomplete: Autocomplete
+        TinyInput: Input
     },
     data() {
         return {