|
|
@@ -235,7 +235,7 @@ var sheetCommonObj = {
|
|
|
ComboCellForActiveCell.prototype = new GC.Spread.Sheets.CellTypes.ComboBox();
|
|
|
ComboCellForActiveCell.prototype.paintValue = function (ctx, value, x, y, w, h, style, options) {
|
|
|
let sheet = options.sheet;
|
|
|
- if (options.row === sheet.getActiveRowIndex() && options.col === sheet.getActiveColumnIndex()) {
|
|
|
+ if (options.row === sheet.getActiveRowIndex() && options.col === sheet.getActiveColumnIndex() && !sheet.getCell(options.row, options.col).locked()) {
|
|
|
GC.Spread.Sheets.CellTypes.ComboBox.prototype.paintValue.apply(this, arguments);
|
|
|
|
|
|
} else {
|
|
|
@@ -244,7 +244,7 @@ var sheetCommonObj = {
|
|
|
};
|
|
|
ComboCellForActiveCell.prototype.getHitInfo = function (x, y, cellStyle, cellRect, options) {
|
|
|
let sheet = options.sheet;
|
|
|
- if (options.row === sheet.getActiveRowIndex() && options.col === sheet.getActiveColumnIndex()) {
|
|
|
+ if (options.row === sheet.getActiveRowIndex() && options.col === sheet.getActiveColumnIndex() && !sheet.getCell(options.row, options.col).locked()) {
|
|
|
return GC.Spread.Sheets.CellTypes.ComboBox.prototype.getHitInfo.apply(this, arguments);
|
|
|
|
|
|
} else {
|
