fix(bug): bug

bug
dream-num · Jul 30, 2020 · 7dff640 · 7dff640
1 parent 0aa9b3b
commit 7dff640
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/src/controllers/conditionformat.js b/src/controllers/conditionformat.js
@@ -1902,8 +1902,8 @@ const conditionformat = {
             "addclass": "luckysheet-newEditorRule-dialog", 
             "title": conditionformat_Text.newFormatRule, 
             "content": content, 
-            "botton":  `<button id="luckysheet-newConditionRule-dialog-confirm" class="btn btn-primary" data-source="'+source+'">${conditionformat_Text.confirm}</button>
-                        <button id="luckysheet-newConditionRule-dialog-close" class="btn btn-default" data-source="'+source+'">${conditionformat_Text.cancel}</button>`, 
+            "botton":  `<button id="luckysheet-newConditionRule-dialog-confirm" class="btn btn-primary" data-source="${source}">${conditionformat_Text.confirm}</button>
+                        <button id="luckysheet-newConditionRule-dialog-close" class="btn btn-default" data-source="${source}">${conditionformat_Text.cancel}</button>`, 
             "style": "z-index:100003" 
         }));
         let $t = $("#luckysheet-newConditionRule-dialog")
@@ -1930,16 +1930,16 @@ const conditionformat = {
         const conditionformat_Text = locale().conditionformat; 
 
         let rule = _this.editorRule.data;
-        let ruleType = rule["type"], ruleFormat = rule["format"];
+        let ruleType = rule["type"], 
+            ruleFormat = rule["format"], 
+            conditionName = rule["conditionName"];
 
         let index, type1;
         if(ruleType == "dataBar" || ruleType == "colorGradation" || ruleType == "icons"){
             index = 0;
             type1 = ruleType;
         }
         else{
-            let conditionName = rule["conditionName"];
-
             if(conditionName == "greaterThan" || conditionName == "lessThan" || conditionName == "betweenness" || conditionName == "equal" || conditionName == "textContains" || conditionName == "occurrenceDate"){
                 index = 1;
 

diff --git a/src/controllers/handler.js b/src/controllers/handler.js
@@ -3612,6 +3612,10 @@ export default function luckysheetHandler() {
                     for(let c = copy_c1; c <= copy_c2; c++){
                         let cell = d[r][c];
 
+                        if(cell != null && cell.mc != null && cell.mc.rs == null){
+                            continue;
+                        }
+
                         let v;
                         if(cell != null){
                             if(cell.ct != null && cell.ct.fa.indexOf("w") > -1){
@@ -3625,6 +3629,10 @@ export default function luckysheetHandler() {
                             v = "";
                         }
 
+                        if(v == null){
+                            v = "";
+                        }
+
                         if(cpDataArr[r - copy_r1][c - copy_c1] != v){
                             isEqual = false;
                             break;
@@ -3633,7 +3641,6 @@ export default function luckysheetHandler() {
                 }
             }
 
-
             const locale_fontjson = locale().fontjson;
 
             if(txtdata.indexOf("luckysheet_copy_action_table") >- 1 && Store.luckysheet_copy_save["copyRange"] != null && Store.luckysheet_copy_save["copyRange"].length > 0 && isEqual){

diff --git a/src/css/luckysheet-core.css b/src/css/luckysheet-core.css
@@ -5667,11 +5667,11 @@ fieldset[disabled] a.btn {
     margin-bottom: 10px;
 }
 #luckysheet-modal-dialog-slider-alternateformat .modelbox{
+    display: inline-block;
     width: 36px;
     padding: 2px;
     border: 2px solid #fff;
     box-sizing: border-box;
-    float: left;
     margin-right: 4px;
     margin-bottom: 4px;
     cursor: pointer;

diff --git a/src/global/draw.js b/src/global/draw.js
@@ -726,6 +726,7 @@ function luckysheetDrawMain(scrollWidth, scrollHeight, drawWidth, drawHeight, of
 
         let fontset = luckysheetfontformat(cell);
         luckysheetTableContent.font = fontset;
+        luckysheetTableContent.textBaseline = 'top';
 
         //文本计算 宽度和高度
         let cellValueSize = getCellValueSize(cell, value, luckysheetTableContent, cellWidth, cellHeight, space_width, space_height);