From 83cb048a96ff947a34aa946f7141cd186d63a32c Mon Sep 17 00:00:00 2001 From: Dushusir <1414556676@qq.com> Date: Thu, 8 Oct 2020 22:22:28 +0800 Subject: [PATCH] style(right menu): right menu 1.remove right menu comfirm button 2.fix iconfont disappear --- docs/guide/api.md | 20 +++++++++++++++ docs/zh/guide/api.md | 21 +++++++++++++++ src/controllers/constant.js | 30 +++++++++------------- src/controllers/matrixOperation.js | 18 +++++++++++++ src/controllers/menuButton.js | 6 ++--- src/controllers/resize.js | 8 ++++-- src/controllers/selection.js | 2 +- src/controllers/sheetmanage.js | 6 ++++- src/css/iconCustom.css | 2 +- src/css/luckysheet-core.css | 41 +++++++++++++++++++----------- src/global/createdom.js | 4 --- src/index.html | 2 +- src/locale/en.js | 4 +-- src/locale/zh.js | 2 +- 14 files changed, 117 insertions(+), 49 deletions(-) diff --git a/docs/guide/api.md b/docs/guide/api.md index e3b46a6..59b02cd 100644 --- a/docs/guide/api.md +++ b/docs/guide/api.md @@ -2026,6 +2026,26 @@ Use note: ------------ +### scroll([setting]) + +[todo] + + +- **参数**: + + - {PlainObject} [setting]: optional parameters + + {Number} [scrollWidth]: horizontal scroll value. The default is the current horizontal scroll position. + + {Number} [scrollHeight]: Vertical scroll value. The default is the current vertical scroll position. + + {Number} [targetRow]: Scroll vertically to the specified row number. The default is the current vertical scroll position. + + {Number} [targetColumn]: scroll horizontally to the specified column number. The default is the current horizontal scroll position. + + {Function} [success]: The callback function after the table is refreshed successfully + +- **说明**: + + Scroll current worksheet position + +------------ + ### resize([setting]) - **Parameter**: diff --git a/docs/zh/guide/api.md b/docs/zh/guide/api.md index ee084fa..a53bd87 100644 --- a/docs/zh/guide/api.md +++ b/docs/zh/guide/api.md @@ -1973,6 +1973,26 @@ Luckysheet针对常用的数据操作需求,开放了主要功能的API,开 ------------ +### scroll([setting]) + +[todo] + + +- **参数**: + + - {PlainObject} [setting]: 可选参数 + + {Number} [scrollWidth]:横向滚动值。默认为当前横向滚动位置。 + + {Number} [scrollHeight]:纵向滚动值。默认为当前纵向滚动位置。 + + {Number} [targetRow]:纵向滚动到指定的行号。默认为当前纵向滚动位置。 + + {Number} [targetColumn]:横向滚动到指定的列号。默认为当前横向滚动位置。 + + {Function} [success]: 表格刷新成功后的回调函数 + +- **说明**: + + 滚动当前工作表位置 + +------------ + ### resize([setting]) - **参数**: @@ -2278,6 +2298,7 @@ Luckysheet针对常用的数据操作需求,开放了主要功能的API,开 按照scrollWidth, scrollHeight刷新canvas展示数据。 + > 推荐使用新API: [scroll](#scroll([setting])) ------------ ### setcellvalue(r, c, d, v) diff --git a/src/controllers/constant.js b/src/controllers/constant.js index 2ff7939..3e171a2 100644 --- a/src/controllers/constant.js +++ b/src/controllers/constant.js @@ -315,7 +315,7 @@ function rightclickHTML(){
@@ -357,12 +357,11 @@ function rightclickHTML(){