|
@@ -20,13 +20,7 @@ let projFeatureView = {
|
|
|
allowUserDragFill: false,
|
|
|
scrollbarMaxAlign : true
|
|
|
},
|
|
|
- combos: [
|
|
|
- {row: 2, key: 'projType', items: ['住宅', '公共建筑', '厂房', '办公楼']},
|
|
|
- {row: 3, key: 'structureType', items: ['排架结构', '框架结构', '现浇、框架结构', '预制、砖混结构', '外砖内模', '内浇外挂', '钢结构']},
|
|
|
- {row: 4, key: 'baseType', items: ['带基', '框排架柱距6m以内', '框排架柱距6m以外', '满基筏式', '满基板式', '满基箱式', '独立基础']},
|
|
|
- {row: 5, key: 'buildingFeature', items: ['点式', '凹式', '凸式', 'Y式', '其他']}
|
|
|
- ],
|
|
|
- numRows: [6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
|
|
|
+ numRows: [],//6, 7, 8, 9, 10, 11, 12, 13, 14, 15
|
|
|
dateRows: [],
|
|
|
locked: {
|
|
|
rows: [0, 1],
|
|
@@ -73,6 +67,9 @@ let projFeatureView = {
|
|
|
for(let i = 0, len = headers.length; i < len; i++){
|
|
|
sheet.setValue(0, i, headers[i].name, GC.Spread.Sheets.SheetArea.colHeader);
|
|
|
sheet.setColumnWidth(i, headers[i].width, GC.Spread.Sheets.SheetArea.colHeader);
|
|
|
+ sheet.getRange(-1, i, -1, 1).hAlign(GC.Spread.Sheets.HorizontalAlign[headers[i]['hAlign']]);
|
|
|
+ sheet.getRange(-1, i, -1, 1).vAlign(GC.Spread.Sheets.VerticalAlign[headers[i]['vAlign']]);
|
|
|
+
|
|
|
}
|
|
|
};
|
|
|
me.renderSheetFuc(sheet, fuc);
|
|
@@ -107,17 +104,17 @@ let projFeatureView = {
|
|
|
sheet.setRowCount(datas.length);
|
|
|
me.initTree(sheet, true, datas);
|
|
|
sheet.setFormatter(-1, 1, '@');
|
|
|
- //setCombo
|
|
|
- for(let i = 0, len = me.setting.combos.length; i < len; i++){
|
|
|
- me.setCombo(sheet, me.setting.combos[i].row, me.setting.combos[i].items);
|
|
|
- }
|
|
|
- for(let col = 0, cLen = cols.length; col < cLen; col++){
|
|
|
- sheet.getRange(-1, col, -1, 1).hAlign(GC.Spread.Sheets.HorizontalAlign[cols[col]['hAlign']]);
|
|
|
- sheet.getRange(-1, col, -1, 1).vAlign(GC.Spread.Sheets.VerticalAlign[cols[col]['vAlign']]);
|
|
|
- for(let row = 0, rLen = datas.length; row < rLen; row++){
|
|
|
- sheet.setValue(row, col, datas[row][cols[col]['dataCode']]);
|
|
|
- }
|
|
|
- }
|
|
|
+ for(let row = 0;row < datas.length ; row ++){
|
|
|
+ if(datas[row].cellType == 'comboBox'){
|
|
|
+ let options = datas[row].options?datas[row].options.split("@"):[];
|
|
|
+ me.setCombo(sheet, row, options);
|
|
|
+ }else if(datas[row].cellType == 'number'){
|
|
|
+ me.setting.numRows.push(row);
|
|
|
+ }
|
|
|
+ for(let col = 0;col < cols.length;col++){
|
|
|
+ sheet.setValue(row, col, datas[row][cols[col]['dataCode']]);
|
|
|
+ }
|
|
|
+ }
|
|
|
};
|
|
|
this.renderSheetFuc(sheet, fuc);
|
|
|
},
|