From 31527bf2a0a10881b3bab7a65fd53d16615a94bc Mon Sep 17 00:00:00 2001
From: xpyjs <jeremyjone@qq.com>
Date: Mon, 5 Jun 2023 15:12:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(column):=20=F0=9F=90=9B=20=E5=88=97?=
 =?UTF-8?q?=E7=9A=84=E7=9B=92=E5=AD=90=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 demo/App.vue                     | 3 +--
 src/components/column/style.scss | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo/App.vue b/demo/App.vue
index b7dfaa0..840be9f 100644
--- a/demo/App.vue
+++ b/demo/App.vue
@@ -151,7 +151,6 @@
           >
             <template #default="{ row }">
               <div
-                name="end"
                 :style="{ backgroundColor: `#${555}`, color: '#789' }"
               >
                 abc - {{ row }}
@@ -164,7 +163,7 @@
           </x-gantt-column>
         </XGanttColumn>
 
-        <XGanttColumn prop="picture12345" :merge="merge5">
+        <XGanttColumn prop="picture12345" :merge="merge5" ellipsis>
           <template #default="{ row }">
             👀😃✨✔🐱‍🚀🐱‍👓 {{ row.ttt.b }}
           </template>
diff --git a/src/components/column/style.scss b/src/components/column/style.scss
index f2ef824..e22cfc3 100644
--- a/src/components/column/style.scss
+++ b/src/components/column/style.scss
@@ -40,6 +40,7 @@
     .cell {
       width: 100%;
       display: inline-block;
+      box-sizing: border-box;
     }
 
     .cell-center {