Browse Source
Merge pull request #857 from nekobc1998923/fix-undefined-show-error
fix: 修复UI显示问题
master
mengshukeji
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
3 additions and
3 deletions
-
src/controllers/menuButton.js
-
src/controllers/protection.js
-
src/css/luckysheet-core.css
|
|
@ -1292,7 +1292,7 @@ const menuButton = { |
|
|
|
let menu = replaceHtml(_this.menu, { "id": "merge-menu", "item": itemset, "subclass": "", "sub": "" }); |
|
|
|
|
|
|
|
$("body").append(menu); |
|
|
|
$menuButton = $("#"+menuButtonId).width(110); |
|
|
|
$menuButton = $("#"+menuButtonId); |
|
|
|
_this.focus($menuButton); |
|
|
|
|
|
|
|
$menuButton.find(".luckysheet-cols-menuitem").click(function(){ |
|
|
|
|
|
@ -555,7 +555,7 @@ function initialProtectionRIghtBar(file){ |
|
|
|
</div> |
|
|
|
<div class="luckysheet-slider-protection-row" style="height:47px;margin-top:4px;"> |
|
|
|
<div class="luckysheet-slider-protection-column" style="width:98%;"> |
|
|
|
<textarea class="luckysheet-protection-textarea" id="protection-hint" placeHolder="${local_protection.enterHintTitle}"></textarea> |
|
|
|
<textarea class="luckysheet-protection-textarea" id="protection-hint" placeHolder="${local_protection.enterHint}"></textarea> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
@ -7132,7 +7132,7 @@ fieldset[disabled] .btn-danger.focus { |
|
|
|
} |
|
|
|
#luckysheet-insertLink-dialog .box-item label{ |
|
|
|
display: inline-block; |
|
|
|
width: 80px; |
|
|
|
width: 90px; |
|
|
|
text-align: right; |
|
|
|
margin-right: 10px; |
|
|
|
} |
|
|
|