Merge branch 'master' of http://192.168.71.39/yanpeng/ureport2

ureport2-console/pom.xml

@@ -23,7 +23,7 @@
 			<groupId>com.bstek.ureport</groupId>
 			<artifactId>ureport2-core</artifactId>
 			<version>2.3.1-SNAPSHOT</version>
-		</dependency>		
+		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
@@ -59,6 +59,14 @@
 				<artifactId>maven-release-plugin</artifactId>
 				<version>2.5.3</version>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-gpg-plugin</artifactId>
+				<version>1.5</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	<pluginRepositories>
@@ -84,4 +92,4 @@
 			<url>http://maven.aiprose.com/nexus/content/repositories/ceis/</url>
 		</snapshotRepository>
 	</distributionManagement>
-</project>
+</project>

ureport2-js/src/Utils.js

@@ -75,7 +75,7 @@ export function resetTableData(hot){
 };
 
 export function buildNewCellDef(rowNumber,columnNumber){
-    let cellDef = {rowNumber,columnNumber,expand: 'None', cellStyle: {fontSize:9,forecolor:'0,0,0',fontFamily:'宋体',align:'center',valign:'middle'}, value: {type: 'simple', value: ''}};
+    let cellDef = {rowNumber,columnNumber,expand: 'None', cellStyle: {fontSize:10,forecolor:'0,0,0',fontFamily:'宋体',align:'center',valign:'middle'}, value: {type: 'simple', value: ''}};
     return cellDef;
 };
 

ureport2-js/src/table/ContextMenu.js

@@ -360,7 +360,7 @@ export default function buildMenuConfigure(){
                     hot.setDataAtCell(i,j,'');
                 }else if(type==='style'){
                     removeCellsMap.set(key,cell.cellStyle);
-                    cell.cellStyle={fontSize:9,forecolor:'0,0,0',fontFamily:'宋体',align:'center',valign:'middle'};
+                    cell.cellStyle={fontSize:10,forecolor:'0,0,0',fontFamily:'宋体',align:'center',valign:'middle'};
                 }else if(type==='all'){
                     context.removeCell(cell);
                     removeCellsMap.set(key,cell);
@@ -372,7 +372,7 @@ export default function buildMenuConfigure(){
                             type:'simple',
                             value:''
                         },
-                        cellStyle:{fontSize:9,forecolor:'0,0,0',fontFamily:'宋体',align:'center',valign:'middle'}
+                        cellStyle:{fontSize:10,forecolor:'0,0,0',fontFamily:'宋体',align:'center',valign:'middle'}
                     };
                     context.addCell(newCell);
                     hot.setDataAtCell(i,j,'');