|
@@ -465,7 +465,8 @@ let characterOprObj = {
|
|
|
setting: {
|
|
|
header: [
|
|
|
{headerName:"项目特征",headerWidth:120, rateWidth:0.9, dataCode:"character", dataType: "String", hAlign: "left", vAlign: "center", formatter: '@'},
|
|
|
- {headerName:"特征值",headerWidth:160,dataCode:"eigenvalue", dataType: "String", cellType: "comboBox", hAlign: "left", vAlign: "center", formatter: '@'},
|
|
|
+ {headerName:"特征值",headerWidth:160,dataCode:"eigenvalue", dataType: "String", hAlign: "left", vAlign: "center", formatter: '@'},
|
|
|
+ //{headerName:"特征值",headerWidth:160,dataCode:"eigenvalue", dataType: "String", cellType: "comboBox", hAlign: "left", vAlign: "center", formatter: '@'},
|
|
|
{headerName:"输出",headerWidth:40,dataCode:"isChecked", cellType:"checkBox", hAlign: "center", vAlign: "center"}
|
|
|
]
|
|
|
},
|
|
@@ -1051,6 +1052,10 @@ let pageCCOprObj = {
|
|
|
for (let row = 0; row < data.length; row++) {
|
|
|
sheet.getCell(row, 0).locked(true);//locked
|
|
|
let val = data[row][setting.header[col].dataCode];
|
|
|
+ if (setting.header[col].dataCode === 'eigenvalue') { // 2020-7-6: 暂时取消下拉
|
|
|
+ const selectedItem = val.find(v => v.isSelected);
|
|
|
+ val = selectedItem && selectedItem.value || '';
|
|
|
+ }
|
|
|
if(setting.header[col].cellType === "checkBox"){
|
|
|
let checkBox = new GC.Spread.Sheets.CellTypes.CheckBox();
|
|
|
checkBox.isThreeState(false);
|