|
@@ -164,21 +164,19 @@ var TREE_SHEET_HELPER = {
|
|
|
sheet.setTag(iRow, iCol,tag);
|
|
|
}*/
|
|
|
if(colSetting.data.field=="code"){
|
|
|
- let tag ="";
|
|
|
+ let tag =null;
|
|
|
if(node.sourceType == ModuleNames.ration){//定额的时候换算子目
|
|
|
tag = node.data.adjustState?node.data.adjustState:'';
|
|
|
}/*else if(node.sourceType == ModuleNames.bills &&projectObj.ifItemCharHiden(setting)){//清单、并且项目特征列隐藏的时候悬浮提示 这里改成在 计量单位那里提示
|
|
|
tag = node.data.itemCharacterText?node.data.itemCharacterText:'';
|
|
|
}*/
|
|
|
- sheet.setTag(iRow, iCol,tag);
|
|
|
+ if(tag!=null&&tag!="") sheet.setTag(iRow, iCol,tag);
|
|
|
}
|
|
|
/*if(colSetting.data.field=="name"){ 2018-08-06 改成在编号列悬浮提示
|
|
|
let tag = node.data.itemCharacterText?node.data.itemCharacterText:'';
|
|
|
sheet.setTag(iRow, iCol,tag);
|
|
|
}*/
|
|
|
-
|
|
|
}
|
|
|
-
|
|
|
if(colSetting.visible == false) return;//隐藏列不做其它操作
|
|
|
var cell = sheet.getCell(iRow, iCol, GC.Spread.Sheets.SheetArea.viewport);
|
|
|
if (colSetting.data.getText && Object.prototype.toString.apply(colSetting.data.getText) === "[object Function]") {
|
|
@@ -211,7 +209,7 @@ var TREE_SHEET_HELPER = {
|
|
|
}
|
|
|
});
|
|
|
if(setting.setAutoFitRow){
|
|
|
- setting.setAutoFitRow(sheet,node)
|
|
|
+ setting.setAutoFitRow(sheet,node)//自动行高功能比较费时,400行,启用和不启用相差2秒左右
|
|
|
}
|
|
|
if (recursive) {
|
|
|
TREE_SHEET_HELPER.refreshTreeNodeData(setting, sheet, node.children, recursive);
|
|
@@ -618,7 +616,7 @@ var TREE_SHEET_HELPER = {
|
|
|
let left = setting.pos.x + hitinfo.cellRect.x;
|
|
|
$(this._toolTipElement).css("top", top).css("left", left);*/
|
|
|
//显示在下方,三角形指
|
|
|
- let top = setting.pos.y + hitinfo.cellRect.y+26;
|
|
|
+ let top = setting.pos.y +hitinfo.cellRect.y+ hitinfo.cellRect.height+10;
|
|
|
let left = setting.pos.x + hitinfo.cellRect.x;
|
|
|
$(this._toolTipElement).css("top", top).css("left", left);
|
|
|
|