From 3d69690615008ac883bb0697f185ad966cb3d50f Mon Sep 17 00:00:00 2001
From: huangxiaomin <huangxiaomin@bjceis.com>
Date: Wed, 7 Jul 2021 11:56:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:maven=E6=89=93=E5=8C=85=E8=B7=B3?=
 =?UTF-8?q?=E8=BF=87gpg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ureport2-console/pom.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ureport2-console/pom.xml b/ureport2-console/pom.xml
index 8d5999a..035ef91 100644
--- a/ureport2-console/pom.xml
+++ b/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>
\ No newline at end of file
+</project>

From 8f00ed938f4cc88811085ae7664b29f23bdcc072 Mon Sep 17 00:00:00 2001
From: huangxiaomin <huangxiaomin@bjceis.com>
Date: Wed, 7 Jul 2021 14:10:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20ureport=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=A1=8C/=E5=88=97=E6=97=B6=EF=BC=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ureport2-js/src/Utils.js             | 2 +-
 ureport2-js/src/table/ContextMenu.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ureport2-js/src/Utils.js b/ureport2-js/src/Utils.js
index 0a9c017..2ae991d 100644
--- a/ureport2-js/src/Utils.js
+++ b/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;
 };
 
diff --git a/ureport2-js/src/table/ContextMenu.js b/ureport2-js/src/table/ContextMenu.js
index 8083370..8b6a13b 100644
--- a/ureport2-js/src/table/ContextMenu.js
+++ b/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,'');