Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
===================================================================
diff -u -r15105 -r15107
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 15105)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 15107)
@@ -97,9 +97,15 @@
 	LODOP.ADD_PRINT_TEXTA('a', 0, 0, 75, 30, '文本');
 }
 function insertTableToLodop(tableConfig){
-	DisplayDesign();
+//	alert(tableConfig)
+	if(tableConfig == null){
+		return;
+	}
+	saveTableConfig(tableConfig);// 自动保存表格属性
+//	DisplayDesign();
 	var itemName = 'table1';
 	var tableHtml = createTableHtmlByConfig(tableConfig,dataSource1);
+//	alert(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');// 多页项
@@ -222,6 +228,8 @@
 //		alert(currentConfig.programCodes)
 		eval(currentConfig.programCodes);// 执行eval方法，装载模板
 	}
+	// 生成预览表格
+	insertTableToLodop(currentTableConfig);
 	LODOP.PREVIEW();
 	
 	DisplayDesign();
@@ -336,7 +344,7 @@
 			}
 		},{
 			text : '打印',
-			hidden : false,
+			hidden : true,
 			handler : function() {
 				prn_Preview();
 			}
@@ -663,11 +671,6 @@
 // 显示表格窗口
 var tableDesignWindow = null;
 function showTableDesignWindow(){
-	if(currentTableConfig == null){
-		if(currentConfig.templateInfo.tableConfigs.length > 0){
-			currentTableConfig = currentConfig.templateInfo.tableConfigs[0];
-		}
-	}
 	if(tableDesignWindow != null){
 		if(tableDesignWindow.isHidden()){
 			tableDesignWindow.show();
@@ -908,19 +911,14 @@
 // 初始化template
 function initTemplate(template){
 //	alert(template.templateInfo)
-	if(isUndefinedOrNullOrEmpty(template.templateInfo)){
-		template.templateInfo = {};
-	}else{
-		template.templateInfo = JSON.parse(template.templateInfo);
+	transformTemplateConfigObjs(template);
+	if(currentTableConfig == null){
+		if(currentConfig.templateInfo.tableConfigs.length > 0){
+			currentTableConfig = currentConfig.templateInfo.tableConfigs[0];
+		}
 	}
-	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);
@@ -967,272 +965,8 @@
 });
 
 
-Ext4.define("StyleConfig", {
-	getStyleStr: function(){
-		return '';
-	}
-});
-Ext4.define("FontConfig", {
-	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+';';
-	},
-	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',
-    getStyleStr: function(){
-		return this.borderWidth +' '+ this.borderStyle +' '+ this.borderColor+';';
-	},
-    constructor: function(){
-        this.callParent(arguments);
-        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:{
-		align: 'center',
-		width: '30%',
-		innerHTML:'',
-		fontConfig: new FontConfig(),
-		borderConfig: new BorderConfig()
-	},
-	constructor: function(config){
-		this.initConfig(config);
-        this.callParent(arguments);
-    },
-	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 = '表头';
-var ROW_TYPE_TABLEFOOT = '表尾';
-var ROW_TYPE_PAGEHEAD = '页头';
-var ROW_TYPE_PAGEFOOT = '页尾';
-var ROW_TYPE_DATAITEM = '数据项'; 
 
 
-Ext4.define("TableRowConfig", {
-	config:{
-		align: 'center',
-		height: '25',
-		fontConfig: new FontConfig(),
-		borderConfig: new BorderConfig(),
-		type: ROW_TYPE_DATAITEM,
-		columnConfigs: []
-	},
-	constructor: function(config){
-		this.initConfig(config);
-        this.callParent(arguments);
-    },
-	getStyleStr: function(){
-		return '';
-	},
-	insertColumnConfig: function(columnConfig){
-		this.columnConfigs.push(columnConfig);
-	},
-	getAllColumnText: function(columnConfig){
-		var text = '';
-		for(var i=0;i<this.columnConfigs.length;++i){
-			if(text == ''){
-				text = this.columnConfigs[i].innerHTML;
-			}else{
-				text += ','+ this.columnConfigs[i].innerHTML;
-			}
-		}
-		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)){
-			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].innerHTML = textArr[i];
-			}else{
-				this.columnConfigs[i].innerHTML = '';
-			}
-		}
-		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 TableRowConfig({
-				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){
@@ -1245,266 +979,19 @@
 		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: [],
-		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 TableConfig({
-				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){
-			if(this.tableRowConfigs[i].type == ROW_TYPE_TABLEHEAD){
-				heads.push(this.tableRowConfigs[i]);
-			}
-		}
-		return heads;
-	},
-	getTableDataItemRowConfig: function(){
-		for(var i=0;i<this.tableRowConfigs.length;++i){
-			if(this.tableRowConfigs[i].type == ROW_TYPE_DATAITEM){
-				return this.tableRowConfigs[i];
-			}
-		}
-		return null;
-	},
-	getStyleStr: function(){
-		return this.borderConfig.getStyleStr() + this.fontConfig.getStyleStr();
-	},
-	insertRowConfig: function(tableRowConfig){
-		this.tableRowConfigs.push(tableRowConfig);
-	},
-	getFirstHeadRowConfig: function(tableRowConfig){
-		for(var i=0;i<this.tableRowConfigs.length;++i){
-			if(this.tableRowConfigs[i].type == ROW_TYPE_TABLEHEAD){
-				return this.tableRowConfigs[i];
-			}
-		}
-		return null;
-	},
-	getFirstDataItemRowConfig: function(tableRowConfig){
-		for(var i=0;i<this.tableRowConfigs.length;++i){
-			if(this.tableRowConfigs[i].type == ROW_TYPE_DATAITEM){
-				return this.tableRowConfigs[i];
-			}
-		}
-		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;
-	}
-});
+
 	
 // 测试数据源
 var dataSource1 = {
-	dataItems:[]	
+	materials:[]	
 }
 
 for(var i=0;i<10;++i){
 	var num = i+1;
-	dataSource1.dataItems.push({
+	dataSource1.materials.push({
 		fullName: '材料'+num,
 		count: '数量'+num,
 		price: '单价'+num
 	});
 }
-// 根据配置和数据源生成表格
-function createTableHtmlByConfig(tableConfig,obj){
-	var tableHtml = '';
-	var tempStr;
-	
-	tableConfig.tableStyle = tableConfig.getStyleStr();
-	// 表格本身
-	tempStr = '<table border ="1" cellspacing="0" cellpadding="0" style="${tableStyle}" >';
-	tableHtml += fillPropertiesFromObj(tableConfig,tempStr);
-	// 获取表头配置
-	var headRowConfigs = tableConfig.getTableHeadRowConfigs();
-	if(headRowConfigs.length > 0){
-		for(var r=0;r<headRowConfigs.length;++r){
-			var headRowConfig = headRowConfigs[r];
-			var columnConfigs = headRowConfig.columnConfigs;
-			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 ="'+tableColumnConfig.width+'" style="'+columnConfig.columnStyle+'">'+columnConfig.innerHTML+'</td>';
-				tableHtml += fillPropertiesFromObj(columnConfig,tempStr);
-			}
-			tableHtml += '</tr>';
-		}
-	}
-	// 数据项
-	var dataRowConfig = tableConfig.getTableDataItemRowConfig();
-	if(dataRowConfig != null){
-		var itemsPerRow = tableConfig.itemsPerRow;
-		var dataItems = obj.dataItems;
-		var mod = dataItems.length % itemsPerRow;
-		var itemsCount = dataItems.length;
-		var rowsCount = parseInt(itemsCount/itemsPerRow);
-		if(mod != 0){
-			rowsCount++;
-		}
-		if(rowsCount > 0){
-			var columnConfigs = dataRowConfig.columnConfigs;
-			for(var row=0;row<rowsCount;++row){
-				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 = {};
-					for(var i=0;i<itemsPerRow;++i){
-						var tdItemI = null;
-						var index = row*itemsPerRow + i;
-						if(index < itemsCount){
-							tdItemI = dataItems[index];
-						}else{
-							tdItemI = {};
-						}
-						itemsObj['item'+(i+1)] = tdItemI;
-					}
-					tempStr = '<td align="'+columnConfig.align+'" width ="'+tableColumnConfig.width+'" style="'+columnConfig.columnStyle+'">'+columnConfig.innerHTML+'</td>';
-					tableHtml += fillPropertiesFromObj(itemsObj,tempStr);
-				}
-				tableHtml += "</tr>";
-			}
-		}
-	}
-	
-	// 结束表格
-	tableHtml += '</table>';
 
-	return tableHtml;
-}