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(){
${rightclick.column} ${rightclick.width} - + px
@@ -357,12 +357,11 @@ function rightclickHTML(){
-
-
- Json - - -
+
+
Json ${rightclick.firstLineTitle}
+
+
+
Json ${rightclick.untitled}
${rightclick.array1}
@@ -370,15 +369,12 @@ function rightclickHTML(){
${rightclick.array2}
-
+
-
${rightclick.array3}
-
- + ${rightclick.array3} + × - -
@@ -388,12 +384,11 @@ function rightclickHTML(){
${rightclick.antiDiagonal}
-
+
${rightclick.diagonalOffset} ${rightclick.column} -
@@ -495,11 +490,11 @@ function rightclickHTML(){
${rightclick.transpose}
-
+
${rightclick.matrixCalculation}
- @@ -509,7 +504,6 @@ function rightclickHTML(){ -
diff --git a/src/controllers/matrixOperation.js b/src/controllers/matrixOperation.js index 6a79717..9e41895 100644 --- a/src/controllers/matrixOperation.js +++ b/src/controllers/matrixOperation.js @@ -269,6 +269,12 @@ export function initialMatrixOperation(){ //复制为多维数组 $("#luckysheet-copy-arraymore-confirm").click(function (event) { + + // Click input element, don't comfirm + if(event.target.nodeName === 'INPUT'){ + return; + } + $("body .luckysheet-cols-menu").hide(); if(Store.luckysheet_select_save.length > 1){ @@ -509,6 +515,12 @@ export function initialMatrixOperation(){ //复制为对角偏移n列 $("#luckysheet-copy-diagonaloffset").click(function (event) { + + // Click input element, don't comfirm + if(event.target.nodeName === 'INPUT'){ + return; + } + $("body .luckysheet-cols-menu").hide(); luckysheetContainerFocus(); @@ -870,6 +882,12 @@ export function initialMatrixOperation(){ //矩阵操作选区 矩阵计算 $("#luckysheet-matrix-cal-confirm").click(function (event) { + + // Click input element, don't comfirm + if(event.target.nodeName === 'INPUT' || event.target.nodeName === 'SELECT'){ + return; + } + $("body .luckysheet-cols-menu").hide(); luckysheetContainerFocus(); diff --git a/src/controllers/menuButton.js b/src/controllers/menuButton.js index 29d8dee..2fd5a00 100644 --- a/src/controllers/menuButton.js +++ b/src/controllers/menuButton.js @@ -39,7 +39,7 @@ import locale from '../locale/locale'; const menuButton = { "menu": '
${item}
', // "item": '
${name} ${example}
', - "item": '
${name}
', + "item": '
${name} ${example}
', "split": '', "color": '
${resetColor}
${coloritem}
', "coloritem": '
${name}
', @@ -68,11 +68,11 @@ const menuButton = { else{ if(item.example=="more"){ // itemset += replaceHtml(_this.item, {"value": item.value, "name": item.text, "example": "►", "sub": "luckysheet-cols-submenu"}); - itemset += replaceHtml(_this.item, {"value": item.value, "name": item.text, "sub": "luckysheet-cols-submenu", "iconClass": "iconfont icon-youjiantou"}); + itemset += replaceHtml(_this.item, {"value": item.value, "name": item.text, "example": "", "sub": "luckysheet-cols-submenu", "iconClass": "iconfont icon-youjiantou"}); } else{ - itemset += replaceHtml(_this.item, {"value": item.value, "name": item.text, "example": item.example, "sub": ""}); + itemset += replaceHtml(_this.item, {"value": item.value, "name": item.text, "example": item.example, "sub": "", "iconClass": ""}); } } } diff --git a/src/controllers/resize.js b/src/controllers/resize.js index c6b126d..dbf632d 100644 --- a/src/controllers/resize.js +++ b/src/controllers/resize.js @@ -136,13 +136,17 @@ export default function luckysheetsizeauto(isRefreshCanvas=true) { // 找到应该隐藏的起始元素位置 for (let index = toobarWidths.length - 1; index >= 0; index--) { + + // #luckysheet-icon-morebtn button width plus right is 83px if(toobarWidths[index] < gridW - 90){ moreButtonIndex = index; - ismore = true; + if(moreButtonIndex !== 33){ + + ismore = true; + } break; } } - // 从起始位置开始，后面的元素统一挪到下方隐藏DIV中 for (let index = moreButtonIndex; index < toobarElements.length; index++) { const element = toobarElements[index]; diff --git a/src/controllers/selection.js b/src/controllers/selection.js index df1d6e2..c49e00a 100644 --- a/src/controllers/selection.js +++ b/src/controllers/selection.js @@ -531,7 +531,7 @@ const selection = { copybyformat: function (e, txt) {//copy事件 let clipboardData = window.clipboardData; //for IE if (!clipboardData) { // for chrome - clipboardData = e.originalEvent.clipboardData; + clipboardData = e.originalEvent && e.originalEvent.clipboardData; } Store.luckysheet_selection_range = [{ "row": Store.luckysheet_select_save[0].row, "column": Store.luckysheet_select_save[0].column }]; diff --git a/src/controllers/sheetmanage.js b/src/controllers/sheetmanage.js index c5b7994..5f1a2f9 100644 --- a/src/controllers/sheetmanage.js +++ b/src/controllers/sheetmanage.js @@ -25,7 +25,7 @@ import { selectHightlightShow, selectionCopyShow } from './select'; import Store from '../store'; import locale from '../locale/locale'; import { renderChartShow } from '../expendPlugins/chart/plugin'; -import {changeSheetContainerSize} from './resize'; +import {changeSheetContainerSize, menuToolBarWidth} from './resize'; import {zoomNumberDomBind} from './zoom'; const sheetmanage = { @@ -749,6 +749,10 @@ const sheetmanage = { else { Store.luckysheetcurrentisPivotTable = false; $("#luckysheet-modal-dialog-slider-pivot").hide(); + + // Store toolbar button width value + menuToolBarWidth(); + luckysheetsizeauto(); //等待滚动条dom宽高加载完成后 初始化滚动位置 diff --git a/src/css/iconCustom.css b/src/css/iconCustom.css index f707385..81d065f 100644 --- a/src/css/iconCustom.css +++ b/src/css/iconCustom.css @@ -41,7 +41,7 @@ } #luckysheet-icon-morebtn{ - padding: 0 13px 0 5px; + padding: 2px 13px 0 5px; } #luckysheet-icon-morebtn .iconfont{ top:-9px; diff --git a/src/css/luckysheet-core.css b/src/css/luckysheet-core.css index d1ee081..863f0ac 100644 --- a/src/css/luckysheet-core.css +++ b/src/css/luckysheet-core.css @@ -774,10 +774,10 @@ margin-right: 0px; } -.luckysheet-icon-autofilter { +/* .luckysheet-icon-autofilter { left: -36px; top: -406px; -} +} */ #luckysheet-icon-pivotTable .luckysheet-toolbar-menu-button-caption { color: #0188fb; @@ -2614,7 +2614,7 @@ body:not(.ewa-ipad) .luckysheet-rows-h-cell-sel:hover { padding: 4px 8px; font-size: 14px; line-height: 1.42857143; - border-radius: 4px; + border-radius: 2px; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; @@ -2730,29 +2730,35 @@ fieldset[disabled] .btn-default.focus { .btn-primary { color: #ffffff; - background-color: #337ab7; - border-color: #2e6da4; + /* background-color: #337ab7; */ + background-color: #2D7FF9; + /* border-color: #2e6da4; */ + border-color:transparent; } .btn-primary:focus, .btn-primary.focus { color: #ffffff; background-color: #286090; - border-color: #122b40; + /* border-color: #122b40; */ + border-color:transparent; } .btn-primary:hover { color: #ffffff; - background-color: #286090; - border-color: #204d74; + /* background-color: #286090; */ + background-color: #5391ff; + /* border-color: #204d74; */ + border-color:transparent; } .btn-primary:active, .btn-primary.active, .open>.dropdown-toggle.btn-primary { color: #ffffff; - background-color: #286090; - border-color: #204d74; + /* background-color: #286090; */ + background-color: #5391ff; + /* border-color: #204d74; */ } .btn-primary:active:hover, @@ -2766,7 +2772,8 @@ fieldset[disabled] .btn-default.focus { .open>.dropdown-toggle.btn-primary.focus { color: #ffffff; background-color: #204d74; - border-color: #122b40; + /* border-color: #122b40; */ + border-color:transparent; } .btn-primary:active, @@ -2794,7 +2801,8 @@ fieldset[disabled] .btn-primary:active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { background-color: #337ab7; - border-color: #2e6da4; + /* border-color: #2e6da4; */ + border-color:transparent; } .btn-primary .badge { @@ -2808,13 +2816,16 @@ fieldset[disabled] .btn-primary.active { .list-group-item.active:hover, .list-group-item.active:focus { background: #0188FB; - border-color: #726EFE; + /* border-color: #726EFE; */ + border-color:transparent; } .btn-primary:hover, .btn-primary:focus { - background: #388cf5; - border-color: #6864FE; + /* background: #388cf5; */ + background: #5391ff; + /* border-color: #6864FE; */ + border-color:transparent; } diff --git a/src/global/createdom.js b/src/global/createdom.js index 8c17096..de4b301 100644 --- a/src/global/createdom.js +++ b/src/global/createdom.js @@ -19,7 +19,6 @@ import rhchInit from './rhchInit'; import { replaceHtml } from '../utils/util'; import Store from '../store'; import locale from '../locale/locale'; -import {menuToolBarWidth} from '../controllers/resize' export default function luckysheetcreatedom(colwidth, rowheight, data, menu, title) { // //最少30行 @@ -99,9 +98,6 @@ export default function luckysheetcreatedom(colwidth, rowheight, data, menu, tit $("#" + Store.container).append(gh); - //统计工具栏按钮宽度值 - menuToolBarWidth(); - $("#luckysheet-scrollbar-x div").width(Store.ch_width); $("#luckysheet-scrollbar-y div").height(Store.rh_height + Store.columeHeaderHeight - Store.cellMainSrollBarSize - 3); diff --git a/src/index.html b/src/index.html index 37042a1..7532791 100644 --- a/src/index.html +++ b/src/index.html @@ -76,7 +76,7 @@ luckysheet.create({ container: 'luckysheet', - lang: 'en', + lang: 'zh', allowEdit:true, forceCalculation:false, plugins: ['chart'], diff --git a/src/locale/en.js b/src/locale/en.js index 30b4f48..a71aee4 100644 --- a/src/locale/en.js +++ b/src/locale/en.js @@ -521,8 +521,8 @@ export default { sortSelection: 'Sort', filterSelection: 'Filter', chartGeneration: 'Create chart', - firstLineTitle: 'First line title', - untitled: 'Untitled', + firstLineTitle: 'first line title', + untitled: 'untitled', array1: 'One-dimensional array', array2: 'Two-dimensional array', array3: 'Multidimensional Arrays', diff --git a/src/locale/zh.js b/src/locale/zh.js index 6b330c5..5f33542 100644 --- a/src/locale/zh.js +++ b/src/locale/zh.js @@ -408,7 +408,7 @@ export default { "clip":"截断", }, rotation:{ - "none":"无选装", + "none":"无旋转", "angleup":"向上倾斜", "angledown":"向下倾斜", "vertical":"竖排文字",