Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js
===================================================================
diff -u -r17473 -r17480
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js	(.../configObj.js)	(revision 17473)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js	(.../configObj.js)	(revision 17480)
@@ -116,7 +116,7 @@
         this.callParent(arguments);
     },
 	getStyleStr: function(){
-		return this.borderConfig.getStyleStr() + this.fontConfig.getStyleStr();
+		return 'border:'+this.borderConfig.getStyleStr() + 'font:'+this.fontConfig.getStyleStr();
 	},
 	statics: {
 		convertFromJsonObjs: function(objs){
@@ -500,8 +500,10 @@
 				for(var c=0;c<columnConfigs.length;++c){
 					var columnConfig = columnConfigs[c];
 					var tableColumnConfig = tableConfig.columnConfigs[c];
+					// 字体直接取表格数据字体
+					columnConfig.fontConfig = tableConfig.dataItemFontConfig;
 					columnConfig.columnStyle = columnConfig.getStyleStr();
-					
+//					alert(columnConfig.columnStyle)
 					var itemsObj = {};
 					for(var i=0;i<itemsPerRow;++i){
 						var tdItemI = null;
@@ -523,7 +525,7 @@
 	
 	// 结束表格
 	tableHtml += '</table>';
-
+//	alert(tableHtml)
 	return tableHtml;
 }
 function transformTemplateConfigObjs(template){