Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
===================================================================
diff -u -r15083 -r15099
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 15083)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 15099)
@@ -78,7 +78,7 @@
 //	LODOP.SET_SHOW_MODE("HIDE_ITEM_LIST",false);//设置对象列表默认处于关闭状态
 	LODOP.SET_SHOW_MODE("TEXT_SHOW_BORDER",2); //设置字符编辑框默认为无边框
 	LODOP.SET_SHOW_MODE("SETUP_ENABLESS", "11111111000000");// 隐藏关闭(叉)按钮
-//	LODOP.SET_SHOW_MODE("HIDE_GROUND_LOCK", true);// 隐藏纸钉按钮
+	LODOP.SET_SHOW_MODE("HIDE_GROUND_LOCK", true);// 隐藏纸钉按钮
 	LODOP.PRINT_DESIGN();
 };
 function DisplaySetup() {
@@ -95,26 +95,42 @@
 function insertTextItem() {
 	LODOP.ADD_PRINT_TEXTA('a', 0, 0, 75, 30, '文本');
 }
-function testInsertTable(tableConfig){
+function insertTableToLodop(tableConfig){
+	DisplayDesign();
+	var itemName = 'table1';
 	var tableHtml = createTableHtmlByConfig(tableConfig,dataSource1);
-	LODOP.ADD_PRINT_TABLE(0,0,'800px','600px',tableHtml);
+	LODOP.ADD_PRINT_TABLE(tableConfig.topforPrint,tableConfig.leftforPrint,tableConfig.widthforPrint,tableConfig.heightforPrint,tableHtml);
 	LODOP.SET_PRINT_STYLEA(0, "ItemType",4);// 多页项
+	LODOP.SET_PRINT_STYLEA(0, "ItemName",'table1');// 多页项
 }
 // 插入表格
 function insertTable() {
-	var tableConfigs = currentConfig.tableConfigs;
+	var tableConfigs = currentConfig.templateInfo.tableConfigs;
 	if(tableConfigs.length > 0){
 		showResult("表格已存在!");
 		return;
 	}
 	var columnAmount = Ext4.getCmp('columnAmount').getValue();
+	var tableDataSourceName = Ext4.getCmp('table_dataSource_name').getValue();
+	
 	var tableConfig = new TableConfig({
+		tableDataSourceName: tableDataSourceName,
 		itemsPerRow: 1,
 		columnAmount: columnAmount,
 		fontConfig: new FontConfig(),
+		headFontConfig: new FontConfig(),
+		dataItemFontConfig: new FontConfig(),
 		borderConfig: new BorderConfig(),
-		tableRowConfigs: []
+		tableRowConfigs: [],
+		columnConfigs: []
 	});
+	// 根据列数生成列配置
+	for(var i=0;i<columnAmount;++i){
+		var column = new TableColumnConfig({
+			innerHTML:''
+		});
+		tableConfig.columnConfigs.push(column);
+	}
 	// 初始化行列配置
 	// 表头
 	var rowConfig = Ext4.create('TableRowConfig',{
@@ -151,9 +167,13 @@
 	tableConfigs.push(tableConfig);
 	
 	currentTableConfig = tableConfig;
+	onCurrentTableConfigChange();
 //	testInsertTable(tableConfig);
 }
 
+function onCurrentTableConfigChange(){
+	loadTableConfig(currentTableConfig);
+}
 function Addhtm() {
 	LODOP
 			.ADD_PRINT_HTM(
@@ -239,7 +259,8 @@
 		url : WWWROOT + '/disinfectSystem/labelTemplateAction!saveOrUpdateProgramCodes.do',
 		params : {
 			id : id,
-			programCodes: currentConfig.programCodes
+			programCodes: currentConfig.programCodes,
+			templateInfo: getTemplateInfoStr()
 		},
 		success : function(response, options) {
 			hideMessageBox(true);
@@ -252,6 +273,20 @@
 		}
 	});
 }
+// 保存表格属性
+function saveTableConfig(tableConfig){
+	tableConfig.saveTableConfig()
+}
+function loadTableConfig(tableConfig){
+	tableConfig.loadTableConfig();
+}
+function saveFontConfig(cmpIdPrefix,fontConfig){
+	
+}
+function loadFontConfig(cmpIdPrefix,fontConfig){
+	
+}
+// 加载表格属性
 function showWindow(id) {
 	
 	formPanel = new Ext4.form.Panel({
@@ -453,19 +488,62 @@
         layout: 'fit',
         items: [{
         	layout: 'column',
+        	id:'editTableDataItemPanel',
         	defaultType: 'textfield',
-        	items: [{
-            	id: 'table_dataItem_text',
-            	value: rowConfig.getAllColumnText(),
-            	columnWidth: 1,
-            	allowBlank: false
-            }]
+        	items: []
         }],
+        listeners:{
+        	render : function(field,event){
+        		// 动态创建列
+        		var colAmount = tableConfig.columnConfigs.length;
+        		var ds = tableConfig.getDataSourceItemNamesForCombo();
+        		var p = Ext4.getCmp('editTableDataItemPanel');
+        		for(var i=0;i<colAmount;++i){
+        			var num = i+1;
+        			var ccombo = Ext4.create('Ext4.form.ComboBox', {
+        			    fieldLabel: '列'+num+':',
+        			    id : 'table_dataItem_'+num,
+        			    name : 'table_dataItem_'+num,
+        			    columnWidth:1,
+        			    valueField : 'value',
+        			    displayField : 'name',
+        			    value: rowConfig.getColumnText(i),
+        			    store : new Ext4.data.SimpleStore( {
+        					fields : [ 'name','value'],
+        					data : ds
+        				}),
+        				listeners:{
+							select: function(combo, records, index){
+								combo.setRawValue(records[0].data.value);
+							}
+						},
+        				editable : true,
+        				forceSelection : false,
+        				mode : 'local',
+        				allowBlank : false,
+        				triggerAction : 'all',
+        				width : 200
+        			});
+        			p.add(ccombo);
+        		}
+//        		editTableDataItemWindow.doLayout();
+		  }
+		},
         buttons : [ {
 			text : '确定',
 			handler : function() {
-				var text = Ext4.getCmp('table_dataItem_text').getValue();
-				rowConfig.setAllColumnText(text);
+				var p = Ext4.getCmp('editTableDataItemPanel');
+				var allText = '';
+				for(var i=0;i<p.items.length;++i){
+					var comp = p.items.items[i];
+					var v = emptyStringIfUndefinedOrNull(comp.getValue());
+					if(i == 0){
+						allText = v;
+					}else{
+						allText += ','+ v;
+					}
+				}
+				rowConfig.setAllColumnText(allText);
 				editTableDataItemWindow.close();
 				editTableDataItemWindow = null;
 			}
@@ -477,8 +555,89 @@
 			}
 		} ]
     });
+	
 	editTableDataItemWindow.show();
 }
+// 编辑列宽
+//编辑数据项
+var editTableColumnConfigsWindow = null;
+function showEditTableColumnConfigsWindow(tableConfig){
+	if(editTableColumnConfigsWindow){
+		return;
+	}
+	var editTableColumnConfigsWindow = Ext4.create('widget.window', {
+        header: {
+            titlePosition: 2,
+            titleAlign: 'center'
+        },
+        closable: false,
+        width: 400,
+        minWidth: 350,
+        height: 300,
+        x:800,
+        layout: 'fit',
+        items: [{
+        	layout: 'column',
+        	id:'table_column_panel',
+        	defaultType: 'textfield',
+        	items: []
+        }],
+        listeners:{
+        	render : function(field,event){
+        		// 动态创建列
+        		var colAmount = tableConfig.columnConfigs.length;
+        		var ds = tableConfig.getDataSourceItemNamesForCombo();
+        		var p = Ext4.getCmp('table_column_panel');
+        		for(var i=0;i<colAmount;++i){
+        			var num = i+1;
+        			var ccombo = Ext4.create('Ext4.form.Panel', {
+        				layout: 'form',
+        				columnWidth: 1,
+        				items:[{
+        					xtype: 'textfield',
+        	            	id: 'table_column_width_'+num,
+        	            	fieldLabel: '第'+num+'列宽度:',
+        	                value: tableConfig.columnConfigs[i].width,
+        	                allowBlank : false
+        				}],
+        				width : 200
+        			});
+        			p.add(ccombo);
+        		}
+//        		editTableDataItemWindow.doLayout();
+		  }
+		},
+        buttons : [ {
+			text : '确定',
+			handler : function() {
+				var p = Ext4.getCmp('table_column_panel');
+				var allText = '';
+				var tCmpList = Ext4.ComponentQuery.query('textfield',p)
+				for(var i=0;i<p.items.length;++i){
+					var comp = p.items.items[i];
+					var textCmp = comp.items.items[0];
+					var v = emptyStringIfUndefinedOrNull(textCmp.getValue());
+					if(i == 0){
+						allText = v;
+					}else{
+						allText += ','+ v;
+					}
+				}
+				tableConfig.setAllColumnWidths(allText);
+				editTableColumnConfigsWindow.close();
+				editTableColumnConfigsWindow = null;
+			}
+		}, {
+			text : '取消',
+			handler : function(){
+				editTableColumnConfigsWindow.close();
+				editTableColumnConfigsWindow = null;
+			}
+		} ]
+    });
+	
+	editTableColumnConfigsWindow.show();
+}
 function showInsertTableWindow(){
 	var w = Ext4.create('widget.window', {
         header: {
@@ -503,6 +662,23 @@
                 value: 3,
                 maxValue: 20,
                 minValue: 1
+            },{
+	    		  xtype : 'combo',
+	    		  fieldLabel : '数据源',
+	    		  id : 'table_dataSource_name',
+	    		  name : 'table_dataSource_name',
+	    		  valueField : 'name',
+	    		  displayField : 'name',
+	    		  store : new Ext4.data.SimpleStore( {
+	    				fields : [ 'name'],
+	    				data : tableDataSourceManager.getDataSourceNamesForCombo()
+	    			}),
+	    		  editable : false,
+	    		  forceSelection : true,
+	    		  mode : 'local',
+	    		  allowBlank : false,
+	    		  triggerAction : 'all',
+	    		  width : 200
             }]
         }],
         buttons : [ {
@@ -530,8 +706,8 @@
 var tableDesignWindow = null;
 function showTableDesignWindow(){
 	if(currentTableConfig == null){
-		if(currentConfig.tableConfigs.length > 0){
-			currentTableConfig = currentConfig.tableConfigs[0];
+		if(currentConfig.templateInfo.tableConfigs.length > 0){
+			currentTableConfig = currentConfig.templateInfo.tableConfigs[0];
 		}
 	}
 	
@@ -597,6 +773,38 @@
                     	}
                     	showEditTableDataItemWindow(currentTableConfig,currentTableConfig.getFirstDataItemRowConfig());
         			}
+                },{
+                	xtype: 'button',
+                    text: '编辑列属性',
+                    handler : function() {
+                    	if(currentTableConfig == null){
+                    		showResult('请先新建表格!');
+                    		return ;
+                    	}
+                    	showEditTableColumnConfigsWindow(currentTableConfig);
+        			}
+                },{
+                	xtype: 'button',
+                    text: '保存表格属性',
+                    handler : function() {
+                    	if(currentTableConfig == null){
+                    		showResult('请先新建表格!');
+                    		return ;
+                    	}
+                    	saveTableConfig(currentTableConfig);
+                    	showResult('保存成功!');
+        			}
+                },{
+                	xtype: 'button',
+                    text: '同步表格到lodop设计窗口',
+                    handler : function() {
+                    	if(currentTableConfig == null){
+                    		showResult('请先新建表格!');
+                    		return ;
+                    	}
+                    	insertTableToLodop(currentTableConfig);
+                    	showResult('同步成功!');
+        			}
                 }]
             }, {
                 region: 'center',
@@ -715,6 +923,29 @@
 //        });
 //    }
 }
+// 初始化template
+function initTemplate(template){
+	if(isUndefinedOrNullOrEmpty(template.templateInfo)){
+		template.templateInfo = {};
+	}else{
+		template.templateInfo = JSON.parse(template.templateInfo);
+	}
+	var templateInfo = template.templateInfo;
+	if(isUndefinedOrNullOrEmpty(templateInfo.tableConfigs)){
+		templateInfo.tableConfigs = [];
+	}else{
+//		var tableConfigs = Ext4.JSON.decode(templateInfo.tableConfigs);
+		templateInfo.tableConfigs = TableConfig.convertFromJsonObjs(templateInfo.tableConfigs);
+	}
+}
+function getTemplateInfoStr(){
+	var tableConfigs = currentConfig.templateInfo.tableConfigs;
+	currentConfig.templateInfo.tableConfigs = TableConfig.convertToJsonObjs(tableConfigs);
+	var templateInfo = JSON.stringify(currentConfig.templateInfo);
+	// 还原
+	currentConfig.templateInfo.tableConfigs = tableConfigs;
+	return templateInfo;
+}
 function loadConfigAndInitDesign() {
 	
 	if (!Ext4.isEmpty(id)) {
@@ -730,11 +961,7 @@
 				var result = Ext4.JSON.decode(response.responseText);
 				if (result.success && result.data) {
 					currentConfig = result.data;
-					if(isUndefinedOrNullOrEmpty(currentConfig.tableConfigs)){
-						currentConfig.tableConfigs = [];
-					}else{
-						currentConfig.tableConfigs = Ext4.JSON.decode(currentConfig.tableConfigs);
-					}
+					initTemplate(currentConfig);
 					DisplayDesign();
 					showTableDesignWindow();
 //					restoreDesign();
@@ -757,38 +984,80 @@
 	loadConfigAndInitDesign();
 });
 
-//function FontConfig(){
-//	this.fontStyle = 'normal';
-//	this.fontVariant = 'normal';
-//	this.fontWeight = 'normal';
-//	this.fontSize = '16px';
-//	this.fontSizeValue = '16';
-//	this.fontSizeUnit = 'px';
-//	this.fontFamily = '宋体';
-//}
-//FontConfig.prototype = {
-//	
-//}
+
 Ext4.define("StyleConfig", {
 	getStyleStr: function(){
 		return '';
 	}
 });
 Ext4.define("FontConfig", {
-	fontStyle: 'normal',
-	fontVariant: 'normal',
-	fontWeight: 'normal',
-	fontSize: '16px',
-	fontSizeValue: '16',
-	fontSizeUnit: 'px',
-	fontFamily: '宋体',
+	config: {
+		fontStyle: 'normal',
+		fontVariant: 'normal',
+		fontWeight: 'normal',
+		fontSize: '16px',
+		fontSizeValue: '16',
+		fontSizeUnit: 'px',
+		fontFamily: '宋体',
+	},
     extend: 'StyleConfig',
+    constructor: function(config){
+    	this.initConfig(config);
+        this.callParent(arguments);
+    },
     getStyleStr: function(){
 		return this.fontStyle +' '+ this.fontVariant +' '+ this.fontWeight +' '+ this.fontSize +' '+ this.fontFamily+';';
 	},
-    constructor: function(){
-        this.callParent(arguments);
-    }
+	saveFontConfig: function(cmpIdPrefix){
+		var family = '';
+		var size = '';
+		var cmpFamily = Ext4.getCmp('cmpIdPrefix_family');
+		var cmpSize = Ext4.getCmp('cmpIdPrefix_size');
+		if(cmpFamily != null){
+			family = cmpFamily.getValue();
+		}
+		if(cmpSize != null){
+			size = cmpSize.getValue();
+		}
+		if(family != ''){
+			this.fontFamily = family;
+		}
+		if(size != ''){
+			this.fontSize = size;
+		}
+	},
+	loadFontConfig: function(cmpIdPrefix){
+		var cmpFamily = Ext4.getCmp('cmpIdPrefix_family');
+		var cmpSize = Ext4.getCmp('cmpIdPrefix_size');
+		if(cmpFamily != null){
+			cmpFamily.setValue(this.fontFamily);
+		}
+		if(cmpSize != null){
+			cmpSize.setValue(this.fontSize);
+		}
+	},
+	convertToJsonObj: function(){
+		var obj = {
+				fontStyle: this.fontStyle,
+				fontVariant: this.fontVariant,
+				fontWeight: this.fontWeight,
+				fontSize: this.fontSize,
+				fontFamily: this.fontFamily	
+		}
+		return obj;
+	},
+	statics: {
+		convertFromJsonObj: function(obj){
+			var newObj = new FontConfig({
+				fontStyle: obj.fontStyle,
+				fontVariant: obj.fontVariant,
+				fontWeight: obj.fontWeight,
+				fontSize: obj.fontSize,
+				fontFamily: obj.fontFamily
+			});
+			return newObj;
+		}
+	}
 });
 Ext4.define("BorderConfig", {
     extend: 'StyleConfig',
@@ -800,7 +1069,25 @@
         this.borderWidth = '1px';
         this.borderStyle = 'solid';
         this.borderColor = 'black';
-    }
+    },
+    convertToJsonObj: function(){
+		var obj = {
+				borderWidth: this.borderWidth,
+				borderStyle: this.borderStyle,
+				borderColor: this.borderColor
+		};
+		return obj;
+	},
+	statics: {
+		convertFromJsonObj: function(obj){
+			var newObj = new BorderConfig({
+				borderWidth: obj.borderWidth,
+				borderStyle: obj.borderStyle,
+				borderColor: obj.borderColor
+			});
+			return newObj;
+		}
+	}
 });
 Ext4.define("TableColumnConfig", {
 	config:{
@@ -816,6 +1103,46 @@
     },
 	getStyleStr: function(){
 		return this.borderConfig.getStyleStr() + this.fontConfig.getStyleStr();
+	},
+	statics: {
+		convertFromJsonObjs: function(objs){
+	    	var newObjs = [];
+	    	for(var i=0;i<objs.length;++i){
+	    		var obj = objs[i];
+	    		var newObj = TableColumnConfig.convertFromJsonObj(obj);
+	    		newObjs.push(newObj);
+	    	}
+	    	return newObjs;
+	    },
+	    convertToJsonObjs: function(objs){
+	    	var newObjs = [];
+	    	for(var i=0;i<objs.length;++i){
+	    		var obj = objs[i];
+	    		var newObj = obj.convertToJsonObj();
+	    		newObjs.push(newObj);
+	    	}
+	    	return newObjs;
+	    },
+	    convertFromJsonObj: function(obj){
+			var newObj = new TableColumnConfig({
+				align: obj.align,
+				width: obj.width,
+				innerHTML: obj.innerHTML,
+				fontConfig: FontConfig.convertFromJsonObj(obj.fontConfig),
+				borderConfig: BorderConfig.convertFromJsonObj(obj.borderConfig)
+			});
+			return newObj;
+		}
+	},
+	convertToJsonObj: function(){
+		var obj = {
+				align: this.align,
+				width: this.width,
+				innerHTML: this.innerHTML,
+				fontConfig: this.fontConfig.convertToJsonObj(),
+				borderConfig: this.borderConfig.convertToJsonObj()
+		}
+		return obj;
 	}
 });
 var ROW_TYPE_TABLEHEAD = '表头';
