Browse Source

Merge pull request #857 from nekobc1998923/fix-undefined-show-error

fix: 修复UI显示问题
master
mengshukeji 4 years ago
committed by GitHub
parent
commit
7e2b4d6ce6
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/controllers/menuButton.js
  2. 2
      src/controllers/protection.js
  3. 2
      src/css/luckysheet-core.css

2
src/controllers/menuButton.js

@ -1292,7 +1292,7 @@ const menuButton = {
let menu = replaceHtml(_this.menu, { "id": "merge-menu", "item": itemset, "subclass": "", "sub": "" }); let menu = replaceHtml(_this.menu, { "id": "merge-menu", "item": itemset, "subclass": "", "sub": "" });
$("body").append(menu); $("body").append(menu);
$menuButton = $("#"+menuButtonId).width(110); $menuButton = $("#"+menuButtonId);
_this.focus($menuButton); _this.focus($menuButton);
$menuButton.find(".luckysheet-cols-menuitem").click(function(){ $menuButton.find(".luckysheet-cols-menuitem").click(function(){

2
src/controllers/protection.js

@ -555,7 +555,7 @@ function initialProtectionRIghtBar(file){
</div> </div>
<div class="luckysheet-slider-protection-row" style="height:47px;margin-top:4px;"> <div class="luckysheet-slider-protection-row" style="height:47px;margin-top:4px;">
<div class="luckysheet-slider-protection-column" style="width:98%;"> <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> </div>
</div> </div>

2
src/css/luckysheet-core.css

@ -7132,7 +7132,7 @@ fieldset[disabled] .btn-danger.focus {
} }
#luckysheet-insertLink-dialog .box-item label{ #luckysheet-insertLink-dialog .box-item label{
display: inline-block; display: inline-block;
width: 80px; width: 90px;
text-align: right; text-align: right;
margin-right: 10px; margin-right: 10px;
} }

Loading…
Cancel
Save