⬆️ jqGrid升级至5.5.2 & 代码整理

ihgoo · Jan 11, 2021 · 937e4a4 · 937e4a4
1 parent c4ceaf6
commit 937e4a4
Show file tree

Hide file tree

Showing 18 changed files with 498 additions and 131 deletions.
diff --git a/...in/plugins/jqgrid-5.3.0/grid.locale-cn.js → ...in/plugins/jqgrid-5.5.2/grid.locale-cn.js b/...in/plugins/jqgrid-5.3.0/grid.locale-cn.js → ...in/plugins/jqgrid-5.5.2/grid.locale-cn.js
diff --git a/src/main/resources/static/admin/plugins/jqgrid-5.5.2/jquery.jqGrid.min.js b/src/main/resources/static/admin/plugins/jqgrid-5.5.2/jquery.jqGrid.min.js
diff --git a/src/main/resources/static/admin/plugins/jqgrid-5.5.2/jquery.jqGrid.min.js.map b/src/main/resources/static/admin/plugins/jqgrid-5.5.2/jquery.jqGrid.min.js.map
diff --git a/...s/jqgrid-5.3.0/ui.jqgrid-bootstrap-ui.css → ...s/jqgrid-5.5.2/ui.jqgrid-bootstrap-ui.css b/...s/jqgrid-5.3.0/ui.jqgrid-bootstrap-ui.css → ...s/jqgrid-5.5.2/ui.jqgrid-bootstrap-ui.css
diff --git a/...gins/jqgrid-5.3.0/ui.jqgrid-bootstrap.css → ...gins/jqgrid-5.5.2/ui.jqgrid-bootstrap.css b/...gins/jqgrid-5.3.0/ui.jqgrid-bootstrap.css → ...gins/jqgrid-5.5.2/ui.jqgrid-bootstrap.css
@@ -103,7 +103,6 @@
 
 .ui-jqgrid .ui-th-div-ie {
 	white-space: nowrap; 
-	zoom :1; 
 	height:17px;
 }
 .ui-jqgrid .ui-jqgrid-resize {
@@ -145,6 +144,14 @@
 .ui-jqgrid tr.ui-search-toolbar td > input { }
 .ui-jqgrid tr.ui-search-toolbar select {}
 
+.ui-jqgrid .ui-th-column > .ui-th-div  {
+	padding-left: 14px;
+}
+.ui-jqgrid .ui-icon-left .ui-grid-ico-sort {
+	margin-left: -14px;
+}
+
+
 /* Body */ 
 .ui-jqgrid .table-bordered,
 .ui-jqgrid .table-bordered td,
@@ -424,7 +431,8 @@ div.tablediv > .table-bordered {
 .ui-jqgrid .ui-th-subgrid {height:20px;}
 .tablediv > .row { margin: 0 0}
 /* loading */
-.ui-jqgrid .loading {
+.ui-jqgrid .loading,
+.loading_pivot {
 	position: absolute; 
 	top: 45%;
 	left: 45%;
@@ -977,3 +985,18 @@ td.menu_text {
 	border-top: 2px solid #333333 ;
 	padding-top: 20px ;
 }
+.ui-jqgrid .jqgrid-caption-menu 
+{ 
+	left:0;
+	top:30px;
+	position:absolute;
+	display:none;
+	font-size: inherit;
+	width : auto;
+}
+.ui-jqgrid .jqgrid-column-menu
+{
+	font-size:inherit;
+	width:auto;
+	position :absolute;
+}