@@ -855,6 +1182,13 @@
 		}
 		return text;
 	},
+	getColumnText: function(index){
+		var text = '';
+		if(index < this.columnConfigs.length){
+			text = this.columnConfigs[index].innerHTML;
+		}
+		return text;
+	},
 	setAllColumnText: function(text){
 		var textArr = [];
 		if(!isUndefinedOrNullOrEmpty(text)){
@@ -872,22 +1206,171 @@
 			}
 		}
 		return text;
+	},
+	statics: {
+		convertFromJsonObjs: function(objs){
+	    	var newObjs = [];
+	    	for(var i=0;i<objs.length;++i){
+	    		var obj = objs[i];
+	    		var newObj = TableRowConfig.convertFromJsonObj(obj);
+	    		newObjs.push(newObj);
+	    	}
+	    	return newObjs;
+	    },
+	    convertToJsonObjs: function(objs){
+	    	var newObjs = [];
+	    	for(var i=0;i<objs.length;++i){
+	    		var obj = objs[i];
+	    		var newObj = obj.convertToJsonObj();
+	    		newObjs.push(newObj);
+	    	}
+	    	return newObjs;
+	    },
+	    convertFromJsonObj: function(obj){
+			var newObj = new TableColumnConfig({
+				align: obj.align,
+				height: obj.height,
+				type: obj.type,
+				fontConfig: FontConfig.convertFromJsonObj(obj.fontConfig),
+				borderConfig: BorderConfig.convertFromJsonObj(obj.borderConfig),
+				columnConfigs: TableColumnConfig.convertFromJsonObjs(obj.columnConfigs)
+			});
+			return newObj;
+		}
+	},
+	convertToJsonObj: function(){
+		var obj = {
+				align: this.align,
+				height: this.height,
+				type: this.type,
+				fontConfig: this.fontConfig.convertToJsonObj(),
+				borderConfig: this.borderConfig.convertToJsonObj(),
+				columnConfigs: TableColumnConfig.convertToJsonObjs(this.columnConfigs)
+		}
+		return obj;
 	}
 });
 
