Browse Source

fix(more formats toolbar): fix more formats toolbar can't sync with cell, fix mac delete button can't delete cell, fix can't delete cell with inline-style

master
javahuang 5 years ago
parent
commit
23fcb137cb
  1. 3
      src/controllers/constant.js
  2. 2
      src/controllers/keyboard.js
  3. 29
      src/controllers/menuButton.js
  4. 3
      src/controllers/rowColumnOperation.js
  5. 2
      src/css/iconCustom.css
  6. 9
      src/css/luckysheet-core.css

3
src/controllers/constant.js

@ -727,6 +727,7 @@ const luckysheetToolHTML = '<div id="luckysheet-tooltip-up" class="jfk-tooltip"
function menuToolBar (){
const toolbar = locale().toolbar;
const fontarray = locale().fontarray;
const defaultFmtArray = locale().defaultFmt;
// <!-- undo -->
return `<div class="luckysheet-toolbar-left-theme">
@ -843,7 +844,7 @@ function menuToolBar (){
style="user-select: none;">
<div class="luckysheet-toolbar-menu-button-caption luckysheet-inline-block"
style="user-select: none;">
123
${defaultFmtArray[0].text}
</div>
<div class="luckysheet-toolbar-menu-button-dropdown luckysheet-inline-block iconfont icon-xiayige"
style="user-select: none;">

2
src/controllers/keyboard.js

@ -748,7 +748,7 @@ export function keyboardInitial(){
selectHightlightShow();
}
else if (kcode == keycode.DELETE) {
else if (kcode == keycode.DELETE || kcode == keycode.BACKSPACE) {
$("#luckysheet-delete-text").click();
event.preventDefault();

29
src/controllers/menuButton.js

@ -419,13 +419,13 @@ const menuButton = {
//luckysheet-icon-fmt-other-menuButton_sub
$("body").append(menu+submenu);
$menuButton = $("#" + menuButtonId).width(250);
_this.focus($menuButton);
$menuButton.find(".luckysheet-cols-menuitem").click(function(){
$menuButton.hide();
luckysheetContainerFocus();
let $t = $(this), itemvalue = $t.attr("itemvalue");
let $t = $(this), itemvalue = $t.attr("itemvalue"),itemname = $t.attr("itemname");;
$("#luckysheet-icon-fmt-other").find(".luckysheet-toolbar-menu-button-caption").html(" "+ itemname +" ");
if(itemvalue == "fmtOtherSelf"){
return;
@ -448,6 +448,12 @@ const menuButton = {
luckysheetMoreFormat.createDialog(itemvalue);
luckysheetMoreFormat.init();
})
} else {
const text =$(this).find(".luckysheet-toolbar-menu-button-caption").text().trim();
const format = locale_defaultFmt.find(f => f.text === text);
if(format) {
_this.focus($menuButton, format.value);
}
}
let userlen = $(this).outerWidth();
@ -3416,6 +3422,23 @@ const menuButton = {
$icon.removeAttr("class").addClass("luckysheet-icon-img-container luckysheet-icon-img luckysheet-icon-rotation-" + itemvalue + iconfontObject[itemvalue]);
$menuButton.hide();
}
else if(attr == "ct") {
let $menuButton = $("#luckysheet-icon-fmt-other");
const _locale = locale();
const locale_defaultFmt = _locale.defaultFmt;
if(!foucsStatus) {
$menuButton.find(".luckysheet-toolbar-menu-button-caption").html(" "+ locale_defaultFmt[0].text +" ");
return;
}
const {fa} = foucsStatus;
const format = locale_defaultFmt.find(f => f.value === fa);
if(format) {
$menuButton.find(".luckysheet-toolbar-menu-button-caption").html(" "+ format.text +" ");
} else {
const otherFormat = locale_defaultFmt.find(f => f.value === "fmtOtherSelf");
$menuButton.find(".luckysheet-toolbar-menu-button-caption").html(" "+ otherFormat.text +" ");
}
}
},
inputMenuButtonFocus:function(focusTarget){
var w = window.getSelection();
@ -3433,7 +3456,7 @@ const menuButton = {
},
menuButtonFocus: function(d, r, c){
let _this = this;
let foucsList = ["bl", "it", "cl", "ff", "ht", "vt", "fs", "tb", "tr"];
let foucsList = ["bl", "it", "cl", "ff", "ht", "vt", "fs", "tb", "tr", "ct"];
const _locale = locale();
for(let i = 0; i < foucsList.length; i++){
let attr = foucsList[i];

3
src/controllers/rowColumnOperation.js

@ -1567,6 +1567,9 @@ export function rowColumnOperationInitial(){
if(getObjType(d[r][c]) == "object"){
delete d[r][c]["m"];
delete d[r][c]["v"];
if(d[r][c]["ct"] != null) {
delete d[r][c]["ct"]["s"]
}
if(d[r][c]["f"] != null){
delete d[r][c]["f"];

2
src/css/iconCustom.css

@ -18,7 +18,7 @@
#luckysheet-icon-morebtn{
position: absolute;
right: 30px;
right: 15px;
}

9
src/css/luckysheet-core.css

@ -573,6 +573,15 @@
top: -1660px;
} */
#luckysheet-icon-fmt-other .luckysheet-toolbar-menu-button-caption {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 55px;
margin-left: 1px;
text-align: center;
}
#luckysheet-icon-font-family .luckysheet-toolbar-menu-button-caption {
overflow: hidden;
text-overflow: ellipsis;

Loading…
Cancel
Save