Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js
===================================================================
diff -u -r21286 -r21789
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js	(.../configObj.js)	(revision 21286)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js	(.../configObj.js)	(revision 21789)
@@ -76,11 +76,12 @@
 Ext4.define("BorderConfig", {
     extend: 'StyleConfig',
     getStyleStr: function(){
-		return this.borderWidth +' '+ this.borderStyle +' '+ this.borderColor+';';
+//		return this.borderWidth +' '+ this.borderStyle +' '+ this.borderColor+';';
+    	return '';
 	},
     constructor: function(){
         this.callParent(arguments);
-        this.borderWidth = '1px';
+        this.borderWidth = '0px';
         this.borderStyle = 'solid';
         this.borderColor = 'black';
     },
@@ -269,6 +270,7 @@
 		tableDataSourceName: '',
 		itemsPerRow: 1,
 		columnAmount:3,
+		border:1,
 		width:400,
 		height:300,
 		topforPrint:0,
@@ -299,6 +301,7 @@
     	this.loadNormalConfig();
     },
     saveNormalConfig: function(){
+    	saveValueFromCmp(this,'border','table_border');
     	saveValueFromCmp(this,'width','table_width');
 		saveValueFromCmp(this,'height','table_height');
 		saveValueFromCmp(this,'topforPrint','table_top_forPrint');
@@ -309,6 +312,7 @@
 		saveValueFromCmp(this,'dataRowHeight','table_data_row_height');
 	},
 	loadNormalConfig: function(cmpIdPrefix){
+		loadValueToCmp(this,'border','table_border');
 		loadValueToCmp(this,'width','table_width');
 		loadValueToCmp(this,'height','table_height');
 		loadValueToCmp(this,'topforPrint','table_top_forPrint');
@@ -342,6 +346,7 @@
 				tableDataSourceName: obj.tableDataSourceName,
 				itemsPerRow: obj.itemsPerRow,
 				columnAmount: obj.columnAmount,
+				border: obj.border,
 				width: obj.width,
 				height: obj.height,
 				topforPrint: obj.topforPrint,
@@ -365,6 +370,7 @@
 				tableDataSourceName: this.tableDataSourceName,
 				itemsPerRow: this.itemsPerRow,
 				columnAmount: this.columnAmount,
+				border: this.border,
 				width: this.width,
 				height: this.height,
 				topforPrint: this.topforPrint,
@@ -454,15 +460,30 @@
 	}
 });
 
+function resetBorder(tableConfig,obj){
+	if(!isUndefinedOrNull(tableConfig.border)){
+		obj.borderConfig.borderWidth = tableConfig.border+'px';
+	}
+}
 //根据配置和数据源生成表格
 function createTableHtmlByConfig(tableConfig,obj){
 	var tableHtml = '';
 	var tempStr;
 	var tableDataSource = tableConfig.getTableDataSource();
 	var itemsPropName = tableDataSource.itemsPropName;
+	if(isUndefinedOrNull(tableConfig.border)){
+//		tableConfig.borderConfig.borderWidth = '1px';
+	}else{
+//		tableConfig.borderConfig.borderWidth = tableConfig.border+'px';
+	}
+	var borderStr = 'border="1"';
+	if(!isUndefinedOrNull(tableConfig.border)){
+		borderStr = 'border="'+tableConfig.border+'"';
+	}
 	tableConfig.tableStyle = tableConfig.getStyleStr();
+	
 	// 表格本身
-	tempStr = '<table border ="1" cellspacing="0" cellpadding="0" style="${tableStyle}" >';
+	tempStr = '<table '+borderStr+' cellspacing="0" cellpadding="0" style="${tableStyle}" >';
 	tableHtml += fillPropertiesFromObj(tableConfig,tempStr);
 	// 获取表头配置
 	var headRowConfigs = tableConfig.getTableHeadRowConfigs();
@@ -475,6 +496,7 @@
 				for(var c=0;c<columnConfigs.length;++c){
 					var columnConfig = columnConfigs[c];
 					var tableColumnConfig = tableConfig.columnConfigs[c];
+//					resetBorder(tableConfig,columnConfig);
 					columnConfig.columnStyle = columnConfig.getStyleStr();
 					tempStr = '<td align="'+columnConfig.align+'" width ="'+tableColumnConfig.width+'" style="'+columnConfig.columnStyle+'">'+columnConfig.innerHTML+'</td>';
 					tableHtml += fillPropertiesFromObj(columnConfig,tempStr);
@@ -504,6 +526,7 @@
 					var tableColumnConfig = tableConfig.columnConfigs[c];
 					// 字体直接取表格数据字体
 					columnConfig.fontConfig = tableConfig.dataItemFontConfig;
+//					resetBorder(tableConfig,columnConfig);
 					columnConfig.columnStyle = columnConfig.getStyleStr();
 //					alert(columnConfig.columnStyle)
 					var itemsObj = {};