-
+function loadValueToCmp(obj,p,cmpId){
+	var cmp = Ext4.getCmp(cmpId);
+	if(cmp != null){
+		cmp.setValue(obj[p]);
+	}
+}
+function saveValueFromCmp(obj,p,cmpId){
+	var cmp = Ext4.getCmp(cmpId);
+	if(cmp != null){
+		obj[p] = cmp.getValue();
+	}
+}
 Ext4.define("TableConfig", {
 	config:{
+		tableDataSourceName: '',
 		itemsPerRow: 1,
 		columnAmount:3,
+		width:400,
+		height:300,
+		topforPrint:0,
+		leftforPrint:0,
+		widthforPrint:'80%',
+		heightforPrint:'50%',
 		fontConfig: new FontConfig(),
+		headFontConfig: new FontConfig(),
+		dataItemFontConfig: new FontConfig(),
 		borderConfig: new BorderConfig(),
-		tableRowConfigs: []
+		tableRowConfigs: [],
+		columnConfigs: []
 	},
 	constructor: function(config){
 		this.initConfig(config);
         this.callParent(arguments);
     },
+    saveTableConfig: function(){
+    	this.headFontConfig.saveFontConfig('table_head_font_');
+    	this.dataItemFontConfig.saveFontConfig('table_dataItem_font_');
+    	this.saveNormalConfig();
+    },
+    loadTableConfig: function(){
+    	this.headFontConfig.loadFontConfig('table_head_font_');
+    	this.dataItemFontConfig.loadFontConfig('table_dataItem_font_');
+    	this.loadNormalConfig();
+    },
+    saveNormalConfig: function(){
+    	saveValueFromCmp(this,'width','table_width');
+		saveValueFromCmp(this,'height','table_height');
+		saveValueFromCmp(this,'topforPrint','table_top_forPrint');
+		saveValueFromCmp(this,'leftforPrint','table_left_forPrint');
+		saveValueFromCmp(this,'widthforPrint','table_width_forPrint');
+		saveValueFromCmp(this,'heightforPrint','table_height_forPrint');
+	},
+	loadNormalConfig: function(cmpIdPrefix){
+		loadValueToCmp(this,'width','table_width');
+		loadValueToCmp(this,'height','table_height');
+		loadValueToCmp(this,'topforPrint','table_top_forPrint');
+		loadValueToCmp(this,'leftforPrint','table_left_forPrint');
+		loadValueToCmp(this,'widthforPrint','table_width_forPrint');
+		loadValueToCmp(this,'heightforPrint','table_height_forPrint');
+	},
+	statics: {
+		convertFromJsonObjs: function(objs){
+	    	var newObjs = [];
+	    	for(var i=0;i<objs.length;++i){
+	    		var obj = objs[i];
+	    		var newObj = TableConfig.convertFromJsonObj(obj);
+	    		newObjs.push(newObj);
+	    	}
+	    	return newObjs;
+	    },
+	    convertToJsonObjs: function(objs){
+	    	var newObjs = [];
+	    	for(var i=0;i<objs.length;++i){
+	    		var obj = objs[i];
+	    		var newObj = obj.convertToJsonObj();
+	    		newObjs.push(newObj);
+	    	}
+	    	return newObjs;
+	    },
+	    convertFromJsonObj: function(obj){
+			var newObj = new TableColumnConfig({
+				tableDataSourceName: obj.tableDataSourceName,
+				itemsPerRow: obj.itemsPerRow,
+				columnAmount: obj.columnAmount,
+				width: obj.width,
+				height: obj.height,
+				topforPrint: obj.topforPrint,
+				leftforPrint: obj.leftforPrint,
+				widthforPrint: obj.widthforPrint,
+				heightforPrint: obj.heightforPrint,
+				fontConfig: FontConfig.convertFromJsonObj(obj.fontConfig),
+				headFontConfig: FontConfig.convertFromJsonObj(obj.headFontConfig),
+				dataItemFontConfig: FontConfig.convertFromJsonObj(obj.dataItemFontConfig),
+				borderConfig: BorderConfig.convertFromJsonObj(obj.borderConfig),
+				tableRowConfigs: TableRowConfig.convertFromJsonObjs(obj.tableRowConfigs),
+				columnConfigs: TableColumnConfig.convertFromJsonObjs(obj.columnConfigs)
+			});
+			return newObj;
+		}
+	},
+    convertToJsonObj: function(){
+		var obj = {
+				tableDataSourceName: this.tableDataSourceName,
+				itemsPerRow: this.itemsPerRow,
+				columnAmount: this.columnAmount,
+				width: this.width,
+				height: this.height,
+				topforPrint: this.topforPrint,
+				leftforPrint: this.leftforPrint,
+				widthforPrint: this.widthforPrint,
+				heightforPrint: this.heightforPrint,
+				fontConfig: this.fontConfig.convertToJsonObj(),
+				headFontConfig: this.headFontConfig.convertToJsonObj(),
+				dataItemFontConfig: this.fontConfig.convertToJsonObj(),
+				borderConfig: this.borderConfig.convertToJsonObj(),
+				tableRowConfigs: TableRowConfig.convertToJsonObjs(this.tableRowConfigs),
+				columnConfigs: TableColumnConfig.convertToJsonObjs(this.columnConfigs)
+		}
+		return obj;
+	},
 	getTableHeadRowConfigs: function(){
 		var heads = [];
 		for(var i=0;i<this.tableRowConfigs.length;++i){
@@ -926,8 +1409,40 @@
 			}
 		}
 		return null;
+	},
+	getTableDataSource: function(){
+		if(!isUndefinedOrNullOrEmpty(this.tableDataSourceName)){
+			return tableDataSourceManager.getTableDataSourceByName(this.tableDataSourceName);
+		}
+		return null;
+	},
+	getDataSourceItemNamesForCombo: function(){
+		var tableDataSource = this.getTableDataSource();
+		if(tableDataSource != null){
+			return tableDataSource.getDataSourceItemNamesForCombo();
+		}
+		return [];
+	},
+	setAllColumnWidths: function(text){
+		var textArr = [];
+		if(!isUndefinedOrNullOrEmpty(text)){
+			var texts = text.split(',');
+			for(var i=0;i<texts.length;++i){
+				textArr.push(texts[i]);
+			}
+		}
+		
+		for(var i=0;i<this.columnConfigs.length;++i){
+			if(i<texts.length){
+				this.columnConfigs[i].width = textArr[i];
+			}else{
+//				this.columnConfigs[i].width = '';
+			}
+		}
+		return text;
 	}
 });
