Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp
===================================================================
diff -u -r15083 -r15105
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp	(.../printCustomDesign.jsp)	(revision 15083)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp	(.../printCustomDesign.jsp)	(revision 15105)
@@ -11,6 +11,7 @@
 <script type="text/javascript" src="${ctx}/js/common.js" /></script>
 <script language="javascript" src="LodopFuncs.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/print/print.js"></script>
+<script language="javascript" src="dataSource.js"></script>
 <script language="javascript" src="printCustomDesign.js"></script>
 <object id="LODOP1" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0> 
 	<embed id="LODOP_EM1" TYPE="application/x-print-lodop" width=0 height=0 PLUGINSPAGE="install_lodop32.exe"></embed>
@@ -44,15 +45,5 @@
         </td>
     </tr>
 </table>
-
-<a href="javascript:;" onclick="javascript:createTemplate();">生成模板</a><br> 
-<a href="javascript:;" onclick="javascript:loadTemplate();">加载模板</a><br> 
-
-<a href="javascript:;" onclick="javascript:getProgram();">获得全部程序代码：</a><br>  
-<textarea rows="6" id="S1" cols="107" >返回的结果值</textarea><br>
-<input type="button" value="用这些代码执行打印预览" id="button01" onclick="prn_Preview()">
-<br/><br/>
-<input type="button" value="用这些代码还原标签设计" id="button02" onclick="restoreDesign()">
-</p>
 </body>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
