Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js =================================================================== diff -u -r22651 -r24657 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js (.../configObj.js) (revision 22651) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js (.../configObj.js) (revision 24657) @@ -279,6 +279,7 @@ heightforPrint:'50%', headRowHeight:'25', dataRowHeight:'25', + tdAlign:'center', fontConfig: new FontConfig(), headFontConfig: new FontConfig(), dataItemFontConfig: new FontConfig(), @@ -310,6 +311,7 @@ saveValueFromCmp(this,'heightforPrint','table_height_forPrint'); saveValueFromCmp(this,'headRowHeight','table_head_row_height'); saveValueFromCmp(this,'dataRowHeight','table_data_row_height'); + saveValueFromCmp(this,'tdAlign','table_data_tdAlign'); }, loadNormalConfig: function(cmpIdPrefix){ loadValueToCmp(this,'border','table_border'); @@ -321,6 +323,7 @@ loadValueToCmp(this,'heightforPrint','table_height_forPrint'); loadValueToCmp(this,'headRowHeight','table_head_row_height'); loadValueToCmp(this,'dataRowHeight','table_data_row_height'); + loadValueToCmp(this,'tdAlign','table_data_tdAlign'); }, statics: { convertFromJsonObjs: function(objs){ @@ -355,6 +358,7 @@ heightforPrint: obj.heightforPrint, headRowHeight: obj.headRowHeight, dataRowHeight: obj.dataRowHeight, + tdAlign: StringUtils.defaultIfEmpty(obj.tdAlign,'center'), fontConfig: FontConfig.convertFromJsonObj(obj.fontConfig), headFontConfig: FontConfig.convertFromJsonObj(obj.headFontConfig), dataItemFontConfig: FontConfig.convertFromJsonObj(obj.dataItemFontConfig), @@ -379,6 +383,7 @@ heightforPrint: this.heightforPrint, headRowHeight: this.headRowHeight, dataRowHeight: this.dataRowHeight, + tdAlign: this.tdAlign, fontConfig: this.fontConfig.convertToJsonObj(), headFontConfig: this.headFontConfig.convertToJsonObj(), dataItemFontConfig: this.dataItemFontConfig.convertToJsonObj(), @@ -543,7 +548,7 @@ } itemsObj['item'+(i+1)] = tdItemI; } - tempStr = ''+columnConfig.innerHTML+''; + tempStr = ''+columnConfig.innerHTML+''; tableHtml += fillPropertiesFromObj(itemsObj,tempStr); } tableHtml += ""; Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js =================================================================== diff -u -r24194 -r24657 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js (.../printCustomDesign.js) (revision 24194) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js (.../printCustomDesign.js) (revision 24657) @@ -1037,6 +1037,25 @@ value: '30px', allowBlank: false },{ + xtype : 'combo', + fieldLabel : '数字对齐', + id : 'table_data_tdAlign', + name : 'table_data_tdAlign', + valueField : 'value', + displayField : 'value', + value: 'center', + store : new Ext4.data.SimpleStore( { + fields : [ 'value'], + data : [['left'],['right'],['center'],['justify']] + }), + editable : false, + forceSelection : true, + mode : 'local', + allowBlank : false, + triggerAction : 'all', + width : 200 + + },{ xtype:'fieldset', title: '表头字体', defaultType: 'textfield',