fix(main canvas): bottom space

When hide add button and back to top button,we donot need 80px space bottom
dream-num · Dec 16, 2020 · 23c8a78 · 23c8a78
1 parent 5add606
commit 23c8a78
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/README-zh.md b/README-zh.md
@@ -182,6 +182,7 @@ Luckysheet是MIT许可的开源项目，其持续稳定的开发离不开这些
 - [@gsw945](https://github.com/gsw945)
 - [@swen-xiong](https://github.com/swen-xiong)
 - [@lzmch](https://github.com/lzmch)
+- [@kdevilpf](https://github.com/kdevilpf)
 
 ## 版权信息
 [MIT](http://opensource.org/licenses/MIT)

diff --git a/README.md b/README.md
@@ -178,6 +178,7 @@ Funds donated via Patreon go directly to support mengshukeji's work on Luckyshee
 - [@gsw945](https://github.com/gsw945)
 - [@swen-xiong](https://github.com/swen-xiong)
 - [@lzmch](https://github.com/lzmch)
+- [@kdevilpf](https://github.com/kdevilpf)
 
 ## License
 [MIT](http://opensource.org/licenses/MIT)

diff --git a/docs/about/README.md b/docs/about/README.md
@@ -20,4 +20,5 @@ Luckysheet is a project led by an individual and jointly developed by several fr
 - [@TimerGang](https://github.com/TimerGang)
 - [@gsw945](https://github.com/gsw945)
 - [@swen-xiong](https://github.com/swen-xiong)
-- [@lzmch](https://github.com/lzmch)
+- [@lzmch](https://github.com/lzmch)
+- [@kdevilpf](https://github.com/kdevilpf)
diff --git a/docs/zh/about/README.md b/docs/zh/about/README.md
@@ -20,4 +20,5 @@ Luckysheet是由个人主导、几个志同道合的小伙伴一同开发的项
 - [@TimerGang](https://github.com/TimerGang)
 - [@gsw945](https://github.com/gsw945)
 - [@swen-xiong](https://github.com/swen-xiong)
-- [@lzmch](https://github.com/lzmch)
+- [@lzmch](https://github.com/lzmch)
+- [@kdevilpf](https://github.com/kdevilpf)
diff --git a/docs/zh/guide/config.md b/docs/zh/guide/config.md
@@ -1213,7 +1213,7 @@ Luckysheet开放了更细致的自定义配置选项，分别有
 ## 工作簿
 
 ### workbookCreateBefore
-（TODO）
+
 - 类型：Function
 - 默认值：null
 - 作用：表格创建之前触发。旧的钩子函数叫做`beforeCreateDom`
@@ -1222,7 +1222,7 @@ Luckysheet开放了更细致的自定义配置选项，分别有
 
 ------------
 ### workbookCreateAfter
-（TODO）
+
 - 类型：Function
 - 默认值：null
 - 作用：表格创建之后触发

diff --git a/src/global/rhchInit.js b/src/global/rhchInit.js
@@ -25,7 +25,13 @@ export default function rhchInit(rowheight, colwidth) {
             Store.visibledatarow.push(Store.rh_height); //行的临时长度分布
         }
 
-        Store.rh_height += 80;  //最底部增加空白
+        // 如果增加行和回到顶部按钮隐藏，则减少底部空白区域，但是预留足够空间给单元格下拉按钮
+        if(!luckysheetConfigsetting.enableAddRow && !luckysheetConfigsetting.enableAddBackTop){
+            Store.rh_height += 29;
+        }else{
+            Store.rh_height += 80;  //最底部增加空白
+        }
+
     }
 
     //列宽