Browse Source

fix(bug): 工具栏缩小后再放大不能回到原位置

master
break-wave 5 years ago
parent
commit
37316b03e2
  1. 3
      src/controllers/resize.js
  2. 6
      src/controllers/toolbar.js

3
src/controllers/resize.js

@ -117,7 +117,7 @@ export default function luckysheetsizeauto(isRefreshCanvas=true) {
const $t = $(this)[0]; const $t = $(this)[0];
const $container = $("#luckysheet-wa-editor")[0]; const $container = $("#luckysheet-wa-editor")[0];
$container.appendChild(document.createTextNode(" ")); // $container.appendChild(document.createTextNode(" "));
$container.appendChild($t); $container.appendChild($t);
}); });
@ -440,7 +440,6 @@ export function menuToolBarWidth() {
return -1; return -1;
} }
} }
toobarElements.forEach((curr,index,arr)=>{ toobarElements.forEach((curr,index,arr)=>{
arr[index] = curr.ele; arr[index] = curr.ele;

6
src/controllers/toolbar.js

@ -846,10 +846,10 @@ export function createToolbarHtml() {
let i = 0; let i = 0;
showtoolbarConfig.forEach(function(key, i) { showtoolbarConfig.forEach(function(key, i) {
if (key === '|') { if (key === '|') {
const nameKeys = defaultToolbar[i - 1] const nameKeys = showtoolbarConfig[i - 1]
if(nameKeys !== '|') { if(nameKeys !== '|') {
buttonHTML.push( buttonHTML.push(
`<div id="toolbar-separator-${camel2split(key)}" class="luckysheet-toolbar-separator luckysheet-inline-block" style="user-select: none;"></div>` `<div id="toolbar-separator-${camel2split(nameKeys)}" class="luckysheet-toolbar-separator luckysheet-inline-block" style="user-select: none;"></div>`
); );
} }
} else { } else {
@ -893,7 +893,7 @@ export function createToolbarHtml() {
const nameKeys = defaultToolbar[i - 1] const nameKeys = defaultToolbar[i - 1]
if(nameKeys !== '|') { if(nameKeys !== '|') {
buttonHTML.push( buttonHTML.push(
`<div id="toolbar-separator-${camel2split(key)}" class="luckysheet-toolbar-separator luckysheet-inline-block" style="user-select: none;"></div>` `<div id="toolbar-separator-${camel2split(nameKeys)}" class="luckysheet-toolbar-separator luckysheet-inline-block" style="user-select: none;"></div>`
); );
} }
} else { } else {

Loading…
Cancel
Save