From af17a4664cff953ad7e2d34243e613d31f70fe0a Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 27 Nov 2018 22:38:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EWebOffice=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=A2=84=E8=A7=88=E7=9A=84=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/template/pom.xml                                 | 4 ++--
 web/.settings/org.eclipse.wst.common.component           | 3 +++
 web/pom.xml                                              | 9 ++++++++-
 .../main/resources/views/modules/test/testDataForm.html  | 4 ++--
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/modules/template/pom.xml b/modules/template/pom.xml
index 238af636..41c52203 100644
--- a/modules/template/pom.xml
+++ b/modules/template/pom.xml
@@ -13,8 +13,8 @@
 		
 		<!-- <relativePath>../parent/pom.xml</relativePath>					/jeesite -->
 		<!-- <relativePath>../../parent/pom.xml</relativePath>				/jeesite/modules -->
-		<!-- <relativePath>../../jeesite/parent/pom.xml</relativePath>		/jeesite-xxx -->
-		<!-- <relativePath>../../../jeesite/parent/pom.xml</relativePath>	/jeesite-xxx/modules -->
+		<!-- <relativePath>../../jeesite/parent/pom.xml</relativePath>		/jeesite- -->
+		<!-- <relativePath>../../../jeesite/parent/pom.xml</relativePath>	/jeesite-/modules -->
 		
 	</parent>
 	
diff --git a/web/.settings/org.eclipse.wst.common.component b/web/.settings/org.eclipse.wst.common.component
index 4e44282e..b8efeaba 100644
--- a/web/.settings/org.eclipse.wst.common.component
+++ b/web/.settings/org.eclipse.wst.common.component
@@ -12,6 +12,9 @@
         <dependent-module archiveName="jeesite-module-swagger-4.1.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-module-swagger/jeesite-module-swagger">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module archiveName="jeesite-module-weboffice-4.1.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-module-weboffice/jeesite-module-weboffice">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <property name="java-output-path" value="/src/main/webapp/WEB-INF/classes"/>
         <property name="context-root" value="web"/>
         <property name="component.exclusion.patterns" value="WEB-INF/classes/*.lic,userfiles/**"/>
diff --git a/web/pom.xml b/web/pom.xml
index 914f736b..870593ee 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -37,13 +37,20 @@
 			<version>${project.parent.version}</version>
 		</dependency>
 		
-		<!-- 在线文档 -->
+		<!-- 在线API文档 -->
 		<dependency>
 			<groupId>com.jeesite</groupId>
 			<artifactId>jeesite-module-swagger</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		
+		<!-- Office在线预览 -->
+		<dependency>
+			<groupId>com.jeesite</groupId>
+			<artifactId>jeesite-module-weboffice</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
+		
 		<!-- Spring Boot -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/web/src/main/resources/views/modules/test/testDataForm.html b/web/src/main/resources/views/modules/test/testDataForm.html
index 1304bdbf..0747d794 100644
--- a/web/src/main/resources/views/modules/test/testDataForm.html
+++ b/web/src/main/resources/views/modules/test/testDataForm.html
@@ -154,7 +154,7 @@
 							<label class="control-label col-sm-2">${text('图片上传')}：</label>
 							<div class="col-sm-10">
 								<#form:fileupload id="uploadImage" bizKey="${testData.id}" bizType="testData_image"
-									uploadType="image" class="" readonly="false"/>
+									uploadType="image" class="" readonly="false" preview="weboffice"/>
 							</div>
 						</div>
 					</div>
@@ -165,7 +165,7 @@
 							<label class="control-label col-sm-2">${text('附件上传')}：</label>
 							<div class="col-sm-10">
 								<#form:fileupload id="uploadFile" bizKey="${testData.id}" bizType="testData_file"
-									uploadType="all" class="" readonly="false"/>
+									uploadType="all" class="" readonly="false" preview="weboffice"/>
 							</div>
 						</div>
 					</div>