+
 Ext4.define("TableDataSourceItem", {
 	config:{
 		propName:'',
@@ -936,27 +1451,28 @@
 	constructor: function(config){
 		this.initConfig(config);
     },
-    getVariableStr(){
-    	return '${'+this.propName+'}';
+    getVariableStr: function(){
+    	return '${'+ this.propName +'}';
     }
 });
 Ext4.define("TableDataSource", {
 	config:{
-		name:'',
-		itemsPropName:'dataItems',
+		name: '',
+		itemsPropName: 'dataItems',
 		dataSourceItems: []
 	},
 	constructor: function(config){
 		this.initConfig(config);
     },
-    getDataSourceForCombo(){
+    getDataSourceItemNamesForCombo: function(){
     	var s = [];
     	for(var i=0;i<this.dataSourceItems.length;++i){
-    		var dataSourceItem = dataSourceItems[i];
-    		var o = {
-    				variableStr: dataSourceItem.getVariableStr(),
-					displayName: dataSourceItem.displayName
-    		}
+    		var dataSourceItem = this.dataSourceItems[i];
+//    		var o = {
+//    				variableStr: dataSourceItem.getVariableStr(),
+//					displayName: dataSourceItem.displayName
+//    		}
+    		var o = [dataSourceItem.displayName,'${item1.'+ dataSourceItem.propName +'}'];
     		s.push(o);
     	}
     	return s;
@@ -974,7 +1490,18 @@
 	},
 	registerTableDataSource: function(tableDataSource){
 		this.tableDataSources[tableDataSource.name] = tableDataSource;
-	}
+	},
+	getDataSourceNamesForCombo: function(){
+    	var s = [];
+    	for(var p in this.tableDataSources){
+    		if(this.tableDataSources.hasOwnProperty(p)){
+    			var o = [this.tableDataSources[p].name];
+//    			alert(o.name)
+        		s.push(o);
+			 }
+    	}
+    	return s;
+    }
 });
 var tableDataSourceManager = new TableDataSourceManager();
 // 器械包材料表格的数据源
@@ -992,6 +1519,7 @@
 		displayName: '材料单价'
 	})]
 });
