|
@@ -334,8 +334,18 @@ var TREE_SHEET_HELPER = {
|
|
};
|
|
};
|
|
TipCellType.prototype.processMouseEnter = function (hitinfo) {
|
|
TipCellType.prototype.processMouseEnter = function (hitinfo) {
|
|
let text = hitinfo.sheet.getText(hitinfo.row, hitinfo.col);
|
|
let text = hitinfo.sheet.getText(hitinfo.row, hitinfo.col);
|
|
|
|
+ let value = hitinfo.sheet.getValue(hitinfo.row, hitinfo.col);
|
|
let tag = hitinfo.sheet.getTag(hitinfo.row, hitinfo.col);
|
|
let tag = hitinfo.sheet.getTag(hitinfo.row, hitinfo.col);
|
|
- if(setting.cols[hitinfo.col].data.field=="quantity"){
|
|
|
|
|
|
+ let acStyle = hitinfo.sheet.getActualStyle(hitinfo.row, hitinfo.col),
|
|
|
|
+ zoom = hitinfo.sheet.zoom();
|
|
|
|
+ let textLength = this.getAutoFitWidth(value, text, acStyle, zoom, {sheet: hitinfo.sheet, row: hitinfo.row, col: hitinfo.col, sheetArea: GC.Spread.Sheets.SheetArea.viewport});
|
|
|
|
+ let cellWidth = hitinfo.sheet.getCell(-1, hitinfo.col).width();
|
|
|
|
+ let dataField = setting.cols[hitinfo.col].data.field;
|
|
|
|
+ if(dataField === 'name' || dataField === 'itemCharacterText' || dataField === 'jobContentText' || dataField === 'adjustState'){
|
|
|
|
+ if(hitinfo.sheet.getParent() === projectObj.mainSpread && textLength <= cellWidth)
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ if(dataField=="quantity"){
|
|
text = tag;
|
|
text = tag;
|
|
}else if(tag !== undefined && tag) {
|
|
}else if(tag !== undefined && tag) {
|
|
text = tag;
|
|
text = tag;
|