===================================================================
diff -u -r15099 -r15105
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 15099)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 15105)
@@ -44,24 +44,25 @@
 }
 function addOrRemove(add,propName) {
 	getLODOP2();
-	var vName = 'obj.'+propName
+	var vName = 'obj.'+propName;
 	var value = obj[propName];
+//	alert(propName)
 	if(add){
-		if(LODOP.GET_VALUE("ItemIsAdded", vName)){
-			LODOP.SET_PRINT_STYLEA(vName, 'Deleted', 0);// 恢复删除的项
+		if(LODOP.GET_VALUE("ItemIsAdded", propName)){
+			LODOP.SET_PRINT_STYLEA(propName, 'Deleted', 0);// 恢复删除的项
 		}else{
-			LODOP.ADD_PRINT_TEXTA(vName, 56, 32, 65, 30, value);
+			LODOP.ADD_PRINT_TEXTA(propName, 56, 32, 65, 30, value);
 			LODOP.SET_PRINT_STYLEA(0, "ContentVName", vName);// 设置内容参数的变量名
 		}
 	}else{
-		LODOP.SET_PRINT_STYLEA(vName, 'Deleted', 1);// 删除对应的项
+		LODOP.SET_PRINT_STYLEA(propName, 'Deleted', 1);// 删除对应的项
 	}
 }
 function CreatePage() {
 	getLODOP2();
 //	alert(currentConfig.width)
 	LODOP.PRINT_INITA(0, 0, currentConfig.width, currentConfig.height, "小标签");
-	LODOP.PRINT_INITA(0, 0, '800px', '600px', "小标签");
+//	LODOP.PRINT_INITA(0, 0, '800px', '600px', "小标签");
 	LODOP.SET_PRINT_MODE("PROGRAM_CONTENT_BYVAR", true);// 生成程序时，内容参数有变量用变量，无变量用具体值
 };
 function DisplayDesign() {
@@ -170,19 +171,15 @@
 	onCurrentTableConfigChange();
 //	testInsertTable(tableConfig);
 }
-
+// 删除表格
+function deleteTable(){
+	currentConfig.templateInfo.tableConfigs = [];
+	currentConfig = null;
+}
 function onCurrentTableConfigChange(){
 	loadTableConfig(currentTableConfig);
 }
-function Addhtm() {
-	LODOP
-			.ADD_PRINT_HTM(
-					45,
-					494,
-					288,
-					88,
-					"<table border='1'>\n<tr>\n<td>表格11</td>\n<td>表格12</td>\n<td>表格13</td>\n</tr>\n<tr>\n<td>表格21</td>\n<td>表格22</td>\n<td>表格23</td>\n</tr>\n</table>");
-};
+
 function SetBKIMG() {
 	getLODOP2();
 	LODOP
@@ -192,24 +189,9 @@
 function getProgram() {
 	getLODOP2();
 	currentConfig.programCodes = LODOP.GET_VALUE("ProgramCodes", 0);
-	document.getElementById('S1').value = LODOP.GET_VALUE("ProgramCodes", 0);
-	document.getElementById('button01').style.display = "";
 };
-function createTemplate() {
-	getLODOP2();
-	document.getElementById('S1').value = LODOP.GET_VALUE("ProgramData", 0);
-};
-function loadTemplate() {
 
-	getLODOP2();
-	eval(document.getElementById('S1').value);
-	if (LODOP.CVERSION)
-		LODOP.On_Return = function(TaskID, Value) {
-			document.getElementById('S1').value = Value;
-		};
-	document.getElementById('S1').value = LODOP.PRINT_DESIGN();
 
-};
 function restoreDesign() {
 
 	getLODOP2();
@@ -237,6 +219,7 @@
 	getProgram();
 	obj = previewObj;
 	if(!isUndefinedOrNullOrEmpty(currentConfig.programCodes)){
+//		alert(currentConfig.programCodes)
 		eval(currentConfig.programCodes);// 执行eval方法，装载模板
 	}
 	LODOP.PREVIEW();
@@ -280,14 +263,16 @@
 function loadTableConfig(tableConfig){
 	tableConfig.loadTableConfig();
 }
-function saveFontConfig(cmpIdPrefix,fontConfig){
-	
+
+function getBuiltInPropCheckedState(propName){
+	var itemExist = LODOP.GET_VALUE ('ItemExist', propName);
+	if(itemExist){
+		return true;
+	}
+	return false;
 }
-function loadFontConfig(cmpIdPrefix,fontConfig){
-	
-}
 // 加载表格属性
-function showWindow(id) {
+function showMainWindow(id) {
 	
 	formPanel = new Ext4.form.Panel({
 		id : 'configForm',
@@ -302,101 +287,40 @@
 			labelWidth : 200
 		},
 		items : [ {
-			xtype : 'hidden',
-			id : 'id',
-			name : 'id'
-		}, {
-			xtype : 'button',
-			text : '删除所选项',
-			handler : function() {
-				deleteSelectedItems();
-			}
-		}, {
-			xtype : 'button',
-			text : '插入文本',
-			handler : function() {
-				insertTextItem();
-			}
+			xtype:'fieldset',
+            title: '工具箱',
+        	defaultType: 'textfield',
+        	columnWidth : 1,
+        	items : [{
+    			xtype : 'button',
+    			text : '删除所选项',
+    			handler : function() {
+    				deleteSelectedItems();
+    			}
+    		}, {
+    			xtype : 'button',
+    			text : '插入文本',
+    			handler : function() {
+    				insertTextItem();
+    			}
+    		}]
 		},{
-			xtype : 'checkboxfield',
-			id: 'cmp_name',
-			boxLabel  : '包名称',
-			handler : function(checkbox,checked) {
-				addOrRemove(checked,'name');
-			}
-		}, {
-			xtype : 'checkboxfield',
-			id: 'cmp_operator',
-			boxLabel  : '配包人',
-			handler : function(checkbox,checked) {
-				addOrRemove(checked,'operator');
-			}
-		}, {
-			xtype : 'checkboxfield',
-			id: 'cmp_reviewer',
-			boxLabel  : '审核人',
-			handler : function(checkbox,checked) {
-				addOrRemove(checked,'reviewer');
-			}
-		}, {
-			xtype : 'checkboxfield',
-			id: 'cmp_sterilizationDate',
-			boxLabel  : '灭菌日期',
-			handler : function(checkbox,checked) {
-				addOrRemove(checked,'sterilizationDate');
-			}
-		}, {
-			xtype : 'checkboxfield',
-			id: 'cmp_validDate',
-			boxLabel  : '失效日期',
-			handler : function(checkbox,checked) {
-				addOrRemove(checked,'validDate');
-			}
-		}, {
-			xtype : 'checkboxfield',
-			id: 'cmp_sterilizer',
-			boxLabel  : '炉号',
-			handler : function(checkbox,checked) {
-				addOrRemove(checked,'sterilizer');
-			}
-		}, {
-			xtype : 'checkboxfield',
-			id: 'cmp_frequency',
-			boxLabel  : '炉次',
-			handler : function(checkbox,checked) {
-				addOrRemove(checked,'frequency');
-			}
-		}, {
-			xtype : 'checkboxfield',
-			id: 'cmp_hospitalName',
-			boxLabel  : '医院名称',
-			handler : function(checkbox,checked) {
-				addOrRemove(checked,'hospitalName');
-			}
-		}, {
-			xtype : 'checkboxfield',
-			id: 'cmp_patient',
-			boxLabel  : '病人姓名',
-			handler : function(checkbox,checked) {
-				addOrRemove(checked,'patient');
-			}
-		}, {
-			xtype : 'checkboxfield',
-			id: 'cmp_toolAmount',
-			boxLabel  : '工具件数',
-			handler : function(checkbox,checked) {
-				addOrRemove(checked,'toolAmount');
-			}
-		}, {
-			xtype : 'checkboxfield',
-			id: 'cmp_implantAmount',
-			boxLabel  : '植入物件数',
-			handler : function(checkbox,checked) {
-				addOrRemove(checked,'implantAmount');
-			}
+			xtype:'fieldset',
+			id: 'builtInProps',
+			layout:'column',
+            title: '内置属性',
+        	defaultType: 'textfield',
+        	columnWidth : 1,
+        	items : []
 		}  ],
 //		tbar : [],
 		buttons : [ {
+			text : '表格设计器',
+			hidden : false,
+			handler : function() {
+				showTableDesignWindow();
+			}
+		},{
 			id : 'zoomIn',
 			text : '放大',
 			hidden : false,
@@ -411,6 +335,12 @@
 				prn_Preview();
 			}
 		},{
+			text : '打印',
+			hidden : false,
+			handler : function() {
+				prn_Preview();
+			}
+		},{
 			id : 'saveBtn',
 			text : '保存',
 			hidden : false,
@@ -423,6 +353,34 @@
 			handler : cancel
 		} ]
 	});
+	var dataSourceName = currentConfig.dataSourceName;
+	if(isUndefinedOrNullOrEmpty(dataSourceName)){
+		dataSourceName = '普通器械包';
+	}
+	var dataSource = objectDataSourceManager.getDataSourceByName(dataSourceName);
+	var objectProperties = dataSource.objectProperties;
+	var pAmount = objectProperties.length;
+	var p = Ext4.getCmp('builtInProps');
+	for(var i=0;i<pAmount;++i){
+		var num = i+1;
+		var prop = objectProperties[i];
+//		alert(prop.propName)
+		var ccombo = createCheckbox(prop);
+		p.add(ccombo);
+	}
+	
+	function createCheckbox(prop){
+		var ccombo = Ext4.create('Ext4.form.Checkbox', {
+		    id: 'cmp_'+prop.propName,
+		    name : 'cmp_'+prop.propName,
+			boxLabel  : prop.displayName,
+			checked: getBuiltInPropCheckedState(prop.propName),
+			handler : function(checkbox,checked) {
+				addOrRemove(checked,prop.propName);
+			}
+		});
+		return ccombo;
+	}
 }
 // 编辑表头文字
 var editTableHeadWindow = null;
@@ -710,17 +668,24 @@
 			currentTableConfig = currentConfig.templateInfo.tableConfigs[0];
 		}
 	}
-	
+	if(tableDesignWindow != null){
+		if(tableDesignWindow.isHidden()){
+			tableDesignWindow.show();
+		}else{
+			tableDesignWindow.hide();
+		}
+		return;
+	}
     if (!tableDesignWindow) {
     	tableDesignWindow = Ext4.create('widget.window', {
             title: '表格设计器',
             header: {
                 titlePosition: 2,
                 titleAlign: 'center'
             },
-            closable: false,
+            closable: true,
             closeAction: 'hide',
-            maximizable: true,
+//            maximizable: true,
             width: 600,
             minWidth: 350,
             height: 600,
@@ -751,7 +716,7 @@
                 	xtype: 'button',
                     text: '删除表格',
                     handler : function() {
-        				prn_Preview();
+        				deleteTable();
         			}
                 },{
                 	xtype: 'button',
@@ -923,8 +888,26 @@
 //        });
 //    }
 }
+function test(){
+	function Proto(){
+		
+	}
+	Proto.prototype = {pro:'pro'}
+	var obj = {
+		key1: 'key1',
+		fun1: function(){
+			
+		}
+	}
+	var obj2 = new Proto();
+	obj2.key1 = 'obj2key1';
+	alert(obj2.pro)
+	alert(JSON.stringify(obj2))
+}
+//test();
 // 初始化template
 function initTemplate(template){
+//	alert(template.templateInfo)
 	if(isUndefinedOrNullOrEmpty(template.templateInfo)){
 		template.templateInfo = {};
 	}else{
@@ -963,7 +946,8 @@
 					currentConfig = result.data;
 					initTemplate(currentConfig);
 					DisplayDesign();
-					showTableDesignWindow();
+					showMainWindow('');
+//					showTableDesignWindow();
 //					restoreDesign();
 				} else {
 					showResult('系统加载出错，请稍候再试');
@@ -979,8 +963,6 @@
 Ext4.onReady(function() {
 	Ext4.QuickTips.init();
 	
-	showWindow('');
-	
 	loadConfigAndInitDesign();
 });
 
@@ -1227,7 +1209,7 @@
 	    	return newObjs;
 	    },
 	    convertFromJsonObj: function(obj){
-			var newObj = new TableColumnConfig({
+			var newObj = new TableRowConfig({
 				align: obj.align,
 				height: obj.height,
 				type: obj.type,
@@ -1331,7 +1313,7 @@
 	    	return newObjs;
 	    },
 	    convertFromJsonObj: function(obj){
-			var newObj = new TableColumnConfig({
+			var newObj = new TableConfig({
 				tableDataSourceName: obj.tableDataSourceName,
 				itemsPerRow: obj.itemsPerRow,
 				columnAmount: obj.columnAmount,
@@ -1442,155 +1424,8 @@
 		return text;
 	}
 });
-
-Ext4.define("TableDataSourceItem", {
-	config:{
-		propName:'',
-		displayName:''
-	},
-	constructor: function(config){
-		this.initConfig(config);
-    },
-    getVariableStr: function(){
-    	return '${'+ this.propName +'}';
-    }
-});
-Ext4.define("TableDataSource", {
-	config:{
-		name: '',
-		itemsPropName: 'dataItems',
-		dataSourceItems: []
-	},
-	constructor: function(config){
-		this.initConfig(config);
-    },
-    getDataSourceItemNamesForCombo: function(){
-    	var s = [];
-    	for(var i=0;i<this.dataSourceItems.length;++i){
-    		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;
-    }
-});
-Ext4.define("TableDataSourceManager", {
-	config:{
-		tableDataSources: {}
-	},
-	constructor: function(config){
-		this.initConfig(config);
-    },
-	getTableDataSourceByName: function(name){
-		return this.tableDataSources[name];
-	},
-	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();
-// 器械包材料表格的数据源
-var tableDataSource = new TableDataSource({
-	name: '器械包材料',
-	itemsPropName: 'dataItems',
-	dataSourceItems: [new TableDataSourceItem({
-		propName: 'fullName',
-		displayName: '材料全名'
-	}),new TableDataSourceItem({
-		propName: 'count',
-		displayName: '材料数量'
-	}),new TableDataSourceItem({
-		propName: 'price',
-		displayName: '材料单价'
-	})]
-});
-tableDataSourceManager.registerTableDataSource(tableDataSource);
-// 测试配置和数据源
-var tableConfig1 = new TableConfig({
-	itemsPerRow: 1,
-	fontConfig: new FontConfig(),
-	borderConfig: new BorderConfig(),
-	tableRowConfigs: []
-});
-
-var rowConfig = Ext4.create('TableRowConfig',{
-	align: 'center',
-	height: '25',
-	fontConfig: new FontConfig(),
-	borderConfig: new BorderConfig(),
-	type: ROW_TYPE_TABLEHEAD,
-	columnConfigs: []
-});
-
-var column = new TableColumnConfig({
-	innerHTML:'包名'
-});
-rowConfig.insertColumnConfig(column);
-
-var column = new TableColumnConfig({
-	innerHTML:'数量'
-});
-rowConfig.insertColumnConfig(column);
-
-var column = new TableColumnConfig({
-	innerHTML:'包名'
-});
-rowConfig.insertColumnConfig(column);
-
-var column = new TableColumnConfig({
-	innerHTML:'数量'
-});
-rowConfig.insertColumnConfig(column);
-
-tableConfig1.insertRowConfig(rowConfig);
-// 数据项
-var rowConfig2 = Ext4.create('TableRowConfig',{
-	align: 'center',
-	height: '25',
-	fontConfig: new FontConfig(),
-	borderConfig: new BorderConfig(),
-	type: ROW_TYPE_DATAITEM,
-	columnConfigs: []
-});
-var column = new TableColumnConfig({
-	innerHTML:'${item1.name}'
-});
-rowConfig2.insertColumnConfig(column);
-
-var column = new TableColumnConfig({
-	innerHTML:'${item1.amount}'
-});
-rowConfig2.insertColumnConfig(column);
-
-var column = new TableColumnConfig({
-	innerHTML:'${item2.name}'
-});
-rowConfig2.insertColumnConfig(column);
-
-var column = new TableColumnConfig({
-	innerHTML:'${item2.amount}'
-});
-rowConfig2.insertColumnConfig(column);
-
-tableConfig1.insertRowConfig(rowConfig2);
-tableConfig1.itemsPerRow = 2;
-
-// 数据源
+	
+// 测试数据源
 var dataSource1 = {
 	dataItems:[]	
 }
@@ -1603,15 +1438,14 @@
 		price: '单价'+num
 	});
 }
-//alert(createTableHtmlByConfig(tableConfig1,dataSource1));
 // 根据配置和数据源生成表格
 function createTableHtmlByConfig(tableConfig,obj){
 	var tableHtml = '';
 	var tempStr;
 	
 	tableConfig.tableStyle = tableConfig.getStyleStr();
 	// 表格本身
-	tempStr = '<table border ="0" cellspacing="0" cellpadding="0" style="${tableStyle}" >';
+	tempStr = '<table border ="1" cellspacing="0" cellpadding="0" style="${tableStyle}" >';
 	tableHtml += fillPropertiesFromObj(tableConfig,tempStr);
 	// 获取表头配置
 	var headRowConfigs = tableConfig.getTableHeadRowConfigs();
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateForm.js
===================================================================
diff -u -r15030 -r15105
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateForm.js	(.../labelTemplateForm.js)	(revision 15030)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateForm.js	(.../labelTemplateForm.js)	(revision 15105)
@@ -25,6 +25,7 @@
 					top.Ext4.ComponentQuery.query("#configForm #name")[0].setValue(result.data.name);
 					top.Ext4.ComponentQuery.query("#configForm #width")[0].setValue(result.data.width);
 					top.Ext4.ComponentQuery.query("#configForm #height")[0].setValue(result.data.height);
+					top.Ext4.ComponentQuery.query("#configForm #dataSourceName")[0].setValue(result.data.dataSourceName);
 					top.Ext4.ComponentQuery.query("#configForm #description")[0].setValue(result.data.description);
 					top.Ext4.ComponentQuery.query("#configForm #programCodes")[0].setValue(result.data.programCodes);
 					
@@ -145,14 +146,31 @@
 						allowBlank : false,
 						anchor : '98%'
 					},{
+			    		  xtype : 'combo',
+			    		  fieldLabel : '数据源',
+			    		  id : 'dataSourceName',
+			    		  name : 'dataSourceName',
+			    		  valueField : 'value',
+			    		  displayField : 'value',
+			    		  value: '普通器械包',
+			    		  store : new Ext4.data.SimpleStore( {
+			    				fields : [ 'value'],
+			    				data : objectDataSourceManager.getDataSourceNamesForCombo()
+			    			}),
+			    		  editable : false,
+			    		  forceSelection : true,
+			    		  mode : 'local',
+			    		  allowBlank : false,
+			    		  triggerAction : 'all',
+			    		  width : 200
+			    			  
+					},{
 						xtype : 'textfield',
 						fieldLabel : '描述',
 						id : 'description',
 						name : 'description',
-						allowBlank : false,
 						anchor : '98%'
-					},
-					{
+					},{
 						xtype : 'textarea',
 						fieldLabel : '程序代码',
 						id : 'programCodes',
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(revision 15105)
@@ -0,0 +1,190 @@
+// 表格数据源
+Ext4.define("TableDataSourceItem", {
+	config:{
+		propName:'',
+		displayName:''
+	},
+	constructor: function(config){
+		this.initConfig(config);
+    },
+    getVariableStr: function(){
+    	return '${'+ this.propName +'}';
+    }
+});
+Ext4.define("TableDataSource", {
+	config:{
+		name: '',
+		itemsPropName: 'dataItems',
+		dataSourceItems: []
+	},
+	constructor: function(config){
+		this.initConfig(config);
+    },
+    getDataSourceItemNamesForCombo: function(){
+    	var s = [];
+    	for(var i=0;i<this.dataSourceItems.length;++i){
+    		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;
+    }
+});
+Ext4.define("TableDataSourceManager", {
+	config:{
+		tableDataSources: {}
+	},
+	constructor: function(config){
+		this.initConfig(config);
+    },
+	getTableDataSourceByName: function(name){
+		return this.tableDataSources[name];
+	},
+	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;
+    }
+});
+// 对象数据源
+Ext4.define("ObjectDataSourceProperty", {
+	config:{
+		propName:'',
+		displayName:'',
+		textForPreview:''
+	},
+	constructor: function(config){
+		this.initConfig(config);
+    },
+    getVariableStr: function(){
+    	return '${'+ this.propName +'}';
+    }
+});
+Ext4.define("ObjectDataSource", {
+	config:{
+		name: '',
+		objectProperties: []
+	},
+	constructor: function(config){
+		this.initConfig(config);
+    },
+    getDataSourceItemNamesForCombo: function(){
+    	var s = [];
+    	for(var i=0;i<this.dataSourceItems.length;++i){
+    		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;
+    }
+});
+Ext4.define("ObjectDataSourceManager", {
+	config:{
+		dataSources: {}
+	},
+	constructor: function(config){
+		this.initConfig(config);
+    },
+	getDataSourceByName: function(name){
+		return this.dataSources[name];
+	},
+	registerDataSource: function(dataSource){
+		this.dataSources[dataSource.name] = dataSource;
+	},
+	getDataSourceNamesForCombo: function(){
+    	var s = [];
+    	for(var p in this.dataSources){
+    		if(this.dataSources.hasOwnProperty(p)){
+    			var o = [this.dataSources[p].name];
+        		s.push(o);
+			 }
+    	}
+    	return s;
+    }
+});
+var tableDataSourceManager = new TableDataSourceManager();
+// 器械包材料表格的数据源
+var tableDataSource = new TableDataSource({
+	name: '器械包材料',
+	itemsPropName: 'dataItems',
+	dataSourceItems: [new TableDataSourceItem({
+		propName: 'fullName',
+		displayName: '材料全名'
+	}),new TableDataSourceItem({
+		propName: 'count',
+		displayName: '材料数量'
+	}),new TableDataSourceItem({
+		propName: 'price',
+		displayName: '材料单价'
+	})]
+});
+tableDataSourceManager.registerTableDataSource(tableDataSource);
+// 注册对象数据源
+var objectDataSourceManager = new ObjectDataSourceManager();
+var normalTousseDataSource = new ObjectDataSource({
+	name: '普通器械包',
+	itemsPropName: 'dataItems',
+	objectProperties: [new ObjectDataSourceProperty({
+		propName: 'name',
+		displayName: '包名',
+		textForPreview: '缝合包'
+	}),new ObjectDataSourceProperty({
+		propName: 'operator',
+		displayName: '配包人',
+		textForPreview: '张三'
+	}),new ObjectDataSourceProperty({
+		propName: 'reviewer',
+		displayName: '审核人',
+		textForPreview: '李四'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilizationDate',
+		displayName: '灭菌日期',
+		textForPreview: '2016-09-10'
+	}),new ObjectDataSourceProperty({
+		propName: 'validDate',
+		displayName: '失效日期',
+		textForPreview: '2016-09-17'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilizer',
+		displayName: '炉号',
+		textForPreview: '1号灭菌炉'
+	}),new ObjectDataSourceProperty({
+		propName: 'frequency',
+		displayName: '炉次',
+		textForPreview: '2'
+	}),new ObjectDataSourceProperty({
+		propName: 'hospitalName',
+		displayName: '医院名称',
+		textForPreview: '广东省人民医院'
+	}),new ObjectDataSourceProperty({
+		propName: 'patient',
+		displayName: '病人',
+		textForPreview: '张三'
+	}),new ObjectDataSourceProperty({
+		propName: 'toolAmount',
+		displayName: '工具件数',
+		textForPreview: '50'
+	}),new ObjectDataSourceProperty({
+		propName: 'implantAmount',
+		displayName: '植入物件数',
+		textForPreview: '10'
+	})]
+});
+objectDataSourceManager.registerDataSource(normalTousseDataSource);
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateView.jsp
===================================================================
diff -u -r15010 -r15105
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateView.jsp	(.../labelTemplateView.jsp)	(revision 15010)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateView.jsp	(.../labelTemplateView.jsp)	(revision 15105)
@@ -22,6 +22,7 @@
 <script type="text/javascript" src="${ctx }/dwr/interface/LabelTemplateTableManager.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/util.js"></script>
+<script language="javascript" src="dataSource.js"></script>
 <script type="text/javascript" src="labelTemplateView.js"></script>
  <script type="text/javascript" src="labelTemplateForm.js"></script> 
 <script type="text/javascript">