+tableDataSourceManager.registerTableDataSource(tableDataSource);
 // 测试配置和数据源
 var tableConfig1 = new TableConfig({
 	itemsPerRow: 1,
@@ -1066,10 +1594,13 @@
 var dataSource1 = {
 	dataItems:[]	
 }
+
 for(var i=0;i<10;++i){
+	var num = i+1;
 	dataSource1.dataItems.push({
-		name: '材料'+(i+1),
-		amount: '数量'+(i+1)
+		fullName: '材料'+num,
+		count: '数量'+num,
+		price: '单价'+num
 	});
 }
 //alert(createTableHtmlByConfig(tableConfig1,dataSource1));
@@ -1091,8 +1622,9 @@
 			tableHtml += '<tr height="'+headRowConfig.height+'">';
 			for(var c=0;c<columnConfigs.length;++c){
 				var columnConfig = columnConfigs[c];
+				var tableColumnConfig = tableConfig.columnConfigs[c];
 				columnConfig.columnStyle = columnConfig.getStyleStr();
-				tempStr = '<td align="'+columnConfig.align+'" width ="'+columnConfig.width+'" style="'+columnConfig.columnStyle+'">'+columnConfig.innerHTML+'</td>';
+				tempStr = '<td align="'+columnConfig.align+'" width ="'+tableColumnConfig.width+'" style="'+columnConfig.columnStyle+'">'+columnConfig.innerHTML+'</td>';
 				tableHtml += fillPropertiesFromObj(columnConfig,tempStr);
 			}
 			tableHtml += '</tr>';
@@ -1115,6 +1647,7 @@
 				tableHtml += '<tr height="'+dataRowConfig.height+'">';
 				for(var c=0;c<columnConfigs.length;++c){
 					var columnConfig = columnConfigs[c];
+					var tableColumnConfig = tableConfig.columnConfigs[c];
 					columnConfig.columnStyle = columnConfig.getStyleStr();
 					
 					var itemsObj = {};
@@ -1128,7 +1661,7 @@
 						}
 						itemsObj['item'+(i+1)] = tdItemI;
 					}
-					tempStr = '<td align="'+columnConfig.align+'" width ="'+columnConfig.width+'" style="'+columnConfig.columnStyle+'">'+columnConfig.innerHTML+'</td>';
+					tempStr = '<td align="'+columnConfig.align+'" width ="'+tableColumnConfig.width+'" style="'+columnConfig.columnStyle+'">'+columnConfig.innerHTML+'</td>';
 					tableHtml += fillPropertiesFromObj(itemsObj,tempStr);
 				}
 				tableHtml += "</tr>";