Browse Source

fix: 修复点击冻结首列再点击取消冻结的情况下,工具栏仍显示取消冻结的问题

master
cdswyda 4 years ago
parent
commit
4e4e952f9f
  1. 20
      src/controllers/freezen.js
  2. 2
      src/controllers/menuButton.js

20
src/controllers/freezen.js

@ -49,6 +49,26 @@ const luckysheetFreezen = {
const _locale = locale(); const _locale = locale();
const locale_freezen = _locale.freezen; const locale_freezen = _locale.freezen;
// 解决freeze 不垂直居中的问题
const freezeHTML = `
<div class="luckysheet-toolbar-button-outer-box luckysheet-inline-block"
style="user-select: none;">
<div class="luckysheet-toolbar-button-inner-box luckysheet-inline-block"
style="user-select: none;">
<div class="luckysheet-icon luckysheet-inline-block " style="user-select: none;">
<div aria-hidden="true" class="luckysheet-icon-img-container luckysheet-icon-img luckysheet-icon-function iconfont luckysheet-iconfont-dongjie1"
style="user-select: none;">
</div>
</div>
<div class="luckysheet-toolbar-menu-button-caption luckysheet-inline-block"
style="user-select: none;">
${locale_freezen.default}
</div>
</div>
</div>
`
$("#luckysheet-freezen-btn-horizontal").html(freezeHTML);
$("#luckysheet-freezen-btn-vertical").html('<i class="fa fa-indent"></i> '+locale_freezen.freezenColumn); $("#luckysheet-freezen-btn-vertical").html('<i class="fa fa-indent"></i> '+locale_freezen.freezenColumn);
_this.freezenverticaldata = null; _this.freezenverticaldata = null;

2
src/controllers/menuButton.js

@ -1619,7 +1619,7 @@ const menuButton = {
let $t = $(this), itemvalue = $t.attr("itemvalue"); let $t = $(this), itemvalue = $t.attr("itemvalue");
_this.focus($menuButton, itemvalue); _this.focus($menuButton, itemvalue);
if (itemvalue === locale_freezen.freezenCancel) { if (itemvalue === 'freezenCancel') {
$menuButton.find('.fa.fa-check').remove(); $menuButton.find('.fa.fa-check').remove();
} }

Loading…
Cancel
Save