续数据中只有喊转义字符数据，则不成为续数据

public/web/sheet/sheet_data_helper.js

@@ -126,16 +126,9 @@ var SheetDataHelper = {
         style.wordWrap = setting.data.wordWrap;
         return style;
     },
-    getTipWidth: function(text){
-        const fontSize = 14.4;
-        let widthArr = text.split('<br>');
-        console.log(widthArr);
-    },
     loadSheetData: function (setting, sheet, datas) {
         let me = this;
         SheetDataHelper.protectdSheet(sheet);
-
-
         let TipCellType = function () {};
         TipCellType.prototype = new GC.Spread.Sheets.CellTypes.Text();
         TipCellType.prototype.getHitInfo = function (x, y, cellStyle, cellRect, context) {

public/web/tree_sheet/tree_sheet_helper.js

@@ -385,7 +385,7 @@ var TREE_SHEET_HELPER = {
             }
         };
         TreeNodeCellType.prototype.processMouseLeave = function (hitinfo) {
-            let me = this;
+            let me = TREE_SHEET_HELPER;
             TREE_SHEET_HELPER.tipDiv = 'hide';
             if (me._toolTipElement) {
                 $(me._toolTipElement).hide();

web/building_saas/css/main.css

@@ -178,7 +178,6 @@ a{
     background:#F1F1F1;
     bottom:30px;
     left:2px;
-    z-index: 999
 }
 .side-tabs .nav-tabs .nav-item {
     z-index: 999

web/building_saas/main/js/views/character_content_view.js

@@ -952,7 +952,6 @@ let pageCCOprObj = {
     },
     //设置特征及内容currentCache
     setCacheAndShow: function (node) {
-        console.log('enterCacheShow');
         if(!projectReadOnly){
             this.refreshRuleTools(projectObj.project.isBillsLocked());
         }

web/building_saas/main/js/views/importBills.js

@@ -349,11 +349,12 @@ const importBills = (function(){
                 let preBill = billIdx[preID];
                 if(preBill){
                     //合并续数据
-                    preBill.code += rData[colMapping.code] && rData[colMapping.code]['value'] ? rData[colMapping.code]['value'] : '';
-                    preBill.name += rData[colMapping.name] && rData[colMapping.name]['value'] ? rData[colMapping.name]['value'] : '';
-                    preBill.itemCharacterText += rData[colMapping.itemCharacterText] && rData[colMapping.itemCharacterText]['value'] ? '\n' + _deNR(rData[colMapping.itemCharacterText]['value']) : '';
-                    preBill.unit += rData[colMapping.unit] && rData[colMapping.unit]['value'] ? rData[colMapping.unit]['value'] : '';
-                    preBill.quantity += rData[colMapping.quantity] && rData[colMapping.quantity]['value'] ? rData[colMapping.quantity]['value'] : '';
+                    preBill.code += rData[colMapping.code] && rData[colMapping.code]['value'] && _isDef(_deESC(rData[colMapping.code]['value'])) ? rData[colMapping.code]['value'] : '';
+                    preBill.name += rData[colMapping.name] && rData[colMapping.name]['value'] && _isDef(_deESC(rData[colMapping.name]['value'])) ? rData[colMapping.name]['value'] : '';
+                    preBill.itemCharacterText += rData[colMapping.itemCharacterText] && rData[colMapping.itemCharacterText]['value'] && _isDef(_deESC(rData[colMapping.itemCharacterText]['value']))
+                        ? '\n' + _deNR(rData[colMapping.itemCharacterText]['value']) : '';
+                    preBill.unit += rData[colMapping.unit] && rData[colMapping.unit]['value'] && _isDef(_deESC(rData[colMapping.unit]['value'])) ? rData[colMapping.unit]['value'] : '';
+                    preBill.quantity += rData[colMapping.quantity] && rData[colMapping.quantity]['value'] && _isDef(_deESC(rData[colMapping.quantity]['value'])) ? rData[colMapping.quantity]['value'] : '';
                 }
             }
             else {
@@ -372,7 +373,6 @@ const importBills = (function(){
                     preBill = billIdx[preLeafID];
                 }
                 //set bill data
-                console.log(rData[colMapping.itemCharacterText] && rData[colMapping.itemCharacterText]['value'] ? rData[colMapping.itemCharacterText]['value'] : '');
                 billIdx[newID] = {
                     nodeType: nodeType,
                     ID: newID, ParentID: pID, NextSiblingID: -1,
@@ -422,13 +422,11 @@ const importBills = (function(){
                 validSheetsDatas.push({position: uploadPosition, colMapping: validSheets[uploadPosition][0].colMapping, validExcelData: validExcelData});
             }
         }
-        console.log(validSheetsDatas);
         for(let validSheetData of validSheetsDatas){
             if(validSheetData.validExcelData.length > 0){
                 rst[validSheetData.position] = parseToBillData(validSheetData.validExcelData, validSheetData.colMapping, positionFlag[validSheetData.position], projectID);
             }
         }
-        console.log(rst);
         return rst;
     }