Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js =================================================================== diff -u -r16199 -r17473 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js (.../configObj.js) (revision 16199) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js (.../configObj.js) (revision 17473) @@ -275,6 +275,8 @@ leftforPrint:0, widthforPrint:'80%', heightforPrint:'50%', + headRowHeight:'25', + dataRowHeight:'25', fontConfig: new FontConfig(), headFontConfig: new FontConfig(), dataItemFontConfig: new FontConfig(), @@ -303,6 +305,8 @@ saveValueFromCmp(this,'leftforPrint','table_left_forPrint'); saveValueFromCmp(this,'widthforPrint','table_width_forPrint'); saveValueFromCmp(this,'heightforPrint','table_height_forPrint'); + saveValueFromCmp(this,'headRowHeight','table_head_row_height'); + saveValueFromCmp(this,'dataRowHeight','table_data_row_height'); }, loadNormalConfig: function(cmpIdPrefix){ loadValueToCmp(this,'width','table_width'); @@ -311,6 +315,8 @@ loadValueToCmp(this,'leftforPrint','table_left_forPrint'); loadValueToCmp(this,'widthforPrint','table_width_forPrint'); loadValueToCmp(this,'heightforPrint','table_height_forPrint'); + loadValueToCmp(this,'headRowHeight','table_head_row_height'); + loadValueToCmp(this,'dataRowHeight','table_data_row_height'); }, statics: { convertFromJsonObjs: function(objs){ @@ -342,6 +348,8 @@ leftforPrint: obj.leftforPrint, widthforPrint: obj.widthforPrint, heightforPrint: obj.heightforPrint, + headRowHeight: obj.headRowHeight, + dataRowHeight: obj.dataRowHeight, fontConfig: FontConfig.convertFromJsonObj(obj.fontConfig), headFontConfig: FontConfig.convertFromJsonObj(obj.headFontConfig), dataItemFontConfig: FontConfig.convertFromJsonObj(obj.dataItemFontConfig), @@ -363,6 +371,8 @@ leftforPrint: this.leftforPrint, widthforPrint: this.widthforPrint, heightforPrint: this.heightforPrint, + headRowHeight: this.headRowHeight, + dataRowHeight: this.dataRowHeight, fontConfig: this.fontConfig.convertToJsonObj(), headFontConfig: this.headFontConfig.convertToJsonObj(), dataItemFontConfig: this.dataItemFontConfig.convertToJsonObj(), @@ -460,7 +470,7 @@ for(var r=0;r'; + tableHtml += ''; for(var c=0;c 0){ var columnConfigs = dataRowConfig.columnConfigs; for(var row=0;row'; + tableHtml += ''; for(var c=0;c