From a00e6f34742f0310327a7769d8f502ac40fc9d1b Mon Sep 17 00:00:00 2001
From: chenjiahan <chenjiahan@youzan.com>
Date: Tue, 25 Aug 2020 15:29:19 +0800
Subject: [PATCH] chore(Layout): improve span

---
 src/col/index.js | 5 +----
 src/row/index.js | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/col/index.js b/src/col/index.js
index 32c80716e..81e3cdad9 100644
--- a/src/col/index.js
+++ b/src/col/index.js
@@ -16,10 +16,7 @@ export default createComponent({
   },
 
   setup(props, { slots }) {
-    const { parent, index } = useParent(
-      ROW_KEY,
-      computed(() => props.span)
-    );
+    const { parent, index } = useParent(ROW_KEY, () => +props.span);
 
     const style = computed(() => {
       const { spaces } = parent || {};
diff --git a/src/row/index.js b/src/row/index.js
index 5f071dee2..99f841aac 100644
--- a/src/row/index.js
+++ b/src/row/index.js
@@ -27,8 +27,8 @@ export default createComponent({
       const groups = [[]];
 
       let totalSpan = 0;
-      children.value.forEach((item, index) => {
-        totalSpan += Number(item.value);
+      children.value.forEach((getSpan, index) => {
+        totalSpan += getSpan();
 
         if (totalSpan > 24) {
           groups.push([index]);