Merge branch 'dev'

src/utils/print.js

@@ -8,7 +8,13 @@ const Print = function(dom, options) {
 	}, options);
 
 	if ((typeof dom) === "string") {
+		try{
 			this.dom = document.querySelector(dom);
+		}catch{
+			var createDom = document.createElement("div")
+				createDom.innerHTML = dom
+			this.dom = createDom;
+		};
 	} else {
 		this.isDOM(dom)
 		this.dom = this.isDOM(dom) ? dom : dom.$el;
@@ -36,7 +42,7 @@ Print.prototype = {
 		}
 		str += "<style>" + (this.options.noPrint ? this.options.noPrint : '.no-print') +
 			"{display:none;}</style>";
-
+		str += "<style>html,body{background-color:#fff;}</style>";
 		return str;
 	},
 

src/views/vab/print.vue

@@ -3,12 +3,13 @@
 		<el-card shadow="never">
 			<el-tabs tab-position="top">
 				<el-tab-pane label="普通打印">
-					<el-alert title="打印当前页面已存在的元素,如包含.no-print样式就忽略" type="success" style="margin-bottom:20px;"></el-alert>
+					<el-alert title="打印当前页面已存在的元素,如包含.no-print样式就忽略,分页打印就需要{page-break-after: always}控制" type="success" style="margin-bottom:20px;"></el-alert>
 					<el-button type="primary" @click="print">普通打印</el-button>
 					<div style="height:20px"></div>
 					<div class="printMain" ref="printMain">
-						打印内容
+						<div class="item">打印内容1 <i class="el-icon-platform-eleme"></i> <p class="no-print">忽略打印</p></div>
-						<p class="no-print">忽略打印</p>
+						<div style="page-break-after: always;"></div>
+						<div class="item">打印内容2</div>
 					</div>
 				</el-tab-pane>
 				<el-tab-pane label="动态打印">
@@ -35,8 +36,7 @@
 			},
 			print2(){
 				//创建虚拟DOM结构后再传入
-				var dom = document.createElement("div")
+				var dom = "<h2>TITLE</h2><p>后创建的DOM结构</p>"
-					dom.innerHTML = "<div>后创建的DOM结构</div>"
 				print(dom)
 			}
 		}
@@ -44,6 +44,6 @@
 </script>
 
 <style scoped>
-	.printMain {padding:20px;border: 1px solid #eee;}
+	.printMain .item{padding:20px;border: 1px solid #409eff;margin-bottom: 20px;background: #ecf5ff;border-radius: 4px;}
 	.printMain p {margin-top: 20px;color: #999;}
 </style>