Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u -r15496 -r15769
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 15496)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 15769)
@@ -21,17 +21,20 @@
 	constructor: function(config){
 		this.initConfig(config);
     },
-    getDataSourceItemNamesForCombo: function(){
+    getDataSourceItemNamesForCombo: function(itemsPerRow){
     	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);
+    	for(var t=1;t<=itemsPerRow;++t){
+    		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+t,'${item' + t+'.' + dataSourceItem.propName +'}'];
+        		s.push(o);
+        	}
     	}
+    	
     	return s;
     }
 });